Fix deploying profiles

check milestones in /av user all addmilestonecount

.github/stale.yml

@@ -1,17 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 20
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 5
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - Priority
-  - nonstale
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

.github/workflows/stale.yml

@@ -0,0 +1,27 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: '19 16 * * *'
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v5
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'Stale issue message'
+        stale-pr-message: 'Stale pull request message'
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'

VotingPlugin/Resources/Config.yml

@@ -245,6 +245,16 @@ Format:
       # %Points% = player points
       Points: '&a%Player% currently has &a&l%Points%&a Points!'
       
+      # /vote givepoints command
+      # Transfer between players command
+      # Enable command below
+      GivePoints:
+        NotEnoughPoints: '&cNot enough points'
+        NotJoinedServer: '&c%player% has not joined the server'
+        NumberLowerThanZero: '&cNumber of points needs to be greater than 0'
+        TransferFrom: '&c%transfer% points given to %touser%'
+        TransferTo: '&cYou received %transfer% points from %fromuser%'
+      
       ToggleBroadcasts:
         Enabled: '&cYou will now see vote broadcasts'
         Disabled: '&cYou will no longer see vote broadcasts'
@@ -434,11 +444,11 @@ CachedPlaceholders: []
 UseJavascriptPlaceholders: false
 
 # Custom placeholder returns
-# For the example below use %votingplugin_custom_points_5%
+# For the example below use %votingplugin_custom_enoughpoints_5%
 # DO NOT USE ON MAIN THREAD IF POSSIBLE
 # Keep everything lowercase
 #CustomPlaceholderReturns:
-#  'points_5':
+#  'enoughpoints_5':
 #    'true': 'User has enough points'
 #    'false': 'User does not have enough points'
 
@@ -528,6 +538,11 @@ OnlineMode: true
 # May improve performance
 #DisableCheckOnWorldChange: false
 
+# If true, number of vote shop purchases will be tracked
+# Data will be tracked in serverdata.yml, may change in the future
+# No commands to view data currently 
+TrackShopPurchases: false
+
 ###########################################
 # Skull settings
 ###########################################
@@ -646,11 +661,6 @@ DelayBetweenUpdates: 3
 # Recommend leaving this to false
 ExtraBackgroundUpdate: false
 
-# Limit number of users to load in a second
-# Effects background tasks mainly
-# set to -1 to disable (default value)
-#PlayerDataLoadLimit: 500
-
 ##########################################
 # Inventory controls
 ##########################################
@@ -680,6 +690,10 @@ AlwaysCloseInventory: false
 # This is to prevent any possible exploits
 CloseInventoryOnVote: true
 
+# This will close GUI's if you shift click them rather than a regular
+# This can help prevent exploits
+CloseGUIOnShiftClick: false
+
 ###########################################
 # Purge settings
 ###########################################
@@ -695,6 +709,10 @@ PurgeMin: 90
 # Options below don't need to be touched
 ##########################################
 
+# If enabled, data is repulled from storage on vote shop purchase
+# This prevents possible exploits with vote shop
+ExtraVoteShopCheck: true
+
 # Options for request api
 # Current methods:
 # ANVIL

VotingPlugin/Resources/GUI.yml

@@ -143,6 +143,10 @@ CHEST:
   VoteNext:
     Name: 'VoteNext: %player%'
     BackButton: true
+    # Extra customization for displaying site names in GUI only
+    #CustomSiteNamesDisplays:
+    #  Site1: site name display
+    LoreLine: '%time%'
   VoteToday:
     Name: 'VoteToday'
     Line: '&6%VoteSite% : %Time%'
@@ -305,6 +309,8 @@ CHEST:
   VoteShopLimitReached: '&aYou reached your limit'
   VoteShopRequireConfirmation: false
   VoteShopDisabled: '&cVote shop disabled'
+  # If true, shop gui will reopen, updating all placeholders
+  VoteShopReopenGUIOnPurchase: false
   # VoteShop extra items for display only
   #VoteShopExtraItems:
     #Item:

VotingPlugin/Resources/plugin.yml

@@ -20,6 +20,7 @@ softdepend:
 loadbefore:
 - MCPerks
 api-version: 1.13
+folia-supported: true
 libraries:
 - org.openjdk.nashorn:nashorn-core:15.3
 commands:
@@ -56,9 +57,6 @@ commands:
   votereward:
     description: Open VoteReward GUI
     aliases: vreward
-  vote?:
-    description: View Help
-    aliases: v?
   voteparty:
     description: A command
     aliases: vparty

VotingPlugin/pom.xml

@@ -1,13 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
-	<artifactId>votingplugin</artifactId>
-	<version>6.12.2</version>
+	<artifactId>${version.art}</artifactId>
+	<version>6.13.1</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
 		<github.global.server>github</github.global.server>
 		<project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
 		<build.number>NOTSET</build.number>
@@ -90,7 +88,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.4.3</version>
+				<version>3.3.0</version>
 				<configuration>
 					<shadedArtifactAttached>false</shadedArtifactAttached>
 					<minimizeJar>true</minimizeJar>
@@ -210,18 +208,22 @@
 			<id>bencodez repo</id>
 			<url>https://nexus.bencodez.com/repository/maven-public/</url>
 		</repository>
+		<repository>
+			<id>papermc</id>
+			<url>https://repo.papermc.io/repository/maven-public/</url>
+		</repository>
 	</repositories>
 	<dependencies>
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.19.4-R0.1-SNAPSHOT</version>
+			<version>1.20.1-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.2</version>
+			<version>1.18.20</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -245,7 +247,7 @@
 		<dependency>
 			<groupId>com.velocitypowered</groupId>
 			<artifactId>velocity-api</artifactId>
-			<version>1.1.5</version>
+			<version>3.1.1</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -254,17 +256,51 @@
 			<version>2.2.1</version>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.bencodez</groupId>
-			<artifactId>advancedcore</artifactId>
-			<version>LATEST</version>
-			<scope>compile</scope>
-		</dependency>
 	</dependencies>
 	<profiles>
+		<profile>
+			<id>normal</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<properties>
+				<build.profile.id>normal</build.profile.id>
+				<version.art>votingplugin</version.art>
+				<maven.compiler.source>1.8</maven.compiler.source>
+				<maven.compiler.target>1.8</maven.compiler.target>
+			</properties>
+			<dependencies>
+				<dependency>
+					<groupId>com.bencodez</groupId>
+					<artifactId>advancedcore</artifactId>
+					<version>LATEST</version>
+					<scope>compile</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>normal-folia</id>
+			<properties>
+				<build.profile.id>normal</build.profile.id>
+				<version.art>votingplugin-folia</version.art>
+				<maven.compiler.source>17</maven.compiler.source>
+				<maven.compiler.target>17</maven.compiler.target>
+			</properties>
+			<dependencies>
+				<dependency>
+					<groupId>com.bencodez</groupId>
+					<artifactId>advancedcore-folia</artifactId>
+					<version>LATEST</version>
+					<scope>compile</scope>
+				</dependency>
+			</dependencies>
+		</profile>
 		<profile>
 			<id>prod2</id>
 			<properties>
+				<version.art>votingplugin</version.art>
+				<maven.compiler.source>1.8</maven.compiler.source>
+				<maven.compiler.target>1.8</maven.compiler.target>
 				<build.profile.id>prod2</build.profile.id>
 			</properties>
 			<distributionManagement>
@@ -274,10 +310,21 @@
 					<url>file://${project.build.directory}/mvn-repo</url>
 				</repository>
 			</distributionManagement>
+			<dependencies>
+				<dependency>
+					<groupId>com.bencodez</groupId>
+					<artifactId>advancedcore</artifactId>
+					<version>LATEST</version>
+					<scope>compile</scope>
+				</dependency>
+			</dependencies>
 		</profile>
 		<profile>
 			<id>deploy-snapshot</id>
 			<properties>
+				<version.art>votingplugin</version.art>
+				<maven.compiler.source>1.8</maven.compiler.source>
+				<maven.compiler.target>1.8</maven.compiler.target>
 				<build.profile.id>deploy-snapshot</build.profile.id>
 			</properties>
 			<distributionManagement>
@@ -290,12 +337,20 @@
 					<url>https://nexus.bencodez.com/repository/maven-snapshots/</url>
 				</repository>
 			</distributionManagement>
+			<dependencies>
+				<dependency>
+					<groupId>com.bencodez</groupId>
+					<artifactId>advancedcore</artifactId>
+					<version>LATEST</version>
+					<scope>compile</scope>
+				</dependency>
+			</dependencies>
 			<build>
 				<plugins>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>3.0.0-M1</version>
+						<version>3.0.0</version>
 						<configuration>
 							<skip>true</skip>
 						</configuration>
@@ -303,7 +358,7 @@
 					<plugin>
 						<groupId>org.sonatype.plugins</groupId>
 						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.5.1</version>
+						<version>1.6.13</version>
 						<executions>
 							<execution>
 								<id>default-deploy</id>
@@ -325,8 +380,19 @@
 		<profile>
 			<id>deploy</id>
 			<properties>
+				<version.art>votingplugin</version.art>
+				<maven.compiler.source>1.8</maven.compiler.source>
+				<maven.compiler.target>1.8</maven.compiler.target>
 				<build.profile.id>deploy</build.profile.id>
 			</properties>
+			<dependencies>
+				<dependency>
+					<groupId>com.bencodez</groupId>
+					<artifactId>advancedcore</artifactId>
+					<version>LATEST</version>
+					<scope>compile</scope>
+				</dependency>
+			</dependencies>
 			<distributionManagement>
 				<snapshotRepository>
 					<id>nexus</id>

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Objects/User.java

@@ -2,7 +2,7 @@ package com.Ben12345rocks.VotingPlugin.Objects;
 
 import org.bukkit.entity.Player;
 
-import com.bencodez.votingplugin.user.UserManager;
+import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 @Deprecated
@@ -10,7 +10,7 @@ public class User {
 	private VotingPluginUser user;
 
 	public User(Player p) {
-		user = UserManager.getInstance().getVotingPluginUser(p);
+		user = VotingPluginMain.plugin.getVotingPluginUserManager().getVotingPluginUser(p);
 	}
 
 	public void addPoints(int points) {

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

@@ -28,11 +28,11 @@ import com.bencodez.advancedcore.bungeeapi.pluginmessage.PluginMessageHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.ClientHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketReceiver;
+import com.bencodez.advancedcore.scheduler.BukkitScheduler;
 import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.bungee.BungeeVersion;
 import com.bencodez.votingplugin.objects.VoteSite;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 import lombok.Getter;
@@ -287,7 +287,7 @@ public class BungeeHandler implements Listener {
 						String service = args.get(2);
 						long time = Long.parseLong(args.get(3));
 						plugin.debug("pluginmessaging vote received from " + player + "/" + uuid + " on " + service);
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuid),
 								player);
 
 						boolean wasOnline = Boolean.valueOf(args.get(4));
@@ -302,7 +302,7 @@ public class BungeeHandler implements Listener {
 
 						boolean setTotals = Boolean.valueOf(args.get(7));
 
-						user.clearCache();
+						user.cache();
 
 						boolean broadcast = true;
 						boolean bungeeBroadcast = false;
@@ -383,9 +383,9 @@ public class BungeeHandler implements Listener {
 
 						plugin.debug(
 								"pluginmessaging voteonline received from " + player + "/" + uuid + " on " + service);
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuid),
 								player);
-						user.clearCache();
+						user.cache();
 
 						if (plugin.getBungeeSettings().isPerServerPoints()) {
 							user.addPoints(plugin.getConfigFile().getPointsOnVote());
@@ -456,8 +456,8 @@ public class BungeeHandler implements Listener {
 				public void onRecieve(String subChannel, ArrayList<String> args) {
 					String player = args.get(0);
 					plugin.debug("pluginmessaging voteupdate received for " + player);
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(player));
-					user.clearCache();
+					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(player));
+					user.cache();
 
 					user.offVote();
 
@@ -485,7 +485,7 @@ public class BungeeHandler implements Listener {
 					if (args.size() > 2) {
 						String uuid = args.get(0);
 						String service = args.get(2);
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuid),
 								args.get(1));
 						VoteSite site = plugin.getVoteSite(service, true);
 						if (site != null) {
@@ -503,7 +503,7 @@ public class BungeeHandler implements Listener {
 					if (args.size() > 2) {
 						String uuid = args.get(0);
 						String votes = args.get(2);
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuid),
 								args.get(1));
 						user.offlineBroadcast(user, false, Integer.parseInt(votes));
 					}
@@ -523,7 +523,7 @@ public class BungeeHandler implements Listener {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
 					for (final String cmd : plugin.getBungeeSettings().getBungeeVotePartyGlobalCommands()) {
-						Bukkit.getScheduler().runTask(plugin, new Runnable() {
+						BukkitScheduler.runTask(plugin, new Runnable() {
 
 							@Override
 							public void run() {
@@ -572,12 +572,12 @@ public class BungeeHandler implements Listener {
 						String uuid = data[1];
 						VotingPluginUser user = null;
 						if (!uuid.isEmpty()) {
-							user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+							user = plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuid));
 						} else {
-							user = UserManager.getInstance().getVotingPluginUser(data[2]);
+							user = plugin.getVotingPluginUserManager().getVotingPluginUser(data[2]);
 						}
 
-						user.clearCache();
+						user.cache();
 
 						if (plugin.getBungeeSettings().isPerServerPoints()) {
 							user.addPoints(plugin.getConfigFile().getPointsOnVote());
@@ -605,12 +605,12 @@ public class BungeeHandler implements Listener {
 						String uuid = data[1];
 						VotingPluginUser user = null;
 						if (!uuid.isEmpty()) {
-							user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+							user = plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuid));
 						} else {
-							user = UserManager.getInstance().getVotingPluginUser(data[2]);
+							user = plugin.getVotingPluginUserManager().getVotingPluginUser(data[2]);
 						}
 
-						user.clearCache();
+						user.cache();
 
 						if (plugin.getBungeeSettings().isPerServerPoints()) {
 							user.addPoints(plugin.getConfigFile().getPointsOnVote());
@@ -628,7 +628,7 @@ public class BungeeHandler implements Listener {
 					if (data.length > 2) {
 						String votes = data[0];
 						String p = data[1];
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(p);
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(p);
 						user.offlineBroadcast(user, false, Integer.parseInt(votes));
 					}
 				}
@@ -641,7 +641,7 @@ public class BungeeHandler implements Listener {
 					if (data.length > 2) {
 						VoteSite site = plugin.getVoteSite(data[1], true);
 						String p = data[3];
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(p);
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(p);
 						if (site != null) {
 							site.broadcastVote(user, false);
 						} else {
@@ -658,7 +658,7 @@ public class BungeeHandler implements Listener {
 					if (data.length > 2) {
 						VoteSite site = plugin.getVoteSite(data[1], true);
 						String p = data[2];
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(p);
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(p);
 						if (site != null) {
 							site.broadcastVote(user, false);
 						} else {

VotingPlugin/src/com/bencodez/votingplugin/VotingPluginHooks.java

@@ -33,7 +33,7 @@ public class VotingPluginHooks {
 	}
 
 	public UserManager getUserManager() {
-		return UserManager.getInstance();
+		return getMainClass().getVotingPluginUserManager();
 	}
 
 }

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

@@ -53,8 +53,10 @@ import com.bencodez.advancedcore.api.rewards.injected.RewardInjectInt;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInjectValidator;
 import com.bencodez.advancedcore.api.skull.SkullHandler;
 import com.bencodez.advancedcore.api.updater.Updater;
+import com.bencodez.advancedcore.api.user.userstorage.Column;
 import com.bencodez.advancedcore.logger.Logger;
 import com.bencodez.advancedcore.nms.NMSManager;
+import com.bencodez.advancedcore.scheduler.BukkitScheduler;
 import com.bencodez.votingplugin.broadcast.BroadcastHandler;
 import com.bencodez.votingplugin.commands.CommandLoader;
 import com.bencodez.votingplugin.commands.executers.CommandAdminVote;
@@ -81,6 +83,7 @@ import com.bencodez.votingplugin.placeholders.MVdWPlaceholders;
 import com.bencodez.votingplugin.placeholders.PlaceHolders;
 import com.bencodez.votingplugin.signs.Signs;
 import com.bencodez.votingplugin.specialrewards.SpecialRewards;
+import com.bencodez.votingplugin.test.VoteTester;
 import com.bencodez.votingplugin.timequeue.TimeQueueHandler;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.topvoter.TopVoterHandler;
@@ -145,6 +148,9 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	@Getter
 	private PlaceHolders placeholders;
 
+	@Getter
+	private VoteTester voteTester;
+
 	@Getter
 	private String profile = "";
 
@@ -222,8 +228,8 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	public void basicBungeeUpdate() {
 		for (Player player : Bukkit.getOnlinePlayers()) {
-			VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
-			user.clearCache();
+			VotingPluginUser user = getVotingPluginUserManager().getVotingPluginUser(player);
+			user.cache();
 			user.offVote();
 			user.checkOfflineRewards();
 		}
@@ -255,7 +261,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		}
 
 		if (ymlError) {
-			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+			BukkitScheduler.runTaskLaterAsynchronously(plugin, new Runnable() {
 
 				@Override
 				public void run() {
@@ -289,7 +295,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	 * @return the user
 	 */
 	public VotingPluginUser getUser(UUID uuid) {
-		return UserManager.getInstance().getVotingPluginUser(uuid);
+		return getVotingPluginUserManager().getVotingPluginUser(uuid);
 	}
 
 	private YamlConfiguration getVersionFile() {
@@ -925,7 +931,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	}
 
 	private void loadTimer() {
-		Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+		BukkitScheduler.runTaskLaterAsynchronously(plugin, new Runnable() {
 
 			@Override
 			public void run() {
@@ -1013,6 +1019,8 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		loadVersionFile();
 		getOptions().setServer(bungeeSettings.getServer());
 
+		voteTester = new VoteTester(plugin);
+
 		loadVoteTimer();
 
 		if (bungeeSettings.isUseBungeecoord()) {
@@ -1044,7 +1052,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		coolDownCheck.checkEnabled();
 		coolDownCheck.load();
 
-		Bukkit.getScheduler().runTask(plugin, new Runnable() {
+		BukkitScheduler.runTask(plugin, new Runnable() {
 
 			@Override
 			public void run() {
@@ -1054,7 +1062,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		topVoterHandler = new TopVoterHandler(this);
 		lastMonthTopVoter = new LinkedHashMap<TopVoterPlayer, Integer>();
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+		BukkitScheduler.runTaskAsynchronously(plugin, new Runnable() {
 
 			@Override
 			public void run() {
@@ -1077,7 +1085,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		topVoterHandler.register();
 
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+		BukkitScheduler.runTaskAsynchronously(plugin, new Runnable() {
 
 			@Override
 			public void run() {
@@ -1102,7 +1110,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		placeholders = new PlaceHolders(this);
 		getServerData().updatePlaceholders();
 		placeholders.load();
-		
 
 		if (Bukkit.getPluginManager().isPluginEnabled("MVdWPlaceholderAPI")) {
 			mvdwPlaceholders = new MVdWPlaceholders(this);
@@ -1115,7 +1122,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			@Override
 			public String onRewardRequest(Reward reward, com.bencodez.advancedcore.api.user.AdvancedCoreUser user,
 					int num, HashMap<String, String> placeholders) {
-				VotingPluginUser vpUser = UserManager.getInstance().getVotingPluginUser(user);
+				VotingPluginUser vpUser = getVotingPluginUserManager().getVotingPluginUser(user);
 				String str = "" + vpUser.addPoints(num);
 				debug("Setting points to " + str);
 				return str;
@@ -1148,7 +1155,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 							StringParser.getInstance().replacePlaceHolder(section.getString("Message", ""),
 									placeholders),
 							section.getString("Color", "BLUE"), section.getString("Style", "SOLID"),
-							(double) UserManager.getInstance().getVotingPluginUser(user).getSitesVotedOn()
+							(double) getVotingPluginUserManager().getVotingPluginUser(user).getSitesVotedOn()
 									/ plugin.getVoteSites().size(),
 							section.getInt("Delay", 30));
 				}
@@ -1161,7 +1168,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 				@Override
 				public String getValue(Reward reward, com.bencodez.advancedcore.api.user.AdvancedCoreUser user) {
-					VotingPluginUser vUser = UserManager.getInstance().getVotingPluginUser(user);
+					VotingPluginUser vUser = getVotingPluginUserManager().getVotingPluginUser(user);
 					return "" + vUser.getTotal(top);
 				}
 			});
@@ -1204,7 +1211,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		}
 
 		if (!issues) {
-			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+			BukkitScheduler.runTaskLaterAsynchronously(plugin, new Runnable() {
 
 				@Override
 				public void run() {
@@ -1242,7 +1249,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		loadVoteSites();
 
-		votingPluginUserManager = UserManager.getInstance();
+		votingPluginUserManager = new UserManager(this);
 		votingPluginUserManager.addCachingKeys();
 
 		setJenkinsSite("bencodez.com");
@@ -1393,7 +1400,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		voteReminding.loadRemindChecking();
 		coolDownCheck.checkEnabled();
-	
+
 		setUpdate(true);
 	}
 
@@ -1420,6 +1427,9 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		plugin.debug("Loaded Files");
 	}
 
+	@Getter
+	private long lastBackgroundTaskTimeTaken = -1;
+
 	public void update() {
 		if (update || configFile.isAlwaysUpdate()) {
 			if (!updateStarted && plugin != null) {
@@ -1434,7 +1444,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 							plugin.debug("Starting background task, current cached users: "
 									+ plugin.getUserManager().getDataManager().getUserDataCache().keySet().size());
 
-							int dataLoadLimit = getConfigFile().getPlayerDataLoadLimit();
 							try {
 								boolean extraBackgroundUpdate = configFile.isExtraBackgroundUpdate();
 								long startTime = System.currentTimeMillis();
@@ -1456,17 +1465,23 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 										.getTopVoterIgnorePermission();
 								ArrayList<String> blackList = plugin.getConfigFile().getBlackList();
 
-								ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
+								// ArrayList<String> uuids = getVotingPluginUserManager().getAllUUIDs();
 								int currentDay = LocalDateTime.now().getDayOfMonth();
-								int currentDataLoad = 0;
-								for (String uuid : uuids) {
+								HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+								long time1 = ((System.currentTimeMillis() - startTime) / 1000);
+								plugin.debug("Finished getting player data in " + time1 + " seconds, " + cols.size()
+										+ " users, " + plugin.getStorageType().toString());
+								time1 = System.currentTimeMillis();
+								for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
+
+									String uuid = playerData.getKey().toString();
 									if (plugin != null && plugin.isEnabled()) {
 										if (uuid != null && !uuid.isEmpty()) {
-											VotingPluginUser user = UserManager.getInstance()
+											VotingPluginUser user = getVotingPluginUserManager()
 													.getVotingPluginUser(UUID.fromString(uuid), false);
 											user.dontCache();
-											user.tempCache();
-											user.getUserData().updateCacheWithTemp();
+											user.updateTempCacheWithColumns(playerData.getValue());
+											cols.put(playerData.getKey(), null);
 											if (!user.isBanned() && !blackList.contains(user.getPlayerName())) {
 
 												if (!topVoterIgnorePermissionUse || !user.isTopVoterIgnore()) {
@@ -1508,24 +1523,13 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 											}
 											user.clearTempCache();
 											user = null;
-											if (dataLoadLimit > 0) {
-												currentDataLoad++;
-												if (currentDataLoad >= dataLoadLimit) {
-													currentDataLoad -= dataLoadLimit;
-													Thread.sleep(1000);
-												}
-											}
 										}
 									} else {
 										return;
 									}
 								}
-								update = false;
-								long time1 = ((System.currentTimeMillis() - startTime) / 1000);
-								plugin.debug("Finished loading player data in " + time1 + " seconds, " + uuids.size()
-										+ " users, " + plugin.getStorageType().toString() + ", data load limit: "
-										+ dataLoadLimit);
-								time1 = System.currentTimeMillis();
+								cols.clear();
+								cols = null;
 
 								topVoterHandler.updateTopVoters(tempTopVoter);
 								placeholders.onUpdate();
@@ -1533,17 +1537,22 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 								serverData.updateValues();
 								getSigns().updateSigns();
 
-								tempTopVoter = null;
-
 								checkFirstTimeLoaded();
 
-								time1 = ((System.currentTimeMillis() - time1) / 1000);
-								long totalTime = ((System.currentTimeMillis() - startTime) / 1000);
-								plugin.debug("Background task finished. Final processing took " + time1
-										+ " seconds. Total time: " + totalTime + " seconds");
 								plugin.getUserManager().getDataManager().clearNonNeededCachedUsers();
 								plugin.extraDebug("Current cached users: "
 										+ plugin.getUserManager().getDataManager().getUserDataCache().keySet().size());
+
+								update = false;
+
+								tempTopVoter = null;
+
+								time1 = ((System.currentTimeMillis() - time1) / 1000);
+								long totalTime = ((System.currentTimeMillis() - startTime) / 1000);
+								lastBackgroundTaskTimeTaken = totalTime;
+								plugin.debug("Background task finished. Final processing took " + time1
+										+ " seconds. Total time: " + totalTime + " seconds");
+
 							} catch (Exception ex) {
 								if (plugin != null) {
 									plugin.getLogger().info("Looks like something went wrong");

VotingPlugin/src/com/bencodez/votingplugin/VotingPluginMetrics.java

@@ -3,7 +3,6 @@ package com.bencodez.votingplugin;
 import java.util.concurrent.Callable;
 
 import com.bencodez.advancedcore.api.metrics.BStatsMetrics;
-import com.bencodez.votingplugin.user.UserManager;
 
 public class VotingPluginMetrics {
 
@@ -177,7 +176,7 @@ public class VotingPluginMetrics {
 
 			@Override
 			public String call() throws Exception {
-				int total = UserManager.getInstance().getAllUUIDs().size();
+				int total = plugin.getUserManager().getAllUUIDs().size();
 				if (total > 800000) {
 					return ">800000";
 				} else if (total > 700000) {
@@ -351,6 +350,14 @@ public class VotingPluginMetrics {
 			}
 		}));
 
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("background_task_time_taken", new Callable<String>() {
+
+			@Override
+			public String call() throws Exception {
+				return "" + plugin.getLastBackgroundTaskTimeTaken();
+			}
+		}));
+
 		if (!plugin.getBuildNumber().equals("NOTSET")) {
 			metrics.addCustomChart(new BStatsMetrics.SimplePie("dev_build_number", new Callable<String>() {
 

VotingPlugin/src/com/bencodez/votingplugin/broadcast/BroadcastHandler.java

@@ -13,7 +13,6 @@ import org.bukkit.entity.Player;
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.user.UserManager;
 
 public class BroadcastHandler {
 	private VotingPluginMain plugin;
@@ -46,7 +45,7 @@ public class BroadcastHandler {
 			bc = StringParser.getInstance().replacePlaceHolder(bc, placeholders);
 			ArrayList<Player> players = new ArrayList<Player>();
 			for (Player p : Bukkit.getOnlinePlayers()) {
-				if (!UserManager.getInstance().getVotingPluginUser(p).getDisableBroadcast()) {
+				if (!plugin.getVotingPluginUserManager().getVotingPluginUser(p).getDisableBroadcast()) {
 					players.add(p);
 				}
 			}

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

@@ -7,6 +7,7 @@ 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 {
@@ -53,7 +54,8 @@ public class NonVotedPlayersCache {
 			bungee.getDataFolder().mkdir();
 		}
 
-		File file = new File(bungee.getDataFolder(), "nonvotedplayerscache.yml");
+		File yamlFile = new File(bungee.getDataFolder(), "nonvotedplayerscache.yml");
+		File file = new File(bungee.getDataFolder(), "nonvotedplayerscache.json");
 
 		if (!file.exists()) {
 			try {
@@ -62,9 +64,24 @@ public class NonVotedPlayersCache {
 				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(YamlConfiguration.class)
-					.load(new File(bungee.getDataFolder(), "nonvotedplayerscache.yml"));
+			data = ConfigurationProvider.getProvider(JsonConfiguration.class)
+					.load(new File(bungee.getDataFolder(), "nonvotedplayerscache.json"));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
@@ -84,8 +101,8 @@ public class NonVotedPlayersCache {
 
 	public void save() {
 		try {
-			ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
-					new File(bungee.getDataFolder(), "nonvotedplayerscache.yml"));
+			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

@@ -9,6 +9,7 @@ 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 {
@@ -114,7 +115,9 @@ public class VoteCache {
 			bungee.getDataFolder().mkdir();
 		}
 
-		File file = new File(bungee.getDataFolder(), "votecache.yml");
+		File yamlFile = new File(bungee.getDataFolder(), "votecache.yml");
+		
+		File file = new File(bungee.getDataFolder(), "votecache.json");
 
 		if (!file.exists()) {
 			try {
@@ -123,9 +126,23 @@ public class VoteCache {
 				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(YamlConfiguration.class)
-					.load(new File(bungee.getDataFolder(), "votecache.yml"));
+			data = ConfigurationProvider.getProvider(JsonConfiguration.class)
+					.load(new File(bungee.getDataFolder(), "votecache.json"));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
@@ -133,8 +150,8 @@ public class VoteCache {
 
 	public void save() {
 		try {
-			ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
-					new File(bungee.getDataFolder(), "votecache.yml"));
+			ConfigurationProvider.getProvider(JsonConfiguration.class).save(data,
+					new File(bungee.getDataFolder(), "votecache.json"));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}

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

@@ -572,7 +572,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 			method = BungeeMethod.PLUGINMESSAGING;
 		}
 
-		bungeeTimeChecker = new BungeeTimeChecker(config.getData().getInt("TimeHourOffSet")) {
+		bungeeTimeChecker = new BungeeTimeChecker(config.getData().getString("TimeZone", ""),
+				config.getData().getInt("TimeHourOffSet")) {
 
 			@Override
 			public void warning(String text) {
@@ -591,7 +592,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 						try {
 							lastOnline = Long.valueOf(lastOnlineStr);
 						} catch (NumberFormatException e) {
-							//e.printStackTrace();
+							// e.printStackTrace();
 						}
 
 						if (LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli() - lastOnline < 1000

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

@@ -2,10 +2,10 @@ package com.bencodez.votingplugin.bungee.velocity;
 
 import java.io.File;
 
-import com.bencodez.advancedcore.bungeeapi.velocity.VelocityYMLFile;
+import com.bencodez.advancedcore.bungeeapi.velocity.VelocityJSONFile;
 import com.velocitypowered.api.proxy.Player;
 
-public class NonVotedPlayersCache extends VelocityYMLFile {
+public class NonVotedPlayersCache extends VelocityJSONFile {
 
 	private VotingPluginVelocity plugin;
 

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

@@ -3,13 +3,13 @@ package com.bencodez.votingplugin.bungee.velocity;
 import java.io.File;
 import java.util.Collection;
 
-import com.bencodez.advancedcore.bungeeapi.velocity.VelocityYMLFile;
+import com.bencodez.advancedcore.bungeeapi.velocity.VelocityJSONFile;
 import com.bencodez.votingplugin.bungee.OfflineBungeeVote;
 import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
 
 import ninja.leaping.configurate.ConfigurationNode;
 
-public class VoteCache extends VelocityYMLFile {
+public class VoteCache extends VelocityJSONFile {
 
 	public VoteCache(File file) {
 		super(file);

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

@@ -59,6 +59,7 @@ import com.bencodez.advancedcore.bungeeapi.sockets.ClientHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketReceiver;
 import com.bencodez.advancedcore.bungeeapi.time.BungeeTimeChecker;
+import com.bencodez.advancedcore.bungeeapi.velocity.VelocityYMLFile;
 import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.bungee.BungeeVersion;
@@ -611,7 +612,8 @@ public class VotingPluginVelocity {
 			e.printStackTrace();
 		}
 
-		bungeeTimeChecker = new BungeeTimeChecker(config.getNode("TimeHourOffSet").getInt()) {
+		bungeeTimeChecker = new BungeeTimeChecker(config.getNode("TimeZone").getString(""),
+				config.getNode("TimeHourOffSet").getInt()) {
 
 			@Override
 			public void warning(String text) {
@@ -632,7 +634,7 @@ public class VotingPluginVelocity {
 						try {
 							lastOnline = Long.valueOf(lastOnlineStr);
 						} catch (NumberFormatException e) {
-							//e.printStackTrace();
+							// e.printStackTrace();
 						}
 
 						if (LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli() - lastOnline < 1000
@@ -752,12 +754,36 @@ public class VotingPluginVelocity {
 		if (mysqlLoaded) {
 			uuidPlayerNameCache = mysql.getRowsUUIDNameQuery();
 
-			voteCacheFile = new VoteCache(new File(dataDirectory.toFile(), "votecache.yml"));
+			voteCacheFile = new VoteCache(new File(dataDirectory.toFile(), "votecache.json"));
 
-			bungeeTimeChecker.loadTimer();
+			// convert yml file if exists
+			File yamlVoteCacheFile = new File(dataDirectory.toFile(), "votecache.yml");
+			if (yamlVoteCacheFile.exists()) {
+				VelocityYMLFile yamlVoteCache = new VelocityYMLFile(yamlVoteCacheFile);
+				voteCacheFile.setConf(yamlVoteCache.getData());
+				yamlVoteCacheFile.renameTo(new File(dataDirectory.toFile(), "oldvotecache.yml"));
+				VelocityYMLFile oldYamlVoteCache = new VelocityYMLFile(
+						new File(dataDirectory.toFile(), "oldvotecache.yml"));
+				oldYamlVoteCache.setConf(yamlVoteCache.getData());
+				voteCacheFile.save();
+			}
 
 			nonVotedPlayersCache = new NonVotedPlayersCache(
-					new File(dataDirectory.toFile(), "nonvotedplayerscache.yml"), this);
+					new File(dataDirectory.toFile(), "nonvotedplayerscache.json"), this);
+
+			// convert yml file if exists
+			File yamlnonVotedPlayersCacheFile = new File(dataDirectory.toFile(), "nonvotedplayerscache.yml");
+			if (yamlnonVotedPlayersCacheFile.exists()) {
+				VelocityYMLFile yamlnonVotedPlayersCache = new VelocityYMLFile(yamlnonVotedPlayersCacheFile);
+				voteCacheFile.setConf(yamlnonVotedPlayersCache.getData());
+				yamlnonVotedPlayersCacheFile.renameTo(new File(dataDirectory.toFile(), "oldnonvotedplayerscache.yml"));
+				VelocityYMLFile oldYamlnonVotedPlayersCache = new VelocityYMLFile(
+						new File(dataDirectory.toFile(), "oldnonvotedplayerscache.yml"));
+				oldYamlnonVotedPlayersCache.setConf(yamlnonVotedPlayersCache.getData());
+				voteCacheFile.save();
+			}
+
+			bungeeTimeChecker.loadTimer();
 
 			try {
 				for (String key : voteCacheFile.getTimedVoteCache()) {

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

@@ -3,6 +3,7 @@ package com.bencodez.votingplugin.commands;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.UUID;
 import java.util.regex.Pattern;
@@ -30,12 +31,13 @@ import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.PlayerUtils;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.advancedcore.api.updater.Updater;
-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;
 import com.bencodez.advancedcore.command.gui.UserGUI;
+import com.bencodez.advancedcore.scheduler.BukkitScheduler;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.commands.executers.CommandAliases;
 import com.bencodez.votingplugin.commands.gui.AdminGUI;
@@ -65,9 +67,7 @@ import com.bencodez.votingplugin.commands.gui.player.VoteURLVoteSite;
 import com.bencodez.votingplugin.commands.tabcompleter.AliasesTabCompleter;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
 import com.bencodez.votingplugin.objects.VoteSite;
-import com.bencodez.votingplugin.test.VoteTester;
 import com.bencodez.votingplugin.topvoter.TopVoter;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 // TODO: Auto-generated Javadoc
@@ -282,7 +282,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 						user.setPoints(Integer.parseInt(args[3]));
 						sender.sendMessage(
 								StringParser.getInstance().colorize("&cSet " + args[1] + " points to " + args[3]));
@@ -297,12 +297,7 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 						sendMessage(sender, "&cStarting...");
-						for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-							VotingPluginUser user = UserManager.getInstance()
-									.getVotingPluginUser(UUID.fromString(uuid));
-							user.dontCache();
-							user.setMilestoneCount(user.getTotal(TopVoter.AllTime));
-						}
+						plugin.getUserManager().copyColumnData(TopVoter.AllTime.getColumnName(), "MilestoneCount");
 						sendMessage(sender, "&cFinished sync milestonecount with all time total");
 
 					}
@@ -337,34 +332,46 @@ public class CommandLoader {
 								plugin.getLogger().warning("Failed to get number from " + str);
 							}
 						}
-						for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-							VotingPluginUser user = UserManager.getInstance()
-									.getVotingPluginUser(UUID.fromString(uuid));
-							user.dontCache();
-							int milestoneCount = user.getMilestoneCount();
-							for (int num : nums) {
-								if (milestoneCount >= num) {
-									if (!user.hasGottenMilestone(num)) {
-										sendMessage(sender,
-												"&cMilestone " + num + " for " + user.getPlayerName()
+						HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+						for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
+
+							String uuid = playerData.getKey().toString();
+							if (plugin != null && plugin.isEnabled()) {
+								if (uuid != null && !uuid.isEmpty()) {
+									VotingPluginUser user = plugin.getVotingPluginUserManager()
+											.getVotingPluginUser(UUID.fromString(uuid));
+									user.dontCache();
+									user.updateTempCacheWithColumns(playerData.getValue());
+									cols.put(playerData.getKey(), null);
+									int milestoneCount = user.getMilestoneCount();
+									for (int num : nums) {
+										if (milestoneCount >= num) {
+											if (!user.hasGottenMilestone(num)) {
+												sendMessage(sender, "&cMilestone " + num + " for "
+														+ user.getPlayerName()
 														+ " not already given when it should be, Current AllTimeTotal: "
 														+ user.getTotal(TopVoter.AllTime) + ", Current MileStoneCount: "
 														+ user.getMilestoneCount());
-										user.setHasGotteMilestone(num, true);
-									}
-								} else {
-									if (user.hasGottenMilestone(num)) {
-										sendMessage(sender,
-												"&cMilestone " + num + " for " + user.getPlayerName()
+												user.setHasGotteMilestone(num, true);
+											}
+										} else {
+											if (user.hasGottenMilestone(num)) {
+												sendMessage(sender, "&cMilestone " + num + " for "
+														+ user.getPlayerName()
 														+ " already given when it shouldn't be, Current AllTimeTotal: "
 														+ user.getTotal(TopVoter.AllTime) + ", Current MileStoneCount: "
 														+ user.getMilestoneCount());
-										user.setHasGotteMilestone(num, false);
-									}
+												user.setHasGotteMilestone(num, false);
+											}
 
+										}
+									}
+									user.clearTempCache();
 								}
 							}
 						}
+						cols.clear();
+						cols = null;
 						sendMessage(sender, "&cFinished");
 
 					}
@@ -392,7 +399,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 						user.setMilestoneCount(user.getTotal(TopVoter.AllTime));
 
 						sendMessage(sender, "&cResynced milestones for " + args[1]);
@@ -407,7 +414,7 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 						synchronized (pointLock) {
-							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 							user.cache();
 							int newTotal = 0;
 							newTotal = user.addPoints(Integer.parseInt(args[3]));
@@ -423,7 +430,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 						user.cache();
 						user.removePoints(Integer.parseInt(args[3]));
 						sender.sendMessage(StringParser.getInstance().colorize("&cRemoved " + args[3] + " points from "
@@ -646,7 +653,7 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				if (sender instanceof Player) {
 					Player player = (Player) sender;
-					Bukkit.getScheduler().runTask(plugin, new Runnable() {
+					BukkitScheduler.runTask(plugin, new Runnable() {
 
 						@Override
 						public void run() {
@@ -655,7 +662,7 @@ public class CommandLoader {
 					});
 
 				} else {
-					Bukkit.getScheduler().runTask(plugin, new Runnable() {
+					BukkitScheduler.runTask(plugin, new Runnable() {
 
 						@Override
 						public void run() {
@@ -728,7 +735,7 @@ public class CommandLoader {
 				try {
 					sender.sendMessage(ChatColor.GREEN + "PlayerName of player " + ChatColor.DARK_GREEN + args[1]
 							+ ChatColor.GREEN + " is: " + PlayerUtils.getInstance().getPlayerName(
-									UserManager.getInstance().getVotingPluginUser(UUID.fromString(args[1])), args[1]));
+									plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(args[1])), args[1]));
 				} catch (IllegalArgumentException e) {
 					sendMessage(sender, "&cInvalid uuid");
 				}
@@ -779,7 +786,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						UserManager.getInstance().getVotingPluginUser(args[1])
+						plugin.getVotingPluginUserManager().getVotingPluginUser(args[1])
 								.setDayVoteStreak(Integer.parseInt(args[4]));
 						sender.sendMessage(StringParser.getInstance()
 								.colorize("&cSet votestreak day for '" + args[1] + "' to " + args[4]));
@@ -793,7 +800,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						UserManager.getInstance().getVotingPluginUser(args[1])
+						plugin.getVotingPluginUserManager().getVotingPluginUser(args[1])
 								.setWeekVoteStreak(Integer.parseInt(args[4]));
 						sender.sendMessage(StringParser.getInstance()
 								.colorize("&cSet votestreak week for '" + args[1] + "' to " + args[4]));
@@ -807,7 +814,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						UserManager.getInstance().getVotingPluginUser(args[1])
+						plugin.getVotingPluginUserManager().getVotingPluginUser(args[1])
 								.setMonthVoteStreak(Integer.parseInt(args[4]));
 						sender.sendMessage(StringParser.getInstance()
 								.colorize("&cSet votestreak month for '" + args[1] + "' to " + args[4]));
@@ -822,7 +829,7 @@ public class CommandLoader {
 
 						@Override
 						public void execute(CommandSender sender, String[] args) {
-							UserManager.getInstance().getVotingPluginUser(args[1]).setTotal(top,
+							plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]).setTotal(top,
 									Integer.parseInt(args[4]));
 							sender.sendMessage(StringParser.getInstance().colorize(
 									"&cSet " + top.toString() + " total for '" + args[1] + "' to " + args[4]));
@@ -836,7 +843,7 @@ public class CommandLoader {
 
 						@Override
 						public void execute(CommandSender sender, String[] args) {
-							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 							user.setTotal(top, user.getTotal(top) + Integer.parseInt(args[4]));
 							sender.sendMessage(StringParser.getInstance()
 									.colorize("&cAdded " + top.toString() + " total for " + args[1]));
@@ -849,7 +856,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+				VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 				user.clearTotals();
 				sender.sendMessage(StringParser.getInstance().colorize("&cCleared totals for '" + args[1] + "'"));
 			}
@@ -860,7 +867,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+				VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 				user.resetLastVoted();
 				sender.sendMessage(StringParser.getInstance().colorize("&cVoted sites reset for '" + args[1] + "'"));
 			}
@@ -873,7 +880,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 						user.resetLastVoted(plugin.getVoteSite(args[3], false));
 						sender.sendMessage(StringParser.getInstance()
 								.colorize("&cVoted site reset for '" + args[1] + "'" + " on " + args[3]));
@@ -886,11 +893,27 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
-						user.setMilestoneCount(user.getMilestoneCount() + Integer.parseInt(args[3]));
-						plugin.getSpecialRewards().checkMilestone(user, null, false);
-						sender.sendMessage(
-								StringParser.getInstance().colorize("&cAdded milestonecount for " + args[1]));
+						if (args[1].equalsIgnoreCase("all")) {
+							int toAdd = Integer.parseInt(args[3]);
+
+							sender.sendMessage(
+									StringParser.getInstance().colorize("&cAdding milestonecount for all players..."));
+							for (String uuidStr : plugin.getUserManager().getAllUUIDs()) {
+								UUID uuid = UUID.fromString(uuidStr);
+								VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid);
+								user.dontCache();
+								user.setMilestoneCount(user.getMilestoneCount() + toAdd);
+								plugin.getSpecialRewards().checkMilestone(user, null, plugin.getBungeeSettings().isUseBungeecoord());
+							}
+							sender.sendMessage(
+									StringParser.getInstance().colorize("&cFinished adding milestonecount for all players"));
+						} else {
+							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
+							user.setMilestoneCount(user.getMilestoneCount() + Integer.parseInt(args[3]));
+							plugin.getSpecialRewards().checkMilestone(user, null, plugin.getBungeeSettings().isUseBungeecoord());
+							sender.sendMessage(
+									StringParser.getInstance().colorize("&cAdded milestonecount for " + args[1]));
+						}
 					}
 				});
 
@@ -900,7 +923,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 						user.setMilestoneCount(Integer.parseInt(args[3]));
 						sender.sendMessage(StringParser.getInstance()
 								.colorize("&cSet milestonecount for " + args[1] + " to " + args[3]));
@@ -914,10 +937,26 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
-						user.setHasGottenMilestone(new HashMap<String, Boolean>());
-						sender.sendMessage(
-								StringParser.getInstance().colorize("&cClearing gotten milestones for " + args[1]));
+						if (args[1].equalsIgnoreCase("all")) {
+							String path = "GottenMileStones";
+							if (plugin.getBungeeSettings().isPerServerMilestones()) {
+								path = plugin.getBungeeSettings().getServerNameStorage() + "_" + "GottenMilestones";
+							}
+							sender.sendMessage(StringParser.getInstance()
+									.colorize("&cClearing gotten milestones for all players..."));
+							plugin.getUserManager().removeAllKeyValues(path, DataType.STRING);
+							for (Player p : Bukkit.getOnlinePlayers()) {
+								plugin.getUserManager().getDataManager().cacheUser(p.getUniqueId());
+							}
+							sender.sendMessage(StringParser.getInstance()
+									.colorize("&cFinished clearing gotten milestones for all players"));
+
+						} else {
+							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
+							user.setHasGottenMilestone(new HashMap<String, Boolean>());
+							sender.sendMessage(
+									StringParser.getInstance().colorize("&cClearing gotten milestones for " + args[1]));
+						}
 					}
 				});
 
@@ -1086,7 +1125,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 						plugin.getRewardHandler().giveReward(user, plugin.getVoteSite(args[3], true).getSiteData(),
 								"CoolDownEndRewards", new RewardOptions());
 						sendMessage(sender, "&cCoolDownEndRewards forced on votesite " + args[3]);
@@ -1193,7 +1232,7 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 
-				Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+				BukkitScheduler.runTaskAsynchronously(plugin, new Runnable() {
 
 					@Override
 					public void run() {
@@ -1300,7 +1339,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						VoteTester.getInstance().testVotes(Integer.parseInt(args[3]), args[1], args[2]);
+						plugin.getVoteTester().testVotes(Integer.parseInt(args[3]), args[1], args[2]);
 						if (isPlayer(sender)) {
 							sendMessage(sender, "&cSee console for details");
 						}
@@ -1313,7 +1352,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						VoteTester.getInstance().testSpam(Integer.parseInt(args[3]), args[1], args[2]);
+						plugin.getVoteTester().testSpam(Integer.parseInt(args[3]), args[1], args[2]);
 						if (isPlayer(sender)) {
 							sendMessage(sender, "&cSee console for details");
 						}
@@ -1326,7 +1365,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						VoteTester.getInstance().testRewards(Integer.parseInt(args[3]), args[1], args[2]);
+						plugin.getVoteTester().testRewards(Integer.parseInt(args[3]), args[1], args[2]);
 						if (isPlayer(sender)) {
 							sendMessage(sender, "&cSee console for details");
 						}
@@ -1399,7 +1438,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 						plugin.getRewardHandler().giveReward(user, plugin.getConfigFile().getData(),
 								plugin.getGui().getChestShopIdentifierRewardsPath(args[3]), new RewardOptions());
 						sendMessage(sender, "&cVoteShop " + args[3] + " forced");
@@ -1412,7 +1451,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 						plugin.getSpecialRewards().giveMilestoneVoteReward(user, user.isOnline(), parseInt(args[3]),
 								plugin.getBungeeSettings().isUseBungeecoord());
 						sendMessage(sender, "&cMilestone " + args[3] + " forced");
@@ -1428,7 +1467,7 @@ public class CommandLoader {
 
 						@Override
 						public void execute(CommandSender sender, String[] args) {
-							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 							int place = parseInt(args[4]);
 							switch (top) {
 							case Daily:
@@ -1473,7 +1512,7 @@ public class CommandLoader {
 
 						@Override
 						public void execute(CommandSender sender, String[] args) {
-							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 							plugin.getSpecialRewards().giveVoteStreakReward(user, user.isOnline(), str, args[4],
 									parseInt(args[4]), plugin.getBungeeSettings().isUseBungeecoord());
 							sendMessage(sender, "&cVoteStreak " + str + " " + args[4] + " forced");
@@ -1487,7 +1526,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 						plugin.getSpecialRewards().giveCumulativeVoteReward(user, user.isOnline(), parseInt(args[3]),
 								plugin.getBungeeSettings().isUseBungeecoord());
 						sendMessage(sender, "&cCumulative " + args[3] + " forced");
@@ -1499,7 +1538,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+				VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 				plugin.getSpecialRewards().giveAllSitesRewards(user, user.isOnline(),
 						plugin.getBungeeSettings().isUseBungeecoord());
 				sendMessage(sender, "&cAllSites forced");
@@ -1511,7 +1550,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+				VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 				plugin.getSpecialRewards().giveAlmostAllSitesRewards(user, user.isOnline(),
 						plugin.getBungeeSettings().isUseBungeecoord());
 				sendMessage(sender, "&cAlmostAllSites forced");
@@ -1523,7 +1562,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+				VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 				plugin.getSpecialRewards().giveFirstVoteRewards(user, user.isOnline(),
 						plugin.getBungeeSettings().isUseBungeecoord());
 				sendMessage(sender, "&cFirstVote forced");
@@ -1535,7 +1574,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+				VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 				plugin.getSpecialRewards().giveFirstVoteTodayRewards(user, user.isOnline(),
 						plugin.getBungeeSettings().isUseBungeecoord());
 				sendMessage(sender, "&cFirstVoteToday forced");
@@ -1550,7 +1589,7 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 						new AdminVotePlaceholdersPlayer(plugin, sender,
-								UserManager.getInstance().getVotingPluginUser(args[1])).open();
+								plugin.getVotingPluginUserManager().getVotingPluginUser(args[1])).open();
 
 					}
 				});
@@ -1680,114 +1719,100 @@ public class CommandLoader {
 	public void loadCommands() {
 		loadAdminVoteCommand();
 		loadVoteCommand();
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+		BukkitScheduler.runTaskAsynchronously(plugin, new Runnable() {
 
 			@Override
 			public void run() {
-				com.bencodez.advancedcore.thread.Thread.getInstance().run(new Runnable() {
+				loadTabComplete();
 
-					@Override
-					public void run() {
-						loadTabComplete();
+				UserGUI.getInstance().addPluginButton(plugin,
+						new BInventoryButton("Force Vote", new String[] {}, new ItemStack(Material.STONE)) {
 
-						UserGUI.getInstance().addPluginButton(plugin,
-								new BInventoryButton("Force Vote", new String[] {}, new ItemStack(Material.STONE)) {
+							@Override
+							public void onClick(ClickEvent clickEvent) {
+								Player player = clickEvent.getPlayer();
+								ArrayList<String> voteSites = new ArrayList<String>();
+								for (VoteSite voteSite : plugin.getVoteSites()) {
+									voteSites.add(voteSite.getKey());
+								}
+								new ValueRequest().requestString(player, "",
+										ArrayUtils.getInstance().convert(voteSites), true, new StringListener() {
 
-									@Override
-									public void onClick(ClickEvent clickEvent) {
-										Player player = clickEvent.getPlayer();
-										ArrayList<String> voteSites = new ArrayList<String>();
-										for (VoteSite voteSite : plugin.getVoteSites()) {
-											voteSites.add(voteSite.getKey());
-										}
-										new ValueRequest().requestString(player, "",
-												ArrayUtils.getInstance().convert(voteSites), true,
-												new StringListener() {
+											@Override
+											public void onInput(Player player, String value) {
+												PlayerVoteEvent voteEvent = new PlayerVoteEvent(
+														plugin.getVoteSite(value, true),
+														UserGUI.getInstance().getCurrentPlayer(player),
+														plugin.getVoteSiteServiceSite(value), false);
+												plugin.getServer().getPluginManager().callEvent(voteEvent);
+
+												player.sendMessage("Forced vote for "
+														+ UserGUI.getInstance().getCurrentPlayer(player) + " on "
+														+ value);
+											}
+										});
+
+							}
+						});
+
+				UserGUI.getInstance().addPluginButton(plugin,
+						new BInventoryButton("MileStones", new String[0], new ItemStack(Material.STONE)) {
+
+							@Override
+							public void onClick(ClickEvent event) {
+
+								Player player = event.getWhoClicked();
+								String playerName = (String) event.getMeta(player, "Player");
+								BInventory inv = new BInventory("MileStones: " + playerName);
+								for (String mileStoneName : plugin.getSpecialRewardsConfig().getMilestoneVotes()) {
+									if (StringParser.getInstance().isInt(mileStoneName)) {
+										int mileStone = Integer.parseInt(mileStoneName);
+
+										inv.addButton(inv.getNextSlot(),
+												new BInventoryButton("" + mileStone, new String[] {
+														"Enabled: " + plugin.getSpecialRewardsConfig()
+																.getMilestoneRewardEnabled(mileStone),
+														"&cClick to set wether this has been completed or not" },
+														new ItemStack(Material.STONE)) {
 
 													@Override
-													public void onInput(Player player, String value) {
-														PlayerVoteEvent voteEvent = new PlayerVoteEvent(
-																plugin.getVoteSite(value, true),
-																UserGUI.getInstance().getCurrentPlayer(player),
-																plugin.getVoteSiteServiceSite(value), false);
-														plugin.getServer().getPluginManager().callEvent(voteEvent);
+													public void onClick(ClickEvent clickEvent) {
+														if (StringParser.getInstance().isInt(clickEvent.getClickedItem()
+																.getItemMeta().getDisplayName())) {
+															Player player = clickEvent.getPlayer();
+															int mileStone = Integer.parseInt(clickEvent.getClickedItem()
+																	.getItemMeta().getDisplayName());
+															String playerName = (String) event.getMeta(player,
+																	"Player");
+															VotingPluginUser user = plugin.getVotingPluginUserManager()
+																	.getVotingPluginUser(playerName);
+															new ValueRequest().requestBoolean(player,
+																	"" + user.hasGottenMilestone(mileStone),
+																	new BooleanListener() {
 
-														player.sendMessage("Forced vote for "
-																+ UserGUI.getInstance().getCurrentPlayer(player)
-																+ " on " + value);
+																		@Override
+																		public void onInput(Player player,
+																				boolean value) {
+																			String playerName = UserGUI.getInstance()
+																					.getCurrentPlayer(player);
+																			VotingPluginUser user = plugin.getVotingPluginUserManager()
+																					.getVotingPluginUser(playerName);
+																			user.setHasGotteMilestone(mileStone, value);
+																			player.sendMessage(
+																					"Set milestone completetion to "
+																							+ value + " on "
+																							+ mileStone);
+
+																		}
+																	});
+														}
 													}
 												});
-
 									}
-								});
+								}
+							}
+						});
 
-						UserGUI.getInstance().addPluginButton(plugin,
-								new BInventoryButton("MileStones", new String[0], new ItemStack(Material.STONE)) {
-
-									@Override
-									public void onClick(ClickEvent event) {
-
-										Player player = event.getWhoClicked();
-										String playerName = (String) event.getMeta(player, "Player");
-										BInventory inv = new BInventory("MileStones: " + playerName);
-										for (String mileStoneName : plugin.getSpecialRewardsConfig()
-												.getMilestoneVotes()) {
-											if (StringParser.getInstance().isInt(mileStoneName)) {
-												int mileStone = Integer.parseInt(mileStoneName);
-
-												inv.addButton(inv.getNextSlot(),
-														new BInventoryButton("" + mileStone, new String[] {
-																"Enabled: " + plugin.getSpecialRewardsConfig()
-																		.getMilestoneRewardEnabled(mileStone),
-																"&cClick to set wether this has been completed or not" },
-																new ItemStack(Material.STONE)) {
-
-															@Override
-															public void onClick(ClickEvent clickEvent) {
-																if (StringParser.getInstance()
-																		.isInt(clickEvent.getClickedItem().getItemMeta()
-																				.getDisplayName())) {
-																	Player player = clickEvent.getPlayer();
-																	int mileStone = Integer
-																			.parseInt(clickEvent.getClickedItem()
-																					.getItemMeta().getDisplayName());
-																	String playerName = (String) event.getMeta(player,
-																			"Player");
-																	VotingPluginUser user = UserManager.getInstance()
-																			.getVotingPluginUser(playerName);
-																	new ValueRequest().requestBoolean(player,
-																			"" + user.hasGottenMilestone(mileStone),
-																			new BooleanListener() {
-
-																				@Override
-																				public void onInput(Player player,
-																						boolean value) {
-																					String playerName = UserGUI
-																							.getInstance()
-																							.getCurrentPlayer(player);
-																					VotingPluginUser user = UserManager
-																							.getInstance()
-																							.getVotingPluginUser(
-																									playerName);
-																					user.setHasGotteMilestone(mileStone,
-																							value);
-																					player.sendMessage(
-																							"Set milestone completetion to "
-																									+ value + " on "
-																									+ mileStone);
-
-																				}
-																			});
-																}
-															}
-														});
-											}
-										}
-									}
-								});
-
-					}
-				});
 			}
 
 		});
@@ -1869,7 +1894,7 @@ public class CommandLoader {
 
 				@Override
 				public void execute(CommandSender sender, String[] args) {
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(sender.getName());
+					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(sender.getName());
 					if (args[1].equals("none")) {
 						user.setPrimaryAccount(null);
 						sendMessage(sender, "&cRemoved primary account");
@@ -1930,7 +1955,7 @@ public class CommandLoader {
 
 				@Override
 				public void execute(CommandSender sender, String[] args) {
-					new VoteShop(plugin, sender, UserManager.getInstance().getVotingPluginUser((Player) sender)).open();
+					new VoteShop(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender)).open();
 				}
 			});
 			plugin.getVoteCommand().add(new CommandHandler(new String[] { "Shop", "(Text)" },
@@ -1962,7 +1987,7 @@ public class CommandLoader {
 
 						int limit = plugin.getGui().getChestShopIdentifierLimit(identifier);
 
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(sender.getName());
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(sender.getName());
 						boolean limitPass = true;
 						if (limit > 0) {
 
@@ -1973,7 +1998,9 @@ public class CommandLoader {
 
 						if (!plugin.getGui().getChestVoteShopNotBuyable(identifier)) {
 							if (hasPerm) {
-								user.cache();
+								if (plugin.getConfigFile().isExtraVoteShopCheck()) {
+									user.cache();
+								}
 								int points = plugin.getGui().getChestShopIdentifierCost(identifier);
 								if (identifier != null) {
 
@@ -1982,7 +2009,7 @@ public class CommandLoader {
 										placeholders.put("identifier", identifier);
 										placeholders.put("points", "" + points);
 										placeholders.put("limit", "" + limit);
-										if (user.removePoints(points)) {
+										if (user.removePoints(points, true)) {
 
 											plugin.getRewardHandler().giveReward(user, plugin.getGui().getData(),
 													plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
@@ -2017,7 +2044,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				new VoteURLVoteSite(plugin, sender, UserManager.getInstance().getVotingPluginUser((Player) sender),
+				new VoteURLVoteSite(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender),
 						args[1]).open();
 			}
 		});
@@ -2027,7 +2054,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				new VoteURL(plugin, sender, UserManager.getInstance().getVotingPluginUser((Player) sender), true)
+				new VoteURL(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender), true)
 						.open();
 
 			}
@@ -2039,7 +2066,7 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				if (plugin.getUserManager().userExist(args[1])) {
-					new VoteLast(plugin, sender, UserManager.getInstance().getVotingPluginUser(args[1])).open();
+					new VoteLast(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser(args[1])).open();
 				} else {
 					sendMessage(sender, StringParser.getInstance()
 							.replacePlaceHolder(plugin.getConfigFile().getFormatUserNotExist(), "player", args[1]));
@@ -2053,7 +2080,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				new VoteLast(plugin, sender, UserManager.getInstance().getVotingPluginUser((Player) sender)).open();
+				new VoteLast(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender)).open();
 			}
 		});
 
@@ -2064,7 +2091,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser((Player) sender);
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender);
 						boolean value = !user.getDisableBroadcast();
 						user.setDisableBroadcast(value);
 						if (!value) {
@@ -2081,7 +2108,7 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				if (plugin.getUserManager().userExist(args[1])) {
-					new VoteNext(plugin, sender, UserManager.getInstance().getVotingPluginUser(args[1])).open();
+					new VoteNext(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser(args[1])).open();
 				} else {
 					sendMessage(sender, StringParser.getInstance()
 							.replacePlaceHolder(plugin.getConfigFile().getFormatUserNotExist(), "player", args[1]));
@@ -2095,11 +2122,11 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				if (plugin.getUserManager().userExist(args[1])) {
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 					String msg = plugin.getConfigFile().getFormatCommandVotePoints()
 							.replace("%Player%", user.getPlayerName()).replace("%Points%", "" + user.getPoints());
 					if (sender instanceof Player) {
-						UserManager.getInstance().getVotingPluginUser((Player) sender).sendMessage(msg);
+						plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender).sendMessage(msg);
 					} else {
 						sender.sendMessage(StringParser.getInstance().colorize(msg));
 					}
@@ -2116,7 +2143,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser((Player) sender);
+				VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender);
 				String msg = plugin.getConfigFile().getFormatCommandVotePoints()
 						.replace("%Player%", user.getPlayerName()).replace("%Points%", "" + user.getPoints());
 				user.sendMessage(msg);
@@ -2128,7 +2155,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				new VoteNext(plugin, sender, UserManager.getInstance().getVotingPluginUser((Player) sender)).open();
+				new VoteNext(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender)).open();
 			}
 		});
 
@@ -2138,7 +2165,7 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				if (plugin.getUserManager().userExist(args[1])) {
-					new VoteGUI(plugin, sender, UserManager.getInstance().getVotingPluginUser(args[1])).open();
+					new VoteGUI(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser(args[1])).open();
 				} else {
 					sendMessage(sender, StringParser.getInstance()
 							.replacePlaceHolder(plugin.getConfigFile().getFormatUserNotExist(), "player", args[1]));
@@ -2152,11 +2179,12 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				new VoteGUI(plugin, sender, UserManager.getInstance().getVotingPluginUser((Player) sender)).open();
+				new VoteGUI(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender)).open();
 			}
 		});
 
 		if (plugin.getGui().isLastMonthGUI() || plugin.getOptions().getDebug().equals(DebugLevel.DEV)) {
+			plugin.debug("Loading last month top");
 			plugin.getVoteCommand()
 					.add(new CommandHandler(new String[] { "LastMonthTop" },
 							"VotingPlugin.Commands.Vote.LastMonthTop|" + playerPerm,
@@ -2165,7 +2193,7 @@ public class CommandLoader {
 						@Override
 						public void execute(CommandSender sender, String[] args) {
 							new VoteTopVoterLastMonth(plugin, sender,
-									UserManager.getInstance().getVotingPluginUser((Player) sender)).open();
+									plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender)).open();
 						}
 					});
 		}
@@ -2258,47 +2286,33 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				ArrayList<String> msg = new ArrayList<String>();
 
-				ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
-
 				int daily = 0;
 				int weekly = 0;
 				int month = 0;
 				int all = 0;
 
-				if (plugin.getOptions().getStorageType().equals(UserStorage.MYSQL)) {
-					for (TopVoter top : TopVoter.values()) {
-						int cTotal = 0;
-						ArrayList<Integer> nums = plugin.getMysql().getNumbersInColumn(top.getColumnName());
-						for (Integer num : nums) {
-							cTotal += num.intValue();
-						}
-						switch (top) {
-						case AllTime:
-							all = cTotal;
-							break;
-						case Daily:
-							daily = cTotal;
-							break;
-						case Monthly:
-							month = cTotal;
-							break;
-						case Weekly:
-							weekly = cTotal;
-							break;
-						default:
-							break;
-
-						}
+				for (TopVoter top : TopVoter.values()) {
+					int cTotal = 0;
+					ArrayList<Integer> nums = plugin.getUserManager().getNumbersInColumn(top.getColumnName());
+					for (Integer num : nums) {
+						cTotal += num.intValue();
 					}
-				} else {
+					switch (top) {
+					case AllTime:
+						all = cTotal;
+						break;
+					case Daily:
+						daily = cTotal;
+						break;
+					case Monthly:
+						month = cTotal;
+						break;
+					case Weekly:
+						weekly = cTotal;
+						break;
+					default:
+						break;
 
-					for (String uuid : uuids) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
-						user.dontCache();
-						daily += user.getTotal(TopVoter.Daily);
-						weekly += user.getTotal(TopVoter.Weekly);
-						month += user.getTotal(TopVoter.Monthly);
-						all += user.getTotal(TopVoter.AllTime);
 					}
 				}
 
@@ -2322,7 +2336,7 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				if (plugin.getUserManager().userExist(args[1])) {
-					new VoteTotal(plugin, sender, UserManager.getInstance().getVotingPluginUser(args[1])).open();
+					new VoteTotal(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser(args[1])).open();
 				} else {
 					sendMessage(sender, StringParser.getInstance()
 							.replacePlaceHolder(plugin.getConfigFile().getFormatUserNotExist(), "player", args[1]));
@@ -2336,7 +2350,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				new VoteTotal(plugin, sender, UserManager.getInstance().getVotingPluginUser((Player) sender)).open();
+				new VoteTotal(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender)).open();
 			}
 		});
 
@@ -2345,7 +2359,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				new VoteBest(plugin, sender, UserManager.getInstance().getVotingPluginUser((Player) sender)).open();
+				new VoteBest(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender)).open();
 			}
 		});
 
@@ -2355,7 +2369,7 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				if (plugin.getUserManager().userExist(args[1])) {
-					new VoteBest(plugin, sender, UserManager.getInstance().getVotingPluginUser(args[1])).open();
+					new VoteBest(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser(args[1])).open();
 				} else {
 					sendMessage(sender, StringParser.getInstance()
 							.replacePlaceHolder(plugin.getConfigFile().getFormatUserNotExist(), "player", args[1]));
@@ -2368,7 +2382,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				new VoteStreak(plugin, sender, UserManager.getInstance().getVotingPluginUser((Player) sender)).open();
+				new VoteStreak(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender)).open();
 			}
 		});
 
@@ -2378,7 +2392,7 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				if (plugin.getUserManager().userExist(args[1])) {
-					new VoteStreak(plugin, sender, UserManager.getInstance().getVotingPluginUser(args[1])).open();
+					new VoteStreak(plugin, sender, plugin.getVotingPluginUserManager().getVotingPluginUser(args[1])).open();
 				} else {
 					sendMessage(sender, StringParser.getInstance()
 							.replacePlaceHolder(plugin.getConfigFile().getFormatUserNotExist(), "player", args[1]));
@@ -2393,29 +2407,44 @@ public class CommandLoader {
 				@Override
 				public void execute(CommandSender sender, String[] args) {
 					if (plugin.getConfigFile().isAllowVotePointTransfers()) {
-						VotingPluginUser cPlayer = UserManager.getInstance().getVotingPluginUser((Player) sender);
+						VotingPluginUser cPlayer = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender);
 						cPlayer.cache();
 
 						if (plugin.getUserManager().userExist(args[1])) {
-							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
-							user.dontCache();
+							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
+							if (!user.isOnline()) {
+								user.dontCache();
+							}
 							int pointsToGive = Integer.parseInt(args[2]);
 							if (pointsToGive > 0) {
 								if (cPlayer.getPoints() >= pointsToGive) {
 									user.addPoints(pointsToGive);
 									cPlayer.removePoints(pointsToGive);
+									HashMap<String, String> placeholders = new HashMap<String, String>();
+									placeholders.put("transfer", "" + pointsToGive);
+									placeholders.put("touser", "" + user.getPlayerName());
+									placeholders.put("fromuser", "" + cPlayer.getPlayerName());
 									sendMessage(sender,
-											"&c" + pointsToGive + " points given to " + user.getPlayerName());
-									user.sendMessage("&cYou received " + pointsToGive + " points from "
-											+ cPlayer.getPlayerName());
+											StringParser.getInstance().replacePlaceHolder(
+													plugin.getConfigFile()
+															.getFormatCommandsVoteGivePointsTransferFrom(),
+													placeholders));
+									user.sendMessage(StringParser.getInstance().replacePlaceHolder(
+											plugin.getConfigFile().getFormatCommandsVoteGivePointsTransferTo(),
+											placeholders));
 								} else {
-									sendMessage(sender, "&cNot enough points");
+									sendMessage(sender,
+											plugin.getConfigFile().getFormatCommandsVoteGivePointsNotEnoughPoints());
 								}
 							} else {
-								sendMessage(sender, "&cNumber of points needs to be greater than 0");
+								sendMessage(sender,
+										plugin.getConfigFile().getFormatCommandsVoteGivePointsNumberLowerThanZero());
 							}
 						} else {
-							sendMessage(sender, "&c" + args[1] + " has not joined the server");
+							sendMessage(sender,
+									StringParser.getInstance().replacePlaceHolder(
+											plugin.getConfigFile().getFormatCommandsVoteGivePointsNotJoinedServer(),
+											"player", args[1]));
 						}
 					}
 				}
@@ -2429,7 +2458,7 @@ public class CommandLoader {
 					public void execute(CommandSender sender, String[] args) {
 						VotingPluginUser user = null;
 						if (sender instanceof Player) {
-							user = UserManager.getInstance().getVotingPluginUser((Player) sender);
+							user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender);
 						}
 						if (plugin.getConfigFile().isUseVoteGUIMainCommand() && sender instanceof Player) {
 							// vote gui command
@@ -2464,7 +2493,7 @@ public class CommandLoader {
 					public void execute(CommandSender sender, String[] args) {
 						sendMessage(sender, section.getString("Message", ""));
 						for (String str : (ArrayList<String>) section.getList("Commands", new ArrayList<String>())) {
-							Bukkit.getScheduler().runTask(plugin, new Runnable() {
+							BukkitScheduler.runTask(plugin, new Runnable() {
 
 								@Override
 								public void run() {

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/AdminGUI.java

@@ -183,6 +183,17 @@ public class AdminGUI {
 			}
 
 		});
+
+		buttons.add(new BInventoryButton(
+				new ItemBuilder(Material.STONE, 1).setName("&cBackground task time").addLoreLine("&aClick to see")) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				event.getPlayer().sendMessage("Last background task time: " + plugin.getLastBackgroundTaskTimeTaken());
+			}
+
+		});
+
 		return buttons;
 	}
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/AdminVotePlaceholdersPlayer.java

@@ -14,7 +14,6 @@ import com.bencodez.advancedcore.api.gui.GUIMethod;
 import com.bencodez.advancedcore.api.placeholder.NonPlayerPlaceHolder;
 import com.bencodez.advancedcore.api.placeholder.PlaceHolder;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 import xyz.upperlevel.spigot.book.BookUtil;
@@ -75,7 +74,7 @@ public class AdminVotePlaceholdersPlayer extends GUIHandler {
 		msg.add("&cPlaceholders:");
 		VotingPluginUser placeholderUser = user;
 		if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders() && user.hasPrimaryAccount()) {
-			placeholderUser = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
+			placeholderUser = plugin.getVotingPluginUserManager().getVotingPluginUser(user.getPrimaryAccount());
 		}
 		for (PlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getPlaceholders()) {
 			String identifier = placeholder.getIdentifier().toLowerCase();

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteGUI.java

@@ -17,7 +17,6 @@ import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class VoteGUI extends GUIHandler {
@@ -122,7 +121,7 @@ public class VoteGUI extends GUIHandler {
 	@Override
 	public void onChest(Player player) {
 		if (this.user == null) {
-			user = UserManager.getInstance().getVotingPluginUser(player);
+			user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
 		}
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteGUIName());
 		if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
@@ -143,7 +142,7 @@ public class VoteGUI extends GUIHandler {
 		for (final String slot : plugin.getGui().getChestVoteGUISlots()) {
 			ItemBuilder builder = getItemSlot(slot, player);
 
-			inv.addButton(new UpdatingBInventoryButton(builder, 1000, 1000) {
+			inv.addButton(new UpdatingBInventoryButton(plugin, builder, 1000, 1000) {
 
 				@Override
 				public void onClick(ClickEvent event) {
@@ -166,7 +165,7 @@ public class VoteGUI extends GUIHandler {
 
 					if (plugin.getRewardHandler().hasRewards(plugin.getGui().getData(), plugin.getGui()
 							.getChestVoteGUISlotRewardsPath(slot, event.getButton().getLastRewardsPath(player)))) {
-						plugin.getRewardHandler().giveReward(UserManager.getInstance().getVotingPluginUser(player),
+						plugin.getRewardHandler().giveReward(plugin.getVotingPluginUserManager().getVotingPluginUser(player),
 								plugin.getGui().getData(),
 								plugin.getGui().getChestVoteGUISlotRewardsPath(slot,
 										event.getButton().getLastRewardsPath(player)),
@@ -177,7 +176,7 @@ public class VoteGUI extends GUIHandler {
 				@Override
 				public ItemBuilder onUpdate(Player player) {
 					ItemBuilder item = getItemSlot(slot, player);
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
+					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
 					item.addPlaceholder("points", "" + user.getPoints());
 					item.addPlaceholder("player", user.getPlayerName());
 					item.addPlaceholder("top", plugin.getConfigFile().getVoteTopDefault());

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteLast.java

@@ -8,8 +8,8 @@ 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.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.messages.StringParser;
@@ -17,7 +17,6 @@ import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class VoteLast extends GUIHandler {
@@ -66,7 +65,7 @@ public class VoteLast extends GUIHandler {
 		for (VoteSite site : plugin.getVoteSites()) {
 			if (!site.isHidden()) {
 				inv.addButton(inv.getNextSlot(),
-						new UpdatingBInventoryButton(site.getItem().setName(site.getDisplayName())
+						new UpdatingBInventoryButton(plugin, site.getItem().setName(site.getDisplayName())
 								.setLore(user.voteCommandLastGUILine(site)).setAmountNone(1), 1000, 1000) {
 
 							@Override
@@ -74,7 +73,7 @@ public class VoteLast extends GUIHandler {
 								if (plugin.getGui().isChestVoteLastClickableLinks()) {
 									Player player = event.getPlayer();
 									if (player != null) {
-										VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
+										VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
 										user.sendMessage(
 												StringParser.getInstance()
 														.replacePlaceHolder(

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteNext.java

@@ -89,9 +89,15 @@ public class VoteNext extends GUIHandler {
 		inv.addPlaceholder("player", user.getPlayerName());
 		for (VoteSite site : plugin.getVoteSites()) {
 			if (!site.isHidden()) {
+				String siteNameDisplay = plugin.getGui().getChestVoteNextCustomSiteNamesDisplays(site.getKey());
+				if (siteNameDisplay.isEmpty()) {
+					siteNameDisplay = site.getDisplayName();
+				}
 				inv.addButton(inv.getNextSlot(),
-						new UpdatingBInventoryButton(site.getItem().setName(site.getDisplayName())
-								.setLore(user.voteCommandNextInfo(site)).setAmountNone(1), 1000, 1000) {
+						new UpdatingBInventoryButton(plugin, site.getItem().setName(siteNameDisplay)
+								.setLore(StringParser.getInstance().replacePlaceHolder(
+										plugin.getGui().getChestVoteNextLine(), "time", user.voteCommandNextInfo(site)))
+								.setAmountNone(1), 1000, 1000) {
 
 							@Override
 							public void onClick(ClickEvent clickEvent) {

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteShop.java

@@ -16,7 +16,6 @@ import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class VoteShop extends GUIHandler {
@@ -54,6 +53,10 @@ public class VoteShop extends GUIHandler {
 		if (this.user == null) {
 			user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
 		}
+		VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
+		/*
+		 * if (!plugin.getConfigFile().isExtraVoteShopCheck()) { user.cacheAsync(); }
+		 */
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteShopName());
 		inv.addPlaceholder("points", "" + user.getPoints());
 		inv.addPlaceholder("sitesavailable", "" + user.getSitesNotVotedOn());
@@ -92,8 +95,10 @@ public class VoteShop extends GUIHandler {
 						public void onClick(ClickEvent event) {
 							Player player = event.getWhoClicked();
 
-							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
-							user.clearCache();
+							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
+							if (plugin.getConfigFile().isExtraVoteShopCheck()) {
+								user.cache();
+							}
 
 							String identifier = (String) getData("identifier");
 							int limit = (int) getData("Limit");
@@ -118,9 +123,12 @@ public class VoteShop extends GUIHandler {
 												plugin.getGui().getChestShopIdentifierIdentifierName(identifier));
 										placeholders.put("points", "" + points);
 										placeholders.put("limit", "" + limit);
-										if (user.removePoints(points)) {
+										if (user.removePoints(points, true)) {
 											plugin.getLogger().info("VoteShop: " + user.getPlayerName() + "/"
 													+ user.getUUID() + " bought " + identifier + " for " + points);
+											if (plugin.getConfigFile().isTrackShopPurchases()) {
+												plugin.getServerData().addVoteShopPurchase(identifier);
+											}
 
 											plugin.getRewardHandler().giveReward(user, plugin.getGui().getData(),
 													plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
@@ -145,6 +153,9 @@ public class VoteShop extends GUIHandler {
 									user.sendMessage(plugin.getGui().getChestVoteShopLimitReached());
 								}
 								plugin.getCommandLoader().processSlotClick(player, user, identifier);
+								if (plugin.getGui().getChestVoteShopReopenGUIOnPurchase()) {
+									plugin.getCommandLoader().processSlotClick(player, user, "shop");
+								}
 							}
 						}
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteShopConfirm.java

@@ -53,16 +53,19 @@ public class VoteShopConfirm extends GUIHandler {
 
 			@Override
 			public void onClick(ClickEvent event) {
-				user.clearCache();
+				user.cache();
 				int points = plugin.getGui().getChestShopIdentifierCost(identifier);
 				int limit = plugin.getGui().getChestShopIdentifierLimit(identifier);
 				HashMap<String, String> placeholders = new HashMap<String, String>();
 				placeholders.put("identifier", identifier);
 				placeholders.put("points", "" + points);
 				placeholders.put("limit", "" + limit);
-				if (user.removePoints(points)) {
+				if (user.removePoints(points, true)) {
 					plugin.getLogger().info("VoteShop: " + user.getPlayerName() + "/" + user.getUUID() + " bought "
 							+ identifier + " for " + points);
+					if (plugin.getConfigFile().isTrackShopPurchases()) {
+						plugin.getServerData().addVoteShopPurchase(identifier);
+					}
 
 					plugin.getRewardHandler().giveReward(user, plugin.getGui().getData(),
 							plugin.getGui().getChestShopIdentifierRewardsPath(identifier),

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteToday.java

@@ -23,7 +23,6 @@ import com.bencodez.advancedcore.nms.NMSManager;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class VoteToday extends GUIHandler {
@@ -110,7 +109,7 @@ public class VoteToday extends GUIHandler {
 
 					@Override
 					public void onClick(ClickEvent clickEvent) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(uuid);
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid);
 						new VoteGUI(plugin, player, user)
 								.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
 					}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteTotal.java

@@ -67,7 +67,7 @@ public class VoteTotal extends GUIHandler {
 		inv.addPlaceholder("player", user.getPlayerName());
 
 		for (final TopVoter top : TopVoter.values()) {
-			inv.addButton(new UpdatingBInventoryButton(
+			inv.addButton(new UpdatingBInventoryButton(plugin,
 					new ItemBuilder(plugin.getGui().getChestVoteTotalItem(top))
 							.addPlaceholder("Total", "" + user.getTotal(top)).addPlaceholder("topvoter", top.getName()),
 					1000, 1000) {

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

@@ -24,7 +24,6 @@ import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.topvoter.TopVoter;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 import xyz.upperlevel.spigot.book.BookUtil;
@@ -41,11 +40,11 @@ public class VoteURL extends GUIHandler {
 		this.user = user;
 		this.json = json;
 		if (user == null && player instanceof Player) {
-			this.user = UserManager.getInstance().getVotingPluginUser((Player) player);
+			this.user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) player);
 		}
 		if (player != null && user != null && player.getName().equals(user.getPlayerName())) {
 			if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders() && user.hasPrimaryAccount()) {
-				user = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
+				user = plugin.getVotingPluginUserManager().getVotingPluginUser(user.getPrimaryAccount());
 			}
 		}
 	}
@@ -165,11 +164,11 @@ public class VoteURL extends GUIHandler {
 		if (plugin.getGui().getChestVoteURLViewAllUrlsButtonEnabled()) {
 			ItemBuilder builderAll = getItemAll();
 
-			inv.addButton(new UpdatingBInventoryButton(builderAll, 5000, 5000) {
+			inv.addButton(new UpdatingBInventoryButton(plugin, builderAll, 5000, 5000) {
 
 				@Override
 				public void onClick(ClickEvent event) {
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(event.getPlayer());
+					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(event.getPlayer());
 					json = true;
 					user.sendMessage(getChat(player));
 				}
@@ -190,13 +189,13 @@ public class VoteURL extends GUIHandler {
 					startSlot++;
 				}
 
-				inv.addButton(new UpdatingBInventoryButton(builder, 5000, 5000) {
+				inv.addButton(new UpdatingBInventoryButton(plugin, builder, 5000, 5000) {
 
 					@Override
 					public void onClick(ClickEvent event) {
 						Player player = event.getPlayer();
 						if (player != null) {
-							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
+							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
 							user.sendMessage(StringParser.getInstance().replacePlaceHolder(StringParser.getInstance()
 									.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
 											plugin.getGui().getChestVoteURLURLText(), "voteurl", voteSite.getVoteURL()),
@@ -222,8 +221,7 @@ public class VoteURL extends GUIHandler {
 				@Override
 				public void onClick(ClickEvent clickEvent) {
 					new RewardBuilder(plugin.getGui().getData(),
-							"CHEST.VoteURL.ExtraItems." + str + "."
-									+ clickEvent.getButton().getLastRewardsPath(player))
+							"CHEST.VoteURL.ExtraItems." + str + "." + clickEvent.getButton().getLastRewardsPath(player))
 							.setGiveOffline(false).send(clickEvent.getPlayer());
 
 				}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteURLVoteSite.java

@@ -69,7 +69,7 @@ public class VoteURLVoteSite extends GUIHandler {
 					}
 				});
 
-		inv.addButton(new UpdatingBInventoryButton(
+		inv.addButton(new UpdatingBInventoryButton(plugin,
 				new ItemBuilder(Material.COMPASS).setName("&4Next Vote").addLoreLine(user.voteCommandNextInfo(site)),
 				1000, 1000) {
 

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

@@ -54,10 +54,6 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean allowUnJoinedCheckServer = true;
 
-	@ConfigDataInt(path = "PlayerDataLoadLimit")
-	@Getter
-	private int playerDataLoadLimit = -1;
-
 	@ConfigDataBoolean(path = "AllowVotePointTransfers")
 	@Getter
 	private boolean allowVotePointTransfers = false;
@@ -70,6 +66,14 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean alwaysCloseInventory = false;
 
+	@ConfigDataBoolean(path = "ExtraVoteShopCheck")
+	@Getter
+	private boolean extraVoteShopCheck = true;
+
+	@ConfigDataBoolean(path = "TrackShopPurchases")
+	@Getter
+	private boolean trackShopPurchases = false;
+
 	@ConfigDataBoolean(path = "AlwaysUpdate")
 	@Getter
 	private boolean alwaysUpdate = false;
@@ -162,6 +166,26 @@ public class Config extends YMLFile {
 	@Getter
 	private String formatCommandsVoteLastLastVoted = "%times% ago";
 
+	@ConfigDataString(path = "Format.Commands.Vote.GivePoints.NotEnoughPoints")
+	@Getter
+	private String formatCommandsVoteGivePointsNotEnoughPoints = "&cNot enough points";
+
+	@ConfigDataString(path = "Format.Commands.Vote.GivePoints.NotJoinedServer")
+	@Getter
+	private String formatCommandsVoteGivePointsNotJoinedServer = "&c%player% has not joined the server";
+
+	@ConfigDataString(path = "Format.Commands.Vote.GivePoints.NumberLowerThanZero")
+	@Getter
+	private String formatCommandsVoteGivePointsNumberLowerThanZero = "&cNumber of points needs to be greater than 0";
+
+	@ConfigDataString(path = "Format.Commands.Vote.GivePoints.TransferFrom")
+	@Getter
+	private String formatCommandsVoteGivePointsTransferFrom = "&c%transfer% points given to %touser%";
+
+	@ConfigDataString(path = "Format.Commands.Vote.GivePoints.TransferTo")
+	@Getter
+	private String formatCommandsVoteGivePointsTransferTo = "&cYou received %transfer points from %fromuser%";
+
 	@ConfigDataString(path = "Format.Commands.Vote.Last.Line", defaultValue = "&3%SiteName%: &6%timeSince% ago")
 	@Getter
 	private String formatCommandsVoteLastLine;

VotingPlugin/src/com/bencodez/votingplugin/config/GUI.java

@@ -301,6 +301,14 @@ public class GUI extends YMLFile {
 	public String getChestVoteNextName() {
 		return getData().getString("CHEST.VoteNext.Name", "VoteNext: %player%");
 	}
+	
+	public String getChestVoteNextLine() {
+		return getData().getString("CHEST.VoteNext.Line", "%time%");
+	}
+	
+	public String getChestVoteNextCustomSiteNamesDisplays(String site) {
+		return getData().getString("CHEST.VoteNext.CustomSiteNamesDisplays." + site, "");
+	}
 
 	public String getChestVoteRewardName() {
 		return getData().getString("CHEST.VoteRewardName", "VoteReward");
@@ -309,6 +317,10 @@ public class GUI extends YMLFile {
 	public boolean getChestVoteShopBackButton() {
 		return getData().getBoolean("CHEST.VoteShopBackButton", true);
 	}
+	
+	public boolean getChestVoteShopReopenGUIOnPurchase() {
+		return getData().getBoolean("CHEST.VoteShopReopenGUIOnPurchase", false);
+	}
 
 	public boolean getChestVoteShopCloseGUI(String shop) {
 		return getData().getBoolean("CHEST.Shop." + shop + ".CloseGUI", true);

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

@@ -50,6 +50,19 @@ public class ServerData {
 		}
 	}
 
+	public void addVoteShopPurchase(String ident) {
+		setVoteShopPurchases(ident, (getVoteShopPurchases(ident) + 1));
+	}
+
+	public void setVoteShopPurchases(String ident, int amount) {
+		getData().set("VoteShopPurchases." + ident, amount);
+		saveData();
+	}
+
+	public int getVoteShopPurchases(String ident) {
+		return getData().getInt("VoteShopPurchases." + ident);
+	}
+
 	public void setAutoCachedPlaceholder(List<String> placeholders) {
 		getData().set("AutoCachePlaceholders", placeholders);
 		saveData();

VotingPlugin/src/com/bencodez/votingplugin/listeners/BlockBreak.java

@@ -1,6 +1,5 @@
 package com.bencodez.votingplugin.listeners;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.block.Sign;
 import org.bukkit.event.EventHandler;
@@ -8,6 +7,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
 
+import com.bencodez.advancedcore.scheduler.BukkitScheduler;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.signs.SignHandler;
 
@@ -39,7 +39,7 @@ public class BlockBreak implements Listener {
 		if (event.getBlock().getState() instanceof Sign) {
 			Sign s = (Sign) event.getBlock().getState();
 			final Location loc = s.getLocation();
-			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+			BukkitScheduler.runTaskAsynchronously(plugin, new Runnable() {
 
 				@Override
 				public void run() {

VotingPlugin/src/com/bencodez/votingplugin/listeners/BungeeVotifierEvent.java

@@ -1,7 +1,6 @@
 package com.bencodez.votingplugin.listeners;
 
-import org.bukkit.Bukkit;
-
+import com.bencodez.advancedcore.scheduler.BukkitScheduler;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
 import com.vexsoftware.votifier.model.Vote;
@@ -10,7 +9,7 @@ import com.vexsoftware.votifier.model.VotifierEvent;
 public class BungeeVotifierEvent {
 	public void send(VotingPluginMain plugin, PlayerVoteEvent event) {
 		plugin.debug("Triggering vote event");
-		Bukkit.getScheduler().runTask(plugin, new Runnable() {
+		BukkitScheduler.runTask(plugin, new Runnable() {
 
 			@Override
 			public void run() {

VotingPlugin/src/com/bencodez/votingplugin/listeners/PlayerInteract.java

@@ -12,7 +12,6 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import com.bencodez.advancedcore.api.misc.PlayerUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.signs.SignHandler;
-import com.bencodez.votingplugin.user.UserManager;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -52,7 +51,7 @@ public class PlayerInteract implements Listener {
 						if (sign.isLocationSame(event.getClickedBlock().getLocation())) {
 							// plugin.debug(player.getName() +
 							// " right clicked a top voter sign, sending message");
-							UserManager.getInstance().getVotingPluginUser(player)
+							plugin.getVotingPluginUserManager().getVotingPluginUser(player)
 									.sendMessage(sign.getRightClickMessage());
 
 							if (!sign.isSkullSet()) {

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

@@ -9,7 +9,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.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 // TODO: Auto-generated Javadoc
@@ -31,7 +30,7 @@ public class PlayerJoinEvent implements Listener {
 	}
 
 	private void login(Player player) {
-		VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
+		VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
 		if (player.isOp() && plugin.isYmlError()) {
 			user.sendMessage("&cVotingPlugin: Detected yml error, please check console for details");
 		}
@@ -81,7 +80,7 @@ public class PlayerJoinEvent implements Listener {
 				public void run() {
 					VotingPluginMain.plugin.getAdvancedTab().remove(uuid);
 
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(uuid);
+					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid);
 					user.dontCache();
 					user.logoutRewards();
 				}

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

@@ -12,12 +12,12 @@ import org.bukkit.event.Listener;
 
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.PlayerUtils;
+import com.bencodez.advancedcore.scheduler.BukkitScheduler;
 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;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 // TODO: Auto-generated Javadoc
@@ -55,7 +55,7 @@ public class PlayerVoteListener implements Listener {
 				plugin.getLogger().warning("Player " + playerName
 						+ " has not joined before, disregarding vote, set AllowUnjoined to true to prevent this");
 				if (event.isBungee() && plugin.getBungeeSettings().isRemoveInvalidUsers()) {
-					UserManager.getInstance().getVotingPluginUser(playerName).remove();
+					plugin.getVotingPluginUserManager().getVotingPluginUser(playerName).remove();
 				}
 				return;
 			}
@@ -108,9 +108,9 @@ public class PlayerVoteListener implements Listener {
 			Player p = Bukkit.getPlayerExact(playerName);
 			if (p != null) {
 				// player online
-				user = UserManager.getInstance().getVotingPluginUser(p);
+				user = plugin.getVotingPluginUserManager().getVotingPluginUser(p);
 			} else {
-				user = UserManager.getInstance().getVotingPluginUser(playerName);
+				user = plugin.getVotingPluginUserManager().getVotingPluginUser(playerName);
 			}
 		}
 
@@ -122,7 +122,6 @@ public class PlayerVoteListener implements Listener {
 		final String uuid = user.getUUID();
 
 		// reupdate cache
-		user.clearCache();
 		user.cache();
 
 		user.updateName(true);
@@ -209,7 +208,7 @@ public class PlayerVoteListener implements Listener {
 		if (plugin.getBungeeSettings().isUseBungeecoord()) {
 			if (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.MYSQL)) {
 
-				Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+				BukkitScheduler.runTaskLaterAsynchronously(plugin, new Runnable() {
 
 					@Override
 					public void run() {
@@ -228,7 +227,6 @@ public class PlayerVoteListener implements Listener {
 		if (!user.isOnline()) {
 			user.clearCache();
 		}
-
 		plugin.setUpdate(true);
 
 		plugin.extraDebug("Finished vote processing: " + playerName + "/" + uuid);

VotingPlugin/src/com/bencodez/votingplugin/listeners/SignChange.java

@@ -1,12 +1,12 @@
 package com.bencodez.votingplugin.listeners;
 
-import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.SignChangeEvent;
 
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.PlayerUtils;
+import com.bencodez.advancedcore.scheduler.BukkitScheduler;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 // TODO: Auto-generated Javadoc
@@ -47,7 +47,7 @@ public class SignChange implements Listener {
 					plugin.getServerData().addSign(event.getBlock().getLocation(), event.getLine(2),
 							Integer.parseInt(event.getLine(1)));
 					event.getPlayer().sendMessage(StringParser.getInstance().colorize("&aAdded sign!"));
-					Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+					BukkitScheduler.runTaskAsynchronously(plugin, new Runnable() {
 
 						@Override
 						public void run() {

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

@@ -16,7 +16,6 @@ import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 import lombok.Getter;
@@ -138,7 +137,7 @@ public class VoteSite {
 				bc = StringParser.getInstance().replacePlaceHolders(user.getOfflinePlayer(), bc);
 				ArrayList<Player> players = new ArrayList<Player>();
 				for (Player p : Bukkit.getOnlinePlayers()) {
-					if (!UserManager.getInstance().getVotingPluginUser(p).getDisableBroadcast()) {
+					if (!plugin.getVotingPluginUserManager().getVotingPluginUser(p).getDisableBroadcast()) {
 						players.add(p);
 					}
 				}

VotingPlugin/src/com/bencodez/votingplugin/placeholders/MVdWPlaceholders.java

@@ -5,7 +5,6 @@ import org.bukkit.Bukkit;
 import com.bencodez.advancedcore.api.placeholder.NonPlayerPlaceHolder;
 import com.bencodez.advancedcore.api.placeholder.PlaceHolder;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 import be.maximvdw.placeholderapi.PlaceholderAPI;
@@ -41,11 +40,11 @@ public class MVdWPlaceholders {
 
 								@Override
 								public String onPlaceholderReplace(PlaceholderReplaceEvent event) {
-									VotingPluginUser user = UserManager.getInstance()
+									VotingPluginUser user = plugin.getVotingPluginUserManager()
 											.getVotingPluginUser(event.getOfflinePlayer());
 									if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders()
 											&& user.hasPrimaryAccount()) {
-										user = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
+										user = plugin.getVotingPluginUserManager().getVotingPluginUser(user.getPrimaryAccount());
 									}
 									return place.placeholderRequest(user,
 											event.getPlaceholder().substring("VotingPlugin_".length()));

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

@@ -18,6 +18,7 @@ import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.placeholder.CalculatingPlaceholder;
 import com.bencodez.advancedcore.api.placeholder.NonPlayerPlaceHolder;
 import com.bencodez.advancedcore.api.placeholder.PlaceHolder;
 import com.bencodez.advancedcore.api.user.AdvancedCoreUser;
@@ -26,7 +27,6 @@ import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 import lombok.Getter;
@@ -55,7 +55,7 @@ public class PlaceHolders {
 		onUpdate();
 		if (!cacheLevel.equals(PlaceholderCacheLevel.NONE)) {
 			for (Player player : Bukkit.getOnlinePlayers()) {
-				onUpdate(UserManager.getInstance().getVotingPluginUser(player));
+				onUpdate(plugin.getVotingPluginUserManager().getVotingPluginUser(player));
 			}
 		}
 	}
@@ -99,7 +99,7 @@ public class PlaceHolders {
 			if (!returnStr.isEmpty()) {
 				return returnStr;
 			}
-			return "No value: " + str;
+			return str;
 		} else {
 			return getPlaceholderValue(p, identifier, javascript, forceProcess, useCache);
 		}
@@ -127,7 +127,7 @@ public class PlaceHolders {
 			return "no player";
 		}
 
-		VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(p);
+		VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(p);
 		if (useCache) {
 			if (!cachedPlaceholders.contains(identifier)) {
 				// not cached placeholder
@@ -150,45 +150,85 @@ public class PlaceHolders {
 		}
 		if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders()) {
 			if (user.hasPrimaryAccount()) {
-				user = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
+				user = plugin.getVotingPluginUserManager().getVotingPluginUser(user.getPrimaryAccount());
 			}
 		}
 
 		for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
 			try {
 				if (placeholder.matches(identifier)) {
-					if (useCache) {
-						if (placeholder.isUsesCache() && placeholder.isCached(identifier)) {
-							ConcurrentHashMap<UUID, String> cache = placeholder.getCache().get(identifier);
-							if (cache.containsKey(p.getUniqueId())) {
-								return cache.get(p.getUniqueId());
-							} else if (!forceProcess) {
-								schedulePlaceholderCheck(user);
-								return "...";
+					if (placeholder instanceof CalculatingPlaceholder<?>) {
+						if (useCache) {
+							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())) {
+										return cPlaceholder.placeholderRequest(user, identifier);
+									}
+									return cache.get(p.getUniqueId());
+								} else if (!forceProcess) {
+									schedulePlaceholderCheck(user);
+									return "...";
+								}
 							}
-						}
 
-						if (forceProcess) {
-							if (getCacheLevel().shouldCache()) {
-								if (!placeholdersToSetCacheOn.contains(identifier)
-										&& !cachedPlaceholders.contains(identifier)) {
-									placeholdersToSetCacheOn.add(identifier);
-									schedulePlaceholderCheck(user);
+							if (forceProcess) {
+								if (getCacheLevel().shouldCache()) {
+									if (!placeholdersToSetCacheOn.contains(identifier)
+											&& !cachedPlaceholders.contains(identifier)) {
+										placeholdersToSetCacheOn.add(identifier);
+										schedulePlaceholderCheck(user);
+									}
 								}
+								return placeholder.placeholderRequest(user, identifier);
+							} else {
+								if (getCacheLevel().shouldCache()) {
+									if (!placeholdersToSetCacheOn.contains(identifier)
+											&& !cachedPlaceholders.contains(identifier)) {
+										placeholdersToSetCacheOn.add(identifier);
+										schedulePlaceholderCheck(user);
+									}
+								}
+								return ".";
 							}
-							return placeholder.placeholderRequest(user, identifier);
 						} else {
-							if (getCacheLevel().shouldCache()) {
-								if (!placeholdersToSetCacheOn.contains(identifier)
-										&& !cachedPlaceholders.contains(identifier)) {
-									placeholdersToSetCacheOn.add(identifier);
-									schedulePlaceholderCheck(user);
-								}
-							}
-							return ".";
+							return placeholder.placeholderRequest(user, identifier);
 						}
 					} else {
-						return placeholder.placeholderRequest(user, identifier);
+						if (useCache) {
+							if (placeholder.isUsesCache() && placeholder.isCached(identifier)) {
+								ConcurrentHashMap<UUID, String> cache = placeholder.getCache().get(identifier);
+								if (cache.containsKey(p.getUniqueId())) {
+									return cache.get(p.getUniqueId());
+								} else if (!forceProcess) {
+									schedulePlaceholderCheck(user);
+									return "...";
+								}
+							}
+
+							if (forceProcess) {
+								if (getCacheLevel().shouldCache()) {
+									if (!placeholdersToSetCacheOn.contains(identifier)
+											&& !cachedPlaceholders.contains(identifier)) {
+										placeholdersToSetCacheOn.add(identifier);
+										schedulePlaceholderCheck(user);
+									}
+								}
+								return placeholder.placeholderRequest(user, identifier);
+							} else {
+								if (getCacheLevel().shouldCache()) {
+									if (!placeholdersToSetCacheOn.contains(identifier)
+											&& !cachedPlaceholders.contains(identifier)) {
+										placeholdersToSetCacheOn.add(identifier);
+										schedulePlaceholderCheck(user);
+									}
+								}
+								return ".";
+							}
+						} else {
+							return placeholder.placeholderRequest(user, identifier);
+						}
 					}
 				}
 			} catch (Exception e) {
@@ -275,6 +315,26 @@ public class PlaceHolders {
 			}
 		}
 
+		placeholders.add(new PlaceHolder<VotingPluginUser>("nextmilestone_votes_required") {
+
+			@Override
+			public String placeholderRequest(VotingPluginUser user, String identifier) {
+				return "" + user.getNextAvailableMileStone();
+			}
+		}.withDescription("Get number of votes required for next available milestone").updateDataKey("MilestoneCount"));
+
+		placeholders.add(new PlaceHolder<VotingPluginUser>("nextmilestone_votes_until") {
+
+			@Override
+			public String placeholderRequest(VotingPluginUser user, String identifier) {
+				int toGo = user.getNextAvailableMileStone() - user.getMilestoneCount();
+				if (toGo >= 0) {
+					return "" + toGo;
+				}
+				return "0";
+			}
+		}.withDescription("Get number of votes until next available milestone").updateDataKey("MilestoneCount"));
+
 		for (final String identifier : plugin.getGui().getChestShopIdentifiers()) {
 			if (plugin.getGui().getChestShopIdentifierLimit(identifier) > 0) {
 				placeholders.add(new PlaceHolder<VotingPluginUser>("VoteShopLimit_" + identifier) {
@@ -432,12 +492,25 @@ public class PlaceHolders {
 		}.withDescription("How long until user can vote on anysite").updateDataKey("LastVotes"));
 
 		for (final VoteSite voteSite : plugin.getVoteSites()) {
-			placeholders.add(new PlaceHolder<VotingPluginUser>("Next_" + voteSite.getKey()) {
+			placeholders.add(new CalculatingPlaceholder<VotingPluginUser>("Next_" + voteSite.getKey()) {
 
 				@Override
 				public String placeholderRequest(VotingPluginUser user, String identifier) {
+					if (getCacheData().containsKey(user.getJavaUUID())) {
+						String data = getCacheData().get(user.getJavaUUID());
+						if (!data.isEmpty()) {
+							long time = Long.valueOf(data);
+							return user.voteCommandNextInfo(voteSite, time);
+						}
+					}
 					return user.voteCommandNextInfo(voteSite);
 				}
+
+				@Override
+				public String placeholderDataRequest(VotingPluginUser user, String identifier) {
+					long time = user.getTime(voteSite);
+					return "" + time;
+				}
 			}.withDescription("How long until user can vote on " + voteSite.getKey()).updateDataKey("LastVotes"));
 			placeholders.add(new PlaceHolder<VotingPluginUser>("Last_" + voteSite.getKey()) {
 
@@ -471,7 +544,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Get user top voter position"));
 
-		placeholders.add(new PlaceHolder<VotingPluginUser>("Points_") {
+		placeholders.add(new PlaceHolder<VotingPluginUser>("EnoughPoints_") {
 
 			@Override
 			public String placeholderRequest(VotingPluginUser user, String identifier) {
@@ -856,22 +929,40 @@ public class PlaceHolders {
 
 			@Override
 			public void onChange(AdvancedCoreUser user, String... keys) {
-				VotingPluginUser vpUser = UserManager.getInstance().getVotingPluginUser(user);
+				VotingPluginUser vpUser = plugin.getVotingPluginUserManager().getVotingPluginUser(user);
 				if (!vpUser.isCached()) {
 					vpUser.dontCache();
 				}
 				for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
-					if (placeholder.isUsesCache()) {
-						for (String key : keys) {
-							if (placeholder.getUpdateDataKey().equalsIgnoreCase(key)) {
-								for (String ident : placeholder.getCache().keySet()) {
-									String value = placeholder.placeholderRequest(vpUser, ident);
-									placeholder.getCache().get(ident).put(vpUser.getJavaUUID(), value);
-									plugin.devDebug("Updated placeholder cache for " + vpUser.getUUID() + " on " + key
-											+ " with " + value);
+					if (placeholder instanceof CalculatingPlaceholder<?>) {
+						CalculatingPlaceholder<VotingPluginUser> cPlaceholder = (CalculatingPlaceholder<VotingPluginUser>) placeholder;
+						if (placeholder.isUsesCache()) {
+							for (String key : keys) {
+								if (placeholder.getUpdateDataKey().equalsIgnoreCase(key)) {
+									for (String ident : placeholder.getCache().keySet()) {
+										String value = placeholder.placeholderRequest(vpUser, ident);
+										cPlaceholder.getCacheData().put(user.getJavaUUID(),
+												cPlaceholder.placeholderDataRequest(vpUser, ident));
+										placeholder.getCache().get(ident).put(vpUser.getJavaUUID(), value);
+										plugin.devDebug("Updated calculating placeholder cache for " + vpUser.getUUID()
+												+ " on " + key + " with " + value);
+									}
+								}
+							}
+						}
+					} else {
+						if (placeholder.isUsesCache()) {
+							for (String key : keys) {
+								if (placeholder.getUpdateDataKey().equalsIgnoreCase(key)) {
+									for (String ident : placeholder.getCache().keySet()) {
+										String value = placeholder.placeholderRequest(vpUser, ident);
+										placeholder.getCache().get(ident).put(vpUser.getJavaUUID(), value);
+										plugin.devDebug("Updated placeholder cache for " + vpUser.getUUID() + " on "
+												+ key + " with " + value);
+
+									}
 
 								}
-
 							}
 						}
 					}
@@ -906,10 +997,24 @@ public class PlaceHolders {
 
 	public void onUpdate(VotingPluginUser user) {
 		for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
-			if (placeholder.isUsesCache()) {
-				for (String ident : placeholder.getCache().keySet()) {
-					placeholder.getCache().get(ident).put(user.getJavaUUID(),
-							placeholder.placeholderRequest(user, ident));
+			if (placeholder instanceof CalculatingPlaceholder<?>) {
+
+				CalculatingPlaceholder<VotingPluginUser> cPlaceholder = (CalculatingPlaceholder<VotingPluginUser>) placeholder;
+				if (placeholder.isUsesCache()) {
+					for (String ident : placeholder.getCache().keySet()) {
+						cPlaceholder.getCacheData().put(user.getJavaUUID(),
+								cPlaceholder.placeholderDataRequest(user, ident));
+						placeholder.getCache().get(ident).put(user.getJavaUUID(),
+								placeholder.placeholderRequest(user, ident));
+					}
+
+				}
+			} else {
+				if (placeholder.isUsesCache()) {
+					for (String ident : placeholder.getCache().keySet()) {
+						placeholder.getCache().get(ident).put(user.getJavaUUID(),
+								placeholder.placeholderRequest(user, ident));
+					}
 				}
 			}
 		}

VotingPlugin/src/com/bencodez/votingplugin/signs/SignHandler.java

@@ -2,7 +2,6 @@ package com.bencodez.votingplugin.signs;
 
 import java.util.ArrayList;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -14,6 +13,7 @@ import org.bukkit.block.data.Directional;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.nms.NMSManager;
+import com.bencodez.advancedcore.scheduler.BukkitScheduler;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
@@ -111,7 +111,7 @@ public class SignHandler {
 	 * Check valid sign.
 	 */
 	public void checkValidSign() {
-		Bukkit.getScheduler().runTask(plugin, new Runnable() {
+		BukkitScheduler.runTask(plugin, new Runnable() {
 
 			@Override
 			public void run() {
@@ -121,7 +121,7 @@ public class SignHandler {
 					setValid(false);
 				}
 			}
-		});
+		}, getLocation());
 
 	}
 
@@ -240,8 +240,9 @@ public class SignHandler {
 	 * @param delay the delay
 	 */
 	public void updateSign(int delay) {
-		Bukkit.getScheduler().runTaskLater(plugin, new Runnable() {
+		BukkitScheduler.runTaskLater(plugin, new Runnable() {
 
+			@SuppressWarnings("deprecation")
 			@Override
 			public void run() {
 				try {
@@ -261,7 +262,7 @@ public class SignHandler {
 					VotingPluginMain.plugin.debug(ex);
 				}
 			}
-		}, delay);
+		}, delay, getLocation());
 	}
 
 	public void updateSkulls(Location loc1, Location loc2) {

VotingPlugin/src/com/bencodez/votingplugin/test/VoteTester.java

@@ -1,25 +1,24 @@
 package com.bencodez.votingplugin.test;
 
 import java.util.ArrayList;
-
-import org.bukkit.Bukkit;
+import java.util.Random;
+import java.util.UUID;
 
 import com.bencodez.advancedcore.api.rewards.Reward;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
+import com.bencodez.advancedcore.scheduler.BukkitScheduler;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
-import com.bencodez.votingplugin.user.UserManager;
+import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class VoteTester {
 
-	private static VoteTester instance = new VoteTester();
-
-	public static VoteTester getInstance() {
-		return instance;
+	public VoteTester(VotingPluginMain plugin) {
+		this.plugin = plugin;
 	}
 
-	private VotingPluginMain plugin = VotingPluginMain.plugin;
+	private VotingPluginMain plugin;
 
 	public void testRewards(int amount, String name, String rewardName) {
 		plugin.getVoteTimer().submit(new Runnable() {
@@ -28,7 +27,7 @@ public class VoteTester {
 			public void run() {
 				long time1 = System.currentTimeMillis();
 				ArrayList<Long> timesPerReward = new ArrayList<Long>();
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(name);
+				VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(name);
 				Reward reward = plugin.getRewardHandler().getReward(rewardName);
 				int rewardsGiven = 0;
 				for (int i = 0; i < amount; i++) {
@@ -51,7 +50,7 @@ public class VoteTester {
 				VotingPluginMain.plugin.getLogger()
 						.info("Time to process rewards (" + amount + "): " + time + " ms, average per reward "
 								+ timePerRewardAvg + " ms. " + VotingPluginMain.plugin.getStorageType() + ", "
-								+ UserManager.getInstance().getAllUUIDs().size() + " users. " + rewardsGiven
+								+ plugin.getVotingPluginUserManager().getAllUUIDs().size() + " users. " + rewardsGiven
 								+ " rewards given");
 			}
 
@@ -59,6 +58,47 @@ public class VoteTester {
 
 	}
 
+	private String getSaltString() {
+		String SALTCHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
+		StringBuilder salt = new StringBuilder();
+		Random rnd = new Random();
+		while (salt.length() < 18) { // length of the random string.
+			int index = (int) (rnd.nextFloat() * SALTCHARS.length());
+			salt.append(SALTCHARS.charAt(index));
+		}
+		String saltStr = salt.toString();
+		return saltStr;
+
+	}
+
+	public void generatePlayers(int numberOfPlayers) {
+		if (plugin.getOptions().getDebug().isDebug()) {
+			int num = 1;
+			String salt = getSaltString();
+			Random random = new Random();
+			for (int i = 0; i < numberOfPlayers; i++) {
+				UUID uuid = UUID.randomUUID();
+				if (!plugin.getUserManager().userExist(uuid)) {
+					String playerName = salt + num;
+					if (!plugin.getUserManager().userExist(playerName)) {
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid,
+								playerName);
+						user.dontCache();
+						user.setPoints(random.nextInt(100));
+						for (TopVoter top : TopVoter.values()) {
+							user.setTotal(top, random.nextInt(1000));
+						}
+						user.setMilestoneCount(random.nextInt(100));
+						user.setPlayerName(playerName);
+						user.updateName(true);
+						num++;
+						plugin.debug("Generated user " + uuid.toString() + "/" + playerName);
+					}
+				}
+			}
+		}
+	}
+
 	public void testVotes(int amount, String name, String site) {
 		plugin.getVoteTimer().submit(new Runnable() {
 
@@ -84,7 +124,7 @@ public class VoteTester {
 				VotingPluginMain.plugin.getLogger()
 						.info("Time to process votes (" + amount + "): " + time + " ms, average per vote "
 								+ timePerVoteAvg + " ms. " + VotingPluginMain.plugin.getStorageType() + ", "
-								+ UserManager.getInstance().getAllUUIDs().size() + " users. "
+								+ plugin.getVotingPluginUserManager().getAllUUIDs().size() + " users. "
 								+ VotingPluginMain.plugin.getVoteSites().size() + " votesites");
 			}
 
@@ -94,7 +134,7 @@ public class VoteTester {
 
 	public void testSpam(int amount, String name, String site) {
 		for (int i = 0; i < amount; i++) {
-			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+			BukkitScheduler.runTaskAsynchronously(plugin, new Runnable() {
 
 				@Override
 				public void run() {

VotingPlugin/src/com/bencodez/votingplugin/topvoter/TopVoterHandler.java

@@ -26,10 +26,10 @@ import com.bencodez.advancedcore.api.time.events.MonthChangeEvent;
 import com.bencodez.advancedcore.api.time.events.PreDateChangedEvent;
 import com.bencodez.advancedcore.api.time.events.WeekChangeEvent;
 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.yml.YMLFileHandler;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class TopVoterHandler implements Listener {
@@ -87,14 +87,26 @@ public class TopVoterHandler implements Listener {
 		if (plugin.getGui().isLastMonthGUI()) {
 			plugin.getLastMonthTopVoter().clear();
 			LinkedHashMap<TopVoterPlayer, Integer> totals = new LinkedHashMap<TopVoterPlayer, Integer>();
-			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
-				user.dontCache();
-				int total = user.getLastMonthTotal();
-				if (total > 0) {
-					totals.put(user.getTopVoterPlayer(), total);
+			HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+			for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
+
+				String uuid = playerData.getKey().toString();
+				if (plugin != null && plugin.isEnabled()) {
+					if (uuid != null && !uuid.isEmpty()) {
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuid));
+						user.dontCache();
+						user.updateTempCacheWithColumns(playerData.getValue());
+						cols.put(playerData.getKey(), null);
+						int total = user.getLastMonthTotal();
+						if (total > 0) {
+							totals.put(user.getTopVoterPlayer(), total);
+						}
+						user.clearTempCache();
+					}
 				}
 			}
+			cols.clear();
+			cols = null;
 
 			plugin.getLastMonthTopVoter().putAll(sortByValues(totals, false));
 
@@ -113,7 +125,6 @@ public class TopVoterHandler implements Listener {
 		if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
 			plugin.getMysql().clearCacheBasic();
 		}
-		plugin.getUserManager().getDataManager().clearCache();
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -127,11 +138,12 @@ public class TopVoterHandler implements Listener {
 
 			plugin.getUserManager().copyColumnData(TopVoter.Daily.getColumnName(), TopVoter.Daily.getLastColumnName());
 			if (plugin.getConfigFile().isUseVoteStreaks() || plugin.getConfigFile().isUseHighestTotals()) {
-				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid), false);
+				HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+				for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
+					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(playerData.getKey(), false);
 					user.dontCache();
-					user.tempCache();
-					user.getUserData().updateCacheWithTemp();
+					user.updateTempCacheWithColumns(playerData.getValue());
+					cols.put(playerData.getKey(), null);
 					if (plugin.getConfigFile().isUseVoteStreaks()) {
 						if (!user.voteStreakUpdatedToday(LocalDateTime.now().minusDays(1))) {
 							if (user.getDayVoteStreak() != 0) {
@@ -147,6 +159,8 @@ public class TopVoterHandler implements Listener {
 					}
 					user.clearTempCache();
 				}
+				cols.clear();
+				cols = null;
 			}
 
 			try {
@@ -171,6 +185,8 @@ public class TopVoterHandler implements Listener {
 							user.dontCache();
 							if (!plugin.getConfigFile().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
 								user.giveDailyTopVoterAward(i, places.get(i));
+								plugin.getLogger().info("Giving daily top voter reward " + i + " to "
+										+ entry.getKey().getPlayerName());
 							}
 						}
 						lastTotal = entry.getValue().intValue();
@@ -186,15 +202,6 @@ public class TopVoterHandler implements Listener {
 				}
 			}
 
-			if (!plugin.getBungeeSettings().isGloblalDataEnabled() && plugin.getBungeeSettings().isUseBungeecoord()) {
-				// give time for other servers to catch up
-				try {
-					Thread.sleep(30000);
-				} catch (InterruptedException e) {
-					e.printStackTrace();
-				}
-			}
-
 			// give time for other servers to catch up
 			if (!plugin.getTopVoterHandler().bungeeHandleResets()) {
 				plugin.debug("Delaying time change 10 seconds for other servers to catchup");
@@ -211,7 +218,6 @@ public class TopVoterHandler implements Listener {
 			if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
 				plugin.getMysql().clearCacheBasic();
 			}
-			plugin.getUserManager().getDataManager().clearCache();
 
 			long now = ((System.currentTimeMillis() - startTime) / 1000);
 			plugin.getLogger().info("Finished processing day change, took " + now + " seconds");
@@ -229,11 +235,12 @@ public class TopVoterHandler implements Listener {
 						TopVoter.Monthly.getLastColumnName());
 			}
 			if (plugin.getConfigFile().isUseHighestTotals() || plugin.getConfigFile().isUseVoteStreaks()) {
-				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid), false);
+				HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+				for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
+					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(playerData.getKey(), false);
 					user.dontCache();
-					user.tempCache();
-					user.getUserData().updateCacheWithTemp();
+					user.updateTempCacheWithColumns(playerData.getValue());
+					cols.put(playerData.getKey(), null);
 					if (plugin.getConfigFile().isUseVoteStreaks()) {
 						if (user.getTotal(TopVoter.Monthly) == 0 && user.getMonthVoteStreak() != 0) {
 							user.setMonthVoteStreak(0);
@@ -259,6 +266,8 @@ public class TopVoterHandler implements Listener {
 					}
 					user.clearTempCache();
 				}
+				cols.clear();
+				cols = null;
 
 			}
 
@@ -285,8 +294,9 @@ public class TopVoterHandler implements Listener {
 							VotingPluginUser user = entry.getKey().getUser();
 							user.dontCache();
 							if (!plugin.getConfigFile().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-
 								user.giveMonthlyTopVoterAward(i, places.get(i));
+								plugin.getLogger().info("Giving Monthly top voter reward " + i + " to "
+										+ entry.getKey().getPlayerName());
 							}
 						}
 						lastTotal = entry.getValue().intValue();
@@ -324,7 +334,6 @@ public class TopVoterHandler implements Listener {
 			if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
 				plugin.getMysql().clearCacheBasic();
 			}
-			plugin.getUserManager().getDataManager().clearCache();
 			long now = ((System.currentTimeMillis() - startTime) / 1000);
 			plugin.getLogger().info("Finished processing day change, took " + now + " seconds");
 		}
@@ -348,11 +357,12 @@ public class TopVoterHandler implements Listener {
 			plugin.getUserManager().copyColumnData(TopVoter.Weekly.getColumnName(),
 					TopVoter.Weekly.getLastColumnName());
 			if (plugin.getConfigFile().isUseVoteStreaks() || plugin.getConfigFile().isUseHighestTotals()) {
-				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid), false);
+				HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+				for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
+					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(playerData.getKey(), false);
 					user.dontCache();
-					user.tempCache();
-					user.getUserData().updateCacheWithTemp();
+					user.updateTempCacheWithColumns(playerData.getValue());
+					cols.put(playerData.getKey(), null);
 					if (plugin.getConfigFile().isUseVoteStreaks()) {
 						if (user.getTotal(TopVoter.Weekly) == 0 && user.getWeekVoteStreak() != 0) {
 							user.setWeekVoteStreak(0);
@@ -374,6 +384,8 @@ public class TopVoterHandler implements Listener {
 					}
 					user.clearTempCache();
 				}
+				cols.clear();
+				cols = null;
 			}
 
 			try {
@@ -397,8 +409,9 @@ public class TopVoterHandler implements Listener {
 							VotingPluginUser user = entry.getKey().getUser();
 							user.dontCache();
 							if (!plugin.getConfigFile().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-
 								user.giveWeeklyTopVoterAward(i, places.get(i));
+								plugin.getLogger().info("Giving weekly top voter reward " + i + " to "
+										+ entry.getKey().getPlayerName());
 							}
 						}
 						lastTotal = entry.getValue().intValue();
@@ -430,7 +443,6 @@ public class TopVoterHandler implements Listener {
 			if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
 				plugin.getMysql().clearCacheBasic();
 			}
-			plugin.getUserManager().getDataManager().clearCache();
 
 			long now = ((System.currentTimeMillis() - startTime) / 1000);
 			plugin.getLogger().info("Finished processing day change, took " + now + " seconds");

VotingPlugin/src/com/bencodez/votingplugin/topvoter/TopVoterPlayer.java

@@ -5,7 +5,7 @@ import java.util.UUID;
 import org.bukkit.inventory.ItemStack;
 
 import com.bencodez.advancedcore.api.misc.PlayerUtils;
-import com.bencodez.votingplugin.user.UserManager;
+import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 import lombok.Getter;
@@ -34,6 +34,6 @@ public class TopVoterPlayer {
 	}
 
 	public VotingPluginUser getUser() {
-		return UserManager.getInstance().getVotingPluginUser(getUuid(), getPlayerName());
+		return VotingPluginMain.plugin.getVotingPluginUserManager().getVotingPluginUser(getUuid(), getPlayerName());
 	}
 }

VotingPlugin/src/com/bencodez/votingplugin/updater/CheckUpdate.java

@@ -3,9 +3,8 @@ package com.bencodez.votingplugin.updater;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import org.bukkit.Bukkit;
-
 import com.bencodez.advancedcore.api.updater.Updater;
+import com.bencodez.advancedcore.scheduler.BukkitScheduler;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 // TODO: Auto-generated Javadoc
@@ -74,7 +73,7 @@ public class CheckUpdate {
 		if (plugin.getConfigFile().isDisableUpdateChecking()) {
 			return;
 		}
-		Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+		BukkitScheduler.runTaskLaterAsynchronously(plugin, new Runnable() {
 
 			@Override
 			public void run() {

VotingPlugin/src/com/bencodez/votingplugin/user/UserManager.java

@@ -7,34 +7,25 @@ import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 import com.bencodez.advancedcore.api.user.usercache.UserDataManager;
+import com.bencodez.advancedcore.api.user.usercache.keys.UserDataKeyBoolean;
 import com.bencodez.advancedcore.api.user.usercache.keys.UserDataKeyInt;
 import com.bencodez.advancedcore.api.user.usercache.keys.UserDataKeyString;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 public class UserManager {
-	/** The instance. */
-	static UserManager instance = new UserManager();
-	/** The plugin. */
-	static VotingPluginMain plugin = VotingPluginMain.plugin;
+	private VotingPluginMain plugin;
 
-	/**
-	 * Gets the single instance of UserManager.
-	 *
-	 * @return single instance of UserManager
-	 */
-	public static UserManager getInstance() {
-		return instance;
-	}
 
-	public UserManager() {
+	public UserManager(VotingPluginMain plugin) {
+		this.plugin = plugin;
 	}
 
 	public void addCachingKeys() {
 		UserDataManager manager = plugin.getUserManager().getDataManager();
-		manager.addKey(new UserDataKeyString("TopVoterIgnore").setColumnType("VARCHAR(5)"));
+		manager.addKey(new UserDataKeyBoolean("TopVoterIgnore"));
 		manager.addKey(new UserDataKeyInt("VotePartyVotes"));
 		manager.addKey(new UserDataKeyString("LastVotes"));
-		manager.addKey(new UserDataKeyString("CoolDownCheck").setColumnType("VARCHAR(5)"));
+		manager.addKey(new UserDataKeyBoolean("CoolDownCheck"));
 		manager.addKey(new UserDataKeyString("OfflineVotes").setColumnType("MEDIUMTEXT"));
 		manager.addKey(new UserDataKeyInt("MilestoneCount"));
 		manager.addKey(new UserDataKeyInt("MonthTotal"));
@@ -46,8 +37,8 @@ public class UserManager {
 		manager.addKey(new UserDataKeyInt("BestDayVoteStreak"));
 		manager.addKey(new UserDataKeyString("DayVoteStreakLastUpdate").setColumnType("MEDIUMTEXT"));
 		manager.addKey(new UserDataKeyString("GottenMileStones").setColumnType("LONGTEXT"));
-		manager.addKey(new UserDataKeyString("Reminded").setColumnType("VARCHAR(5)"));
-		manager.addKey(new UserDataKeyString("DisableBroadcast").setColumnType("VARCHAR(5)"));
+		manager.addKey(new UserDataKeyBoolean("Reminded"));
+		manager.addKey(new UserDataKeyBoolean("DisableBroadcast"));
 		manager.addKey(new UserDataKeyInt("WeekVoteStreak"));
 		manager.addKey(new UserDataKeyInt("BestWeekVoteStreak"));
 		manager.addKey(new UserDataKeyInt("MonthVoteStreak"));

VotingPlugin/src/com/bencodez/votingplugin/user/VotingPluginUser.java

@@ -12,6 +12,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Set;
 import java.util.Map.Entry;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -115,7 +116,11 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	 * @param value the value
 	 * @return current total points
 	 */
-	public synchronized int addPoints(int value) {
+	public int addPoints(int value) {
+		return addPoints(value, false);
+	}
+
+	public synchronized int addPoints(int value, boolean async) {
 		PlayerReceivePointsEvent event = new PlayerReceivePointsEvent(this, value);
 		Bukkit.getPluginManager().callEvent(event);
 
@@ -123,7 +128,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 			return getPoints();
 		}
 		int newTotal = getPoints() + event.getPoints();
-		setPoints(newTotal);
+		setPoints(newTotal, async);
 		return newTotal;
 	}
 
@@ -271,10 +276,24 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 
 				return now.isAfter(nextvote);
 			} else {
-				if (now.getDayOfYear() != lastVote.getDayOfYear() || now.getYear() != lastVote.getYear()) {
-					return true;
+				LocalDateTime offsetoclockyesterday = plugin.getTimeChecker().getTime().plusDays(-1).withHour(0)
+						.withMinute(0).plusHours((long) voteSite.getTimeOffSet());
+				LocalDateTime offsetoclocktoday = plugin.getTimeChecker().getTime().withHour(0).withMinute(0)
+						.plusHours((long) voteSite.getTimeOffSet());
+
+				if (!now.isBefore(offsetoclocktoday)) {
+					if (!lastVote.isBefore(offsetoclocktoday)) {
+						return false;
+					} else {
+						return true;
+					}
+				} else {
+					if (!lastVote.isBefore(offsetoclockyesterday)) {
+						return false;
+					} else {
+						return true;
+					}
 				}
-				return false;
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -784,7 +803,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 				bc = StringParser.getInstance().replacePlaceHolders(user.getOfflinePlayer(), bc);
 				ArrayList<Player> players = new ArrayList<Player>();
 				for (Player p : Bukkit.getOnlinePlayers()) {
-					if (!UserManager.getInstance().getVotingPluginUser(p).getDisableBroadcast()) {
+					if (!plugin.getVotingPluginUserManager().getVotingPluginUser(p).getDisableBroadcast()) {
 						players.add(p);
 					}
 				}
@@ -818,6 +837,14 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		return false;
 	}
 
+	public boolean removePoints(int points, boolean async) {
+		if (getPoints() >= points) {
+			setPoints(getPoints() - points, async);
+			return true;
+		}
+		return false;
+	}
+
 	public void resetTotals(TopVoter topVoter) {
 		setTotal(topVoter, 0);
 	}
@@ -992,6 +1019,10 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		getUserData().setInt(getPointsPath(), value, false);
 	}
 
+	public void setPoints(int value, boolean async) {
+		getUserData().setInt(getPointsPath(), value, false, async);
+	}
+
 	public void setPrimaryAccount(java.util.UUID uuid) {
 		if (uuid != null) {
 			getData().setString("PrimaryAccount", uuid.toString());
@@ -1000,6 +1031,40 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		}
 	}
 
+	public int getNextAvailableMileStone() {
+		Set<String> mVotes = plugin.getSpecialRewardsConfig().getMilestoneVotes();
+		ArrayList<Integer> nums = new ArrayList<Integer>();
+		int mileStoneCount = getMilestoneCount();
+		HashMap<String, Boolean> gottenMileStones = getHasGottenMilestone();
+		for (String vote : mVotes) {
+			if (StringParser.getInstance().isInt(vote)) {
+				final int num = Integer.parseInt(vote);
+				if (plugin.getSpecialRewardsConfig().getMilestoneRewardEnabled(num)) {
+					if (gottenMileStones.containsKey("" + num)) {
+						if (!gottenMileStones.get("" + num).booleanValue()) {
+							nums.add(Integer.valueOf(num));
+						}
+					} else {
+						nums.add(Integer.valueOf(num));
+					}
+				}
+			}
+		}
+
+		int lowestNum = -1;
+
+		for (Integer num : nums) {
+			if (mileStoneCount < num.intValue()) {
+				if (lowestNum == -1 || num.intValue() < lowestNum) {
+					lowestNum = num.intValue();
+				}
+			}
+		}
+
+		return lowestNum;
+
+	}
+
 	public void setReminded(boolean reminded) {
 		getUserData().setString("Reminded", "" + reminded);
 	}
@@ -1188,9 +1253,12 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 	}
 
 	public String voteCommandNextInfo(VoteSite voteSite) {
+		return voteCommandNextInfo(voteSite, getTime(voteSite));
+	}
+	
+	public String voteCommandNextInfo(VoteSite voteSite, long time) {
 		String info = new String();
 
-		long time = getTime(voteSite);
 		LocalDateTime now = plugin.getTimeChecker().getTime();
 
 		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault())

VotingPlugin/src/com/bencodez/votingplugin/voteparty/VoteParty.java

@@ -3,6 +3,7 @@ package com.bencodez.votingplugin.voteparty;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Random;
 import java.util.UUID;
 
 import org.bukkit.Bukkit;
@@ -19,9 +20,9 @@ import com.bencodez.advancedcore.api.time.events.DayChangeEvent;
 import com.bencodez.advancedcore.api.time.events.MonthChangeEvent;
 import com.bencodez.advancedcore.api.time.events.WeekChangeEvent;
 import com.bencodez.advancedcore.api.user.userstorage.DataType;
+import com.bencodez.advancedcore.scheduler.BukkitScheduler;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.events.VotePartyEvent;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 // TODO: Auto-generated Javadoc
@@ -186,15 +187,29 @@ public class VoteParty implements Listener {
 				.setServer(useBungee).send(user);
 	}
 
+	public String getRandomPlayerName() {
+		ArrayList<String> allPlayers = new ArrayList<String>();
+		for (Player players : Bukkit.getOnlinePlayers()) {
+			allPlayers.add(players.getName());
+		}
+		if (allPlayers.size() == 0) {
+			return "No Player";
+		}
+		int random = new Random().nextInt(allPlayers.size());
+		return allPlayers.get(random);
+	}
+
 	public void giveRewards(VotingPluginUser orgUser, boolean forceBungee) {
 		MiscUtils.getInstance().broadcast(plugin.getSpecialRewardsConfig().getVotePartyBroadcast());
 
+		String player = getRandomPlayerName();
 		for (final String cmd : plugin.getSpecialRewardsConfig().getVotePartyGlobalCommands()) {
-			Bukkit.getScheduler().runTask(plugin, new Runnable() {
+			BukkitScheduler.runTask(plugin, new Runnable() {
 
 				@Override
 				public void run() {
-					Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), cmd);
+					Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(),
+							StringParser.getInstance().replacePlaceHolder(cmd, "randomonlineplayer", player));
 				}
 
 			});
@@ -208,7 +223,7 @@ public class VoteParty implements Listener {
 				if (orgUser != null && orgUser.getJavaUUID().equals(p.getUniqueId())) {
 					user = orgUser;
 				} else {
-					user = UserManager.getInstance().getVotingPluginUser(p);
+					user = plugin.getVotingPluginUserManager().getVotingPluginUser(p);
 					user.dontCache();
 				}
 
@@ -217,13 +232,13 @@ public class VoteParty implements Listener {
 				}
 				alreadyGotten.add(p.getUniqueId().toString());
 			}
-			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+			for (String uuid : plugin.getVotingPluginUserManager().getAllUUIDs()) {
 				if (!alreadyGotten.contains(uuid)) {
 					VotingPluginUser user;
 					if (orgUser != null && orgUser.getJavaUUID().toString().equals(uuid)) {
 						user = orgUser;
 					} else {
-						user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+						user = plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuid));
 						user.dontCache();
 					}
 
@@ -240,7 +255,7 @@ public class VoteParty implements Listener {
 				if (orgUser != null && orgUser.getJavaUUID().toString().equals(uuid)) {
 					user = orgUser;
 				} else {
-					user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+					user = plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuid));
 					user.dontCache();
 				}
 				if (!plugin.getSpecialRewardsConfig().isVotePartyGiveOnlinePlayersOnly() || user.isOnline()) {

VotingPlugin/src/com/bencodez/votingplugin/votereminding/VoteReminding.java

@@ -11,7 +11,6 @@ import org.bukkit.entity.Player;
 
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 import lombok.Getter;
@@ -72,7 +71,7 @@ public class VoteReminding {
 				public void run() {
 					if (plugin != null && plugin.isEnabled()) {
 						for (Player player : Bukkit.getServer().getOnlinePlayers()) {
-							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
+							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
 							if (!plugin.getOptions().isTreatVanishAsOffline() || !user.isVanished()) {
 								checkRemind(user);
 							}
@@ -93,7 +92,7 @@ public class VoteReminding {
 	public void runRemind(VotingPluginUser user) {
 		if (plugin.getConfigFile().getVoteRemindingEnabled()) {
 			if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders() && user.hasPrimaryAccount()) {
-				user = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
+				user = plugin.getVotingPluginUserManager().getVotingPluginUser(user.getPrimaryAccount());
 			}
 			giveReward(user);
 			if (user.getData().hasData() && plugin.getConfigFile().getVoteRemindingRemindOnlyOnce()) {
@@ -128,9 +127,9 @@ public class VoteReminding {
 		if (plugin.getConfigFile().getVoteRemindingEnabled()) {
 			if (user.hasPermission("VotingPlugin.Login.RemindVotes") || user.hasPermission("VotingPlugin.Player")) {
 				if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders() && user.hasPrimaryAccount()) {
-					user = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
+					user = plugin.getVotingPluginUserManager().getVotingPluginUser(user.getPrimaryAccount());
 				}
-				if ((!UserManager.getInstance().getAllUUIDs().contains(user.getUUID()) || shouldRemind(user))) {
+				if ((!plugin.getVotingPluginUserManager().getAllUUIDs().contains(user.getUUID()) || shouldRemind(user))) {
 					giveReward(user);
 					if (user.getData().hasData()) {
 						user.setReminded(true);