Bump version number to 6.19.1

Removed color codes from DiscordSRV messages

.github/workflows/maven.yml

@@ -0,0 +1,41 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support documentation.
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: write   # required for dependency submission
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Build with Maven
+        run: mvn -B -f VotingPlugin/pom.xml package
+
+      # Only submit dependency snapshot on push (not on pull_request)
+      - name: Submit Dependency Snapshot
+        if: github.event_name == 'push'
+        uses: advanced-security/maven-dependency-submission-action@v5
+        with:
+          directory: VotingPlugin   # path to pom.xml
+          # optional: maven-args: "-DskipTests"

README.md

@@ -2,10 +2,6 @@
 Plugin on SpigotMC
 https://www.spigotmc.org/resources/votingplugin.15358/
 
-## License
-### Creative Commons Arttribution 3.0 Unported
-https://github.com/BenCodez/VotingPlugin/blob/master/VotingPlugin/Resources/LICENSE.txt
-
 ### Maven:
 
     <repository>

VotingPlugin/.gitignore

@@ -6,3 +6,4 @@
 /.settings/
 /.classpath
 /.factorypath
+/.apt_generated_tests/

VotingPlugin/pom.xml

@@ -4,20 +4,21 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
 	<artifactId>votingplugin</artifactId>
-	<version>6.18.2</version>
+	<version>6.19.1</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
 		<github.global.server>github</github.global.server>
 		<project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
 		<build.number>NOTSET</build.number>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
+		<maven.compiler.source>8</maven.compiler.source>
+		<maven.compiler.target>8</maven.compiler.target>
+		<maven.compiler.release>8</maven.compiler.release>
 	</properties>
 	<build>
 		<resources>
 			<resource>
-				<directory>Resources</directory>
+				<directory>src/main/resources</directory>
 				<filtering>true</filtering>
 				<includes>
 					<include>plugin.yml</include>
@@ -26,11 +27,12 @@
 				</includes>
 			</resource>
 			<resource>
-				<directory>Resources</directory>
+				<directory>src/main/resources</directory>
 				<filtering>false</filtering>
 			</resource>
 		</resources>
-		<sourceDirectory>src</sourceDirectory>
+		<sourceDirectory>src/main/java</sourceDirectory>
+		<testSourceDirectory>src/test/java</testSourceDirectory>
 		<pluginManagement>
 			<plugins>
 				<plugin>
@@ -74,7 +76,7 @@
 						<configuration>
 							<addOutputDirectory>false</addOutputDirectory>
 							<outputDirectory>${project.basedir}/target/delombok</outputDirectory>
-							<sourceDirectory>${project.basedir}/src</sourceDirectory>
+							<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
 						</configuration>
 					</execution>
 				</executions>
@@ -82,10 +84,10 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.6.0</version>
+				<version>3.6.1</version>
 				<configuration>
 					<shadedArtifactAttached>false</shadedArtifactAttached>
-					<minimizeJar>true</minimizeJar>
+					<minimizeJar>false</minimizeJar>
 					<filters>
 						<filter>
 							<artifact>mysql-connector-java</artifact>
@@ -93,6 +95,14 @@
 								<include>**</include>
 							</includes>
 						</filter>
+					    <filter>
+                            <artifact>*:*</artifact>
+                              <excludes>
+                                 <exclude>META-INF/*.SF</exclude>
+                                 <exclude>META-INF/*.DSA</exclude>
+                                 <exclude>META-INF/*.RSA</exclude>
+                              </excludes>
+                        </filter>
 					</filters>
 					<relocations>
 						<relocation>
@@ -119,15 +129,9 @@
 							<shadedPattern>
 								${project.groupId}.votingplugin.mysqlapi</shadedPattern>
 						</relocation>
-						<relocation>
-							<pattern>com.zaxxer.HikariCP</pattern>
-							<shadedPattern>
-								${project.groupId}.votingplugin.HikariCP</shadedPattern>
-						</relocation>
 						<relocation>
 							<pattern>com.zaxxer.hikari</pattern>
-							<shadedPattern>
-								${project.groupId}.votingplugin.hikari</shadedPattern>
+							<shadedPattern>${project.groupId}.votingplugin.simpleapi.hikari</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>org.bstats</pattern>
@@ -156,7 +160,8 @@
 								<excludes>
 									<exclude>com.google.*:*</exclude>
 								</excludes>
-							</artifactSet>
+							</artifactSet> 
+							<minimizeJar>false</minimizeJar>
 							<createDependencyReducedPom>false</createDependencyReducedPom>
 							<filters>
 								<filter>
@@ -165,9 +170,14 @@
 										<exclude>META-INF/*.SF</exclude>
 										<exclude>META-INF/*.DSA</exclude>
 										<exclude>META-INF/*.RSA</exclude>
+										<exclude>module-info.class</exclude>
 									</excludes>
 								</filter>
 							</filters>
+							<transformers>
+        <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
+      </transformers>
 						</configuration>
 					</execution>
 				</executions>
@@ -204,24 +214,28 @@
 			<url>
 				https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
 		</repository>
+		<repository>
+            <id>scarsz</id>
+            <url>https://nexus.scarsz.me/content/groups/public/</url>
+        </repository>
 	</repositories>
 	<dependencies>
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.21.4-R0.1-SNAPSHOT</version>
+			<version>1.21.10-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.36</version>
+			<version>1.18.38</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.md-5</groupId>
 			<artifactId>bungeecord-api</artifactId>
-			<version>1.20-R0.3-SNAPSHOT</version>
+			<version>1.21-R0.4</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -257,9 +271,27 @@
 		<dependency>
 			<groupId>com.bencodez</groupId>
 			<artifactId>advancedcore</artifactId>
-			<version>3.7.14-SNAPSHOT</version>
+			<version>3.7.19</version>
 			<scope>compile</scope>
 		</dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.12.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>5.15.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.discordsrv</groupId>
+            <artifactId>discordsrv</artifactId>
+            <version>1.30.1</version>
+            <scope>provided</scope>
+        </dependency>
 	</dependencies>
 	<profiles>
 		<profile>
@@ -342,7 +374,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.11.2</version>
+						<version>3.12.0</version>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>
@@ -360,7 +392,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>3.1.3</version>
+						<version>3.1.4</version>
 						<configuration>
 							<skip>true</skip>
 						</configuration>
@@ -417,7 +449,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.11.2</version>
+						<version>3.12.0</version>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>
@@ -559,7 +591,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.11.2</version>
+						<version>3.12.0</version>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>
@@ -577,7 +609,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>3.1.3</version>
+						<version>3.1.4</version>
 						<configuration>
 							<skip>true</skip>
 						</configuration>

VotingPlugin/src/com/bencodez/votingplugin/bungee/NonVotedPlayersCache.java

@@ -1,118 +0,0 @@
-package com.bencodez.votingplugin.bungee;
-
-import java.io.File;
-import java.io.IOException;
-
-import lombok.Getter;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.config.Configuration;
-import net.md_5.bungee.config.ConfigurationProvider;
-import net.md_5.bungee.config.JsonConfiguration;
-import net.md_5.bungee.config.YamlConfiguration;
-
-public class NonVotedPlayersCache {
-	private VotingPluginBungee bungee;
-	@Getter
-	private Configuration data;
-
-	public NonVotedPlayersCache(VotingPluginBungee bungee) {
-		this.bungee = bungee;
-	}
-
-	public void addPlayer(ProxiedPlayer proxiedPlayer) {
-		if (!bungee.getVotingPluginProxy().getProxyMySQL().containsKeyQuery(proxiedPlayer.getUniqueId().toString())) {
-			addPlayer(proxiedPlayer.getUniqueId().toString(), proxiedPlayer.getName());
-		}
-	}
-
-	public void addPlayer(String uuid, String playerName) {
-		getData().set("NonVotedPlayers." + playerName + ".UUID", uuid);
-		getData().set("NonVotedPlayers." + playerName + ".LastTime", System.currentTimeMillis());
-		save();
-	}
-
-	public void addPlayerCheck(String uuid, String playerName) {
-		if (!bungee.getVotingPluginProxy().getProxyMySQL().containsKeyQuery(uuid)) {
-			addPlayer(uuid, playerName);
-		}
-	}
-
-	public void check() {
-		for (String player : getData().getSection("NonVotedPlayers").getKeys()) {
-			long time = getData().getLong("NonVotedPlayers." + player + ".LastTime", 0);
-			if ((System.currentTimeMillis() - time) > 1000 * 60 * 60 * 24 * 5) {
-				remove(player);
-			} else {
-				String uuid = getData().getString("NonVotedPlayers." + player + ".UUID", "");
-				if (!uuid.isEmpty()) {
-					if (bungee.getVotingPluginProxy().getProxyMySQL().containsKeyQuery(uuid)) {
-						remove(player);
-					}
-				} else {
-					remove(player);
-				}
-			}
-		}
-		save();
-	}
-
-	public void load() {
-		if (!bungee.getDataFolder().exists()) {
-			bungee.getDataFolder().mkdir();
-		}
-
-		File yamlFile = new File(bungee.getDataFolder(), "nonvotedplayerscache.yml");
-		File file = new File(bungee.getDataFolder(), "nonvotedplayerscache.json");
-
-		if (!file.exists()) {
-			try {
-				file.createNewFile();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-
-		if (yamlFile.exists()) {
-			try {
-				data = ConfigurationProvider.getProvider(YamlConfiguration.class)
-						.load(new File(bungee.getDataFolder(), "nonvotedplayerscache.yml"));
-				yamlFile.renameTo(new File(bungee.getDataFolder(), "oldnonvotedplayerscache.yml"));
-				ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
-						new File(bungee.getDataFolder(), "oldnonvotedplayerscache.yml"));
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-
-			save();
-		}
-
-		try {
-			data = ConfigurationProvider.getProvider(JsonConfiguration.class)
-					.load(new File(bungee.getDataFolder(), "nonvotedplayerscache.json"));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public String playerExists(String playerName) {
-		if (getData().getSection("NonVotedPlayers").getKeys().contains(playerName)) {
-			return getData().getString("NonVotedPlayers." + playerName + ".UUID", "");
-		}
-		return "";
-	}
-
-	private void remove(String player) {
-		bungee.debug("Removing nonvotedplayer: " + player);
-		getData().set("NonVotedPlayers." + player, null);
-	}
-
-	public void save() {
-		try {
-			ConfigurationProvider.getProvider(JsonConfiguration.class).save(data,
-					new File(bungee.getDataFolder(), "nonvotedplayerscache.json"));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-}

VotingPlugin/src/com/bencodez/votingplugin/bungee/VoteCache.java

@@ -1,161 +0,0 @@
-package com.bencodez.votingplugin.bungee;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collection;
-
-import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
-
-import lombok.Getter;
-import net.md_5.bungee.config.Configuration;
-import net.md_5.bungee.config.ConfigurationProvider;
-import net.md_5.bungee.config.JsonConfiguration;
-import net.md_5.bungee.config.YamlConfiguration;
-
-public class VoteCache {
-	private VotingPluginBungee bungee;
-	@Getter
-	private Configuration data;
-
-	public VoteCache(VotingPluginBungee bungee) {
-		this.bungee = bungee;
-	}
-
-	public void addTimedVote(int num, VoteTimeQueue voteTimedQueue) {
-		Configuration section = getData().getSection("TimedVoteCache." + num);
-		section.set("Name", voteTimedQueue.getName());
-		section.set("Service", voteTimedQueue.getService());
-		section.set("Time", voteTimedQueue.getTime());
-	}
-
-	public void addVote(String server, int num, OfflineBungeeVote voteData) {
-		Configuration section = getData().getSection("VoteCache." + server + "." + num);
-		section.set("Name", voteData.getPlayerName());
-		section.set("Service", voteData.getService());
-		section.set("UUID", voteData.getUuid());
-		section.set("Time", voteData.getTime());
-		section.set("Real", voteData.isRealVote());
-		section.set("Text", voteData.getText());
-	}
-
-	public void addVoteOnline(String player, int num, OfflineBungeeVote voteData) {
-		Configuration section = getData().getSection("OnlineCache." + player + "." + num);
-		section.set("Name", voteData.getPlayerName());
-		section.set("Service", voteData.getService());
-		section.set("UUID", voteData.getUuid());
-		section.set("Time", voteData.getTime());
-		section.set("Real", voteData.isRealVote());
-		section.set("Text", voteData.getText());
-	}
-
-	public void clearData() {
-		getData().set("VoteCache", null);
-		getData().set("OnlineCache", null);
-		getData().set("TimedVoteCache", null);
-		save();
-	}
-
-	public Collection<String> getOnlineVotes(String name) {
-		return getData().getSection("OnlineCache." + name).getKeys();
-	}
-
-	public Configuration getOnlineVotes(String name, String num) {
-		return getData().getSection("OnlineCache." + name + "." + num);
-	}
-
-	public Collection<String> getPlayers() {
-		return getData().getSection("OnlineCache").getKeys();
-	}
-
-	public Collection<String> getServers() {
-		return getData().getSection("VoteCache").getKeys();
-	}
-
-	public Collection<String> getServerVotes(String server) {
-		return getData().getSection("VoteCache." + server).getKeys();
-	}
-
-	public Configuration getServerVotes(String server, String num) {
-		return getData().getSection("VoteCache." + server + "." + num);
-	}
-
-	public Collection<String> getTimedVoteCache() {
-		return getData().getSection("TimedVoteCache").getKeys();
-	}
-
-	public Configuration getTimedVoteCache(String key) {
-		return getData().getSection("TimedVoteCache." + key);
-	}
-
-	public int getVotePartyCache(String server) {
-		return getData().getInt("VoteParty.Cache." + server, 0);
-	}
-
-	public int getVotePartyCurrentVotes() {
-		return getData().getInt("VoteParty.CurrentVotes", 0);
-	}
-
-	public int getVotePartyInreaseVotesRequired() {
-		return getData().getInt("VoteParty.IncreaseVotes", 0);
-	}
-
-	public void load() {
-		if (!bungee.getDataFolder().exists()) {
-			bungee.getDataFolder().mkdir();
-		}
-
-		File yamlFile = new File(bungee.getDataFolder(), "votecache.yml");
-
-		File file = new File(bungee.getDataFolder(), "votecache.json");
-
-		if (!file.exists()) {
-			try {
-				file.createNewFile();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		if (yamlFile.exists()) {
-			try {
-				data = ConfigurationProvider.getProvider(YamlConfiguration.class)
-						.load(new File(bungee.getDataFolder(), "votecache.yml"));
-				yamlFile.renameTo(new File(bungee.getDataFolder(), "oldvotecache.yml"));
-				ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
-						new File(bungee.getDataFolder(), "oldvotecache.yml"));
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-
-			save();
-		}
-
-		try {
-			data = ConfigurationProvider.getProvider(JsonConfiguration.class)
-					.load(new File(bungee.getDataFolder(), "votecache.json"));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void save() {
-		try {
-			ConfigurationProvider.getProvider(JsonConfiguration.class).save(data,
-					new File(bungee.getDataFolder(), "votecache.json"));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void setVotePartyCache(String server, int amount) {
-		getData().set("VoteParty.Cache." + server, amount);
-	}
-
-	public void setVotePartyCurrentVotes(int amount) {
-		getData().set("VoteParty.CurrentVotes", amount);
-	}
-
-	public void setVotePartyInreaseVotesRequired(int amount) {
-		getData().set("VoteParty.IncreaseVotes", amount);
-	}
-
-}

VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/VoteCache.java

@@ -1,107 +0,0 @@
-package com.bencodez.votingplugin.bungee.velocity;
-
-import java.io.File;
-import java.util.Collection;
-
-import com.bencodez.simpleapi.file.velocity.VelocityJSONFile;
-import com.bencodez.votingplugin.bungee.OfflineBungeeVote;
-import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
-
-import ninja.leaping.configurate.ConfigurationNode;
-
-public class VoteCache extends VelocityJSONFile {
-
-	public VoteCache(File file) {
-		super(file);
-	}
-
-	public void addTimedVote(int num, VoteTimeQueue voteTimedQueue) {
-		getNode("TimedVoteCache", "" + num, "Name").setValue(voteTimedQueue.getName());
-		getNode("TimedVoteCache", "" + num, "Service").setValue(voteTimedQueue.getService());
-		getNode("TimedVoteCache", "" + num, "Time").setValue(voteTimedQueue.getTime());
-	}
-
-	public void addVote(String server, int num, OfflineBungeeVote voteData) {
-
-		getNode("VoteCache", server, "" + num, "Name").setValue(voteData.getPlayerName());
-		getNode("VoteCache", server, "" + num, "Service").setValue(voteData.getService());
-		getNode("VoteCache", server, "" + num, "UUID").setValue(voteData.getUuid());
-		getNode("VoteCache", server, "" + num, "Time").setValue(voteData.getTime());
-		getNode("VoteCache", server, "" + num, "Real").setValue(voteData.isRealVote());
-		getNode("VoteCache", server, "" + num, "Text").setValue(voteData.getText());
-	}
-
-	public void addVoteOnline(String player, int num, OfflineBungeeVote voteData) {
-
-		getNode("OnlineCache", player, "" + num, "Name").setValue(voteData.getPlayerName());
-		getNode("OnlineCache", player, "" + num, "Service").setValue(voteData.getService());
-		getNode("OnlineCache", player, "" + num, "UUID").setValue(voteData.getUuid());
-		getNode("OnlineCache", player, "" + num, "Time").setValue(voteData.getTime());
-		getNode("OnlineCache", player, "" + num, "Real").setValue(voteData.isRealVote());
-		getNode("OnlineCache", player, "" + num, "Text").setValue(voteData.getText());
-	}
-
-	public void clearData() {
-		getNode("VoteCache").setValue(null);
-		getNode("OnlineCache").setValue(null);
-		getNode("TimedVoteCache").setValue(null);
-		save();
-	}
-
-	public Collection<String> getOnlineVotes(String name) {
-		return getKeys(getNode("OnlineCache", name));
-	}
-
-	public ConfigurationNode getOnlineVotes(String name, String num) {
-		return getNode("OnlineCache", name, num);
-	}
-
-	public Collection<String> getPlayers() {
-		return getKeys(getNode("OnlineCache"));
-	}
-
-	public Collection<String> getServers() {
-		return getKeys(getNode("VoteCache"));
-	}
-
-	public Collection<String> getServerVotes(String server) {
-		return getKeys(getNode("VoteCache", server));
-	}
-
-	public ConfigurationNode getServerVotes(String server, String num) {
-		return getNode("VoteCache", server, num);
-	}
-
-	public Collection<String> getTimedVoteCache() {
-		return getKeys(getNode("TimedVoteCache"));
-	}
-
-	public ConfigurationNode getTimedVoteCache(String name) {
-		return getNode("TimedVoteCache", name);
-	}
-
-	public int getVotePartyCache(String server) {
-		return getNode("VoteParty").getNode("Cache").getNode(server).getInt(0);
-	}
-
-	public int getVotePartyCurrentVotes() {
-		return getInt(getNode("VoteParty").getNode("CurrentVotes"), 0);
-	}
-
-	public int getVotePartyInreaseVotesRequired() {
-		return getInt(getNode("VoteParty").getNode("IncreaseVotes"), 0);
-	}
-
-	public void setVotePartyCache(String server, int amount) {
-		getNode("VoteParty").getNode("Cache").getNode(server).setValue(amount);
-	}
-
-	public void setVotePartyCurrentVotes(int amount) {
-		getNode("VoteParty").getNode("CurrentVotes").setValue(amount);
-	}
-
-	public void setVotePartyInreaseVotesRequired(int amount) {
-		getNode("VoteParty").getNode("IncreaseVotes").setValue(amount);
-	}
-
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/BungeeHandler.java

@@ -1,6 +1,7 @@
 package com.bencodez.votingplugin;
 
 import java.io.File;
+import java.sql.SQLException;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.ArrayList;
@@ -9,34 +10,41 @@ import java.util.UUID;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
+import org.eclipse.paho.client.mqttv3.MqttException;
 
 import com.bencodez.advancedcore.api.misc.MiscUtils;
-import com.bencodez.advancedcore.api.misc.encryption.EncryptionHandler;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.time.TimeType;
 import com.bencodez.advancedcore.api.user.UserStorage;
-import com.bencodez.advancedcore.api.user.usercache.value.DataValue;
-import com.bencodez.advancedcore.api.user.usercache.value.DataValueBoolean;
-import com.bencodez.advancedcore.api.user.userstorage.mysql.api.config.MysqlConfigSpigot;
-import com.bencodez.advancedcore.bungeeapi.GlobalMessage.GlobalMessageHandler;
-import com.bencodez.advancedcore.bungeeapi.GlobalMessage.GlobalMessageListener;
 import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalDataHandler;
 import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalMySQL;
-import com.bencodez.advancedcore.bungeeapi.pluginmessage.PluginMessageHandler;
-import com.bencodez.advancedcore.bungeeapi.redis.RedisHandler;
-import com.bencodez.advancedcore.bungeeapi.redis.RedisListener;
-import com.bencodez.advancedcore.bungeeapi.sockets.ClientHandler;
-import com.bencodez.advancedcore.bungeeapi.sockets.SocketHandler;
-import com.bencodez.advancedcore.bungeeapi.sockets.SocketReceiver;
 import com.bencodez.simpleapi.array.ArrayUtils;
-import com.bencodez.votingplugin.bungee.BungeeMessageData;
-import com.bencodez.votingplugin.bungee.BungeeMethod;
-import com.bencodez.votingplugin.bungee.BungeeVersion;
+import com.bencodez.simpleapi.encryption.EncryptionHandler;
+import com.bencodez.simpleapi.messages.MessageAPI;
+import com.bencodez.simpleapi.servercomm.global.GlobalMessageHandler;
+import com.bencodez.simpleapi.servercomm.global.GlobalMessageListener;
+import com.bencodez.simpleapi.servercomm.mqtt.MqttHandler;
+import com.bencodez.simpleapi.servercomm.mqtt.MqttHandler.MessageHandler;
+import com.bencodez.simpleapi.servercomm.mqtt.MqttServerComm;
+import com.bencodez.simpleapi.servercomm.mysql.BackendMessenger;
+import com.bencodez.simpleapi.servercomm.pluginmessage.PluginMessageHandler;
+import com.bencodez.simpleapi.servercomm.redis.RedisHandler;
+import com.bencodez.simpleapi.servercomm.redis.RedisListener;
+import com.bencodez.simpleapi.servercomm.sockets.ClientHandler;
+import com.bencodez.simpleapi.servercomm.sockets.SocketHandler;
+import com.bencodez.simpleapi.servercomm.sockets.SocketReceiver;
+import com.bencodez.simpleapi.sql.data.DataValue;
+import com.bencodez.simpleapi.sql.data.DataValueBoolean;
+import com.bencodez.simpleapi.sql.mysql.config.MysqlConfigSpigot;
 import com.bencodez.votingplugin.objects.VoteSite;
+import com.bencodez.votingplugin.proxy.BungeeMessageData;
+import com.bencodez.votingplugin.proxy.BungeeMethod;
+import com.bencodez.votingplugin.proxy.BungeeVersion;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 import lombok.Getter;
@@ -74,6 +82,9 @@ public class BungeeHandler implements Listener {
 
 	private Thread redisThread;
 
+	@Getter
+	private BackendMessenger backendMysqlMessenger;
+
 	public BungeeHandler(VotingPluginMain plugin) {
 		this.plugin = plugin;
 	}
@@ -161,6 +172,10 @@ public class BungeeHandler implements Listener {
 	}
 
 	public void close() {
+		if (backendMysqlMessenger != null) {
+			backendMysqlMessenger.shutdown();
+		}
+
 		if (socketHandler != null) {
 			socketHandler.closeConnection();
 		}
@@ -188,7 +203,14 @@ public class BungeeHandler implements Listener {
 			@Override
 			public void sendMessage(String subChannel, String... messageData) {
 				if (method.equals(BungeeMethod.MYSQL)) {
-					plugin.getPluginMessaging().sendPluginMessage(subChannel, messageData);
+					// plugin.getPluginMessaging().sendPluginMessage(subChannel, messageData);
+
+					try {
+						backendMysqlMessenger.sendToProxy(subChannel + "%l%" + String.join("%l%", messageData));
+					} catch (SQLException e) {
+						e.printStackTrace();
+					}
+
 				} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
 					plugin.getPluginMessaging().sendPluginMessage(subChannel, messageData);
 				} else if (method.equals(BungeeMethod.SOCKETS)) {
@@ -202,6 +224,17 @@ public class BungeeHandler implements Listener {
 					list.addAll(ArrayUtils.convert(messageData));
 					redisHandler.sendMessage(plugin.getBungeeSettings().getRedisPrefix() + "VotingPlugin",
 							ArrayUtils.convert(list));
+				} else if (method.equals(BungeeMethod.MQTT)) {
+					ArrayList<String> list = new ArrayList<>();
+					list.add(subChannel);
+					list.addAll(ArrayUtils.convert(messageData));
+					try {
+						mqttHandler.publish(plugin.getBungeeSettings().getMqttPrefix() + "votingplugin/servers/proxy",
+								String.join(":", list));
+					} catch (Exception e) {
+						e.printStackTrace();
+					}
+
 				}
 			}
 		};
@@ -324,10 +357,6 @@ public class BungeeHandler implements Listener {
 							.getVotingPluginUser(UUID.fromString(uuid), player);
 					user.cache();
 
-					if (plugin.getBungeeSettings().isPerServerPoints()) {
-						user.addPoints(plugin.getConfigFile().getPointsOnVote());
-					}
-
 					boolean setTotals = Boolean.valueOf(args.get(7));
 
 					boolean wasOnline = Boolean.valueOf(args.get(4));
@@ -403,11 +432,6 @@ public class BungeeHandler implements Listener {
 
 				user.offVote();
 
-				if (args.size() > 3 && plugin.getBungeeSettings().isPerServerMilestones()) {
-					BungeeMessageData text = new BungeeMessageData(args.get(3));
-					plugin.getSpecialRewards().checkMilestone(user, text, true);
-				}
-
 				if (args.size() > 2) {
 					bungeeVotePartyCurrent = Integer.parseInt(args.get(1));
 					bungeeVotePartyRequired = Integer.parseInt(args.get(2));
@@ -415,6 +439,26 @@ public class BungeeHandler implements Listener {
 					plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
 				}
 
+				if (args.size() > 3 && plugin.getBungeeSettings().isPerServerMilestones()) {
+					BungeeMessageData text = new BungeeMessageData(args.get(3));
+					plugin.getSpecialRewards().checkMilestone(user, text, true);
+				}
+
+				if (args.size() > 5) {
+					String service = args.get(4);
+					String data = args.get(5);
+					if (MessageAPI.isLong(data)) {
+						long time = Long.valueOf(data);
+						if (time > 0) {
+							user.setTime(plugin.getVoteSite(service, true), time);
+						} else {
+							if (plugin.getBungeeSettings().isBungeeDebug()) {
+								plugin.debug("Invalid last vote time received from bungee: " + time);
+							}
+						}
+					}
+				}
+
 				plugin.setUpdate(true);
 			}
 		});
@@ -506,6 +550,27 @@ public class BungeeHandler implements Listener {
 
 		if (method.equals(BungeeMethod.MYSQL)) {
 			plugin.registerBungeeChannels(plugin.getBungeeSettings().getPluginMessagingChannel());
+
+			try {
+				backendMysqlMessenger = new BackendMessenger("VotingPlugin",
+						plugin.getMysql().getMysql().getConnectionManager().getDataSource(),
+						plugin.getOptions().getServer(), msg -> {
+							plugin.debug("Proxy sent: " + msg.payload);
+
+							String[] message = msg.payload.split(Pattern.quote("%l%"));
+							if (message.length > 0) {
+								ArrayList<String> list = new ArrayList<>();
+								for (int i = 1; i < message.length; i++) {
+									list.add(message[i]);
+								}
+								globalMessageHandler.onMessage(message[0], list);
+							}
+
+						});
+			} catch (SQLException e) {
+				e.printStackTrace();
+			}
+
 		} else if (method.equals(BungeeMethod.REDIS)) {
 			redisHandler = new RedisHandler(plugin.getBungeeSettings().getRedisHost(),
 					plugin.getBungeeSettings().getRedisPort(), plugin.getBungeeSettings().getRedisUsername(),
@@ -520,7 +585,9 @@ public class BungeeHandler implements Listener {
 
 				@Override
 				protected void onMessage(String channel, String[] message) {
-					plugin.getLogger().info(channel + ArrayUtils.makeStringList(ArrayUtils.convert(message)));
+					if (plugin.getBungeeSettings().isBungeeDebug()) {
+						plugin.debug(channel + " " + ArrayUtils.makeStringList(ArrayUtils.convert(message)));
+					}
 					if (message.length > 0) {
 						ArrayList<String> list = new ArrayList<>();
 						for (int i = 1; i < message.length; i++) {
@@ -547,88 +614,24 @@ public class BungeeHandler implements Listener {
 			plugin.registerBungeeChannels(plugin.getBungeeSettings().getPluginMessagingChannel());
 
 			if (plugin.getBungeeSettings().isPluginMessageEncryption()) {
-				encryptionHandler = new EncryptionHandler(new File(plugin.getDataFolder(), "secretkey.key"));
+				encryptionHandler = new EncryptionHandler(plugin.getName(),
+						new File(plugin.getDataFolder(), "secretkey.key"));
 				plugin.getPluginMessaging().setEncryptionHandler(encryptionHandler);
 			}
 
-			bungeeVotePartyCurrent = plugin.getServerData().getBungeeVotePartyCurrent();
-			bungeeVotePartyRequired = plugin.getServerData().getBungeeVotePartyRequired();
-
 			plugin.getPluginMessaging().setDebug(plugin.getBungeeSettings().isBungeeDebug());
 
-			plugin.getPluginMessaging().add(new PluginMessageHandler("Vote") {
+			plugin.getPluginMessaging().add(new PluginMessageHandler() {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					globalMessageHandler.onMessage("Vote", args);
-				}
-			});
+					globalMessageHandler.onMessage(subChannel, args);
 
-			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteOnline") {
-				@Override
-				public void onRecieve(String subChannel, ArrayList<String> args) {
-					globalMessageHandler.onMessage("VoteOnline", args);
-				}
-			});
-
-			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteUpdate") {
-				@Override
-				public void onRecieve(String subChannel, ArrayList<String> args) {
-					globalMessageHandler.onMessage("VoteUpdate", args);
-				}
-			});
-
-			plugin.getPluginMessaging().add(new PluginMessageHandler("BungeeTimeChange") {
-				@Override
-				public void onRecieve(String subChannel, ArrayList<String> args) {
-					globalMessageHandler.onMessage("BungeeTimeChange", args);
-
-				}
-			});
-
-			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteBroadcast") {
-				@Override
-				public void onRecieve(String subChannel, ArrayList<String> args) {
-					globalMessageHandler.onMessage("VoteBroadcast", args);
-				}
-			});
-
-			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteBroadcastOffline") {
-				@Override
-				public void onRecieve(String subChannel, ArrayList<String> args) {
-					globalMessageHandler.onMessage("VoteBroadcastOffline", args);
-				}
-			});
-
-			plugin.getPluginMessaging().add(new PluginMessageHandler("Status") {
-				@Override
-				public void onRecieve(String subChannel, ArrayList<String> args) {
-					globalMessageHandler.onMessage("Status", args);
-				}
-			});
-
-			plugin.getPluginMessaging().add(new PluginMessageHandler("ServerName") {
-				@Override
-				public void onRecieve(String subChannel, ArrayList<String> args) {
-					globalMessageHandler.onMessage("ServerName", args);
-				}
-			});
-
-			plugin.getPluginMessaging().add(new PluginMessageHandler("VotePartyBungee") {
-				@Override
-				public void onRecieve(String subChannel, ArrayList<String> args) {
-					globalMessageHandler.onMessage("VotePartyBungee", args);
-				}
-			});
-
-			plugin.getPluginMessaging().add(new PluginMessageHandler("VotePartyBroadcast") {
-				@Override
-				public void onRecieve(String subChannel, ArrayList<String> args) {
-					globalMessageHandler.onMessage("VotePartyBroadcast", args);
 				}
 			});
 
 		} else if (method.equals(BungeeMethod.SOCKETS)) {
-			encryptionHandler = new EncryptionHandler(new File(plugin.getDataFolder(), "secretkey.key"));
+			encryptionHandler = new EncryptionHandler(plugin.getName(),
+					new File(plugin.getDataFolder(), "secretkey.key"));
 
 			clientHandler = new ClientHandler(plugin.getBungeeSettings().getBungeeServerHost(),
 					plugin.getBungeeSettings().getBungeeServerPort(), encryptionHandler,
@@ -644,158 +647,55 @@ public class BungeeHandler implements Listener {
 				}
 			};
 
-			socketHandler.add(new SocketReceiver("bungeevote") {
+			socketHandler.add(new SocketReceiver() {
 
 				@Override
 				public void onReceive(String[] data) {
-					if (data.length > 5) {
-						plugin.extraDebug("BungeeVote from " + data[2] + ", processing");
-						String uuid = data[1];
-						VotingPluginUser user = null;
-						if (!uuid.isEmpty()) {
-							user = plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuid));
-						} else {
-							user = plugin.getVotingPluginUserManager().getVotingPluginUser(data[2]);
-						}
-
-						user.cache();
-
-						if (plugin.getBungeeSettings().isPerServerPoints()) {
-							user.addPoints(plugin.getConfigFile().getPointsOnVote());
-						}
-
-						user.bungeeVote(data[3], new BungeeMessageData(data[4]), !Boolean.valueOf(data[5]));
-					}
+					globalMessageHandler.onMessage(data[0], ArrayUtils.convertAndRemoveFirst(data));
 				}
 			});
 
-			socketHandler.add(new SocketReceiver("BungeeTimeChange") {
-
-				@Override
-				public void onReceive(String[] data) {
-					checkGlobalData();
+		} else if (method.equals(BungeeMethod.MQTT)) {
+			try {
+				String id = plugin.getBungeeSettings().getMqttClientID();
+				if (id.isEmpty()) {
+					id = plugin.getOptions().getServer();
 				}
-			});
+				mqttHandler = new MqttHandler(new MqttServerComm(plugin.getBungeeSettings().getMqttClientID(),
+						plugin.getBungeeSettings().getMqttBrokerURL(), plugin.getBungeeSettings().getMqttUsername(),
+						plugin.getBungeeSettings().getMqttPassword()), 2);
+				mqttHandler.subscribe(plugin.getBungeeSettings().getMqttPrefix() + "votingplugin/servers/"
+						+ plugin.getOptions().getServer(), new MessageHandler() {
 
-			socketHandler.add(new SocketReceiver("bungeevoteonline") {
+							@Override
+							public void onMessage(String topic, String payload) {
+								String[] message = payload.split(":");
 
-				@Override
-				public void onReceive(String[] data) {
-					if (data.length > 5) {
-						plugin.extraDebug("BungeeVoteOnline from " + data[2] + ", processing");
-						String uuid = data[1];
-						VotingPluginUser user = null;
-						if (!uuid.isEmpty()) {
-							user = plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuid));
-						} else {
-							user = plugin.getVotingPluginUserManager().getVotingPluginUser(data[2]);
-						}
-
-						user.cache();
-
-						if (plugin.getBungeeSettings().isPerServerPoints()) {
-							user.addPoints(plugin.getConfigFile().getPointsOnVote());
-						}
-
-						user.bungeeVoteOnline(data[3], new BungeeMessageData(data[4]), !Boolean.valueOf(data[5]));
-					}
-				}
-			});
-
-			socketHandler.add(new SocketReceiver("BroadcastOffline") {
-
-				@Override
-				public void onReceive(String[] data) {
-					if (data.length > 2) {
-						String votes = data[0];
-						String p = data[1];
-						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(p);
-						user.offlineBroadcast(user, false, Integer.parseInt(votes));
-					}
-				}
-			});
-
-			socketHandler.add(new SocketReceiver("BungeeBroadcast") {
-
-				@Override
-				public void onReceive(String[] data) {
-					if (data.length > 2) {
-						VoteSite site = plugin.getVoteSite(data[1], true);
-						String p = data[3];
-						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(p);
-						if (site != null) {
-							site.broadcastVote(user, false);
-						} else {
-							plugin.getLogger().warning("No votesite for " + data[1]);
-						}
-					}
-				}
-			});
-
-			socketHandler.add(new SocketReceiver("Broadcast") {
-
-				@Override
-				public void onReceive(String[] data) {
-					if (data.length > 2) {
-						VoteSite site = plugin.getVoteSite(data[1], true);
-						String p = data[2];
-						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(p);
-						if (site != null) {
-							site.broadcastVote(user, false);
-						} else {
-							plugin.getLogger().warning("No votesite for " + data[1]);
-						}
-					}
-				}
-			});
-
-			socketHandler.add(new SocketReceiver("Status") {
-
-				@Override
-				public void onReceive(String[] data) {
-					if (data.length > 0) {
-						plugin.getLogger().info("Received status command, sending status back");
-						sendData("StatusOkay", plugin.getOptions().getServer());
-
-					}
-				}
-			});
-
-			socketHandler.add(new SocketReceiver("BungeeUpdate") {
-
-				@Override
-				public void onReceive(String[] data) {
-					plugin.setUpdate(true);
-				}
-			});
-
-			socketHandler.add(new SocketReceiver("VotePartyBungee") {
-
-				@Override
-				public void onReceive(String[] data) {
-					for (Player p : Bukkit.getOnlinePlayers()) {
-						new RewardBuilder(plugin.getBungeeSettings().getData(), "BungeeVotePartyRewards").send(p);
-					}
-				}
-			});
-
-			socketHandler.add(new SocketReceiver("VotePartyBroadcast") {
-
-				@Override
-				public void onReceive(String[] data) {
-					String broadcast = data[0];
-					MiscUtils.getInstance().broadcast(broadcast);
-				}
-			});
-
-			if (plugin.getOptions().getServer().equalsIgnoreCase("pleaseset")) {
-				plugin.getLogger().warning("Server name for bungee voting is not set, please set it");
+								if (message.length > 0) {
+									globalMessageHandler.onMessage(message[0],
+											ArrayUtils.convertAndRemoveFirst(message));
+								}
+							}
+						});
+			} catch (MqttException e) {
+				e.printStackTrace();
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
 			}
-
 		}
 
+		bungeeVotePartyCurrent = plugin.getServerData().getBungeeVotePartyCurrent();
+		bungeeVotePartyRequired = plugin.getServerData().getBungeeVotePartyRequired();
+
+		if (plugin.getOptions().getServer().equalsIgnoreCase("pleaseset")) {
+			plugin.getLogger().warning("Server name for bungee voting is not set, please set it");
+		}
 	}
 
+	@Getter
+	private MqttHandler mqttHandler;
+
 	public void loadGlobalMysql() {
 		if (plugin.getBungeeSettings().isGloblalDataEnabled()) {
 			if (timer != null) {
@@ -832,12 +732,12 @@ public class BungeeHandler implements Listener {
 						new GlobalMySQL("VotingPlugin_GlobalData", plugin.getMysql().getMysql()) {
 
 							@Override
-							public void debug(Exception e) {
+							public void debugEx(Exception e) {
 								plugin.debug(e);
 							}
 
 							@Override
-							public void debug(String text) {
+							public void debugLog(String text) {
 								plugin.debug(text);
 							}
 
@@ -847,7 +747,7 @@ public class BungeeHandler implements Listener {
 							}
 
 							@Override
-							public void severe(String text) {
+							public void logSevere(String text) {
 								plugin.getLogger().severe(text);
 							}
 
@@ -862,12 +762,12 @@ public class BungeeHandler implements Listener {
 								plugin.getBungeeSettings().getData().getConfigurationSection("GlobalData"))) {
 
 							@Override
-							public void debug(Exception e) {
+							public void debugEx(Exception e) {
 								plugin.debug(e);
 							}
 
 							@Override
-							public void debug(String text) {
+							public void debugLog(String text) {
 								plugin.debug(text);
 							}
 
@@ -877,7 +777,7 @@ public class BungeeHandler implements Listener {
 							}
 
 							@Override
-							public void severe(String text) {
+							public void logSevere(String text) {
 								plugin.getLogger().severe(text);
 							}
 

VotingPlugin/src/main/java/com/bencodez/votingplugin/VotingPluginMain.java

@@ -55,11 +55,10 @@ import com.bencodez.advancedcore.api.rewards.injected.RewardInjectInt;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInjectValidator;
 import com.bencodez.advancedcore.api.rewards.injectedrequirement.RequirementInjectConfigurationSection;
 import com.bencodez.advancedcore.api.user.AdvancedCoreUser;
-import com.bencodez.advancedcore.api.user.userstorage.Column;
 import com.bencodez.advancedcore.logger.Logger;
 import com.bencodez.simpleapi.file.YMLConfig;
-import com.bencodez.simpleapi.nms.NMSManager;
 import com.bencodez.simpleapi.skull.SkullCache;
+import com.bencodez.simpleapi.sql.Column;
 import com.bencodez.simpleapi.updater.Updater;
 import com.bencodez.votingplugin.broadcast.BroadcastHandler;
 import com.bencodez.votingplugin.commands.CommandLoader;
@@ -76,6 +75,7 @@ import com.bencodez.votingplugin.config.ShopFile;
 import com.bencodez.votingplugin.config.SpecialRewardsConfig;
 import com.bencodez.votingplugin.cooldown.CoolDownCheck;
 import com.bencodez.votingplugin.data.ServerData;
+import com.bencodez.votingplugin.discord.DiscordHandler;
 import com.bencodez.votingplugin.listeners.BlockBreak;
 import com.bencodez.votingplugin.listeners.PlayerInteract;
 import com.bencodez.votingplugin.listeners.PlayerJoinEvent;
@@ -247,6 +247,9 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	private boolean firstTimeLoaded = false;
 
+	@Getter
+	private DiscordHandler discordHandler;
+
 	public void addDirectlyDefinedRewards(DirectlyDefinedReward directlyDefinedReward) {
 		getRewardHandler().addDirectlyDefined(directlyDefinedReward);
 	}
@@ -339,6 +342,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	 * @param uuid the uuid
 	 * @return the user
 	 */
+	@Deprecated
 	public VotingPluginUser getUser(UUID uuid) {
 		return getVotingPluginUserManager().getVotingPluginUser(uuid);
 	}
@@ -1198,6 +1202,12 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			mvdwPlaceholders.loadMVdWPlaceholders();
 		}
 
+		if (Bukkit.getPluginManager().isPluginEnabled("DiscordSRV") && configFile.isDiscordSRVEnabled()) {
+			discordHandler = new DiscordHandler(this);
+			discordHandler.load();
+			debug("DiscordSRV enabled, loading DiscordSRV handler");
+		}
+
 		// Add rewards
 		getRewardHandler().addInjectedReward(new RewardInjectInt("Points", 0) {
 
@@ -1384,18 +1394,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	public void onPreLoad() {
 		plugin = this;
 
-		// disable plugin for older versions below 1.12
-
-		if (NMSManager.getInstance().isVersion("1.7", "1.8", "1.9", "1.10", "1.11")) {
-			plugin.getLogger().severe("Detected running " + Bukkit.getVersion()
-					+ ", this version is not supported on this build, read the plugin page. Disabling...");
-			if (!configFile.isOverrideVersionDisable()) {
-				Bukkit.getPluginManager().disablePlugin(this);
-				return;
-			}
-			plugin.getLogger().warning("Overriding version disable, beware of using this! This may cause issues!");
-		}
-
 		setupFiles();
 
 		loadVoteSites();
@@ -1712,6 +1710,11 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 								checkFirstTimeLoaded();
 
+								if (discordHandler != null) {
+									plugin.extraDebug("Attempting to update DiscordSRV leaderboard");
+									discordHandler.updateDiscordLeaderboard();
+								}
+
 								plugin.getUserManager().getDataManager().clearNonNeededCachedUsers();
 								plugin.extraDebug("Current cached users: "
 										+ plugin.getUserManager().getDataManager().getUserDataCache().keySet().size());

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/CommandLoader.java

@@ -31,8 +31,6 @@ import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.misc.PlayerManager;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.advancedcore.api.user.UserStorage;
-import com.bencodez.advancedcore.api.user.userstorage.Column;
-import com.bencodez.advancedcore.api.user.userstorage.DataType;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 import com.bencodez.advancedcore.api.valuerequest.listeners.BooleanListener;
 import com.bencodez.advancedcore.api.valuerequest.listeners.StringListener;
@@ -43,6 +41,8 @@ import com.bencodez.simpleapi.command.TabCompleteHandle;
 import com.bencodez.simpleapi.command.TabCompleteHandler;
 import com.bencodez.simpleapi.debug.DebugLevel;
 import com.bencodez.simpleapi.messages.MessageAPI;
+import com.bencodez.simpleapi.sql.Column;
+import com.bencodez.simpleapi.sql.DataType;
 import com.bencodez.simpleapi.updater.Updater;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.commands.executers.CommandAliases;
@@ -51,6 +51,7 @@ import com.bencodez.votingplugin.commands.gui.admin.AdminVoteHelp;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVotePerms;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVotePlaceholders;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVotePlaceholdersPlayer;
+import com.bencodez.votingplugin.commands.gui.admin.AdminVoteTopPoints;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVoteVoteParty;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVoteVotePlayer;
 import com.bencodez.votingplugin.commands.gui.admin.cumulative.AdminVoteCumulative;
@@ -295,6 +296,18 @@ public class CommandLoader {
 					}
 				});
 
+		plugin.getAdminVoteCommand().add(new CommandHandler(plugin, new String[] { "TopPoints" },
+				"VotingPlugin.Commands.AdminVote.TopPoints|" + adminPerm, "Open the top points GUI", false) {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				sendMessage(sender, "&cLoading top points, please wait...");
+
+				new AdminVoteTopPoints(plugin, sender,
+						plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender), 1).open();
+			}
+		});
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(plugin, new String[] { "PauseRewards" },
 				"VotingPlugin.Commands.AdminVote.PauseRewards|" + adminPerm, "Pause rewards globally") {
 
@@ -1056,7 +1069,7 @@ public class CommandLoader {
 						sender.sendMessage(MessageAPI.colorize("&cClearing gotten milestones for all players..."));
 						plugin.getUserManager().removeAllKeyValues(path, DataType.STRING);
 						for (Player p : Bukkit.getOnlinePlayers()) {
-							plugin.getUserManager().getDataManager().cacheUser(p.getUniqueId());
+							plugin.getUserManager().getDataManager().cacheUser(p.getUniqueId(), p.getName());
 						}
 						sender.sendMessage(
 								MessageAPI.colorize("&cFinished clearing gotten milestones for all players"));
@@ -1829,6 +1842,21 @@ public class CommandLoader {
 					}
 				});
 
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(plugin, new String[] { "ClearDiscordMessageID", "(topvoter)" },
+						"VotingPlugin.Commands.AdminVote.ClearDiscordMessageID",
+						"Clear discord message ID for top voter", true, true) {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						String topVoter = args[1];
+						TopVoter top = TopVoter.getTopVoter(topVoter);
+						plugin.getServerData().setTopVoterMessageId(top, 0);
+						plugin.getDiscordHandler().getTopVoterMessageIds().put(top, 0L);
+						sendMessage(sender, "&cCleared discord message ID for " + top.toString());
+					}
+				});
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(plugin, new String[] {},
 				"VotingPlugin.Commands.AdminVote|" + adminPerm, "Base command") {
 

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/admin/AdminVoteTopPoints.java

@@ -0,0 +1,172 @@
+package com.bencodez.votingplugin.commands.gui.admin;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Queue;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.gui.GUIHandler;
+import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.commands.gui.player.VoteGUI;
+import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
+import com.bencodez.votingplugin.user.VotingPluginUser;
+
+public class AdminVoteTopPoints extends GUIHandler {
+
+	@SuppressWarnings("unused")
+	private int page;
+	private VotingPluginMain plugin;
+	private VotingPluginUser user;
+
+	public AdminVoteTopPoints(VotingPluginMain plugin, CommandSender player, VotingPluginUser user, int page) {
+		super(plugin, player);
+		this.plugin = plugin;
+		this.user = user;
+		this.page = page;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender sender) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+	}
+
+	@Override
+	public void onChest(Player player) {
+		try {
+			Set<Entry<TopVoterPlayer, Integer>> users = null;
+
+			LinkedHashMap<TopVoterPlayer, Integer> topPoints1 = new LinkedHashMap<TopVoterPlayer, Integer>();
+
+			for (String uuid : plugin.getVotingPluginUserManager().getAllUUIDs()) {
+				VotingPluginUser vpUser = plugin.getVotingPluginUserManager()
+						.getVotingPluginUser(UUID.fromString(uuid));
+				vpUser.dontCache();
+				int points = vpUser.getPoints();
+				if (points > 0) {
+					topPoints1.put(vpUser.getTopVoterPlayer(), points);
+
+				}
+			}
+
+			LinkedHashMap<TopVoterPlayer, Integer> topPoints = plugin.getTopVoterHandler().sortByValues(topPoints1,
+					false);
+
+			users = topPoints.entrySet();
+
+			ConfigurationSection customization = plugin.getGui().getChestVoteTopCustomization();
+			boolean customzationEnabled = false;
+			Queue<Integer> playerSlots = new ConcurrentLinkedQueue<>();
+			if (customization != null) {
+				customzationEnabled = customization.getBoolean("Enabled");
+				List<Integer> customizationPlayerSlots = customization.getIntegerList("PlayerSlots");
+				playerSlots.addAll(customizationPlayerSlots);
+			}
+
+			BInventory inv = new BInventory("Top Points");
+			if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
+				inv.dontClose();
+			}
+
+			int pos = 1;
+			for (Entry<TopVoterPlayer, Integer> entry : users) {
+
+				ItemBuilder playerItem = new ItemBuilder(Material.PAPER);
+
+				if (plugin.getGui().isChestVoteTopUseSkull()) {
+					playerItem = new ItemBuilder(entry.getKey().getPlayerHead());
+				} else {
+					playerItem = new ItemBuilder(Material.valueOf(plugin.getGui().getChestVoteTopPlayerItemMaterial()));
+				}
+
+				playerItem.setLore(new ArrayList<>());
+
+				BInventoryButton button = new BInventoryButton(playerItem
+						.setName(plugin.getGui().getChestVoteTopItemName())
+						.addLoreLine(plugin.getGui().getChestVoteTopItemLore()).addPlaceholder("position", "" + pos)
+						.addPlaceholder("player", entry.getKey().getPlayerName())
+						.addPlaceholder("votes", "" + entry.getValue())) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						if (plugin.getGui().isChestVoteTopOpenMainGUIOnClick()) {
+							TopVoterPlayer user = (TopVoterPlayer) getData("User");
+							new VoteGUI(plugin, player, user.getUser())
+									.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
+						}
+					}
+				}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey());
+
+				if (customzationEnabled && !playerSlots.isEmpty()) {
+					button.setSlot(playerSlots.remove());
+				}
+
+				inv.setCloseInv(plugin.getGui().isChestVoteTopCloseGUIOnClick());
+
+				inv.addButton(button);
+				pos++;
+			}
+
+			if (plugin.getGui().isChestVoteTopBackButton()) {
+				if (customzationEnabled) {
+					inv.addButton(plugin.getCommandLoader().getBackButton(user)
+							.setSlot(customization.getInt("BackButtonSlot", 0)));
+				} else {
+					inv.getPageButtons().add(plugin.getCommandLoader().getBackButton(user).setSlot(1));
+				}
+			}
+
+			String guiPath = "VoteTop.Customization";
+			for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+				inv.addButton(
+						new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+							@Override
+							public void onClick(ClickEvent clickEvent) {
+								plugin.getCommandLoader().processSlotClick(player, user, str);
+								new RewardBuilder(plugin.getGui().getData(),
+										"CHEST." + guiPath + ".ExtraItems." + str + ".Rewards").setGiveOffline(false)
+										.send(clickEvent.getPlayer());
+
+							}
+						});
+			}
+
+			if (customization == null || !customzationEnabled || !customization.getBoolean("RemoveBottomBar")) {
+				inv.setPages(true);
+			}
+			inv.setMaxInvSize(plugin.getGui().getChestVoteTopSize());
+			inv.openInventory(player);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/player/VoteURL.java

@@ -186,8 +186,26 @@ public class VoteURL extends GUIHandler {
 
 	@Override
 	public void onChest(Player player) {
-		// normal GUI
+
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteURLName());
+
+		if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
+			inv.dontClose();
+		}
+
+		for (final String str : plugin.getGui().getChestVoteURLExtraItems()) {
+			inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestVoteURLExtraItemsItem(str))) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					new RewardBuilder(plugin.getGui().getData(),
+							"CHEST.VoteURL.ExtraItems." + str + "." + clickEvent.getButton().getLastRewardsPath(player))
+							.setGiveOffline(false).send(clickEvent.getPlayer());
+
+				}
+			});
+		}
+
 		if (plugin.getGui().isChestVoteURLViewAllUrlsButtonEnabled()) {
 			ItemBuilder builderAll = getItemAll();
 
@@ -195,6 +213,7 @@ public class VoteURL extends GUIHandler {
 
 				@Override
 				public void onClick(ClickEvent event) {
+					event.closeInventory();
 					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(event.getPlayer());
 					json = true;
 					if (event.getClick().equals(ClickType.SHIFT_LEFT)
@@ -218,6 +237,15 @@ public class VoteURL extends GUIHandler {
 				if (voteSite.getPermissionToView().isEmpty() || player.hasPermission(voteSite.getPermissionToView())) {
 					ItemBuilder builder = getItemVoteSite(voteSite);
 					if (startSlot >= 0) {
+						if (inv.isSlotTaken(startSlot)) {
+							boolean found = false;
+							while (!found) {
+								startSlot++;
+								if (!inv.isSlotTaken(startSlot)) {
+									found = true;
+								}
+							}
+						}
 						builder.setSlot(startSlot);
 						startSlot++;
 					}
@@ -226,6 +254,7 @@ public class VoteURL extends GUIHandler {
 
 						@Override
 						public void onClick(ClickEvent event) {
+							event.closeInventory();
 							Player player = event.getPlayer();
 							if (player != null) {
 								VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
@@ -252,21 +281,6 @@ public class VoteURL extends GUIHandler {
 			}
 		}
 
-		for (
-
-		final String str : plugin.getGui().getChestVoteURLExtraItems()) {
-			inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestVoteURLExtraItemsItem(str))) {
-
-				@Override
-				public void onClick(ClickEvent clickEvent) {
-					new RewardBuilder(plugin.getGui().getData(),
-							"CHEST.VoteURL.ExtraItems." + str + "." + clickEvent.getButton().getLastRewardsPath(player))
-							.setGiveOffline(false).send(clickEvent.getPlayer());
-
-				}
-			});
-		}
-
 		if (plugin.getGui().isChestVoteURLBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}

VotingPlugin/src/main/java/com/bencodez/votingplugin/config/BungeeSettings.java

@@ -58,6 +58,26 @@ public class BungeeSettings extends YMLFile {
 	@ConfigDataInt(path = "Redis.Port")
 	@Getter
 	private int RedisPort = 6379;
+	
+	@ConfigDataString(path = "MQTT.ClientID")
+	@Getter
+	private String mqttClientID = "";
+
+	@ConfigDataString(path = "MQTT.BrokerURL")
+	@Getter
+	private String mqttBrokerURL = "tcp://localhost:1883";
+
+	@ConfigDataString(path = "MQTT.Username")
+	@Getter
+	private String mqttUsername = "";
+
+	@ConfigDataString(path = "MQTT.Password")
+	@Getter
+	private String mqttPassword = "";
+
+	@ConfigDataString(path = "MQTT.Prefix")
+	@Getter
+	private String mqttPrefix = "";
 
 	@ConfigDataString(path = "BungeeServer.Host")
 	@Getter

VotingPlugin/src/main/java/com/bencodez/votingplugin/config/Config.java

@@ -14,6 +14,7 @@ import com.bencodez.simpleapi.file.annotation.ConfigDataBoolean;
 import com.bencodez.simpleapi.file.annotation.ConfigDataInt;
 import com.bencodez.simpleapi.file.annotation.ConfigDataKeys;
 import com.bencodez.simpleapi.file.annotation.ConfigDataListString;
+import com.bencodez.simpleapi.file.annotation.ConfigDataLong;
 import com.bencodez.simpleapi.file.annotation.ConfigDataString;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.placeholders.PlaceholderCacheLevel;
@@ -67,6 +68,134 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean preloadSkulls = false;
 
+	@ConfigDataBoolean(path = "DiscordSRV.Enabled")
+	@Getter
+	private boolean discordSRVEnabled = false;
+
+	@ConfigDataBoolean(path = "DiscordSRV.TopVoter.AllTime.Enabled")
+	@Getter
+	private boolean discordSRVTopVoterAllTimeEnabled = false;
+
+	@ConfigDataLong(path = "DiscordSRV.TopVoter.AllTime.Channel")
+	@Getter
+	private long discordSRVTopVoterAllTimeChannel = 0;
+
+	@ConfigDataString(path = "DiscordSRV.TopVoter.AllTime.Title")
+	@Getter
+	private String discordSRVTopVoterAllTimeTitle = "All Time Top Voters";
+
+	@ConfigDataString(path = "DiscordSRV.TopVoter.AllTime.RankDisplay")
+	@Getter
+	private String discordSRVTopVoterAllTimeRankDisplay = "%rank%: %player% - %votes% Votes";
+
+	@ConfigDataBoolean(path = "DiscordSRV.TopVoter.Monthly.Enabled")
+	@Getter
+	private boolean discordSRVTopVoterMonthlyEnabled = false;
+
+	@ConfigDataLong(path = "DiscordSRV.TopVoter.Monthly.Channel")
+	@Getter
+	private long discordSRVTopVoterMonthlyChannel = 0;
+
+	@ConfigDataString(path = "DiscordSRV.TopVoter.Monthly.Title")
+	@Getter
+	private String discordSRVTopVoterMonthlyTitle = "Top Voters of the Month";
+
+	@ConfigDataString(path = "DiscordSRV.TopVoter.Monthly.RankDisplay")
+	@Getter
+	private String discordSRVTopVoterMonthlyRankDisplay = "%rank%: %player% - %votes% Votes";
+
+	@ConfigDataBoolean(path = "DiscordSRV.TopVoter.Weekly.Enabled")
+	@Getter
+	private boolean discordSRVTopVoterWeeklyEnabled = false;
+
+	@ConfigDataLong(path = "DiscordSRV.TopVoter.Weekly.Channel")
+	@Getter
+	private long discordSRVTopVoterWeeklyChannel = 0;
+
+	@ConfigDataString(path = "DiscordSRV.TopVoter.Weekly.Title")
+	@Getter
+	private String discordSRVTopVoterWeeklyTitle = "Top Voters of the Week";
+
+	@ConfigDataString(path = "DiscordSRV.TopVoter.Weekly.RankDisplay")
+	@Getter
+	private String discordSRVTopVoterWeeklyRankDisplay = "%rank%: %player% - %votes% Votes";
+
+	@ConfigDataBoolean(path = "DiscordSRV.TopVoter.Daily.Enabled")
+	@Getter
+	private boolean discordSRVTopVoterDailyEnabled = false;
+
+	@ConfigDataLong(path = "DiscordSRV.TopVoter.Daily.Channel")
+	@Getter
+	private long discordSRVTopVoterDailyChannel = 0;
+
+	@ConfigDataString(path = "DiscordSRV.TopVoter.Daily.Title")
+	@Getter
+	private String discordSRVTopVoterDailyTitle = "Top Voters of the Day";
+
+	@ConfigDataString(path = "DiscordSRV.TopVoter.Daily.RankDisplay")
+	@Getter
+	private String discordSRVTopVoterDailyRankDisplay = "%rank%: %player% - %votes% Votes";
+
+	public boolean isDiscordSRVTopVoterEnabled(TopVoter topVoter) {
+		switch (topVoter) {
+		case AllTime:
+			return isDiscordSRVTopVoterAllTimeEnabled();
+		case Monthly:
+			return isDiscordSRVTopVoterMonthlyEnabled();
+		case Weekly:
+			return isDiscordSRVTopVoterWeeklyEnabled();
+		case Daily:
+			return isDiscordSRVTopVoterDailyEnabled();
+		default:
+			return false;
+		}
+	}
+
+	public long getDiscordSRVTopVoterChannel(TopVoter topVoter) {
+		switch (topVoter) {
+		case AllTime:
+			return getDiscordSRVTopVoterAllTimeChannel();
+		case Monthly:
+			return getDiscordSRVTopVoterMonthlyChannel();
+		case Weekly:
+			return getDiscordSRVTopVoterWeeklyChannel();
+		case Daily:
+			return getDiscordSRVTopVoterDailyChannel();
+		default:
+			return 0;
+		}
+	}
+
+	public String getDiscordSRVTopVoterTitle(TopVoter topVoter) {
+		switch (topVoter) {
+		case AllTime:
+			return getDiscordSRVTopVoterAllTimeTitle();
+		case Monthly:
+			return getDiscordSRVTopVoterMonthlyTitle();
+		case Weekly:
+			return getDiscordSRVTopVoterWeeklyTitle();
+		case Daily:
+			return getDiscordSRVTopVoterDailyTitle();
+		default:
+			return "";
+		}
+	}
+
+	public String getDiscordSRVTopVoterRankDisplay(TopVoter topVoter) {
+		switch (topVoter) {
+		case AllTime:
+			return getDiscordSRVTopVoterAllTimeRankDisplay();
+		case Monthly:
+			return getDiscordSRVTopVoterMonthlyRankDisplay();
+		case Weekly:
+			return getDiscordSRVTopVoterWeeklyRankDisplay();
+		case Daily:
+			return getDiscordSRVTopVoterDailyRankDisplay();
+		default:
+			return "";
+		}
+	}
+
 	@ConfigDataBoolean(path = "AllowUnJoinedCheckServer")
 	@Getter
 	private boolean allowUnJoinedCheckServer = true;
@@ -738,3 +867,4 @@ public class Config extends YMLFile {
 	}
 
 }
+

VotingPlugin/src/main/java/com/bencodez/votingplugin/config/ConfigVoteSites.java

@@ -41,7 +41,7 @@ public class ConfigVoteSites extends YMLFile {
 	public void generateVoteSite(String siteName) {
 		if (plugin.getConfigFile().isAutoCreateVoteSites()) {
 			String org = siteName;
-			siteName = siteName.replace(".", "_");
+			siteName = siteName.replace(".", "_").replace(" ", "_");
 			plugin.getLogger().warning("VoteSite " + siteName + " does not exist with the servicesite '" + org
 					+ "', creating one, set AutoCreateVoteSites to false to prevent this");
 			setEnabled(siteName, true);

VotingPlugin/src/main/java/com/bencodez/votingplugin/cooldown/CoolDownCheck.java

@@ -16,7 +16,7 @@ import org.bukkit.event.Listener;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.advancedcore.api.user.AdvancedCoreUser;
 import com.bencodez.advancedcore.api.user.UserStartup;
-import com.bencodez.advancedcore.api.user.userstorage.Column;
+import com.bencodez.simpleapi.sql.Column;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.events.PlayerVoteCoolDownEndEvent;
 import com.bencodez.votingplugin.events.PlayerVoteSiteCoolDownEndEvent;

VotingPlugin/src/main/java/com/bencodez/votingplugin/data/ServerData.java

@@ -16,6 +16,7 @@ import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.signs.SignHandler;
 import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
+import com.bencodez.votingplugin.topvoter.TopVoter;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -244,6 +245,15 @@ public class ServerData {
 		plugin.getServerDataFile().reloadData();
 	}
 
+	public long getTopVoterMessageId(TopVoter top) {
+		return getData().getLong("DiscordSRV.TopVoterMessageId." + top.toString(), 0);
+	}
+
+	public void setTopVoterMessageId(TopVoter top, long messageId) {
+		getData().set("DiscordSRV.TopVoterMessageId." + top.toString(), messageId);
+		saveData();
+	}
+
 	/**
 	 * Removes the sign.
 	 *

VotingPlugin/src/main/java/com/bencodez/votingplugin/discord/DiscordHandler.java

@@ -0,0 +1,146 @@
+package com.bencodez.votingplugin.discord;
+
+import java.awt.Color;
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.bukkit.configuration.ConfigurationSection;
+
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
+import com.bencodez.advancedcore.api.rewards.Reward;
+import com.bencodez.advancedcore.api.rewards.injected.RewardInjectConfigurationSection;
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.topvoter.TopVoter;
+import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
+
+import github.scarsz.discordsrv.DiscordSRV;
+import github.scarsz.discordsrv.api.Subscribe;
+import github.scarsz.discordsrv.api.events.DiscordReadyEvent;
+import github.scarsz.discordsrv.dependencies.jda.api.EmbedBuilder;
+import github.scarsz.discordsrv.dependencies.jda.api.JDA;
+import github.scarsz.discordsrv.dependencies.jda.api.entities.TextChannel;
+import github.scarsz.discordsrv.util.DiscordUtil;
+import lombok.Getter;
+
+public class DiscordHandler {
+
+	private final VotingPluginMain plugin;
+	@Getter
+	private final HashMap<TopVoter, Long> topVoterMessageIds = new HashMap<TopVoter, Long>();
+	private final AtomicBoolean discordReady = new AtomicBoolean(false);
+
+	public DiscordHandler(VotingPluginMain plugin) {
+		this.plugin = plugin;
+		for (TopVoter top : TopVoter.values()) {
+			long savedId = plugin.getServerData().getTopVoterMessageId(top);
+			topVoterMessageIds.put(top, savedId);
+		}
+	}
+
+	/** Call this early, e.g. from onEnable() in main plugin class */
+	public void load() {
+		DiscordSRV.api.subscribe(this);
+		plugin.getLogger().info("DiscordHandler loaded; awaiting Discord readiness.");
+
+		// if DiscordSRV is already up and running, mark it ready now
+		if (DiscordUtil.getJda().getStatus() == JDA.Status.CONNECTED) {
+			discordReady.set(true);
+			plugin.getLogger().info("DiscordSRV was already ready; manual update now available.");
+		}
+
+		plugin.getRewardHandler().addInjectedReward(new RewardInjectConfigurationSection("DiscordSRV") {
+
+			@Override
+			public String onRewardRequested(Reward arg0, com.bencodez.advancedcore.api.user.AdvancedCoreUser user,
+					ConfigurationSection section, HashMap<String, String> placeholders) {
+				if (section.getBoolean("Enabled")) {
+					String msg = PlaceholderUtils
+							.replacePlaceHolder(section.getString("Message", "Please set a message"), placeholders);
+					msg = PlaceholderUtils.replacePlaceHolders(user.getOfflinePlayer(), msg);
+					sendRewardMessage(msg, section.getString("ChannelID", "0"));
+				}
+				return null;
+			}
+		});
+	}
+
+	/** Fired once JDA is fully initialized */
+	@Subscribe
+	public void onDiscordReady(DiscordReadyEvent event) {
+		discordReady.set(true);
+		plugin.getLogger().info("DiscordSRV is ready; manual update now available.");
+	}
+
+	/**
+	 * Public method to update the Top Voter message on demand. Checks Discord
+	 * readiness internally.
+	 */
+	public void updateDiscordLeaderboard() {
+		if (!discordReady.get()) {
+			plugin.getLogger().warning("DiscordSRV not ready yet; cannot update Top Voters.");
+			return;
+		}
+
+		for (TopVoter top : TopVoter.values()) {
+			if (plugin.getConfigFile().isDiscordSRVTopVoterEnabled(top)) {
+				plugin.debug("Updating Discord Top Voter: " + top.toString());
+				updateTopVoterMessageId(top);
+			}
+		}
+	}
+
+	public void updateTopVoterMessageId(TopVoter top) {
+		long channelId = plugin.getConfigFile().getDiscordSRVTopVoterChannel(top);
+		LinkedHashMap<TopVoterPlayer, Integer> topVoters = plugin.getTopVoter(top);
+
+		String title = plugin.getConfigFile().getDiscordSRVTopVoterTitle(top);
+		String rankDisplay = plugin.getConfigFile().getDiscordSRVTopVoterRankDisplay(top);
+
+		EmbedBuilder eb = new EmbedBuilder().setTitle(title).setColor(Color.CYAN).setTimestamp(Instant.now());
+
+		int rank = 1;
+		for (Entry<TopVoterPlayer, Integer> entry : topVoters.entrySet()) {
+			if (rank > 10)
+				break;
+			String line = rankDisplay.replace("%rank%", String.valueOf(rank))
+					.replace("%player%", entry.getKey().getPlayerName())
+					.replace("%votes%", String.valueOf(entry.getValue()));
+			eb.addField("", line, false);
+			rank++;
+		}
+
+		TextChannel channel = DiscordUtil.getJda().getTextChannelById(channelId);
+		if (channel == null) {
+			plugin.getLogger().warning("Discord channel ID " + channelId + " not found: " + top.toString());
+			return;
+		}
+
+		if (topVoterMessageIds.get(top) <= 0) {
+			channel.sendMessageEmbeds(eb.build()).queue(msg -> {
+				long newId = msg.getIdLong();
+				topVoterMessageIds.put(top, newId);
+				plugin.getServerData().setTopVoterMessageId(top, newId);
+				plugin.getLogger().info("Posted new Top Voters  " + top.toString() + " (ID: " + newId + ")");
+			}, err -> plugin.getLogger()
+					.warning("Error sending Top Voters " + top.toString() + ": " + err.getMessage()));
+		} else {
+			channel.editMessageEmbedsById(topVoterMessageIds.get(top), eb.build())
+					.queue(m -> plugin.getLogger()
+							.info("Edited Top Voters " + top.toString() + " (ID: " + topVoterMessageIds.get(top) + ")"),
+							err -> plugin.getLogger()
+									.warning("Error editing Top Voters" + top.toString() + ": " + err.getMessage()));
+		}
+	}
+
+	public void sendRewardMessage(String message, String channelId) {
+		TextChannel channel = DiscordUtil.getJda().getTextChannelById(channelId);
+		if (channel != null) {
+			channel.sendMessage(message).queue();
+		} else {
+			plugin.getLogger().warning("Discord channel ID " + channelId + " not found for reward message.");
+		}
+	}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/events/PlayerPostVoteEvent.java

@@ -3,8 +3,8 @@ package com.bencodez.votingplugin.events;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.objects.VoteSite;
+import com.bencodez.votingplugin.proxy.BungeeMessageData;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 import lombok.Getter;

VotingPlugin/src/main/java/com/bencodez/votingplugin/events/PlayerVoteEvent.java

@@ -3,8 +3,8 @@ package com.bencodez.votingplugin.events;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.objects.VoteSite;
+import com.bencodez.votingplugin.proxy.BungeeMessageData;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 import lombok.Getter;

VotingPlugin/src/main/java/com/bencodez/votingplugin/listeners/PlayerJoinEvent.java

@@ -8,7 +8,6 @@ import org.bukkit.event.player.PlayerQuitEvent;
 
 import com.bencodez.advancedcore.listeners.AdvancedCoreLoginEvent;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 // TODO: Auto-generated Javadoc
@@ -50,9 +49,7 @@ public class PlayerJoinEvent implements Listener {
 
 		plugin.getPlaceholders().onUpdate(user, true);
 
-		if (plugin.getBungeeSettings().isUseBungeecoord()
-				&& (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)
-						|| plugin.getBungeeHandler().getMethod().equals(BungeeMethod.REDIS))) {
+		if (plugin.getBungeeSettings().isUseBungeecoord()) {
 			plugin.getBungeeHandler().getGlobalMessageHandler().sendMessage("Login", user.getPlayerName(),
 					user.getUUID(), plugin.getBungeeSettings().getServer());
 		}
@@ -76,14 +73,14 @@ public class PlayerJoinEvent implements Listener {
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
 	public void onPlayerQuit(PlayerQuitEvent event) {
 		if (plugin != null && plugin.isEnabled()) {
-			final java.util.UUID uuid = event.getPlayer().getUniqueId();
+			final Player player = event.getPlayer();
 			plugin.getLoginTimer().execute(new Runnable() {
 
 				@Override
 				public void run() {
-					VotingPluginMain.plugin.getAdvancedTab().remove(uuid);
+					VotingPluginMain.plugin.getAdvancedTab().remove(player.getUniqueId());
 
-					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid);
+					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
 					user.dontCache();
 					user.logoutRewards();
 					plugin.getPlaceholders().onLogout(user);

VotingPlugin/src/main/java/com/bencodez/votingplugin/listeners/PlayerVoteListener.java

@@ -3,6 +3,7 @@ package com.bencodez.votingplugin.listeners;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
+import java.util.Map.Entry;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -10,10 +11,10 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
+import com.bencodez.advancedcore.api.bedrock.BedrockNameResolver;
 import com.bencodez.advancedcore.api.misc.PlayerManager;
 import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.events.PlayerPostVoteEvent;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
 import com.bencodez.votingplugin.objects.VoteSite;
@@ -50,17 +51,35 @@ public class PlayerVoteListener implements Listener {
 		}
 		String playerName = event.getPlayer();
 		plugin.debug("Processing PlayerVoteEvent: " + playerName + "/" + event.getServiceSite());
-		if (!PlayerManager.getInstance().isValidUser(playerName, plugin.getConfigFile().isAllowUnJoinedCheckServer())) {
+
+		// check for name casing
+		final String properName = plugin.getUserManager().getProperName(playerName);
+
+		// Resolve Bedrock/Java + add prefix only when appropriate
+		BedrockNameResolver.Result rn = plugin.getBedrockHandle().resolve(properName);
+		String creditedName = rn.finalName;
+
+		plugin.debug("Vote name resolved: " + properName + " -> " + creditedName + " (" + rn.rationale + ")");
+
+		// Single validity check on the final name
+		boolean allowUnJoinedCheckServer = plugin.getConfigFile().isAllowUnJoinedCheckServer();
+		boolean isValid = PlayerManager.getInstance().isValidUser(creditedName, allowUnJoinedCheckServer);
+
+		// Handle not-valid the same way you did before
+		if (!isValid) {
 			if (!plugin.getConfigFile().isAllowUnjoined()) {
-				plugin.getLogger().warning("Player " + playerName
-						+ " has not joined before, disregarding vote, set AllowUnjoined to true to prevent this");
+				plugin.getLogger().warning("Player " + creditedName + " has not joined before, disregarding vote. "
+						+ "Set AllowUnjoined to true to accept.");
 				if (event.isBungee() && plugin.getBungeeSettings().isRemoveInvalidUsers()) {
-					plugin.getVotingPluginUserManager().getVotingPluginUser(playerName).remove();
+					plugin.getVotingPluginUserManager().getVotingPluginUser(creditedName).remove();
 				}
 				return;
 			}
 		}
 
+		// If we get here, use the resolved/possibly-prefixed name going forward
+		playerName = creditedName;
+
 		if (playerName.isEmpty()) {
 			plugin.getLogger().warning("Empty player name from vote, ignoring");
 			return;
@@ -109,6 +128,7 @@ public class PlayerVoteListener implements Listener {
 				// player online
 				user = plugin.getVotingPluginUserManager().getVotingPluginUser(p);
 			} else {
+				// attempt to get exact name from cache matching casing
 				user = plugin.getVotingPluginUserManager().getVotingPluginUser(playerName);
 			}
 		}
@@ -240,21 +260,6 @@ public class PlayerVoteListener implements Listener {
 		plugin.getSpecialRewards().checkMilestone(user, event.getBungeeTextTotals(), event.isForceBungee());
 		plugin.getCoolDownCheck().vote(user, voteSite);
 
-		if (plugin.getBungeeSettings().isUseBungeecoord()) {
-			if (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.MYSQL)) {
-
-				plugin.getBukkitScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
-
-					@Override
-					public void run() {
-						if (Bukkit.getOnlinePlayers().size() > 0) {
-							plugin.getBungeeHandler().getGlobalMessageHandler().sendMessage("VoteUpdate", uuid);
-						}
-					}
-				}, 2);
-			}
-		}
-
 		PlayerPostVoteEvent postVoteEvent = new PlayerPostVoteEvent(voteSite, user, event.isRealVote(),
 				event.isForceBungee(), voteTime);
 		plugin.getServer().getPluginManager().callEvent(postVoteEvent);

VotingPlugin/src/main/java/com/bencodez/votingplugin/listeners/VotiferEvent.java

@@ -8,8 +8,8 @@ import org.bukkit.event.Listener;
 
 import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
+import com.bencodez.votingplugin.proxy.BungeeMethod;
 import com.vexsoftware.votifier.model.Vote;
 import com.vexsoftware.votifier.model.VotifierEvent;
 
@@ -72,9 +72,11 @@ public class VotiferEvent implements Listener {
 					plugin.getServerData().addServiceSite(voteSite);
 					if (plugin.getBungeeSettings().isUseBungeecoord() && !plugin.getBungeeSettings().isVotifierBypass()
 							&& (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)
-									|| plugin.getBungeeHandler().getMethod().equals(BungeeMethod.SOCKETS))) {
+									|| plugin.getBungeeHandler().getMethod().equals(BungeeMethod.SOCKETS)
+									|| plugin.getBungeeHandler().getMethod().equals(BungeeMethod.MQTT)
+									|| plugin.getBungeeHandler().getMethod().equals(BungeeMethod.REDIS))) {
 						plugin.getLogger().severe(
-								"Ignoring vote from votifier since pluginmessaging or socket bungee method is enabled, this means you aren't setup correctly for those methods, please check: https://github.com/BenCodez/VotingPlugin/wiki/Bungeecord-Setups");
+								"Ignoring vote from votifier since pluginmessaging, socket, redis, or mqtt bungee method is enabled, this means you aren't setup correctly for those methods, please check: https://github.com/BenCodez/VotingPlugin/wiki/Bungeecord-Setups");
 						return;
 					}
 					String matchSite = "";

VotingPlugin/src/main/java/com/bencodez/votingplugin/objects/VoteSite.java

@@ -16,7 +16,6 @@ import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 import lombok.Getter;
@@ -110,6 +109,11 @@ public class VoteSite {
 		if (plugin.getConfigFile().isFormatAlternateBroadcastEnabled()) {
 			return;
 		}
+		if (isHidden()) {
+			plugin.debug("Not broadcasting for " + user.getPlayerName() + ", site is hidden");
+			return;
+		}
+		
 		if (!user.isVanished()) {
 			String playerName = user.getPlayerName();
 			if (plugin.getConfigFile().getVotingBroadcastBlacklist().contains(playerName)) {
@@ -118,17 +122,9 @@ public class VoteSite {
 			}
 			if (checkBungee && plugin.getBungeeSettings().isBungeeBroadcast()
 					&& plugin.getBungeeSettings().isUseBungeecoord()) {
-				if (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.SOCKETS)) {
-					plugin.getBungeeHandler().sendData("Broadcast", getServiceSite(), user.getPlayerName());
-				} else if (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.MYSQL)
-						|| plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
-					String uuid = user.getUUID();
-					String service = getServiceSite();
-
-					if (Bukkit.getOnlinePlayers().size() > 0) {
-						plugin.getPluginMessaging().sendPluginMessage("VoteBroadcast", uuid, service);
-					}
-				}
+				String uuid = user.getUUID();
+				String service = getServiceSite();
+				plugin.getBungeeHandler().getGlobalMessageHandler().sendMessage("VoteBroadcast", uuid, service);
 
 			} else {
 				String bc = MessageAPI.colorize(plugin.getConfigFile().getFormatBroadCastMsg());

VotingPlugin/src/main/java/com/bencodez/votingplugin/placeholders/PlaceHolders.java

@@ -180,6 +180,8 @@ public class PlaceHolders {
 			}
 		}
 
+		UUID uuid = user.getJavaUUID();
+
 		for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
 			try {
 				if (placeholder.matches(identifier)) {
@@ -190,11 +192,11 @@ public class PlaceHolders {
 						CalculatingPlaceholder<VotingPluginUser> cPlaceholder = (CalculatingPlaceholder<VotingPluginUser>) placeholder;
 						if (placeholder.isUsesCache() && placeholder.isCached(identifier)) {
 							ConcurrentHashMap<UUID, String> cache = placeholder.getCache().get(identifier);
-							if (cache.containsKey(p.getUniqueId())) {
-								if (cPlaceholder.getCacheData().containsKey(user.getJavaUUID())) {
+							if (cache.containsKey(uuid)) {
+								if (cPlaceholder.getCacheData().containsKey(uuid)) {
 									return cPlaceholder.placeholderRequest(user, identifier);
 								}
-								return cache.get(p.getUniqueId());
+								return cache.get(uuid);
 							} else if (!forceProcess) {
 								schedulePlaceholderCheck(user);
 								return "...";
@@ -226,8 +228,9 @@ public class PlaceHolders {
 					}
 					if (placeholder.isUsesCache() && placeholder.isCached(identifier)) {
 						ConcurrentHashMap<UUID, String> cache = placeholder.getCache().get(identifier);
-						if (cache.containsKey(p.getUniqueId())) {
-							return cache.get(p.getUniqueId());
+
+						if (cache.containsKey(uuid)) {
+							return cache.get(uuid);
 						} else if (!forceProcess) {
 							schedulePlaceholderCheck(user);
 							return "...";
@@ -541,6 +544,14 @@ public class PlaceHolders {
 			}
 		}.withDescription("Get number of sites available to be voted on").updateDataKey("LastVotes"));
 
+		placeholders.add(new PlaceHolder<VotingPluginUser>("SitesAvailableTotal") {
+
+			@Override
+			public String placeholderRequest(VotingPluginUser user, String identifier) {
+				return "" + user.getTotalNumberOfSites();
+			}
+		}.withDescription("Get total number of sites available to be voted on"));
+
 		for (final VoteSite voteSite : plugin.getVoteSitesEnabled()) {
 			placeholders.add(new CalculatingPlaceholder<VotingPluginUser>("Next_" + voteSite.getKey()) {
 
@@ -642,7 +653,7 @@ public class PlaceHolders {
 				}
 				return "";
 			}
-		}.useStartsWith().withDescription("Get user at postion in top voter"));
+		}.useStartsWith().withDescription("Get username at postion in top voter"));
 
 		placeholders.add(new PlaceHolder<VotingPluginUser>("Top_Month_Position") {
 
@@ -658,7 +669,7 @@ public class PlaceHolders {
 				}
 				return "";
 			}
-		}.withDescription("Get user top voter position"));
+		}.withDescription("Get user's current top voter position"));
 
 		if (plugin.getGui().isLastMonthGUI()) {
 			placeholders.add(new PlaceHolder<VotingPluginUser>("Top_LastMonth_Position") {
@@ -730,7 +741,7 @@ public class PlaceHolders {
 				}
 				return "";
 			}
-		}.useStartsWith().withDescription("Get user at position in top voter"));
+		}.useStartsWith().withDescription("Get username at position in top voter"));
 
 		nonPlayerPlaceholders.add(new NonPlayerPlaceHolder<VotingPluginUser>("Top_MonthVotes_") {
 
@@ -781,7 +792,7 @@ public class PlaceHolders {
 				}
 				return "";
 			}
-		}.useStartsWith().withDescription("Get user at postion in top voter"));
+		}.useStartsWith().withDescription("Get username at postion in top voter"));
 
 		nonPlayerPlaceholders.add(new NonPlayerPlaceHolder<VotingPluginUser>("Top_WeekVotes_") {
 
@@ -832,7 +843,7 @@ public class PlaceHolders {
 				}
 				return "";
 			}
-		}.useStartsWith().withDescription("Get user at postion in top voter"));
+		}.useStartsWith().withDescription("Get username at postion in top voter"));
 
 		placeholders.add(new PlaceHolder<VotingPluginUser>("VotePartyContributedVotes") {
 
@@ -1007,7 +1018,7 @@ public class PlaceHolders {
 
 			@Override
 			public String placeholderRequest(String identifier) {
-				LocalDateTime now = plugin.getTimeChecker().getTime();
+				LocalDateTime now = plugin.getTimeChecker().getTime().plusDays(plugin.getOptions().getTimeWeekOffSet());
 				LocalDateTime newWeek = plugin.getTimeChecker().getTime().withHour(0).withMinute(0);
 
 				TemporalField woy = WeekFields.of(Locale.getDefault()).weekOfWeekBasedYear();

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/BungeeMessageData.java

@@ -1,4 +1,4 @@
-package com.bencodez.votingplugin.bungee;
+package com.bencodez.votingplugin.proxy;
 
 import java.util.regex.Pattern;
 

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/BungeeMethod.java

@@ -1,7 +1,11 @@
-package com.bencodez.votingplugin.bungee;
+package com.bencodez.votingplugin.proxy;
 
 public enum BungeeMethod {
-	MYSQL, PLUGINMESSAGING, SOCKETS, REDIS;
+	MYSQL, PLUGINMESSAGING, SOCKETS, REDIS, MQTT;
+	
+	public boolean requiresPlayerOnline() {
+		return this == PLUGINMESSAGING;
+	}
 
 	public static BungeeMethod getByName(String str) {
 		for (BungeeMethod method : values()) {

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/BungeeVersion.java

@@ -1,4 +1,4 @@
-package com.bencodez.votingplugin.bungee;
+package com.bencodez.votingplugin.proxy;
 
 public class BungeeVersion {
 	public static int getPluginMessageVersion() {

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/OfflineBungeeVote.java

@@ -1,6 +1,7 @@
-package com.bencodez.votingplugin.bungee;
+package com.bencodez.votingplugin.proxy;
 
 import lombok.Getter;
+import lombok.Setter;
 
 public class OfflineBungeeVote {
 
@@ -11,6 +12,7 @@ public class OfflineBungeeVote {
 	@Getter
 	private String service;
 	@Getter
+	@Setter
 	private String text;
 	@Getter
 	private long time;

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/ProxyMysqlUserTable.java

@@ -0,0 +1,552 @@
+package com.bencodez.votingplugin.proxy;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.bencodez.simpleapi.sql.Column;
+import com.bencodez.simpleapi.sql.DataType;
+import com.bencodez.simpleapi.sql.data.DataValue;
+import com.bencodez.simpleapi.sql.data.DataValueInt;
+import com.bencodez.simpleapi.sql.data.DataValueString;
+import com.bencodez.simpleapi.sql.mysql.config.MysqlConfig;
+import com.bencodez.simpleapi.sql.mysql.queries.Query;
+
+import lombok.Getter;
+
+public abstract class ProxyMysqlUserTable {
+	private List<String> columns = Collections.synchronizedList(new ArrayList<String>());
+
+	private List<String> intColumns = new ArrayList<>();
+
+	// private HashMap<String, ArrayList<Column>> table;
+
+	// ConcurrentMap<String, ArrayList<Column>> table = new
+	// ConcurrentHashMap<String, ArrayList<Column>>();
+
+	@Getter
+	private com.bencodez.simpleapi.sql.mysql.MySQL mysql;
+
+	private String name;
+
+	private Object object2 = new Object();
+
+	private Object object3 = new Object();
+
+	private Object object4 = new Object();
+
+	private Set<String> uuids = Collections.synchronizedSet(new HashSet<String>());
+
+	public abstract void logSevere(String string);
+
+	public abstract void logInfo(String string);
+
+	public ProxyMysqlUserTable(String tableName, MysqlConfig config, boolean debug) {
+
+		if (config.hasTableNameSet()) {
+			tableName = config.getTableName();
+		}
+		name = tableName;
+		if (config.getTablePrefix() != null) {
+			name = config.getTablePrefix() + tableName;
+		}
+		if (config.getPoolName().isEmpty()) {
+			config.setPoolName("VotingPlugin" + "-" + tableName);
+		}
+		mysql = new com.bencodez.simpleapi.sql.mysql.MySQL(config.getMaxThreads()) {
+
+			@Override
+			public void debug(SQLException e) {
+				if (debug) {
+					e.printStackTrace();
+				}
+			}
+
+			@Override
+			public void severe(String string) {
+				logSevere(string);
+			}
+
+			@Override
+			public void debug(String msg) {
+				if (debug) {
+					logInfo("MYSQL DEBUG: " + msg);
+				}
+			}
+		};
+
+		if (!mysql.connect(config)) {
+
+		}
+		try {
+			Query q = new Query(mysql, "USE `" + config.getDatabase() + "`;");
+			q.executeUpdateAsync();
+		} catch (SQLException e) {
+			severe("Failed to send use database query: " + config.getDatabase() + " Error: " + e.getMessage());
+			debug(e);
+		}
+		String sql = "CREATE TABLE IF NOT EXISTS " + getName() + " (";
+		sql += "uuid VARCHAR(37),";
+		sql += "PRIMARY KEY ( uuid )";
+		sql += ");";
+		Query query;
+		try {
+			query = new Query(mysql, sql);
+
+			query.executeUpdate();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+
+		loadData();
+
+		// tempoary to improve performance from old tables
+		// addToQue("ALTER TABLE " + getName() + " MODIFY uuid VARCHAR(37);");
+		alterColumnType("uuid", "VARCHAR(37)");
+	}
+
+	public void addColumn(String column, DataType dataType) {
+		synchronized (object3) {
+			String sql = "ALTER TABLE " + getName() + " ADD COLUMN `" + column + "` text" + ";";
+			try {
+				Query query = new Query(mysql, sql);
+				query.executeUpdate();
+
+				getColumns().add(column);
+			} catch (SQLException e) {
+				e.printStackTrace();
+			}
+
+		}
+	}
+
+	public void alterColumnType(String column, String newType) {
+		checkColumn(column, DataType.STRING);
+
+		try {
+			new Query(mysql, "ALTER TABLE " + getName() + " MODIFY `" + column + "` " + newType + ";")
+					.executeUpdateAsync();
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		if (newType.contains("INT")) {
+			if (!intColumns.contains(column)) {
+				intColumns.add(column);
+			}
+		}
+
+	}
+
+	public void checkColumn(String column, DataType dataType) {
+		synchronized (object4) {
+			if (!getColumns().contains(column)) {
+				if (!getColumnsQueury().contains(column)) {
+					addColumn(column, dataType);
+				}
+			}
+		}
+	}
+
+	public void clearCache() {
+		clearCacheBasic();
+	}
+
+	public void clearCacheBasic() {
+		columns.clear();
+		columns.addAll(getColumnsQueury());
+		uuids.clear();
+		uuids.addAll(getUuidsQuery());
+	}
+
+	public void close() {
+		mysql.disconnect();
+	}
+
+	public boolean containsKeyQuery(String index) {
+		String sqlStr = "SELECT uuid FROM " + getName() + ";";
+		try (Connection conn = mysql.getConnectionManager().getConnection();
+				PreparedStatement sql = conn.prepareStatement(sqlStr)) {
+			ResultSet rs = sql.executeQuery();
+			/*
+			 * Query query = new Query(mysql, sql); ResultSet rs = query.executeQuery();
+			 */
+			while (rs.next()) {
+				if (rs.getString("uuid").equals(index)) {
+					rs.close();
+					return true;
+				}
+			}
+			rs.close();
+		} catch (SQLException ex) {
+			ex.printStackTrace();
+		}
+		return false;
+	}
+
+	public void copyColumnData(String columnFromName, String columnToName) {
+		checkColumn(columnFromName, DataType.STRING);
+		checkColumn(columnToName, DataType.STRING);
+		String sql = "UPDATE `" + getName() + "` SET `" + columnToName + "` = `" + columnFromName + "`;";
+		try {
+			Query query = new Query(mysql, sql);
+			query.executeUpdate();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public abstract void debug(SQLException e);
+
+	public List<String> getColumns() {
+		if (columns == null || columns.size() == 0) {
+			loadData();
+		}
+		return columns;
+	}
+
+	public ArrayList<String> getColumnsQueury() {
+		ArrayList<String> columns = new ArrayList<>();
+		try (Connection conn = mysql.getConnectionManager().getConnection();
+				PreparedStatement sql = conn.prepareStatement("SHOW COLUMNS FROM `" + getName() + "`;")) {
+			ResultSet rs = sql.executeQuery();
+
+			while (rs.next()) {
+				String columnName = rs.getString(1);
+				columns.add(columnName);
+
+			}
+
+			rs.close();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return columns;
+	}
+
+	public ArrayList<Column> getExactQuery(Column column) {
+		ArrayList<Column> result = new ArrayList<>();
+		String query = "SELECT * FROM " + getName() + " WHERE `" + column.getName() + "`='"
+				+ column.getValue().getString() + "';";
+
+		try (Connection conn = mysql.getConnectionManager().getConnection();
+				PreparedStatement sql = conn.prepareStatement(query)) {
+			ResultSet rs = sql.executeQuery();
+
+			/*
+			 * Query sql = new Query(mysql, query); sql.setParameter(1,
+			 * column.getValue().toString()); ResultSet rs = sql.executeQuery();
+			 */
+			if (rs.next()) {
+				for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
+					String columnName = rs.getMetaData().getColumnLabel(i);
+					Column rCol = null;
+					if (intColumns.contains(columnName)) {
+						rCol = new Column(columnName, DataType.INTEGER);
+						rCol.setValue(new DataValueInt(rs.getInt(i)));
+					} else {
+						rCol = new Column(columnName, DataType.STRING);
+						rCol.setValue(new DataValueString(rs.getString(i)));
+					}
+					result.add(rCol);
+				}
+			}
+			rs.close();
+			return result;
+		} catch (SQLException e) {
+			e.printStackTrace();
+		} catch (ArrayIndexOutOfBoundsException e) {
+		}
+
+		for (String col : getColumns()) {
+			result.add(new Column(col, DataType.STRING));
+		}
+		return result;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public ArrayList<String> getNamesQuery() {
+		ArrayList<String> uuids = new ArrayList<>();
+
+		checkColumn("PlayerName", DataType.STRING);
+		ArrayList<Column> rows = getRowsNameQuery();
+		if (rows != null) {
+			for (Column c : rows) {
+				if (c.getValue().isString()) {
+					uuids.add(c.getValue().getString());
+				}
+			}
+		}
+
+		return uuids;
+	}
+
+	public ArrayList<Column> getRowsNameQuery() {
+		ArrayList<Column> result = new ArrayList<>();
+		String sqlStr = "SELECT PlayerName FROM " + getName() + ";";
+
+		try (Connection conn = mysql.getConnectionManager().getConnection();
+				PreparedStatement sql = conn.prepareStatement(sqlStr)) {
+			ResultSet rs = sql.executeQuery();
+			/*
+			 * Query query = new Query(mysql, sql); ResultSet rs = query.executeQuery();
+			 */
+
+			while (rs.next()) {
+				Column rCol = new Column("PlayerName", new DataValueString(rs.getString("PlayerName")));
+				result.add(rCol);
+			}
+			sql.close();
+			conn.close();
+		} catch (SQLException e) {
+		}
+
+		return result;
+	}
+
+	public ArrayList<Column> getRowsQuery() {
+		ArrayList<Column> result = new ArrayList<>();
+		String sqlStr = "SELECT uuid FROM " + getName() + ";";
+
+		try (Connection conn = mysql.getConnectionManager().getConnection();
+				PreparedStatement sql = conn.prepareStatement(sqlStr)) {
+			ResultSet rs = sql.executeQuery();
+			/*
+			 * Query query = new Query(mysql, sql); ResultSet rs = query.executeQuery();
+			 */
+
+			while (rs.next()) {
+				Column rCol = new Column("uuid", new DataValueString(rs.getString("uuid")));
+				result.add(rCol);
+			}
+			rs.close();
+		} catch (SQLException e) {
+			return null;
+		}
+
+		return result;
+	}
+
+	public ConcurrentHashMap<UUID, String> getRowsUUIDNameQuery() {
+		ConcurrentHashMap<UUID, String> uuidNames = new ConcurrentHashMap<>();
+		String sqlStr = "SELECT UUID, PlayerName FROM " + getName() + ";";
+
+		try (Connection conn = mysql.getConnectionManager().getConnection();
+				PreparedStatement sql = conn.prepareStatement(sqlStr)) {
+			ResultSet rs = sql.executeQuery();
+			/*
+			 * Query query = new Query(mysql, sql); ResultSet rs = query.executeQuery();
+			 */
+
+			while (rs.next()) {
+				String uuid = rs.getString("uuid");
+				String playerName = rs.getString("PlayerName");
+				if (uuid != null && !uuid.isEmpty() && !uuid.equals("null") && playerName != null) {
+					uuidNames.put(UUID.fromString(uuid), playerName);
+				}
+			}
+			sql.close();
+			conn.close();
+		} catch (SQLException e) {
+		}
+
+		return uuidNames;
+	}
+
+	public String getUUID(String playerName) {
+		String query = "SELECT uuid FROM " + getName() + " WHERE " + "PlayerName" + "='" + playerName + "';";
+		try (Connection conn = mysql.getConnectionManager().getConnection();
+				PreparedStatement sql = conn.prepareStatement(query)) {
+			ResultSet rs = sql.executeQuery();
+			/*
+			 * Query sql = new Query(mysql, query); ResultSet rs = sql.executeQuery();
+			 */
+			if (rs.next()) {
+				String uuid = rs.getString("uuid");
+				if (uuid != null && !uuid.isEmpty()) {
+					rs.close();
+					return uuid;
+				}
+			}
+			rs.close();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		} catch (ArrayIndexOutOfBoundsException e) {
+		}
+		return null;
+	}
+
+	public Set<String> getUuids() {
+		if (uuids == null || uuids.size() == 0) {
+			uuids.clear();
+			uuids.addAll(getUuidsQuery());
+			return uuids;
+		}
+		return uuids;
+	}
+
+	public ArrayList<String> getUuidsQuery() {
+		ArrayList<String> uuids = new ArrayList<>();
+
+		ArrayList<Column> rows = getRowsQuery();
+		for (Column c : rows) {
+			if (c.getValue().isString()) {
+				uuids.add(c.getValue().getString());
+			}
+		}
+
+		return uuids;
+	}
+
+	public void insert(String index, String column, DataValue value) {
+		insertQuery(index, Arrays.asList(new Column(column, value)));
+	}
+
+	public void insertQuery(String index, List<Column> cols) {
+		String query = "INSERT IGNORE " + getName() + " ";
+
+		query += "set uuid='" + index + "', ";
+
+		for (int i = 0; i < cols.size(); i++) {
+			Column col = cols.get(i);
+			if (i == cols.size() - 1) {
+				if (col.getValue().isString()) {
+					query += "`" + col.getName() + "`='" + col.getValue().getString() + "';";
+				} else if (col.getValue().isBoolean()) {
+					query += "`" + col.getName() + "`='" + col.getValue().getBoolean() + "';";
+				} else if (col.getValue().isInt()) {
+					query += "`" + col.getName() + "`='" + col.getValue().getInt() + "';";
+				}
+			} else {
+				if (col.getValue().isString()) {
+					query += "`" + col.getName() + "`='" + col.getValue().getString() + "', ";
+				} else if (col.getValue().isBoolean()) {
+					query += "`" + col.getName() + "`='" + col.getValue().getBoolean() + "', ";
+				} else if (col.getValue().isInt()) {
+					query += "`" + col.getName() + "`='" + col.getValue().getInt() + "', ";
+				}
+			}
+
+		}
+
+		try {
+			uuids.add(index);
+			new Query(mysql, query).executeUpdateAsync();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+
+	}
+
+	public boolean isIntColumn(String key) {
+		return intColumns.contains(key);
+	}
+
+	public void loadData() {
+		columns = getColumnsQueury();
+	}
+
+	public abstract void severe(String str);
+
+	public void shutdown() {
+		mysql.disconnect();
+	}
+
+	public void update(String index, List<Column> cols) {
+		for (Column col : cols) {
+			checkColumn(col.getName(), col.getDataType());
+		}
+		if (getUuids().contains(index)) {
+			synchronized (object2) {
+
+				String query = "UPDATE " + getName() + " SET ";
+
+				for (int i = 0; i < cols.size(); i++) {
+					Column col = cols.get(i);
+					if (i == cols.size() - 1) {
+						if (col.getValue().isString()) {
+							query += "`" + col.getName() + "`='" + col.getValue().getString() + "'";
+						} else if (col.getValue().isBoolean()) {
+							query += "`" + col.getName() + "`='" + col.getValue().getBoolean() + "'";
+						} else if (col.getValue().isInt()) {
+							query += "`" + col.getName() + "`='" + col.getValue().getInt() + "'";
+						}
+					} else {
+						if (col.getValue().isString()) {
+							query += "`" + col.getName() + "`='" + col.getValue().getString() + "', ";
+						} else if (col.getValue().isBoolean()) {
+							query += "`" + col.getName() + "`='" + col.getValue().getBoolean() + "', ";
+						} else if (col.getValue().isInt()) {
+							query += "`" + col.getName() + "`='" + col.getValue().getInt() + "', ";
+						}
+					}
+				}
+				query += " WHERE `uuid`=";
+				query += "'" + index + "';";
+
+				try {
+					Query q = new Query(mysql, query);
+					q.executeUpdateAsync();
+				} catch (SQLException e) {
+					e.printStackTrace();
+				}
+			}
+		} else {
+			insertQuery(index, cols);
+		}
+	}
+
+	public void update(String index, String column, DataValue value) {
+		checkColumn(column, value.getType());
+		if (getUuids().contains(index)) {
+			synchronized (object2) {
+				String query = "UPDATE " + getName() + " SET ";
+
+				if (value.isString()) {
+					query += column + "='" + value.getString() + "'";
+				} else if (value.isBoolean()) {
+					query += column + "='" + value.getBoolean() + "'";
+				} else if (value.isInt()) {
+					query += column + "='" + value.getInt() + "'";
+				}
+				query += " WHERE `uuid`=";
+				query += "'" + index + "';";
+
+				try {
+					Query q = new Query(mysql, query);
+					q.executeUpdate();
+				} catch (SQLException e) {
+					e.printStackTrace();
+				}
+			}
+
+		} else {
+			insert(index, column, value);
+		}
+
+	}
+
+	public void wipeColumnData(String columnName, DataType dataType) {
+		checkColumn(columnName, dataType);
+		String sql = "UPDATE " + getName() + " SET " + columnName + " = " + dataType.getNoValue() + ";";
+		try {
+			Query query = new Query(mysql, sql);
+			query.executeUpdate();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+
+	}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/VotingPluginProxyCommand.java

@@ -1,7 +1,6 @@
-package com.bencodez.votingplugin.bungee.proxy;
+package com.bencodez.votingplugin.proxy;
 
 import com.bencodez.advancedcore.api.time.TimeType;
-import com.bencodez.votingplugin.bungee.BungeeMethod;
 
 public class VotingPluginProxyCommand {
 	private VotingPluginProxy plugin;
@@ -71,6 +70,7 @@ public class VotingPluginProxyCommand {
 			return "&aChecking status via sockets. Check console for details.";
 
 		case PLUGINMESSAGING:
+		case MYSQL:
 		case REDIS:
 			plugin.status();
 			plugin.sendServerNameMessage();

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/VotingPluginProxyConfig.java

@@ -1,4 +1,4 @@
-package com.bencodez.votingplugin.bungee.proxy;
+package com.bencodez.votingplugin.proxy;
 
 import java.util.Collection;
 import java.util.List;
@@ -27,6 +27,20 @@ public interface VotingPluginProxyConfig {
 	public boolean getPluginMessageEncryption();
 
 	public boolean getDebug();
+	
+	public boolean getVoteCacheUseMySQL();
+	
+	public boolean getVoteCacheUseMainMySQL();
+
+	public String getMqttClientID();
+
+	public String getMqttBrokerURL();
+
+	public String getMqttUsername();
+
+	public String getMqttPassword();
+
+	public String getMqttPrefix();
 
 	public String getFallBack();
 
@@ -93,6 +107,8 @@ public interface VotingPluginProxyConfig {
 	public boolean getTimeChangeFailSafeBypass();
 
 	public int getTimeHourOffSet();
+	
+	public int getTimeWeekOffSet();
 
 	public String getTimeZone();
 
@@ -120,6 +136,20 @@ public interface VotingPluginProxyConfig {
 
 	public List<String> getWhiteListedServers();
 
+	public Collection<String> getWaitUntilVoteDelaySites();
+
+	public String getWaitUntilVoteDelayService(String site);
+
+	public int getWaitUntilVoteDelayVoteDelay(String site);
+
+	public int getWaitUntilVoteDelayVoteDelayMin(String site);
+	
+	public boolean getResetMilestonesMonthly();
+
+	public int getWaitUntilVoteDelayVoteDelayHour(String site);
+
+	public boolean getWaitUntilVoteDelayVoteDelayDaily(String site);
+
 	public void load();
 
 	public void save();

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/bungee/BStatsMetricsBungee.java

@@ -1,4 +1,4 @@
-package com.bencodez.votingplugin.bungee;
+package com.bencodez.votingplugin.proxy.bungee;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/bungee/Config.java

@@ -1,4 +1,4 @@
-package com.bencodez.votingplugin.bungee;
+package com.bencodez.votingplugin.proxy.bungee;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,7 +9,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.bencodez.votingplugin.bungee.proxy.VotingPluginProxyConfig;
+import com.bencodez.votingplugin.proxy.VotingPluginProxyConfig;
 
 import lombok.Getter;
 import net.md_5.bungee.config.Configuration;
@@ -33,226 +33,306 @@ public class Config implements VotingPluginProxyConfig {
 		return map;
 	}
 
+	@Override
 	public boolean getAllowUnJoined() {
 		return getData().getBoolean("AllowUnJoined", false);
 	}
 
+	@Override
 	public String getBedrockPlayerPrefix() {
 		return getData().getString("BedrockPlayerPrefix", ".");
 	}
 
+	@Override
 	public List<String> getBlockedServers() {
 		return getData().getStringList("BlockedServers");
 	}
 
+	@Override
 	public boolean getBroadcast() {
 		return getData().getBoolean("Broadcast", false);
 	}
 
+	@Override
 	public String getBungeeHost() {
 		return getData().getString("BungeeServer.Host", "");
 	}
 
+	@Override
 	public boolean getBungeeManageTotals() {
 		return getData().getBoolean("BungeeManageTotals", true);
 	}
 
+	@Override
 	public String getBungeeMethod() {
 		return getData().getString("BungeeMethod", "SOCKETS");
 	}
 
+	@Override
 	public int getBungeePort() {
 		return getData().getInt("BungeeServer.Port", 1297);
 	}
 
+	@Override
 	public boolean getDebug() {
 		return getData().getBoolean("Debug", false);
 	}
 
+	@Override
 	public String getFallBack() {
 		return getData().getString("FallBackServer", "");
 	}
 
+	@Override
 	public boolean getGlobalDataEnabled() {
 		return getData().getBoolean("GlobalData.Enabled", false);
 	}
 
+	@Override
 	public boolean getGlobalDataUseMainMySQL() {
 		return getData().getBoolean("GlobalData.UseMainMySQL", true);
 	}
 
+	@Override
 	public int getLimitVotePoints() {
 		return getData().getInt("LimitVotePoints", -1);
 	}
 
+	@Override
 	public int getMaxAmountOfVotesPerDay() {
 		return getData().getInt("MaxAmountOfVotesPerDay", -1);
 	}
 
+	@Override
 	public String getMultiProxyMethod() {
 		return getData().getString("MultiProxyMethod", "SOCKET");
 	}
 
+	@Override
 	public boolean getMultiProxyOneGlobalReward() {
 		return getData().getBoolean("MultiProxyOneGlobalReward", false);
 	}
 
+	@Override
 	public String getMultiProxyRedisHost() {
 		return getData().getString("MultiProxyRedis.Host", "");
 	}
 
+	@Override
 	public String getMultiProxyRedisPassword() {
 		return getData().getString("MultiProxyRedis.Password", "");
 	}
 
+	@Override
 	public int getMultiProxyRedisPort() {
 		return getData().getInt("MultiProxyRedis.Port", 6379);
 	}
 
+	@Override
 	public boolean getMultiProxyRedisUseExistingConnection() {
 		return getData().getBoolean("MultiProxyRedis.UseExistingConnection", false);
 	}
 
+	@Override
 	public String getMultiProxyRedisUsername() {
 		return getData().getString("MultiProxyRedis.Username", "");
 	}
 
+	@Override
 	public Collection<String> getMultiProxyServers() {
 		return getData().getSection("MultiProxyServers").getKeys();
 	}
 
+	@Override
 	public Map<String, Object> getMultiProxyServersConfiguration(String s) {
 		return configToMap(getData().getSection("MultiProxyServers." + s));
 	}
 
+	@Override
 	public String getMultiProxySocketHostHost() {
 		return getData().getString("MultiProxySocketHost.Host", "");
 	}
 
+	@Override
 	public int getMultiProxySocketHostPort() {
 		return getData().getInt("MultiProxySocketHost.Port", 1297);
 	}
 
+	@Override
 	public boolean getMultiProxySupport() {
 		return getData().getBoolean("MultiProxySupport", false);
 	}
 
+	@Override
 	public boolean getOnlineMode() {
 		return getData().getBoolean("OnlineMode", true);
 	}
 
+	@Override
 	public int getPointsOnVote() {
 		return getData().getInt("PointsOnVote", 1);
 	}
 
+	@Override
 	public boolean getPrimaryServer() {
 		return getData().getBoolean("PrimaryServer", false);
 	}
 
+	@Override
 	public String getProxyServerName() {
 		return getData().getString("ProxyServerName", "SOCKET");
 	}
 
+	@Override
 	public List<String> getProxyServers() {
 		return getData().getStringList("ProxyServers");
 	}
 
+	@Override
 	public String getRedisHost() {
 		return getData().getString("Redis.Host", "");
 	}
 
+	@Override
 	public String getRedisPassword() {
 		return getData().getString("Redis.Password", "");
 	}
 
+	@Override
 	public int getRedisPort() {
 		return getData().getInt("Redis.Port", 6379);
 	}
 
+	@Override
 	public String getRedisPrefix() {
 		return getData().getString("Redis.Prefix", "");
 	}
 
+	@Override
 	public String getRedisUsername() {
 		return getData().getString("Redis.Username", "");
 	}
 
+	@Override
 	public boolean getSendVotesToAllServers() {
 		return getData().getBoolean("SendVotesToAllServers");
 	}
 
+	@Override
 	public Map<String, Object> getSpigotServerConfiguration(String s) {
 		return configToMap(getData().getSection("SpigotServers." + s));
 	}
 
+	@Override
 	public Collection<String> getSpigotServers() {
 		return getData().getSection("SpigotServers").getKeys();
 	}
 
+	@Override
 	public boolean getStoreMonthTotalsWithDate() {
 		return getData().getBoolean("StoreMonthTotalsWithDate", false);
 	}
 
+	@Override
 	public boolean getTimeChangeFailSafeBypass() {
 		return getData().getBoolean("TimeChangeFailSafeBypass", false);
 	}
 
+	@Override
 	public int getTimeHourOffSet() {
 		return getData().getInt("TimeHourOffSet");
 	}
 
+	@Override
 	public String getTimeZone() {
 		return getData().getString("TimeZone", "");
 	}
 
+	@Override
 	public boolean getUseMonthDateTotalsAsPrimaryTotal() {
 		return getData().getBoolean("UseMonthDateTotalsAsPrimaryTotal", false);
 	}
 
+	@Override
 	public boolean getUUIDLookup() {
 		return getData().getBoolean("UUIDLookup", true);
 	}
 
+	@Override
 	public int getVoteCacheTime() {
 		return getData().getInt("VoteCacheTime", -1);
 	}
 
+	@Override
 	public String getVotePartyBroadcast() {
 		return getData().getString("VoteParty.Broadcast", "");
 	}
 
+	@Override
 	public List<String> getVotePartyBungeeCommands() {
 		return getData().getStringList("VoteParty.BungeeCommands");
 	}
 
+	@Override
 	public boolean getVotePartyEnabled() {
 		return getData().getBoolean("VoteParty.Enabled", false);
 	}
 
+	@Override
 	public int getVotePartyIncreaseVotesRequired() {
 		return getData().getInt("VoteParty.IncreaseVotesRequired", 0);
 	}
 
+	@Override
 	public boolean getVotePartySendToAllServers() {
 		return getData().getBoolean("VoteParty.SendToAllServers", true);
 	}
 
+	@Override
 	public List<String> getVotePartyServersToSend() {
 		return getData().getStringList("VoteParty.ServersToSend");
 	}
 
+	@Override
 	public int getVotePartyVotesRequired() {
 		return getData().getInt("VoteParty.VotesRequired", 100);
 	}
 
+	@Override
 	public boolean getWaitForUserOnline() {
-		return getData().getBoolean("WaitForUserOnline", false);
+		return getData().getBoolean("WaitForUserOnline", true);
 	}
 
+	@Override
 	public List<String> getWhiteListedServers() {
 		return getData().getStringList("WhiteListedServers");
 	}
 
+	@Override
+	public String getMqttClientID() {
+		return getData().getString("MQTT.ClientID", "proxy");
+	}
+
+	@Override
+	public String getMqttBrokerURL() {
+		return getData().getString("MQTT.BrokerURL", "tcp://localhost:1883");
+	}
+
+	@Override
+	public String getMqttUsername() {
+		return getData().getString("MQTT.Username", "");
+	}
+
+	@Override
+	public String getMqttPassword() {
+		return getData().getString("MQTT.Password", "");
+	}
+
+	@Override
+	public String getMqttPrefix() {
+		return getData().getString("MQTT.Prefix", "");
+	}
+
 	public void load() {
 		if (!bungee.getDataFolder().exists()) {
 			bungee.getDataFolder().mkdir();
@@ -294,4 +374,54 @@ public class Config implements VotingPluginProxyConfig {
 		return getData().getBoolean("PluginMessageEncryption", false);
 	}
 
+	@Override
+	public Collection<String> getWaitUntilVoteDelaySites() {
+		return getData().getSection("WaitUntilVoteDelay").getKeys();
+	}
+
+	@Override
+	public String getWaitUntilVoteDelayService(String site) {
+		return getData().getString("WaitUntilVoteDelay." + site + ".ServiceSite", "");
+	}
+
+	@Override
+	public int getWaitUntilVoteDelayVoteDelay(String site) {
+		return getData().getInt("WaitUntilVoteDelay." + site + ".VoteDelay", 24);
+	}
+
+	@Override
+	public boolean getWaitUntilVoteDelayVoteDelayDaily(String site) {
+		return getData().getBoolean("WaitUntilVoteDelay." + site + ".VoteDelayDaily", false);
+	}
+
+	@Override
+	public int getWaitUntilVoteDelayVoteDelayHour(String site) {
+		return getData().getInt("WaitUntilVoteDelay." + site + ".VoteDelayDailyHour", 0);
+	}
+
+	@Override
+	public int getWaitUntilVoteDelayVoteDelayMin(String site) {
+		return getData().getInt("WaitUntilVoteDelay." + site + ".VoteDelayMin", 0);
+	}
+
+	@Override
+	public boolean getResetMilestonesMonthly() {
+		return getData().getBoolean("ResetMilestonesMonthly", false);
+	}
+
+	@Override
+	public boolean getVoteCacheUseMySQL() {
+		return getData().getBoolean("VoteCache.UseMySQL", false);
+	}
+
+	@Override
+	public boolean getVoteCacheUseMainMySQL() {
+		return getData().getBoolean("VoteCache.UseMainMySQL", true);
+	}
+
+	@Override
+	public int getTimeWeekOffSet() {
+		return getData().getInt("TimeWeekOffSet");
+	}
+
 }

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/bungee/NonVotedPlayersCache.java

@@ -0,0 +1,73 @@
+package com.bencodez.votingplugin.proxy.bungee;
+
+import java.io.File;
+
+import com.bencodez.simpleapi.file.BungeeJsonFile;
+import com.velocitypowered.api.proxy.Player;
+
+import lombok.Getter;
+import net.md_5.bungee.config.Configuration;
+
+public class NonVotedPlayersCache extends BungeeJsonFile {
+	private VotingPluginBungee plugin;
+	@Getter
+	private Configuration data;
+
+	public NonVotedPlayersCache(VotingPluginBungee plugin) {
+		super(new File(plugin.getDataFolder(), "nonvotedplayerscache.json"));
+		this.plugin = plugin;
+	}
+
+	public void addPlayer(Player player) {
+		if (!plugin.getVotingPluginProxy().getProxyMySQL().containsKeyQuery(player.getUniqueId().toString())) {
+			addPlayer(player.getUniqueId().toString(), player.getUsername());
+		}
+	}
+
+	public void addPlayer(String uuid, String playerName) {
+		setString("NonVotedPlayers." + playerName + ".UUID", uuid);
+		setLong("NonVotedPlayers." + playerName + ".LastTime", System.currentTimeMillis());
+		save();
+	}
+
+	public void addPlayerCheck(String uuid, String playerName) {
+		if (!plugin.getVotingPluginProxy().getProxyMySQL().containsKeyQuery(uuid)) {
+			addPlayer(uuid, playerName);
+		}
+	}
+
+	public void check() {
+		for (String player : getKeys("NonVotedPlayers")) {
+			long time = getLong("NonVotedPlayers." + player + ".LastTime", 0);
+			if ((System.currentTimeMillis() - time) > 1000 * 60 * 60 * 24 * 5) {
+				removePlayer(player);
+			} else {
+				String uuid = getString("NonVotedPlayers." + player + ".UUID", "");
+				if (!uuid.isEmpty()) {
+					if (plugin.getVotingPluginProxy().getProxyMySQL().containsKeyQuery(uuid)) {
+						removePlayer(player);
+					}
+				} else {
+					removePlayer(player);
+				}
+			}
+		}
+		save();
+	}
+
+	public String playerExists(String playerName) {
+		String uuid = getString("NonVotedPlayers." + playerName + ".UUID", "");
+		if (!uuid.isEmpty()) {
+			return uuid;
+		}
+		return "";
+	}
+
+	private void removePlayer(String player) {
+		plugin.debug("Removing nonvotedplayer: " + player);
+		remove("NonVotedPlayers." + player);
+
+		save();
+	}
+
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/bungee/VoteCache.java

@@ -0,0 +1,223 @@
+package com.bencodez.votingplugin.proxy.bungee;
+
+import java.io.File;
+import java.util.Collection;
+
+import com.bencodez.simpleapi.file.BungeeJsonFile;
+import com.bencodez.votingplugin.proxy.OfflineBungeeVote;
+import com.bencodez.votingplugin.proxy.cache.DataNode;
+import com.bencodez.votingplugin.proxy.cache.GsonDataNode;
+import com.bencodez.votingplugin.proxy.cache.IVoteCache;
+import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
+
+public class VoteCache extends BungeeJsonFile implements IVoteCache {
+	private VotingPluginBungee bungee;
+
+	public VoteCache(VotingPluginBungee bungee) {
+		super(new File(bungee.getDataFolder(), "votecache.json"));
+		this.bungee = bungee;
+		initialize();
+	}
+
+	private void initialize() {
+		if (!bungee.getDataFolder().exists()) {
+			bungee.getDataFolder().mkdir();
+		}
+		// Reload the JSON file to ensure latest data
+		reload();
+	}
+
+	public void addTimedVote(int num, VoteTimeQueue voteTimedQueue) {
+		String path = "TimedVoteCache." + num;
+		setString(path + ".Name", voteTimedQueue.getName());
+		setString(path + ".Service", voteTimedQueue.getService());
+		setLong(path + ".Time", voteTimedQueue.getTime());
+	}
+
+	public void addVote(String server, int num, OfflineBungeeVote voteData) {
+		String path = "VoteCache." + server + "." + num;
+		setString(path + ".Name", voteData.getPlayerName());
+		setString(path + ".Service", voteData.getService());
+		setString(path + ".UUID", voteData.getUuid());
+		setLong(path + ".Time", voteData.getTime());
+		setBoolean(path + ".Real", voteData.isRealVote());
+		setString(path + ".Text", voteData.getText());
+	}
+
+	public void addVoteOnline(String player, int num, OfflineBungeeVote voteData) {
+		String path = "OnlineCache." + player + "." + num;
+		setString(path + ".Name", voteData.getPlayerName());
+		setString(path + ".Service", voteData.getService());
+		setString(path + ".UUID", voteData.getUuid());
+		setLong(path + ".Time", voteData.getTime());
+		setBoolean(path + ".Real", voteData.isRealVote());
+		setString(path + ".Text", voteData.getText());
+	}
+
+	public void clearData() {
+		setString("VoteCache", null);
+		setString("OnlineCache", null);
+		setString("TimedVoteCache", null);
+		save();
+	}
+
+	public Collection<String> getOnlineVotes(String name) {
+		return getKeys("OnlineCache." + name);
+	}
+
+	public GsonDataNode getOnlineVotes(String name, String num) {
+		return new GsonDataNode(getNode("OnlineCache." + name + "." + num));
+	}
+
+	public Collection<String> getPlayers() {
+		return getKeys("OnlineCache");
+	}
+
+	public Collection<String> getServers() {
+		return getKeys("VoteCache");
+	}
+
+	public Collection<String> getServerVotes(String server) {
+		return getKeys("VoteCache." + server);
+	}
+
+	public GsonDataNode getServerVotes(String server, String num) {
+		return new GsonDataNode(getNode("VoteCache." + server + "." + num));
+	}
+
+	public Collection<String> getTimedVoteCache() {
+		return getKeys("TimedVoteCache");
+	}
+
+	public DataNode getTimedVoteCache(String key) {
+		return new GsonDataNode(getNode("TimedVoteCache." + key));
+	}
+
+	public int getVotePartyCache(String server) {
+		return getInt("VoteParty.Cache." + server, 0);
+	}
+
+	public int getVotePartyCurrentVotes() {
+		return getInt("VoteParty.CurrentVotes", 0);
+	}
+
+	public int getVotePartyInreaseVotesRequired() {
+		return getInt("VoteParty.IncreaseVotes", 0);
+	}
+
+	public void setVotePartyCache(String server, int amount) {
+		setInt("VoteParty.Cache." + server, amount);
+	}
+
+	public void setVotePartyCurrentVotes(int amount) {
+		setInt("VoteParty.CurrentVotes", amount);
+	}
+
+	public void setVotePartyInreaseVotesRequired(int amount) {
+		setInt("VoteParty.IncreaseVotes", amount);
+	}
+
+	@Override
+	public void save() {
+		super.save();
+	}
+
+	@Override
+	public void reload() {
+		super.reload();
+	}
+
+	@Override
+	public void removeOnlineVotes(String player) {
+		setString("OnlineCache." + player, null);
+	}
+
+	@Override
+	public void removeServerVotes(String server) {
+		setString("VoteCache." + server, null);
+	}
+
+	@Override
+	public void removeServerVote(String server, String uuid) {
+		Collection<String> votes = getServerVotes(server);
+		if (votes == null) {
+			return;
+		}
+		// search for vote with uuid and remove it
+		for (String num : votes) {
+			GsonDataNode node = getServerVotes(server, num);
+			if (node == null) {
+				continue;
+			}
+			DataNode uuidNode = node.get("UUID");
+			if (uuidNode == null) {
+				continue;
+			}
+			String nodeUuid = uuidNode.asString();
+			if (nodeUuid != null && nodeUuid.equals(uuid)) {
+				setString("VoteCache." + server + "." + num, null);
+			}
+		}
+	}
+
+	@Override
+	public void removeVote(String server, OfflineBungeeVote vote) {
+		Collection<String> votes = getServerVotes(server);
+		if (votes == null) {
+			return;
+		}
+		for (String num : votes) {
+			GsonDataNode node = getServerVotes(server, num);
+			if (node == null) {
+				continue;
+			}
+			DataNode uuidNode = node.get("UUID");
+			DataNode serviceNode = node.get("Service");
+			DataNode timeNode = node.get("Time");
+			if (uuidNode == null || serviceNode == null || timeNode == null) {
+				continue;
+			}
+			String nodeUuid = uuidNode.asString();
+			String nodeService = serviceNode.asString();
+			Long nodeTime = timeNode.asLong();
+			if (nodeUuid != null && nodeService != null && nodeTime != null && nodeUuid.equals(vote.getUuid())
+					&& nodeService.equals(vote.getService()) && nodeTime.longValue() == vote.getTime()) {
+				setString("VoteCache." + server + "." + num, null);
+			}
+		}
+	}
+
+	@Override
+	public void removeOnlineVote(OfflineBungeeVote vote) {
+		Collection<String> players = getPlayers();
+		if (players == null) {
+			return;
+		}
+		for (String player : players) {
+			Collection<String> onlineVotes = getOnlineVotes(player);
+			if (onlineVotes == null) {
+				continue;
+			}
+			for (String num : onlineVotes) {
+				GsonDataNode node = getOnlineVotes(player, num);
+				if (node == null) {
+					continue;
+				}
+				DataNode uuidNode = node.get("UUID");
+				DataNode serviceNode = node.get("Service");
+				DataNode timeNode = node.get("Time");
+				if (uuidNode == null || serviceNode == null || timeNode == null) {
+					continue;
+				}
+				String nodeUuid = uuidNode.asString();
+				String nodeService = serviceNode.asString();
+				Long nodeTime = timeNode.asLong();
+				if (nodeUuid != null && nodeService != null && nodeTime != null && nodeUuid.equals(vote.getUuid())
+						&& nodeService.equals(vote.getService()) && nodeTime.longValue() == vote.getTime()) {
+					setString("OnlineCache." + player + "." + num, null);
+				}
+			}
+		}
+	}
+
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/bungee/VoteEventBungee.java

@@ -1,4 +1,4 @@
-package com.bencodez.votingplugin.bungee;
+package com.bencodez.votingplugin.proxy.bungee;
 
 import com.vexsoftware.votifier.bungee.events.VotifierEvent;
 import com.vexsoftware.votifier.model.Vote;

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/bungee/VotingPluginBungee.java

@@ -1,4 +1,4 @@
-package com.bencodez.votingplugin.bungee;
+package com.bencodez.votingplugin.proxy.bungee;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
@@ -15,19 +15,22 @@ import java.util.HashSet;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
 import com.bencodez.advancedcore.api.time.TimeType;
-import com.bencodez.advancedcore.api.user.userstorage.DataType;
-import com.bencodez.advancedcore.api.user.userstorage.mysql.api.config.MysqlConfigBungee;
 import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalDataHandlerProxy;
 import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalMySQL;
-import com.bencodez.advancedcore.bungeeapi.mysql.BungeeMySQL;
-import com.bencodez.votingplugin.bungee.proxy.VotingPluginProxy;
-import com.bencodez.votingplugin.bungee.proxy.VotingPluginProxyConfig;
-import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
+import com.bencodez.simpleapi.sql.DataType;
+import com.bencodez.simpleapi.sql.mysql.config.MysqlConfig;
+import com.bencodez.simpleapi.sql.mysql.config.MysqlConfigBungee;
+import com.bencodez.votingplugin.proxy.BungeeVersion;
+import com.bencodez.votingplugin.proxy.ProxyMysqlUserTable;
+import com.bencodez.votingplugin.proxy.VotingPluginProxy;
+import com.bencodez.votingplugin.proxy.VotingPluginProxyConfig;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 
 import lombok.Getter;
@@ -58,6 +61,9 @@ public class VotingPluginBungee extends Plugin implements Listener {
 	@Getter
 	private VotingPluginProxy votingPluginProxy;
 
+	@Getter
+	private ScheduledExecutorService timer;
+
 	public void debug(String msg) {
 		if (config.getDebug()) {
 			getLogger().info("Debug: " + msg);
@@ -131,7 +137,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 	}
 
 	private void loadMysql() {
-		votingPluginProxy.setProxyMySQL(new BungeeMySQL(this, "VotingPlugin_Users", config.getData()) {
+		votingPluginProxy.setProxyMySQL(new ProxyMysqlUserTable("VotingPlugin_Users",
+				new MysqlConfigBungee(config.getData()), config.getDebug()) {
 
 			@Override
 			public void debug(SQLException e) {
@@ -139,6 +146,23 @@ public class VotingPluginBungee extends Plugin implements Listener {
 					e.printStackTrace();
 				}
 			}
+
+			@Override
+			public void logSevere(String string) {
+				getLogger().severe(string);
+
+			}
+
+			@Override
+			public void logInfo(String string) {
+				getLogger().info(string);
+			}
+
+			@Override
+			public void severe(String string) {
+				getLogger().severe(string);
+			}
+
 		});
 
 		ArrayList<String> servers = new ArrayList<>();
@@ -152,14 +176,14 @@ public class VotingPluginBungee extends Plugin implements Listener {
 						new GlobalMySQL("VotingPlugin_GlobalData", getVotingPluginProxy().getProxyMySQL().getMysql()) {
 
 							@Override
-							public void debug(Exception e) {
+							public void debugEx(Exception e) {
 								if (config.getDebug()) {
 									e.printStackTrace();
 								}
 							}
 
 							@Override
-							public void debug(String text) {
+							public void debugLog(String text) {
 								debug2(text);
 							}
 
@@ -170,7 +194,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 							}
 
 							@Override
-							public void severe(String text) {
+							public void logSevere(String text) {
 								getLogger().severe(text);
 							}
 
@@ -192,6 +216,12 @@ public class VotingPluginBungee extends Plugin implements Listener {
 						if (type.equals(TimeType.MONTH)) {
 							getVotingPluginProxy().getProxyMySQL().copyColumnData(TopVoter.Monthly.getColumnName(),
 									"LastMonthTotal");
+							if (getVotingPluginProxy().getConfig().getResetMilestonesMonthly()) {
+								getVotingPluginProxy().getProxyMySQL().wipeColumnData("MilestoneCount",
+										DataType.INTEGER);
+								getVotingPluginProxy().getProxyMySQL().wipeColumnData("GottenMileStones",
+										DataType.STRING);
+							}
 						}
 						getVotingPluginProxy().getProxyMySQL().wipeColumnData(TopVoter.of(type).getColumnName(),
 								DataType.INTEGER);
@@ -201,11 +231,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 						}
 						for (String s : getAvailableAllServers()) {
 							getVotingPluginProxy().getGlobalDataHandler().setBoolean(s, "ForceUpdate", true);
-							if (getVotingPluginProxy().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
-								getVotingPluginProxy().sendPluginMessageServer(s, "BungeeTimeChange", "");
-							} else if (getVotingPluginProxy().getMethod().equals(BungeeMethod.SOCKETS)) {
-								getVotingPluginProxy().sendServerMessage(s, "BungeeTimeChange");
-							}
+							getVotingPluginProxy().getGlobalMessageProxyHandler().sendMessage(s, 1, "BungeeTimeChange",
+									"");
 						}
 
 						getVotingPluginProxy().processQueue();
@@ -218,14 +245,14 @@ public class VotingPluginBungee extends Plugin implements Listener {
 								new MysqlConfigBungee(config.getData().getSection("GlobalData"))) {
 
 							@Override
-							public void debug(Exception e) {
+							public void debugEx(Exception e) {
 								if (config.getDebug()) {
 									e.printStackTrace();
 								}
 							}
 
 							@Override
-							public void debug(String text) {
+							public void debugLog(String text) {
 								debug2(text);
 							}
 
@@ -236,7 +263,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 							}
 
 							@Override
-							public void severe(String text) {
+							public void logSevere(String text) {
 								getLogger().severe(text);
 							}
 
@@ -260,6 +287,12 @@ public class VotingPluginBungee extends Plugin implements Listener {
 								if (type.equals(TimeType.MONTH)) {
 									getVotingPluginProxy().getProxyMySQL()
 											.copyColumnData(TopVoter.Monthly.getColumnName(), "LastMonthTotal");
+									if (getVotingPluginProxy().getConfig().getResetMilestonesMonthly()) {
+										getVotingPluginProxy().getProxyMySQL().wipeColumnData("MilestoneCount",
+												DataType.INTEGER);
+										getVotingPluginProxy().getProxyMySQL().wipeColumnData("GottenMileStones",
+												DataType.STRING);
+									}
 								}
 								getVotingPluginProxy().getProxyMySQL().wipeColumnData(TopVoter.of(type).getColumnName(),
 										DataType.INTEGER);
@@ -269,11 +302,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 								}
 								for (String s : getAvailableAllServers()) {
 									getVotingPluginProxy().getGlobalDataHandler().setBoolean(s, "ForceUpdate", true);
-									if (getVotingPluginProxy().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
-										getVotingPluginProxy().sendPluginMessageServer(s, "BungeeTimeChange", "");
-									} else if (getVotingPluginProxy().getMethod().equals(BungeeMethod.SOCKETS)) {
-										getVotingPluginProxy().sendServerMessage(s, "BungeeTimeChange");
-									}
+									getVotingPluginProxy().getGlobalMessageProxyHandler().sendMessage(s, 1,
+											"BungeeTimeChange", "");
 								}
 
 								getVotingPluginProxy().processQueue();
@@ -355,41 +385,13 @@ public class VotingPluginBungee extends Plugin implements Listener {
 
 	@Override
 	public void onDisable() {
-		if (getVotingPluginProxy().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
-			getLogger().info("VotingPlugin saving vote cache: " + getVotingPluginProxy().getCachedVotes().size() + "/"
-					+ getVotingPluginProxy().getCachedOnlineVotes().size());
-			for (Entry<String, ArrayList<OfflineBungeeVote>> entry : getVotingPluginProxy().getCachedVotes()
-					.entrySet()) {
-				String server = entry.getKey();
-				int num = 0;
-				for (OfflineBungeeVote voteData : entry.getValue()) {
-					voteCacheFile.addVote(server, num, voteData);
-					num++;
-				}
-			}
-			for (Entry<String, ArrayList<OfflineBungeeVote>> entry : getVotingPluginProxy().getCachedOnlineVotes()
-					.entrySet()) {
-				String name = entry.getKey();
-				int num = 0;
-				for (OfflineBungeeVote voteData : entry.getValue()) {
-					voteCacheFile.addVoteOnline(name, num, voteData);
-					num++;
-				}
-			}
-		}
-		if (!getVotingPluginProxy().getTimeChangeQueue().isEmpty()) {
-			int num = 0;
-			for (VoteTimeQueue vote : getVotingPluginProxy().getTimeChangeQueue()) {
-				voteCacheFile.addTimedVote(num, vote);
-				num++;
-			}
-		}
-
 		getVotingPluginProxy().onDisable();
 
 		voteCacheFile.save();
 		nonVotedPlayersCache.save();
 
+		timer.shutdownNow();
+
 		getLogger().info("VotingPlugin disabled");
 
 	}
@@ -397,6 +399,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 	@Override
 	public void onEnable() {
 
+		timer = Executors.newScheduledThreadPool(1);
+
 		getProxy().getPluginManager().registerListener(this, this);
 
 		config = new Config(this);
@@ -450,6 +454,11 @@ public class VotingPluginBungee extends Plugin implements Listener {
 			public String getUUID(String playerName) {
 
 				if (!config.getOnlineMode()) {
+					// correct casing
+					ProxiedPlayer p = getProxy().getPlayer(playerName);
+					if (p != null && p.isConnected()) {
+						playerName = p.getName();
+					}
 					return UUID.nameUUIDFromBytes(("OfflinePlayer:" + playerName).getBytes(StandardCharsets.UTF_8))
 							.toString();
 				}
@@ -490,22 +499,22 @@ public class VotingPluginBungee extends Plugin implements Listener {
 
 			@Override
 			public long getVoteCacheLastUpdated() {
-				return voteCacheFile.getData().getLong("Time.LastUpdated");
+				return voteCacheFile.getLong("Time.LastUpdated", 0L);
 			}
 
 			@Override
 			public int getVoteCachePrevDay() {
-				return voteCacheFile.getData().getInt("Time.Day");
+				return voteCacheFile.getInt("Time.Day", 0);
 			}
 
 			@Override
 			public String getVoteCachePrevMonth() {
-				return voteCacheFile.getData().getString("Time.Month");
+				return voteCacheFile.getString("Time.Month", "");
 			}
 
 			@Override
 			public int getVoteCachePrevWeek() {
-				return voteCacheFile.getData().getInt("Time.Week");
+				return voteCacheFile.getInt("Time.Week", 0);
 			}
 
 			@Override
@@ -531,7 +540,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 
 			@Override
 			public boolean isVoteCacheIgnoreTime() {
-				return voteCacheFile.getData().getBoolean("Time.IgnoreTime");
+				return voteCacheFile.getBoolean("Time.IgnoreTime", false);
 			}
 
 			@Override
@@ -561,36 +570,36 @@ public class VotingPluginBungee extends Plugin implements Listener {
 
 			@Override
 			public void sendPluginMessageData(String server, String channel, byte[] data, boolean queue) {
-				getProxy().getServers().get(server).sendData(channel, data, queue);
+				getProxy().getServerInfo(server).sendData(channel, data, queue);
 			}
 
 			@Override
 			public void setVoteCacheLastUpdated() {
-				voteCacheFile.getData().set("Time.LastUpdated", System.currentTimeMillis());
+				voteCacheFile.setLong("Time.LastUpdated", System.currentTimeMillis());
 				voteCacheFile.save();
 			}
 
 			@Override
 			public void setVoteCachePrevDay(int day) {
-				voteCacheFile.getData().set("Time.Day", day);
+				voteCacheFile.setInt("Time.Day", day);
 				voteCacheFile.save();
 			}
 
 			@Override
 			public void setVoteCachePrevMonth(String text) {
-				voteCacheFile.getData().set("Time.Month", text);
+				voteCacheFile.setString("Time.Month", text);
 				voteCacheFile.save();
 			}
 
 			@Override
 			public void setVoteCachePrevWeek(int week) {
-				voteCacheFile.getData().set("Time.Week", week);
+				voteCacheFile.setInt("Time.Week", week);
 				voteCacheFile.save();
 			}
 
 			@Override
 			public void setVoteCacheVoteCacheIgnoreTime(boolean ignore) {
-				voteCacheFile.getData().set("Time.IgnoreTime", ignore);
+				voteCacheFile.setBoolean("Time.IgnoreTime", ignore);
 				voteCacheFile.save();
 			}
 
@@ -609,12 +618,22 @@ public class VotingPluginBungee extends Plugin implements Listener {
 			public void warn(String message) {
 				getLogger().warning(message);
 			}
-			
+
 			@Override
 			public void reloadCore(boolean mysql) {
 				reloadPlugin(mysql);
 			}
 
+			@Override
+			public ScheduledExecutorService getScheduler() {
+				return timer;
+			}
+
+			@Override
+			public MysqlConfig getVoteCacheMySQLConfig() {
+				return new MysqlConfigBungee(config.getData().getSection("VoteCache"));
+			}
+
 		};
 		try {
 			Class.forName("com.vexsoftware.votifier.bungee.events.VotifierEvent");
@@ -648,69 +667,25 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		if (mysqlLoaded) {
 
 			voteCacheFile = new VoteCache(this);
-			voteCacheFile.load();
+			// voteCacheFile.load();
 
 			nonVotedPlayersCache = new NonVotedPlayersCache(this);
-			nonVotedPlayersCache.load();
+			// nonVotedPlayersCache.load();
 
-			getVotingPluginProxy().load();
-
-			try {
-				for (String key : voteCacheFile.getTimedVoteCache()) {
-					Configuration data = voteCacheFile.getTimedVoteCache(key);
-					getVotingPluginProxy().getTimeChangeQueue().add(
-							new VoteTimeQueue(data.getString("Name"), data.getString("Service"), data.getLong("Time")));
-				}
-
-				getVotingPluginProxy().processQueue();
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-
-			try {
-				for (String server : voteCacheFile.getServers()) {
-					ArrayList<OfflineBungeeVote> vote = new ArrayList<>();
-					for (String num : voteCacheFile.getServerVotes(server)) {
-						Configuration data = voteCacheFile.getServerVotes(server, num);
-						vote.add(new OfflineBungeeVote(data.getString("Name"), data.getString("UUID"),
-								data.getString("Service"), data.getLong("Time"), data.getBoolean("Real"),
-								data.getString("Text")));
-					}
-					getVotingPluginProxy().getCachedVotes().put(server, vote);
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-
-			try {
-				for (String player : voteCacheFile.getPlayers()) {
-					ArrayList<OfflineBungeeVote> vote = new ArrayList<>();
-					for (String num : voteCacheFile.getOnlineVotes(player)) {
-						Configuration data = voteCacheFile.getOnlineVotes(player, num);
-						vote.add(new OfflineBungeeVote(data.getString("Name"), data.getString("UUID"),
-								data.getString("Service"), data.getLong("Time"), data.getBoolean("Real"),
-								data.getString("Text")));
-					}
-					getVotingPluginProxy().getCachedOnlineVotes().put(player, vote);
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-
-			voteCacheFile.clearData();
+			getVotingPluginProxy().load(voteCacheFile);
 
 			getProxy().getScheduler().schedule(this, new Runnable() {
 
 				@Override
 				public void run() {
 
-					for (String server : getVotingPluginProxy().getCachedVotes().keySet()) {
+					for (String server : getVotingPluginProxy().getVoteCacheHandler().getCachedVotesServers()) {
 						getVotingPluginProxy().checkCachedVotes(server);
 					}
 
-					for (String player : getVotingPluginProxy().getCachedOnlineVotes().keySet()) {
-						getVotingPluginProxy().checkOnlineVotes(getProxy().getPlayer(UUID.fromString(player)).getName(),
-								player, null);
+					for (ProxiedPlayer player : getProxy().getPlayers()) {
+						getVotingPluginProxy().checkOnlineVotes(player.getName(), player.getUniqueId().toString(),
+								null);
 					}
 				}
 			}, 120l, 60l, TimeUnit.SECONDS);

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/bungee/VotingPluginBungeeCommand.java

@@ -1,6 +1,6 @@
-package com.bencodez.votingplugin.bungee;
+package com.bencodez.votingplugin.proxy.bungee;
 
-import com.bencodez.votingplugin.bungee.proxy.VotingPluginProxyCommand;
+import com.bencodez.votingplugin.proxy.VotingPluginProxyCommand;
 
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.chat.TextComponent;
@@ -22,7 +22,7 @@ public class VotingPluginBungeeCommand extends Command {
 				sender.sendMessage(new TextComponent(result.replace("&", "§")));
 			}
 		} else {
-			sender.sendMessage(new TextComponent("&cYou do not have permission to do this!"));
+			sender.sendMessage(new TextComponent("&cYou do not have permission to do this!".replace("&", "§")));
 		}
 	}
 

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/cache/ConfigDataNode.java

@@ -0,0 +1,92 @@
+package com.bencodez.votingplugin.proxy.cache;
+
+import ninja.leaping.configurate.ConfigurationNode;
+
+public class ConfigDataNode implements DataNode {
+
+	private final ConfigurationNode node;
+
+	public ConfigDataNode(ConfigurationNode node) {
+		this.node = node;
+	}
+
+	@SuppressWarnings("deprecation")
+	@Override
+	public boolean isObject() {
+		return node.hasMapChildren();
+	}
+
+	@SuppressWarnings("deprecation")
+	@Override
+	public boolean isArray() {
+		return node.hasListChildren();
+	}
+
+	@Override
+	public boolean isPrimitive() {
+		return !isObject() && !isArray();
+	}
+
+	@Override
+	public DataNode get(String key) {
+		return new ConfigDataNode(node.getNode((Object) key));
+	}
+	
+	@Override
+	public long asLong() {
+	    return node.getLong();
+	}
+
+	
+    @Override
+    public boolean has(String key) {
+        ConfigurationNode child = node.getNode((Object) key);
+        return child != null && child.getValue() != null;
+    }
+
+    @Override
+    public boolean has(int index) {
+        ConfigurationNode child = node.getNode(index);
+        return child != null && child.getValue() != null;
+    }
+
+	@Override
+	public DataNode get(int index) {
+		return new ConfigDataNode(node.getNode(index));
+	}
+
+	@Override
+	public void set(String key, Object value) {
+		node.getNode((Object) key).setValue(value);
+	}
+
+	@Override
+	public void set(int index, Object value) {
+		node.getNode(index).setValue(value);
+	}
+
+	@Override
+	public Object asPrimitive() {
+		return node.getValue();
+	}
+
+	@Override
+	public String asString() {
+		return node.getString();
+	}
+
+	@Override
+	public int asInt() {
+		return node.getInt();
+	}
+
+	@Override
+	public boolean asBoolean() {
+		return node.getBoolean();
+	}
+
+	@Override
+	public Object toInternal() {
+		return node;
+	}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/cache/DataNode.java

@@ -0,0 +1,32 @@
+package com.bencodez.votingplugin.proxy.cache;
+
+public interface DataNode {
+	boolean isObject();
+
+	boolean isArray();
+
+	boolean isPrimitive();
+
+	DataNode get(String key);
+
+	DataNode get(int index);
+
+	void set(String key, Object value);
+
+	void set(int index, Object value);
+
+	Object asPrimitive();
+
+	String asString();
+	
+	long asLong();
+	
+    boolean has(String key); 
+    boolean has(int index);  
+
+	int asInt();
+
+	boolean asBoolean();
+
+	Object toInternal(); // Returns either JsonElement or ConfigurationNode
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/cache/GsonDataNode.java

@@ -0,0 +1,118 @@
+package com.bencodez.votingplugin.proxy.cache;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+
+public class GsonDataNode implements DataNode {
+
+	private final JsonElement element;
+
+	public GsonDataNode(JsonElement element) {
+		this.element = element;
+	}
+
+	@Override
+	public boolean isObject() {
+		return element.isJsonObject();
+	}
+
+	@Override
+	public boolean isArray() {
+		return element.isJsonArray();
+	}
+
+	@Override
+	public boolean isPrimitive() {
+		return element.isJsonPrimitive();
+	}
+
+	@Override
+	public DataNode get(String key) {
+		if (!isObject())
+			return null;
+		return new GsonDataNode(element.getAsJsonObject().get(key));
+	}
+
+	@Override
+	public DataNode get(int index) {
+		if (!isArray())
+			return null;
+		return new GsonDataNode(element.getAsJsonArray().get(index));
+	}
+
+	@Override
+	public void set(String key, Object value) {
+		if (!isObject())
+			return;
+		element.getAsJsonObject().add(key, new Gson().toJsonTree(value));
+	}
+
+	@Override
+	public void set(int index, Object value) {
+		if (!isArray())
+			return;
+		element.getAsJsonArray().set(index, new Gson().toJsonTree(value));
+	}
+
+	@Override
+	public long asLong() {
+		if (element == null || !element.isJsonPrimitive())
+			return 0L;
+
+		JsonPrimitive prim = element.getAsJsonPrimitive();
+
+		if (prim.isNumber()) {
+			return prim.getAsLong();
+		}
+
+		// Try parsing from string if it’s not a number
+		try {
+			return Long.parseLong(prim.getAsString());
+		} catch (NumberFormatException e) {
+			return 0L;
+		}
+	}
+
+	@Override
+	public Object asPrimitive() {
+		if (!isPrimitive())
+			return null;
+		JsonPrimitive prim = element.getAsJsonPrimitive();
+		if (prim.isBoolean())
+			return prim.getAsBoolean();
+		if (prim.isNumber())
+			return prim.getAsNumber();
+		return prim.getAsString();
+	}
+
+	@Override
+	public boolean has(String key) {
+		return isObject() && element.getAsJsonObject().has(key);
+	}
+
+	@Override
+	public boolean has(int index) {
+		return isArray() && index >= 0 && index < element.getAsJsonArray().size();
+	}
+
+	@Override
+	public String asString() {
+		return element.getAsString();
+	}
+
+	@Override
+	public int asInt() {
+		return element.getAsInt();
+	}
+
+	@Override
+	public boolean asBoolean() {
+		return element.getAsBoolean();
+	}
+
+	@Override
+	public Object toInternal() {
+		return element;
+	}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/cache/IVoteCache.java

@@ -0,0 +1,59 @@
+package com.bencodez.votingplugin.proxy.cache;
+
+import java.util.Collection;
+
+import com.bencodez.votingplugin.proxy.OfflineBungeeVote;
+import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
+
+public interface IVoteCache {
+
+	void addTimedVote(int num, VoteTimeQueue voteTimedQueue);
+
+	void addVote(String server, int num, OfflineBungeeVote voteData);
+
+	void addVoteOnline(String player, int num, OfflineBungeeVote voteData);
+
+	void clearData();
+
+	Collection<String> getOnlineVotes(String name);
+
+	DataNode getOnlineVotes(String name, String num);
+
+	Collection<String> getPlayers();
+
+	Collection<String> getServers();
+
+	Collection<String> getServerVotes(String server);
+
+	DataNode getServerVotes(String server, String num);
+
+	Collection<String> getTimedVoteCache();
+
+	DataNode getTimedVoteCache(String key);
+
+	int getVotePartyCache(String server);
+
+	int getVotePartyCurrentVotes();
+
+	int getVotePartyInreaseVotesRequired();
+
+	void setVotePartyCache(String server, int amount);
+
+	void setVotePartyCurrentVotes(int amount);
+
+	void setVotePartyInreaseVotesRequired(int amount);
+
+	void save();
+
+	void reload();
+
+	void removeOnlineVotes(String player);
+
+	void removeServerVotes(String server);
+
+	void removeServerVote(String server, String uuid);
+
+	void removeVote(String server, OfflineBungeeVote vote);
+
+	void removeOnlineVote(OfflineBungeeVote vote);
+}