Update version number

Fix ToggleBroadcasts configuration path

README.md

@@ -2,9 +2,13 @@
 Plugin on SpigotMC
 https://www.spigotmc.org/resources/votingplugin.15358/
 
+![img](http://badge.henrya.org/spigot/downloads?id=15358&color=green)
+
+![img2](http://badge.henrya.org/spigot/version?id=15358&color=red)
+
 ## License
 ### Creative Commons Arttribution 3.0 Unported
-https://github.com/Ben12345rocks/VotingPlugin/blob/master/VotingPlugin/LICENSE.txt
+https://github.com/Ben12345rocks/VotingPlugin/blob/master/VotingPlugin/Resources/LICENSE.txt
 
 ### Maven:
 

VotingPlugin/Resources/Config.yml

@@ -4,7 +4,7 @@
 # https://github.com/Ben12345rocks/VotingPlugin/wiki
 
 # Valid Options:
-# - SQLITE
+# - SQLITE 
 # - FLAT
 # - MYSQL
 DataStorage: SQLITE
@@ -32,6 +32,10 @@ MySQL:
 # Recommend: False (Will prevent creating random user data)
 AllowUnjoined: false
 
+# Use server lookup for when allowunjoined is set to false
+# Recommend leaving enabled unless you face issues
+AllowUnJoinedCheckServer: true
+
 # ------------------------------------------------
 # VoteReminding
 # ------------------------------------------------
@@ -42,12 +46,12 @@ AllowUnjoined: false
 VoteReminding:
   # Enable vote reminding
   # This will remind player when he can vote on all sites
-  # Requires VoteDelay's to be setup properly
+  # Requires VoteDelays to be setup properly
   # Use /vote next to see when you can be reminded
   # Players require the perm "VotingPlugin.Login.RemindVotes" or "VotingPlugin.Player"
   Enabled: true
 
-  # Wether or t to remind only once when the player can vote
+  # Whether or not to remind only once when the player can vote
   # Does not apply to login reminds.
   RemindOnlyOnce: true
 
@@ -91,7 +95,7 @@ VoteReminding:
 # Set Message to '' (2 ') to disable message
 
 Commands:
-  # Wether or not the following commands will open GUIs rather than display text
+  # Whether or not the following commands will open GUIs rather than display text
   UseGUI:
     Today: true
     TopVoter: true
@@ -224,6 +228,9 @@ Format:
         - '&3Highest Week Streak: &3&l%BestWeeklyStreak%'
         - '&3Highest Month Streak: &3&l%BestMonthlyStreak%'
         
+      Today:
+        Line: '&6%player% : %VoteSite% : %Time%'
+        
       # PlaceHolders:
       # %VotesRequired% = VotesRequired
       # %NeededVotes% = Number of votes needed to reach VotesRequired
@@ -234,7 +241,7 @@ Format:
       # %Points% = player points
       Points: '&a%Player% currently has &a&l%Points%&a Points!'
       
-      ToggleBroadcast:
+      ToggleBroadcasts:
         Enabled: '&cYou will now see vote broadcasts'
         Disabled: '&cYou will no longer see vote broadcasts'
   
@@ -282,9 +289,16 @@ Format:
   # User not exist message, from commands such as /vote next (player)
   UserNotExist: '&cUser does not exist: %player%'
   
-  # Text for page buttons in inventories
-  PrevPage: '&aPrevious Page'
-  NextPage: '&aNext Page'
+  # Prev/Next page tems in GUIs
+  PrevItem:
+    Material: 'BLACK_STAINED_GLASS_PANE'
+    Amount: 1
+    Name: '&aPrevious Page'
+    
+  NextItem:
+    Material: 'BLACK_STAINED_GLASS_PANE'
+    Amount: 1
+    Name: '&aNext Page'
   
   InvFull: '&cInventory full, dropping items on ground'
   
@@ -300,6 +314,10 @@ Format:
 # GUI Options
 # ------------------------------------------------
   
+# Enable command for last month gui
+# Requires restart to take effect
+LastMonthGUI: false
+  
 # Configure GUI's here
 # Note: Slots start at 0 instead of 1, max slot is 53 (don't go over) (E.g: last slot in first row of inventory is 8)
 # Item Material's can be found here: https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Material.html
@@ -547,6 +565,10 @@ BackButton:
 
 VoteShopBackButton: true
 VoteShopEnabled: true
+# Hide items in vote shop which user can not buy
+VoteShopHideLimitedReached: true
+# Requires above to be false
+VoteShopLimitReached: '&aYou reached your limit'
 Shop:
   # Identifier
   # Used in placeholders for formats
@@ -567,6 +589,8 @@ Shop:
     Permission: ''
     # Limit how many times you can buy this
     #Limit: 3
+    # If true, item is not buyable
+    #NotBuyable: false
     # Rewards to run if player buys successfully
     Rewards:
       Items:
@@ -634,7 +658,7 @@ VoteParty:
   # List of commands to execute, these only execute once.
   # %player% does not work here
   Commands: []
-  # Rewards to give
+  # Rewards to give per player
   Rewards: 
     Commands:
     - say %player%
@@ -649,7 +673,7 @@ ResetMilestonesMonthly: false
 MileStones:
   # Number of votes required
   # Allows multiple milestones
-  # Number be be around ' (E.g. '1')
+  # Number be around ' (E.g. '1')
   # Can have multiple listed here
   '20':
     Enabled: false
@@ -698,6 +722,9 @@ VoteStreak:
     Day: 50
     Week: 50
     Month: 50
+    
+# Reward given when vote cooldown ended
+VoteCoolDownEndedReward: []
           
   
 # ONLY USE THIS FOR TITLES/SOUNDS AND OTHER EFFECTS
@@ -794,6 +821,8 @@ DailyAwards:
 # Set to 0 to give no points
 PointsOnVote: 1
 
+AlwaysCloseInventory: false
+
 # Set this to false to disable the plugin adding totals
 # Not really recommended
 AddTotals: true
@@ -804,6 +833,9 @@ ClickSound:
   Sound: 'UI_BUTTON_CLICK'
   Volume: 1.0
   Pitch: 1.0
+  
+# Limit monthly votes to number of days of a month multipled by the number of sites
+LimitMonthlyVotes: false
 
 # Debug
 Debug: false
@@ -819,10 +851,11 @@ DebugInGame: false
 
 # Will log debug messages to VotingPlugin/Log/log.txt
 # Requires Debug to be on
-LogDebugToFile: false
+# Only needed for extreme cases
+#LogDebugToFile: false
 
 # Options for request api
-# Current methods
+# Current methods:
 # ANVIL
 # BOOK
 # CHAT
@@ -831,7 +864,7 @@ RequestAPI:
   DefaultMethod: 'Anvil'
   DisabledMethods: []
   
-# Wether or not to log every vote to a file
+# Whether or not to log every vote to a file
 # Use this if you wanna track player votes
 # Not recommended though
 LogVotesToFile: false
@@ -905,6 +938,14 @@ LoadCommandAliases: true
 # Requires AuthMe
 WaitUntilLoggedIn: true
 
+# Preload skulls to improve performance
+# If false, skulls will be cached as they are used
+PreloadSkulls: false
+
+# Setting to false disables saving skulls in a cache to improve speeds
+# Will reduce ram usage if disabled
+LoadSkulls: true
+
 # ---------------------------------------------------------
 # Mysql cache options
 # Clearing cache forces the plugin to pull from database
@@ -921,6 +962,10 @@ ClearCacheOnJoin: false
 # Would recommend for some bungee setups
 ClearCacheOnVote: false
 
+# Use vault for permission checks
+# May not work on some plugins
+UseVaultPermissions: false
+
 # ###############################################################
 # Deprecated options, don't recommend using any of these
 
@@ -938,4 +983,4 @@ ClearCacheOnVote: false
 
 # Disable checking on world change
 # May improve performance
-#DisableCheckOnWorldChange: false
+#DisableCheckOnWorldChange: false

VotingPlugin/Resources/VoteSites.yml

@@ -1,5 +1,7 @@
 VoteSites:
-  # VoteSite name
+  # VoteSite key
+  # Used for saving data for votesites
+  # Use a short name if you can
   ExampleVoteSite:
     # Enable voteSite
     # If false, votesite will not be loaded by plugin
@@ -16,7 +18,8 @@ VoteSites:
           
     # The serviceName from the vote, has to be correct to work correctly
     # Gotten from voting on the site (will be in console/log)
-    # Usually is the main part of the url(e.g. PlanetMinecraft.com)
+    # Usually is the main part of the url(e.g. PlanetMinecraft.com), but not always
+    # See console when you vote (it will notify you if the plugin didn't find a votingsite matching the service site
     ServiceSite: 'PlanetMinecraft.com'
 
     # vote url for /vote
@@ -29,9 +32,11 @@ VoteSites:
     VoteDelay: 24
     
     # Require waiting until votedelay time has pasted in order to accept vote
+    # Recommend: false
     WaitUntilVoteDelay: false
     
     # Reset vote delay each day (for certain sites that do this)
+    # Recommend: false
     VoteDelayDaily: false
     
     # If true, rewards can be executed offline (requires ForceOffline to be true in the reward)
@@ -48,8 +53,47 @@ VoteSites:
     # Rewards to give
     # https://github.com/Ben12345rocks/AdvancedCore/wiki/Rewards
     Rewards:
+      # Execute console commands
       Commands:
       - 'say hello'
+      # Send player a message
+      Messages:
+        Player: 'You voted'
+  # Site 2 example
+  Site2:
+    Enabled: false
+    Name: 'Site2'
+    ServiceSite: 'PlanetMinecraft.com'
+    VoteURL: 'link to vote URL here, used in /vote'
+    VoteDelay: 24
+    Item:
+      Material: 'DIAMOND'
+      Amount: 1
+    Rewards:
+      Commands:
+      - 'say hello'
+      # Advanced example
+      # 50% chance for reward1, if reward1 not given then 20% chance to get reward2, if reward2 not given then fallback
+      AdvancedPriority:
+        # Similar to priority, but no need to have to use reward files
+        # Add requirements under each reward
+        # Will go in order from list here and try to run each of the following rewards...
+        # This name can be anything, but they need to be different
+        Reward1:
+          Chance: 50
+          # Any other requirement here
+          # If any requirement fails, the next will be attempted
+          Messages:
+            Player: 'You got first reward'
+        Reward2:
+          Chance: 20
+          Messages:
+            Player: 'You got second reward'
+        # Fallback, 100% chance, after other rewards fail chances
+        Fallback:
+          Messages:
+            Player: 'You got unlucky'
+
       Messages:
         Player: 'You voted'
     

VotingPlugin/Resources/plugin.yml

@@ -4,6 +4,7 @@ main: com.Ben12345rocks.VotingPlugin.Main
 description: Highly Customizable Voting Listener!
 website: https://www.spigotmc.org/resources/votingplugin.15358/
 author: Ben12345rocks
+softdepend: [MVdWPlaceholders, Votifier]
 api-version: 1.13
 commands:
   vote:
@@ -60,9 +61,18 @@ commands:
   votepoints:
     description: A command
     aliases: vpoints
+  votelist:
+    description: A command
+    aliases: vlist
+  voteall:
+    description: A command
+    aliases: vall
   votechoices:
     description: A command
     alaises: vchoices
+  votegivepoints:
+    description: A command
+    alaises: vgivepoints
   adminvotehelp:
     description: Open adminvote help
     aliases: avhelp
@@ -81,6 +91,9 @@ commands:
   adminvotereload:
     description: Command Alias
     aliases: avreload
+  adminvotetestreward:
+    description: Command Alias
+    aliases: avtestreward
   adminvoteversion:
     description: Command Alias
     aliases: avversion

VotingPlugin/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>5.18</version>
+	<version>5.20.1</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -120,6 +120,10 @@
 							<pattern>com.zaxxer.HikariCP</pattern>
 							<shadedPattern>${project.groupId}.${project.artifactId}.HikariCP</shadedPattern>
 						</relocation>
+						<relocation>
+							<pattern>com.zaxxer.hikari</pattern>
+							<shadedPattern>${project.groupId}.${project.artifactId}.hikari</shadedPattern>
+						</relocation>
 						<relocation>
 							<pattern>org.slf4j.slf4j-simple</pattern>
 							<shadedPattern>${project.groupId}.${project.artifactId}.slf4j-simple</shadedPattern>
@@ -241,7 +245,7 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.13.2-R0.1-SNAPSHOT</version>
+			<version>1.14.4-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Commands/CommandLoader.java

@@ -14,7 +14,6 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
 import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandle;
 import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandler;
@@ -27,6 +26,7 @@ import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventoryButton;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
+import com.Ben12345rocks.AdvancedCore.Util.Placeholder.PlaceHolder;
 import com.Ben12345rocks.AdvancedCore.Util.Updater.Updater;
 import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.ValueRequest;
 import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.Listeners.BooleanListener;
@@ -47,7 +47,6 @@ import com.Ben12345rocks.VotingPlugin.Test.VoteTester;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
-import com.Ben12345rocks.VotingPlugin.Util.PlaceHolders.PlaceHolder;
 import com.Ben12345rocks.VotingPlugin.Util.PlaceHolders.PlaceHolders;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
 import com.google.common.collect.ListMultimap;
@@ -89,6 +88,8 @@ public class CommandLoader {
 		return instance;
 	}
 
+	private Object pointLock = new Object();
+
 	/** The commands. */
 	private HashMap<String, CommandHandler> commands;
 
@@ -342,7 +343,9 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
-						user.addPoints(Integer.parseInt(args[3]));
+						synchronized (pointLock) {
+							user.addPoints(Integer.parseInt(args[3]));
+						}
 						sender.sendMessage(StringUtils.getInstance().colorize("&cGave " + args[1] + " " + args[3]
 								+ " points" + ", " + args[1] + " now has " + user.getPoints() + " points"));
 					}
@@ -457,10 +460,22 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				sender.sendMessage(ChatColor.RED + "Reloading " + plugin.getName() + "...");
+				sendMessage(sender, "&4" + "Reloading " + plugin.getName() + "...");
 				plugin.reload();
-				sender.sendMessage(
-						ChatColor.RED + plugin.getName() + " v" + plugin.getDescription().getVersion() + " reloaded!");
+				if (plugin.isYmlError()) {
+					sendMessage(sender, "&3Detected yml error, please check server log for details");
+				}
+				sendMessage(sender,
+						"&4" + plugin.getName() + " v" + plugin.getDescription().getVersion() + " reloaded!");
+				if (ServerData.getInstance().getServiceSites().size() == 0) {
+					sendMessage(sender, "&c"
+							+ "Detected that server hasn't received any votes from votifier, please check votifier connection");
+				}
+				if (!Config.getInstance().isDisableUpdateChecking()
+						&& plugin.getUpdater().getResult().equals(Updater.UpdateResult.UPDATE_AVAILABLE)) {
+					sendMessage(sender,
+							"&3Plugin has update available! https://www.spigotmc.org/resources/votingplugin.15358/");
+				}
 			}
 		});
 
@@ -606,7 +621,7 @@ public class CommandLoader {
 						try {
 							sender.sendMessage("Starting to convert");
 							UserStorage prevStorage = UserStorage.valueOf(args[1].toUpperCase());
-							plugin.convertDataStorage(prevStorage, AdvancedCoreHook.getInstance().getStorageType());
+							plugin.convertDataStorage(prevStorage, Main.plugin.getStorageType());
 							sender.sendMessage("Finished converting!");
 						} catch (Exception ex) {
 							ex.printStackTrace();
@@ -682,19 +697,6 @@ public class CommandLoader {
 					}
 				});
 
-		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "User", "(player)", "SetData", "(Text)", "(text)" },
-						"VotingPlugin.Commands.AdminVote.SetData|" + adminPerm, "Set data") {
-
-					@Override
-					public void execute(CommandSender sender, String[] args) {
-						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
-						user.getData().setString(args[3], args[4]);
-						sender.sendMessage(StringUtils.getInstance()
-								.colorize("&cSet " + args[3] + " for " + args[1] + " to " + args[4]));
-					}
-				});
-
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Vote", "(player)", "(Sitename)" },
 				"VotingPlugin.Commands.AdminVote.Vote|" + adminPerm, "Trigger manual vote") {
 
@@ -710,18 +712,12 @@ public class CommandLoader {
 				}
 				plugin.getServer().getPluginManager().callEvent(voteEvent);
 
-			}
-		});
-
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "User", "(Player)", "ViewData" },
-				"VotingPlugin.Commands.AdminVote.ViewData|" + adminPerm, "View playerdata") {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
-				for (String key : user.getData().getKeys()) {
-					user.sendMessage("&c&l" + key + " &c" + user.getData().getString(key));
+				if (plugin.isYmlError()) {
+					sendMessage(sender,
+							"&4" + plugin.getName() + " v" + plugin.getDescription().getVersion() + " reloaded!");
+					sendMessage(sender, "&3Detected yml error, please check server log for details");
 				}
+
 			}
 		});
 
@@ -766,7 +762,7 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						AdvancedCoreHook.getInstance().getOptions().setDebug(true);
+						Main.plugin.getOptions().setDebug(true);
 					}
 				});
 
@@ -961,6 +957,19 @@ public class CommandLoader {
 					}
 				});
 
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "TestReward", "(Player)", "(reward)", "(number)" },
+						"VotingPlugin.Commands.AdminVote.TestReward|" + adminPerm, "Test reward times") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						VoteTester.getInstance().testRewards(Integer.parseInt(args[3]), args[1], args[2]);
+						if (isPlayer(sender)) {
+							sendMessage(sender, "&cSee console for details");
+						}
+					}
+				});
+
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "Placeholders" },
 						"VotingPlugin.Commands.AdminVote.Placeholders|" + adminPerm,
@@ -970,7 +979,7 @@ public class CommandLoader {
 					public void execute(CommandSender sender, String[] args) {
 						ArrayList<String> msg = new ArrayList<String>();
 						msg.add("&cPlaceholders:");
-						for (PlaceHolder placeholder : PlaceHolders.getInstance().getPlaceholders()) {
+						for (PlaceHolder<User> placeholder : PlaceHolders.getInstance().getPlaceholders()) {
 							String identifier = placeholder.getIdentifier();
 							if (identifier.endsWith("_")) {
 								identifier += "#";
@@ -982,7 +991,7 @@ public class CommandLoader {
 							}
 						}
 
-						for (PlaceHolder placeholder : PlaceHolders.getInstance().getNonPlayerPlaceholders()) {
+						for (PlaceHolder<User> placeholder : PlaceHolders.getInstance().getNonPlayerPlaceholders()) {
 							String identifier = placeholder.getIdentifier();
 							if (identifier.endsWith("_")) {
 								identifier += "#";
@@ -1073,7 +1082,7 @@ public class CommandLoader {
 						ArrayList<String> msg = new ArrayList<String>();
 						msg.add("&cPlaceholders:");
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
-						for (PlaceHolder placeholder : PlaceHolders.getInstance().getPlaceholders()) {
+						for (PlaceHolder<User> placeholder : PlaceHolders.getInstance().getPlaceholders()) {
 							String identifier = placeholder.getIdentifier();
 							if (identifier.endsWith("_")) {
 								identifier += "1";
@@ -1082,7 +1091,7 @@ public class CommandLoader {
 									+ placeholder.placeholderRequest(user.getOfflinePlayer(), user, identifier));
 						}
 
-						for (PlaceHolder placeholder : PlaceHolders.getInstance().getNonPlayerPlaceholders()) {
+						for (PlaceHolder<User> placeholder : PlaceHolders.getInstance().getNonPlayerPlaceholders()) {
 							String identifier = placeholder.getIdentifier();
 							if (identifier.endsWith("_")) {
 								identifier += "1";
@@ -1331,14 +1340,16 @@ public class CommandLoader {
 			}
 		});
 
-		plugin.getVoteCommand().add(new CommandHandler(new String[] { "Shop" },
-				"VotingPlugin.Commands.Vote.Shop|" + playerPerm, "Open VoteShop GUI", false) {
+		if (Config.getInstance().getVoteShopEnabled()) {
+			plugin.getVoteCommand().add(new CommandHandler(new String[] { "Shop" },
+					"VotingPlugin.Commands.Vote.Shop|" + playerPerm, "Open VoteShop GUI", false) {
 
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				PlayerGUIs.getInstance().openVoteShop((Player) sender);
-			}
-		});
+				@Override
+				public void execute(CommandSender sender, String[] args) {
+					PlayerGUIs.getInstance().openVoteShop((Player) sender);
+				}
+			});
+		}
 
 		plugin.getVoteCommand().add(new CommandHandler(new String[] { "URL" },
 				"VotingPlugin.Commands.Vote.URL|" + playerPerm, "Open VoteURL GUI", false) {
@@ -1557,6 +1568,19 @@ public class CommandLoader {
 			}
 		});
 
+		if (Config.getInstance().isLastMonthGUI()) {
+			plugin.getVoteCommand()
+					.add(new CommandHandler(new String[] { "LastMonthTop" },
+							"VotingPlugin.Commands.Vote.LastMonthTop|" + playerPerm,
+							"Open list of Top Voters from last month") {
+
+						@Override
+						public void execute(CommandSender sender, String[] args) {
+							PlayerGUIs.getInstance().openVoteTopLastMonth((Player) sender);
+						}
+					});
+		}
+
 		plugin.getVoteCommand().add(new CommandHandler(new String[] { "Top" },
 				"VotingPlugin.Commands.Vote.Top|" + playerPerm, "Open list of Top Voters") {
 
@@ -1982,31 +2006,28 @@ public class CommandLoader {
 		});
 
 		if (Config.getInstance().isAllowVotePointTransfers()) {
-			plugin.getVoteCommand()
-					.add(new CommandHandler(new String[] { "GivePoints", "(player)", "(number)" },
-							"VotingPlugin.Commands.Vote.GivePoints|" + playerPerm,
-							"Give someone points from your points", false) {
+			plugin.getVoteCommand().add(new CommandHandler(new String[] { "GivePoints", "(player)", "(number)" },
+					"VotingPlugin.Commands.Vote.GivePoints", "Give someone points from your points", false) {
 
-						@Override
-						public void execute(CommandSender sender, String[] args) {
-							if (Config.getInstance().isAllowVotePointTransfers()) {
-								User cPlayer = UserManager.getInstance().getVotingPluginUser((Player) sender);
+				@Override
+				public void execute(CommandSender sender, String[] args) {
+					if (Config.getInstance().isAllowVotePointTransfers()) {
+						User cPlayer = UserManager.getInstance().getVotingPluginUser((Player) sender);
 
-								User user = UserManager.getInstance().getVotingPluginUser(args[1]);
-								int pointsToGive = Integer.parseInt(args[2]);
-								if (cPlayer.getPoints() >= pointsToGive) {
-									user.addPoints(pointsToGive);
-									cPlayer.removePoints(pointsToGive);
-									sendMessage(sender,
-											"&c" + pointsToGive + " points given to " + user.getPlayerName());
-									user.sendMessage("&cYou received " + pointsToGive + " points from "
-											+ cPlayer.getPlayerName());
-								} else {
-									sendMessage(sender, "&cNot enough points");
-								}
-							}
+						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						int pointsToGive = Integer.parseInt(args[2]);
+						if (cPlayer.getPoints() >= pointsToGive) {
+							user.addPoints(pointsToGive);
+							cPlayer.removePoints(pointsToGive);
+							sendMessage(sender, "&c" + pointsToGive + " points given to " + user.getPlayerName());
+							user.sendMessage(
+									"&cYou received " + pointsToGive + " points from " + cPlayer.getPlayerName());
+						} else {
+							sendMessage(sender, "&cNot enough points");
 						}
-					});
+					}
+				}
+			});
 		}
 
 		plugin.getVoteCommand().add(
@@ -2028,6 +2049,20 @@ public class CommandLoader {
 					}
 				});
 
+		plugin.getVoteCommand().add(new CommandHandler(new String[] { "List&All" },
+				"VotingPlugin.Commands.Vote.List|" + playerPerm, "See voting URLs") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				if (isPlayer(sender)) {
+					User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
+					user.sendMessage(Commands.getInstance().voteURLs(user));
+				} else {
+					sender.sendMessage(Commands.getInstance().voteURLs(null));
+				}
+			}
+		});
+
 		ArrayList<CommandHandler> avCommands = com.Ben12345rocks.AdvancedCore.Commands.CommandLoader.getInstance()
 				.getBasicCommands("VotingPlugin");
 		for (CommandHandler cmd : avCommands) {

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Commands/Commands.java

@@ -17,8 +17,8 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permission;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.TimeChecker;
 import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
@@ -100,7 +100,7 @@ public class Commands {
 		msg.add(StringUtils.getInstance().stringToComp("&3&l() = Needed"));
 		msg.add(StringUtils.getInstance().stringToComp("&3&lAliases: adminvote, av"));
 
-		for (int i = pagesize * page; (i < text.size()) && (i < ((page + 1) * pagesize) - 1); i++) {
+		for (int i = pagesize * page; (i < text.size()) && (i < ((page + 1) * pagesize)); i++) {
 			msg.add(text.get(i));
 		}
 
@@ -322,7 +322,7 @@ public class Commands {
 	 *            the page
 	 */
 	public void sendTopVoterAllTimeScoreBoard(final Player player, int page) {
-		if (AdvancedCoreHook.getInstance().getOptions().isSendScoreboards()) {
+		if (Main.plugin.getOptions().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
 			ArrayList<User> users = plugin.convertSet(plugin.getTopVoter(TopVoter.AllTime).keySet());
 
@@ -362,7 +362,7 @@ public class Commands {
 	 *            the page
 	 */
 	public void sendTopVoterDailyScoreBoard(final Player player, int page) {
-		if (AdvancedCoreHook.getInstance().getOptions().isSendScoreboards()) {
+		if (Main.plugin.getOptions().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
 			ArrayList<User> users = plugin.convertSet(plugin.getTopVoter(TopVoter.Daily).keySet());
 
@@ -402,7 +402,7 @@ public class Commands {
 	 *            the page
 	 */
 	public void sendTopVoterMonthlyScoreBoard(final Player player, int page) {
-		if (AdvancedCoreHook.getInstance().getOptions().isSendScoreboards()) {
+		if (Main.plugin.getOptions().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
 			ArrayList<User> users = plugin.convertSet(plugin.getTopVoter(TopVoter.Monthly).keySet());
 
@@ -442,7 +442,7 @@ public class Commands {
 	 *            the page
 	 */
 	public void sendTopVoterWeeklyScoreBoard(final Player player, int page) {
-		if (AdvancedCoreHook.getInstance().getOptions().isSendScoreboards()) {
+		if (Main.plugin.getOptions().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
 			ArrayList<User> users = plugin.convertSet(plugin.getTopVoter(TopVoter.Weekly).keySet());
 
@@ -483,7 +483,7 @@ public class Commands {
 	 *            the page
 	 */
 	public void sendVoteTodayScoreBoard(final Player player, int page) {
-		if (AdvancedCoreHook.getInstance().getOptions().isSendScoreboards()) {
+		if (Main.plugin.getOptions().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
 
 			String[] voteToday = voteToday();
@@ -732,8 +732,9 @@ public class Commands {
 		String info = new String();
 
 		long time = user.getTime(voteSite);
-		LocalDateTime now = LocalDateTime.now();
-		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault());
+		LocalDateTime now = TimeChecker.getInstance().getTime();
+		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault())
+				.plusHours(Main.plugin.getOptions().getTimeHourOffSet());
 
 		if (!voteSite.isVoteDelayDaily()) {
 			double votedelay = voteSite.getVoteDelay();
@@ -762,7 +763,7 @@ public class Commands {
 			}
 		} else {
 			if (lastVote.getDayOfYear() == now.getDayOfYear() && lastVote.getYear() == now.getYear()) {
-				LocalDateTime midnight = LocalDateTime.now().plusDays(1).withHour(0).withMinute(0);
+				LocalDateTime midnight = TimeChecker.getInstance().getTime().plusDays(1).withHour(0).withMinute(0);
 				Duration dur = Duration.between(now, midnight);
 
 				int diffHours = (int) (dur.getSeconds() / (60 * 60));
@@ -888,7 +889,14 @@ public class Commands {
 			for (VoteSite voteSite : plugin.getVoteToday().get(user).keySet()) {
 				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(Config.getInstance().getFormatTimeFormat());
 				String timeString = plugin.getVoteToday().get(user).get(voteSite).format(formatter);
-				msg.add("&6" + user.getPlayerName() + " : " + voteSite.getKey() + " : " + timeString);
+				HashMap<String, String> placeholders = new HashMap<String, String>();
+				placeholders.put("player", user.getPlayerName());
+				placeholders.put("votesite", voteSite.getKey());
+				placeholders.put("time", timeString);
+				msg.add(StringUtils.getInstance()
+						.replacePlaceHolder(Config.getInstance().getFormatCommandsVoteTodayLine(), placeholders));
+				// msg.add("&6" + user.getPlayerName() + " : " + voteSite.getKey() + " : " +
+				// timeString);
 			}
 		}
 		msg = ArrayUtils.getInstance().colorize(msg);

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Commands/GUI/AdminGUI.java

@@ -11,6 +11,7 @@ import org.bukkit.inventory.ItemStack;
 import com.Ben12345rocks.AdvancedCore.Util.EditGUI.EditGUI;
 import com.Ben12345rocks.AdvancedCore.Util.EditGUI.EditGUIButton;
 import com.Ben12345rocks.AdvancedCore.Util.EditGUI.ValueTypes.EditGUIValueBoolean;
+import com.Ben12345rocks.AdvancedCore.Util.EditGUI.ValueTypes.EditGUIValueList;
 import com.Ben12345rocks.AdvancedCore.Util.EditGUI.ValueTypes.EditGUIValueNumber;
 import com.Ben12345rocks.AdvancedCore.Util.EditGUI.ValueTypes.EditGUIValueString;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
@@ -250,6 +251,20 @@ public class AdminGUI {
 			}
 		}));
 
+		if (voteSite.getSiteData().isList("Rewards")) {
+
+			inv.addButton(
+					new EditGUIButton(new EditGUIValueList("Rewards", voteSite.getSiteData().getStringList("Rewards")) {
+
+						@Override
+						public void setValue(Player p, ArrayList<String> rewards) {
+							VoteSite voteSite = (VoteSite) getInv().getMeta(player, "VoteSite");
+							ConfigVoteSites.getInstance().set(voteSite.getKey(), "Rewards", rewards);
+							plugin.reload();
+						}
+					}));
+		}
+
 		inv.openInventory(player);
 	}
 }

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Commands/GUI/PlayerGUIs.java

@@ -12,7 +12,6 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
@@ -53,12 +52,28 @@ public class PlayerGUIs {
 	private PlayerGUIs() {
 	}
 
-	public ItemBuilder getBackButton() {
+	public BInventoryButton getBackButton() {
 		ConfigurationSection sec = Config.getInstance().getBackButton();
+		ItemBuilder item;
 		if (sec != null) {
-			return new ItemBuilder(sec);
+			item = new ItemBuilder(sec);
+		} else {
+			item = new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI");
 		}
-		return new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI");
+
+		BInventoryButton b = new BInventoryButton(item) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				openVoteGUI(event.getWhoClicked(), getSelectedPlayer(event.getWhoClicked()));
+			}
+		};
+
+		if (!Config.getInstance().isAlwaysCloseInventory()) {
+			b.dontClose();
+		}
+
+		return b;
 	}
 
 	public User getSelectedPlayer(Player player) {
@@ -111,13 +126,15 @@ public class PlayerGUIs {
 				&& !player.hasPermission("VotingPlugin.Mod"))
 				|| (!player.hasPermission("VotingPlugin.Commands.Vote.GUI")
 						&& !player.hasPermission("VotingPlugin.Player"))) {
-			player.sendMessage(
-					StringUtils.getInstance().colorize(AdvancedCoreHook.getInstance().getOptions().getFormatNoPerms()));
+			player.sendMessage(StringUtils.getInstance().colorize(Main.plugin.getOptions().getFormatNoPerms()));
 			return;
 		}
 		setSelectedPlayer(player, user);
 		BInventory inv = new BInventory(StringUtils.getInstance()
 				.replacePlaceHolder(Config.getInstance().getGUIVoteGUIName(), "player", user.getPlayerName()));
+		if (!Config.getInstance().isAlwaysCloseInventory()) {
+			inv.dontClose();
+		}
 
 		for (String slot : Config.getInstance().getVoteGUISlots()) {
 			ItemBuilder builder = new ItemBuilder(Config.getInstance().getVoteGUISlotSection(slot));
@@ -170,8 +187,16 @@ public class PlayerGUIs {
 							Player player = event.getWhoClicked();
 							String cmd = Config.getInstance().getVoteGUISlotCommand(slot);
 							User user = getSelectedPlayer(player);
-							if (!cmd.equals("")) {
-								player.performCommand(cmd);
+							if (cmd.equalsIgnoreCase("none")) {
+								return;
+							} else if (!cmd.equals("")) {
+								Bukkit.getScheduler().runTask(plugin, new Runnable() {
+
+									@Override
+									public void run() {
+										player.performCommand(cmd);
+									}
+								});
 							} else {
 								if (slot.equalsIgnoreCase("url")) {
 									openVoteURL(player);
@@ -189,6 +214,8 @@ public class PlayerGUIs {
 									player.performCommand("vote help");
 								} else if (slot.equalsIgnoreCase("shop")) {
 									openVoteShop(player);
+								} else if (slot.equalsIgnoreCase("lastmonth")) {
+									openVoteTopLastMonth(player);
 								}
 							}
 						}
@@ -217,14 +244,7 @@ public class PlayerGUIs {
 		}
 
 		if (Config.getInstance().getGUIVoteLastBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-
-			});
+			inv.addButton(getBackButton());
 		}
 
 		inv.openInventory(player);
@@ -246,14 +266,7 @@ public class PlayerGUIs {
 		}
 
 		if (Config.getInstance().getGUIVoteNextBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-
-			});
+			inv.addButton(getBackButton());
 		}
 		inv.openInventory(player);
 	}
@@ -286,70 +299,77 @@ public class PlayerGUIs {
 				}
 			}
 
-			if (hasPerm && limitPass) {
-				ItemBuilder builder = new ItemBuilder(Config.getInstance().getIdentifierSection(identifier));
+			if (!Config.getInstance().getVoteShopNotBuyable(identifier)) {
+				if (hasPerm && (limitPass || !Config.getInstance().isVoteShopHideLimitedReached())) {
+					ItemBuilder builder = new ItemBuilder(Config.getInstance().getIdentifierSection(identifier));
 
-				inv.addButton(new BInventoryButton(builder) {
+					inv.addButton(new BInventoryButton(builder) {
 
-					@Override
-					public void onClick(ClickEvent event) {
-						Player player = event.getWhoClicked();
+						@Override
+						public void onClick(ClickEvent event) {
+							Player player = event.getWhoClicked();
 
-						User user = UserManager.getInstance().getVotingPluginUser(player);
-						user.clearCache();
-						String identifier = (String) getData("identifier");
-						int limit = (int) getData("Limit");
-						int points = Config.getInstance().getIdentifierCost(identifier);
-						if (identifier != null) {
+							User user = UserManager.getInstance().getVotingPluginUser(player);
+							user.clearCache();
+							String identifier = (String) getData("identifier");
+							int limit = (int) getData("Limit");
+							int points = Config.getInstance().getIdentifierCost(identifier);
+							if (identifier != null) {
 
-							// limit fail-safe, should never be needed, except in rare cases
-							boolean limitPass = true;
-							if (limit > 0) {
-								if (user.getVoteShopIdentifierLimit(identifier) >= limit) {
-									limitPass = false;
+								// limit fail-safe, should never be needed, except in rare cases
+								boolean limitPass = true;
+								if (limit > 0) {
+									if (user.getVoteShopIdentifierLimit(identifier) >= limit) {
+										limitPass = false;
+									}
 								}
-							}
 
-							if (limitPass) {
-								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 (limitPass) {
+									HashMap<String, String> placeholders = new HashMap<String, String>();
+									placeholders.put("identifier", identifier);
+									placeholders.put("points", "" + points);
+									placeholders.put("limit", "" + limit);
+									if (user.removePoints(points)) {
 
-									RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-											Config.getInstance().getIdentifierRewardsPath(identifier),
-											new RewardOptions().setPlaceholders(placeholders));
+										RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
+												Config.getInstance().getIdentifierRewardsPath(identifier),
+												new RewardOptions().setPlaceholders(placeholders));
 
-									user.sendMessage(StringUtils.getInstance().replacePlaceHolder(
-											Config.getInstance().getFormatShopPurchaseMsg(), placeholders));
-									if (limit > 0) {
-										user.setVoteShopIdentifierLimit(identifier,
-												user.getVoteShopIdentifierLimit(identifier) + 1);
+										user.sendMessage(StringUtils.getInstance().replacePlaceHolder(
+												Config.getInstance().getFormatShopPurchaseMsg(), placeholders));
+										if (limit > 0) {
+											user.setVoteShopIdentifierLimit(identifier,
+													user.getVoteShopIdentifierLimit(identifier) + 1);
+										}
+									} else {
+										user.sendMessage(StringUtils.getInstance().replacePlaceHolder(
+												Config.getInstance().getFormatShopFailedMsg(), placeholders));
 									}
 								} else {
-									user.sendMessage(StringUtils.getInstance().replacePlaceHolder(
-											Config.getInstance().getFormatShopFailedMsg(), placeholders));
+									user.sendMessage(Config.getInstance().getVoteShopLimitReached());
 								}
 							}
 						}
-					}
 
-				}.addData("identifier", identifier).addData("Limit", limit));
+					}.addData("identifier", identifier).addData("Limit", limit));
+				}
+			} else {
+				if (hasPerm) {
+					ItemBuilder builder = new ItemBuilder(Config.getInstance().getIdentifierSection(identifier));
+					inv.addButton(new BInventoryButton(builder) {
+
+						@Override
+						public void onClick(ClickEvent event) {
+
+						}
+
+					}.dontClose().addData("identifier", identifier).addData("Limit", limit));
+				}
 			}
 		}
 
 		if (Config.getInstance().getVoteShopBackButton()) {
-			inv.addButton(new BInventoryButton(PlayerGUIs.getInstance().getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					PlayerGUIs.getInstance().openVoteGUI(event.getPlayer(),
-							UserManager.getInstance().getVotingPluginUser(player));
-				}
-
-			});
-
+			inv.addButton(getBackButton());
 		}
 
 		inv.openInventory(player);
@@ -417,13 +437,7 @@ public class PlayerGUIs {
 				});
 
 		if (Config.getInstance().getGUIVoteStreakBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-			});
+			inv.addButton(getBackButton());
 		}
 
 		inv.openInventory(player);
@@ -432,6 +446,9 @@ public class PlayerGUIs {
 	public void openVoteToday(Player player) {
 		setSelectedPlayer(player, null);
 		BInventory inv = new BInventory(Config.getInstance().getGUIVoteTodayName());
+		if (!Config.getInstance().isAlwaysCloseInventory()) {
+			inv.dontClose();
+		}
 		for (User user : plugin.getVoteToday().keySet()) {
 
 			for (VoteSite voteSite : plugin.getVoteToday().get(user).keySet()) {
@@ -446,21 +463,13 @@ public class PlayerGUIs {
 						User user = UserManager.getInstance()
 								.getVotingPluginUser(clickEvent.getClickedItem().getItemMeta().getDisplayName());
 						openVoteGUI(player, user);
-
 					}
 				});
 			}
 		}
 
 		if (Config.getInstance().getGUIVoteTodayBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-
-			});
+			inv.addButton(getBackButton());
 		}
 		inv.openInventory(player);
 	}
@@ -476,6 +485,9 @@ public class PlayerGUIs {
 
 		BInventory inv = new BInventory(StringUtils.getInstance()
 				.replacePlaceHolder(Config.getInstance().getGUIVoteTopName(), "topvoter", topVoter));
+		if (!Config.getInstance().isAlwaysCloseInventory()) {
+			inv.dontClose();
+		}
 
 		int pos = 1;
 		for (Entry<User, Integer> entry : users) {
@@ -518,13 +530,54 @@ public class PlayerGUIs {
 		});
 
 		if (Config.getInstance().getGUIVoteTopBackButton()) {
-			inv.getPageButtons().add(new BInventoryButton(getBackButton().setSlot(1)) {
+			inv.getPageButtons().add(getBackButton().setSlot(1));
+		}
+
+		inv.setPages(true);
+		inv.setMaxInvSize(Config.getInstance().getGUIVoteTopSize());
+		inv.openInventory(player);
+
+	}
+
+	public void openVoteTopLastMonth(Player player) {
+		Set<Entry<User, Integer>> users = null;
+
+		users = plugin.getLastMonthTopVoter().entrySet();
+
+		BInventory inv = new BInventory(StringUtils.getInstance()
+				.replacePlaceHolder(Config.getInstance().getGUIVoteTopName(), "topvoter", "Last Month"));
+		if (!Config.getInstance().isAlwaysCloseInventory()) {
+			inv.dontClose();
+		}
+
+		int pos = 1;
+		for (Entry<User, Integer> entry : users) {
+			ItemBuilder playerItem;
+
+			if (Config.getInstance().isGuiVoteTopUseSkull()) {
+				playerItem = new ItemBuilder(entry.getKey().getPlayerHead());
+			} else {
+				playerItem = new ItemBuilder(Material.valueOf(Config.getInstance().getGuiVoteTopPlayerItemMaterial()));
+			}
+
+			playerItem.setLore(new ArrayList<String>());
+
+			inv.addButton(new BInventoryButton(playerItem.setName(Config.getInstance().getGUIVoteTopItemName())
+					.addLoreLine(Config.getInstance().getGUIVoteTopItemLore()).addPlaceholder("position", "" + pos)
+					.addPlaceholder("player", entry.getKey().getPlayerName())
+					.addPlaceholder("votes", "" + entry.getValue())) {
 
 				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				public void onClick(ClickEvent clickEvent) {
+					User user = (User) getData("User");
+					openVoteGUI(player, user);
 				}
-			});
+			}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey()));
+			pos++;
+		}
+
+		if (Config.getInstance().getGUIVoteTopBackButton()) {
+			inv.getPageButtons().add(getBackButton().setSlot(1));
 		}
 
 		inv.setPages(true);
@@ -550,14 +603,7 @@ public class PlayerGUIs {
 		}
 
 		if (Config.getInstance().getGUIVoteTotalBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-
-			});
+			inv.addButton(getBackButton());
 		}
 		inv.openInventory(player);
 	}
@@ -638,13 +684,7 @@ public class PlayerGUIs {
 		}
 
 		if (Config.getInstance().getGUIVoteURLBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-			});
+			inv.addButton(getBackButton());
 		}
 
 		inv.openInventory(player);
@@ -657,6 +697,9 @@ public class PlayerGUIs {
 		BInventory inv = new BInventory(StringUtils.getInstance()
 				.replacePlaceHolder(Config.getInstance().getGUIVoteURLSiteName(), "site", site.getDisplayName()));
 		inv.setMeta(player, "VoteSite", site);
+		if (!Config.getInstance().isAlwaysCloseInventory()) {
+			inv.dontClose();
+		}
 
 		inv.addButton(
 				new BInventoryButton(new ItemBuilder(Material.BOW).setName("&4URL").addLoreLine("Click to see URL")) {
@@ -687,13 +730,7 @@ public class PlayerGUIs {
 		});
 
 		if (Config.getInstance().getGUIVoteURLBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-			});
+			inv.addButton(getBackButton());
 		}
 		inv.openInventory(player);
 	}
@@ -748,13 +785,7 @@ public class PlayerGUIs {
 		}
 
 		if (Config.getInstance().isVoteRewardBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-			});
+			inv.addButton(getBackButton());
 		}
 
 		inv.openInventory(player);

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Config/Config.java

@@ -264,9 +264,41 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean allowVotePointTransfers = false;
 
+	@ConfigDataBoolean(path = "LimitMonthlyVotes")
+	@Getter
+	private boolean limitMonthlyVotes = false;
+
+	@ConfigDataBoolean(path = "AlwaysCloseInventory")
+	@Getter
+	private boolean alwaysCloseInventory = false;
+
+	@ConfigDataBoolean(path = "VoteShopHideLimitedReached")
+	@Getter
+	private boolean voteShopHideLimitedReached = true;
+
+	@ConfigDataString(path = "VoteShopLimitReached")
+	@Getter
+	private String voteShopLimitReached = "&aYou reached your limit";
+
 	@Getter
 	private int formatPageSize = 10;
 
+	@ConfigDataString(path = "Format.Commands.Vote.Today.Line")
+	@Getter
+	private String formatCommandsVoteTodayLine = "&6%player% : %VoteSite% : %Time%";
+
+	@ConfigDataBoolean(path = "OverrideVersionDisable")
+	@Getter
+	private boolean overrideVersionDisable = false;
+
+	@ConfigDataBoolean(path = "LastMonthGUI")
+	@Getter
+	private boolean lastMonthGUI = false;
+
+	@ConfigDataBoolean(path = "AllowUnJoinedCheckServer")
+	@Getter
+	private boolean allowUnJoinedCheckServer = true;
+
 	/**
 	 * Instantiates a new config.
 	 */
@@ -1243,6 +1275,10 @@ public class Config extends YMLFile {
 		return getData().getString("GUI.VoteShopName", "VoteShop");
 	}
 
+	public boolean getVoteShopNotBuyable(String shop) {
+		return getData().getBoolean("Shop." + shop + ".NotBuyable", false);
+	}
+
 	public String getVoteShopPermission(String ident) {
 		return getData().getString("Shop." + ident + ".Permission", "");
 	}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/CoolDown/CoolDownCheck.java

@@ -0,0 +1,84 @@
+package com.Ben12345rocks.VotingPlugin.CoolDown;
+
+import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.DateChangedEvent;
+import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
+import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Config.Config;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteCoolDownEndEvent;
+import com.Ben12345rocks.VotingPlugin.Objects.User;
+import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class VoteReminding.
+ */
+public class CoolDownCheck implements Listener {
+
+	/** The instance. */
+	static CoolDownCheck instance = new CoolDownCheck();
+
+	/** The plugin. */
+	static Main plugin = Main.plugin;
+
+	/**
+	 * Gets the single instance of VoteReminding.
+	 *
+	 * @return single instance of VoteReminding
+	 */
+	public static CoolDownCheck getInstance() {
+		return instance;
+	}
+
+	/**
+	 * Instantiates a new vote reminding.
+	 */
+	private CoolDownCheck() {
+	}
+
+	/**
+	 * Instantiates a new vote reminding.
+	 *
+	 * @param plugin
+	 *            the plugin
+	 */
+	public CoolDownCheck(Main plugin) {
+		CoolDownCheck.plugin = plugin;
+	}
+
+	public void checkAll() {
+		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+					if (Main.plugin != null) {
+						User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+						if (user.getUserData().hasData() && user.hasLoggedOnBefore()) {
+							user.checkCoolDownEvents();
+						}
+					}
+				}
+			}
+		});
+
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void onCoolDownEnd(PlayerVoteCoolDownEndEvent event) {
+		RewardHandler.getInstance().giveReward(event.getPlayer(), Config.getInstance().getData(),
+				"VoteCoolDownEndedReward",
+				new RewardOptions().addPlaceholder("Votesite", event.getVoteSite().getDisplayName()));
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void onDayChangeEnd(DateChangedEvent event) {
+		checkAll();
+	}
+}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Events/PlayerReceivePointsEvent.java

@@ -44,8 +44,8 @@ public class PlayerReceivePointsEvent extends Event {
 
 	public PlayerReceivePointsEvent(User user, int points) {
 		super(true);
-		setPlayer(user);
-		setPoints(points);
+		this.player = user;
+		this.points = points;
 	}
 
 	/*

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Events/PlayerSpecialRewardEvent.java

@@ -40,8 +40,8 @@ public class PlayerSpecialRewardEvent extends Event {
 
 	public PlayerSpecialRewardEvent(User user, SpecialRewardType type) {
 		super(true);
-		setType(type);
-		setUser(user);
+		this.type = type;
+		this.user = user;
 	}
 
 	/*

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Events/PlayerVoteCoolDownEndEvent.java

@@ -0,0 +1,57 @@
+package com.Ben12345rocks.VotingPlugin.Events;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.Ben12345rocks.VotingPlugin.Objects.User;
+import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
+
+import lombok.Getter;
+import lombok.Setter;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class PlayerVoteEvent.
+ */
+public class PlayerVoteCoolDownEndEvent extends Event {
+
+	/** The Constant handlers. */
+	private static final HandlerList handlers = new HandlerList();
+
+	/**
+	 * Gets the handler list.
+	 *
+	 * @return the handler list
+	 */
+	public static HandlerList getHandlerList() {
+		return handlers;
+	}
+
+	@Getter
+	@Setter
+	private User player;
+
+	@Getter
+	@Setter
+	private VoteSite voteSite;
+
+	@Getter
+	@Setter
+	private boolean cancelled;
+
+	public PlayerVoteCoolDownEndEvent(User user, VoteSite site) {
+		super(true);
+		player = user;
+		voteSite = site;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.bukkit.event.Event#getHandlers()
+	 */
+	@Override
+	public HandlerList getHandlers() {
+		return handlers;
+	}
+
+}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Events/PlayerVoteEvent.java

@@ -48,10 +48,10 @@ public class PlayerVoteEvent extends Event {
 
 	public PlayerVoteEvent(VoteSite voteSite, String voteUsername, String serviceSite, boolean realVote) {
 		super(true);
-		setPlayer(voteUsername);
-		setVoteSite(voteSite);
-		setRealVote(realVote);
-		setServiceSite(serviceSite);
+		this.player = voteUsername;
+		this.voteSite = voteSite;
+		this.realVote = realVote;
+		this.serviceSite = serviceSite;
 	}
 
 	/*

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Listeners/PlayerJoinEvent.java

@@ -5,7 +5,6 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.Listeners.AdvancedCoreLoginEvent;
 import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
 import com.Ben12345rocks.VotingPlugin.Main;
@@ -40,13 +39,16 @@ public class PlayerJoinEvent implements Listener {
 	 */
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
 	public void onPlayerLogin(AdvancedCoreLoginEvent event) {
-		if (event.getPlayer() == null || (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)
-				&& AdvancedCoreHook.getInstance().getMysql() == null)) {
+		if (event.getPlayer() == null
+				|| (Main.plugin.getStorageType().equals(UserStorage.MYSQL) && Main.plugin.getMysql() == null)) {
 			return;
 		}
 		Player player = event.getPlayer();
 
 		User user = UserManager.getInstance().getVotingPluginUser(player);
+		if (player.isOp() && plugin.isYmlError()) {
+			user.sendMessage("&cVotingPlugin: Detected yml error, please check console for details");
+		}
 
 		// run remind
 		user.loginMessage();

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Listeners/PlayerVoteListener.java

@@ -6,7 +6,6 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
@@ -55,7 +54,7 @@ public class PlayerVoteListener implements Listener {
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onplayerVote(PlayerVoteEvent event) {
 		String playerName = event.getPlayer();
-		if (!PlayerUtils.getInstance().isValidUser(playerName)) {
+		if (!PlayerUtils.getInstance().isValidUser(playerName, Config.getInstance().isAllowUnJoinedCheckServer())) {
 			if (!config.isAllowUnjoined()) {
 				plugin.getLogger().warning("Player " + playerName
 						+ " has not joined before, disregarding vote, set AllowUnjoined to true to prevent this");
@@ -108,6 +107,7 @@ public class PlayerVoteListener implements Listener {
 
 			// update last vote time
 			user.setTime(voteSite);
+			user.setLastVoteCoolDownCheck(false, voteSite);
 
 			// check first vote rewards
 			SpecialRewards.getInstance().checkFirstVote(user);
@@ -118,8 +118,7 @@ public class PlayerVoteListener implements Listener {
 
 			// check if player has voted on all sites in one day
 
-			if ((user.isOnline() || voteSite.isGiveOffline())
-					&& AdvancedCoreHook.getInstance().getOptions().isProcessRewards()) {
+			if ((user.isOnline() || voteSite.isGiveOffline()) && Main.plugin.getOptions().isProcessRewards()) {
 				user.playerVote(voteSite, true, false);
 				user.closeInv();
 			} else {

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Listeners/VotiferEvent.java

@@ -7,11 +7,13 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
+import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteEvent;
+import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
 import com.vexsoftware.votifier.model.Vote;
 import com.vexsoftware.votifier.model.VotifierEvent;
 
@@ -51,6 +53,7 @@ public class VotiferEvent implements Listener {
 
 		Vote vote = event.getVote();
 		final String voteSite = vote.getServiceName();
+		final String IP = vote.getAddress();
 		final String voteUsername = vote.getUsername().trim();
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
@@ -65,10 +68,12 @@ public class VotiferEvent implements Listener {
 			return;
 		}
 
-		plugin.getLogger().info("Recieved a vote from '" + voteSite + "' by player '" + voteUsername + "'!");
+		plugin.getLogger()
+				.info("Recieved a vote from service site '" + voteSite + "' by player '" + voteUsername + "'!");
 
 		plugin.debug("PlayerUsername: " + voteUsername);
 		plugin.debug("VoteSite: " + voteSite);
+		plugin.debug("IP: " + IP);
 
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
@@ -77,15 +82,26 @@ public class VotiferEvent implements Listener {
 				String voteSiteName = plugin.getVoteSiteName(voteSite);
 
 				ArrayList<String> sites = configVoteSites.getVoteSitesNames();
+				boolean createSite = false;
 				if (sites != null) {
-					if (!sites.contains(voteSiteName) && Config.getInstance().isAutoCreateVoteSites()) {
-						plugin.getLogger()
-								.warning("VoteSite " + voteSiteName + " doe not exist, generaterating one...");
-						ConfigVoteSites.getInstance().generateVoteSite(voteSiteName);
+					if (!sites.contains(voteSiteName)) {
+						createSite = true;
 					}
-				} else if (Config.getInstance().isAutoCreateVoteSites()) {
-					plugin.getLogger().warning("VoteSite " + voteSiteName + " doe not exist, generaterating one...");
+				} else {
+					createSite = true;
+				}
+
+				if (Config.getInstance().isAutoCreateVoteSites() && createSite) {
+					plugin.getLogger().warning("VoteSite with service site '" + voteSiteName
+							+ "' does not exist, attempting to generaterate...");
 					ConfigVoteSites.getInstance().generateVoteSite(voteSiteName);
+
+					ArrayList<String> services = new ArrayList<String>();
+					for (VoteSite site : plugin.getVoteSites()) {
+						services.add(site.getServiceSite());
+					}
+					plugin.getLogger()
+							.info("Current known service sites: " + ArrayUtils.getInstance().makeStringList(services));
 				}
 
 				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName), voteUsername,

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Main.java

@@ -18,19 +18,22 @@ import java.util.TimerTask;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.java.JavaPlugin;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
+import com.Ben12345rocks.AdvancedCore.AdvancedCorePlugin;
 import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
 import com.Ben12345rocks.AdvancedCore.NMSManager.NMSManager;
 import com.Ben12345rocks.AdvancedCore.Rewards.Reward;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardPlaceholderHandle;
+import com.Ben12345rocks.AdvancedCore.Rewards.Injected.RewardInject;
 import com.Ben12345rocks.AdvancedCore.Rewards.Injected.RewardInjectInt;
+import com.Ben12345rocks.AdvancedCore.Rewards.Injected.RewardInjectValidator;
 import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
 import com.Ben12345rocks.AdvancedCore.Util.EditGUI.EditGUIButton;
@@ -51,6 +54,7 @@ import com.Ben12345rocks.VotingPlugin.Commands.TabCompleter.AdminVoteTabComplete
 import com.Ben12345rocks.VotingPlugin.Commands.TabCompleter.VoteTabCompleter;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.CoolDown.CoolDownCheck;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
 import com.Ben12345rocks.VotingPlugin.Listeners.BlockBreak;
 import com.Ben12345rocks.VotingPlugin.Listeners.PlayerCommandSendListener;
@@ -72,6 +76,7 @@ import com.Ben12345rocks.VotingPlugin.Util.PlaceHolders.MVdWPlaceholders;
 import com.Ben12345rocks.VotingPlugin.Util.PlaceHolders.PlaceHolders;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
 import com.Ben12345rocks.VotingPlugin.VoteReminding.VoteReminding;
+import com.vexsoftware.votifier.Votifier;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -79,7 +84,7 @@ import lombok.Setter;
 /**
  * The Class Main.
  */
-public class Main extends JavaPlugin {
+public class Main extends AdvancedCorePlugin {
 
 	/** The config. */
 	public static Config config;
@@ -93,6 +98,9 @@ public class Main extends JavaPlugin {
 	@Getter
 	private LinkedHashMap<TopVoter, LinkedHashMap<User, Integer>> topVoter;
 
+	@Getter
+	private LinkedHashMap<User, Integer> lastMonthTopVoter;
+
 	@Getter
 	@Setter
 	private Updater updater;
@@ -125,9 +133,8 @@ public class Main extends JavaPlugin {
 	@Getter
 	private boolean updateStarted = false;
 
-	public AdvancedCoreHook getAdvancedCoreHook() {
-		return AdvancedCoreHook.getInstance();
-	}
+	@Getter
+	private boolean ymlError = false;
 
 	/**
 	 * Check votifier.
@@ -141,26 +148,66 @@ public class Main extends JavaPlugin {
 		}
 	}
 
+	private boolean checkVotifierLoaded() {
+		try {
+			Class.forName("com.vexsoftware.votifier.Votifier");
+			if (Votifier.getInstance().getVoteReceiver() == null) {
+				return false;
+			}
+		} catch (ClassNotFoundException e) {
+			debug("Using NuVotiifer?");
+		}
+		return true;
+	}
+
+	private void checkYMLError() {
+		if (config.isFailedToRead() || configVoteSites.isFailedToRead()) {
+			ymlError = true;
+		} else if (!config.isFailedToRead() && !configVoteSites.isFailedToRead()) {
+			ymlError = false;
+		}
+
+		if (config.isFailedToRead()) {
+			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					plugin.getLogger().severe("Failed to load Config.yml");
+				}
+			}, 10);
+		}
+
+		if (configVoteSites.isFailedToRead()) {
+			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					plugin.getLogger().severe("Failed to load VoteSites.yml");
+				}
+
+			}, 10);
+		}
+	}
+
 	public void convertDataStorage(UserStorage from, UserStorage to) {
 		if (from == null || to == null) {
 			throw new RuntimeException("Invalid Storage Method");
 		}
-		UserStorage cur = AdvancedCoreHook.getInstance().getStorageType();
-		AdvancedCoreHook.getInstance().getOptions().setStorageType(from);
-		if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)
-				&& AdvancedCoreHook.getInstance().getMysql() != null) {
-			AdvancedCoreHook.getInstance().getMysql().clearCache();
+		UserStorage cur = getStorageType();
+		getOptions().setStorageType(from);
+		if (getStorageType().equals(UserStorage.MYSQL) && getMysql() != null) {
+			getMysql().clearCache();
 		}
 		ArrayList<String> uuids = new ArrayList<String>(UserManager.getInstance().getAllUUIDs());
 
 		while (uuids.size() > 0) {
 			HashMap<User, HashMap<String, String>> data = new HashMap<User, HashMap<String, String>>();
-			AdvancedCoreHook.getInstance().getOptions().setStorageType(from);
-			// AdvancedCoreHook.getInstance().setStorageType(to);
+			getOptions().setStorageType(from);
+			loadUserAPI(getOptions().getStorageType());
+			// setStorageType(to);
 
-			if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)
-					&& AdvancedCoreHook.getInstance().getMysql() != null) {
-				AdvancedCoreHook.getInstance().getMysql().clearCache();
+			if (getStorageType().equals(UserStorage.MYSQL) && getMysql() != null) {
+				getMysql().clearCache();
 			}
 
 			ArrayList<String> converted = new ArrayList<String>();
@@ -182,7 +229,7 @@ public class Main extends JavaPlugin {
 					data.put(user, values);
 					debug("[Convert] Added " + uuid);
 				} catch (Exception e) {
-					AdvancedCoreHook.getInstance().debug(e);
+					debug(e);
 					plugin.getLogger().warning("Exception occoured for '" + uuid + "': " + e.getMessage()
 							+ ", turn debug on to see full stack traces");
 				}
@@ -198,17 +245,17 @@ public class Main extends JavaPlugin {
 			plugin.getLogger()
 					.info("Finished getting data from " + from.toString() + " Converting " + data.size() + " users");
 
-			AdvancedCoreHook.getInstance().getOptions().setStorageType(to);
-			if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)
-					&& AdvancedCoreHook.getInstance().getMysql() != null) {
-				AdvancedCoreHook.getInstance().getMysql().clearCache();
+			getOptions().setStorageType(to);
+			loadUserAPI(getOptions().getStorageType());
+			if (getStorageType().equals(UserStorage.MYSQL) && getMysql() != null) {
+				getMysql().clearCache();
 			}
 
 			writeConvertData(data);
 		}
 
-		AdvancedCoreHook.getInstance().getOptions().setStorageType(cur);
-		AdvancedCoreHook.getInstance().reload();
+		getOptions().setStorageType(cur);
+		reload();
 
 		plugin.getLogger().info("Finished convertting");
 	}
@@ -217,16 +264,6 @@ public class Main extends JavaPlugin {
 		return new ArrayList<User>(set);
 	}
 
-	/**
-	 * Debug.
-	 *
-	 * @param message
-	 *            the message
-	 */
-	public void debug(String message) {
-		AdvancedCoreHook.getInstance().debug(plugin, message);
-	}
-
 	public LinkedHashMap<User, Integer> getTopVoter(TopVoter top) {
 		return topVoter.get(top);
 	}
@@ -242,10 +279,6 @@ public class Main extends JavaPlugin {
 		return UserManager.getInstance().getVotingPluginUser(uuid);
 	}
 
-	public UserManager getUserManager() {
-		return UserManager.getInstance();
-	}
-
 	public VoteParty getVoteParty() {
 		return VoteParty.getInstance();
 	}
@@ -275,31 +308,37 @@ public class Main extends JavaPlugin {
 	/**
 	 * Gets the vote site name.
 	 *
-	 * @param url
+	 * @param urls
 	 *            the url
 	 * @return the vote site name
 	 */
-	public String getVoteSiteName(String url) {
+	public String getVoteSiteName(String... urls) {
 		ArrayList<String> sites = ConfigVoteSites.getInstance().getVoteSitesNames();
-		if (url == null) {
-			return null;
-		}
-		if (sites != null) {
-			for (String siteName : sites) {
-				String URL = ConfigVoteSites.getInstance().getServiceSite(siteName);
-				if (URL != null) {
-					if (URL.equalsIgnoreCase(url)) {
+		for (String url : urls) {
+			if (url == null) {
+				return null;
+			}
+			if (sites != null) {
+				for (String siteName : sites) {
+					String URL = ConfigVoteSites.getInstance().getServiceSite(siteName);
+					if (URL != null) {
+						if (URL.equalsIgnoreCase(url)) {
+							return siteName;
+						}
+					}
+				}
+				for (String siteName : sites) {
+					if (siteName.equalsIgnoreCase(url)) {
 						return siteName;
 					}
 				}
 			}
-			for (String siteName : sites) {
-				if (siteName.equalsIgnoreCase(url)) {
-					return siteName;
-				}
-			}
+			return url;
 		}
-		return url;
+		for (String url : urls) {
+			return url;
+		}
+		return "";
 
 	}
 
@@ -325,6 +364,10 @@ public class Main extends JavaPlugin {
 
 	}
 
+	public UserManager getVotingPluginUserManager() {
+		return UserManager.getInstance();
+	}
+
 	public boolean hasVoteSite(String site) {
 		String siteName = getVoteSiteName(site);
 		for (VoteSite voteSite : getVoteSites()) {
@@ -340,13 +383,30 @@ public class Main extends JavaPlugin {
 
 			@Override
 			public void run() {
-				AdvancedCoreHook.getInstance().getTimer().schedule(new TimerTask() {
+				getTimer().schedule(new TimerTask() {
 
 					@Override
 					public void run() {
-						update();
+						if (plugin != null) {
+							update();
+						} else {
+							cancel();
+						}
 					}
 				}, 1000, 1000 * 60 * Config.getInstance().getDelayBetweenUpdates());
+
+				getTimer().schedule(new TimerTask() {
+
+					@Override
+					public void run() {
+						if (plugin != null) {
+							CoolDownCheck.getInstance().checkAll();
+						} else {
+							cancel();
+						}
+					}
+				}, 1000 * 60 * 10, 1000 * 60 * 5);
+
 			}
 		}, 40L);
 
@@ -565,7 +625,7 @@ public class Main extends JavaPlugin {
 
 			@Override
 			public String getValue() {
-				return "" + AdvancedCoreHook.getInstance().getOptions().isSendScoreboards();
+				return "" + getOptions().isSendScoreboards();
 			}
 		});
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("numberofuser") {
@@ -577,6 +637,10 @@ public class Main extends JavaPlugin {
 				num = num * 100;
 				int num2 = (total + 100) / 100;
 				num2 = num2 * 100;
+				if (total < 1000) {
+					num = 0;
+					num2 = 1000;
+				}
 				return "" + num + "-" + num2;
 			}
 		});
@@ -584,14 +648,14 @@ public class Main extends JavaPlugin {
 
 			@Override
 			public String getValue() {
-				return AdvancedCoreHook.getInstance().getOptions().getStorageType().toString();
+				return getOptions().getStorageType().toString();
 			}
 		});
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("DisableCheckOnWorldChange") {
 
 			@Override
 			public String getValue() {
-				return "" + AdvancedCoreHook.getInstance().getOptions().isDisableCheckOnWorldChange();
+				return "" + getOptions().isDisableCheckOnWorldChange();
 			}
 		});
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("votereminding_enabled") {
@@ -680,42 +744,13 @@ public class Main extends JavaPlugin {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.bukkit.plugin.java.JavaPlugin#onDisable()
-	 */
 	@Override
-	public void onDisable() {
-		new Timer().schedule(new TimerTask() {
-
-			@Override
-			public void run() {
-				Signs.getInstance().storeSigns();
-			}
-		}, 0);
-		HandlerList.unregisterAll(plugin);
-		plugin = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.bukkit.plugin.java.JavaPlugin#onEnable()
-	 */
-	@Override
-	public void onEnable() {
-		plugin = this;
-
-		setupFiles();
-		loadVoteSites();
-		AdvancedCoreHook.getInstance().setJenkinsSite("ben12345rocks.com");
-		updateAdvancedCoreHook();
-		AdvancedCoreHook.getInstance().loadHook(this);
+	public void onPostLoad() {
 		registerCommands();
 		registerEvents();
 		checkVotifier();
 		CheckUpdate.getInstance().startUp();
 		VoteReminding.getInstance().loadRemindChecking();
-
 		plugin.signs = new ArrayList<SignHandler>();
 
 		Bukkit.getScheduler().runTask(plugin, new Runnable() {
@@ -726,6 +761,15 @@ public class Main extends JavaPlugin {
 			}
 		});
 
+		lastMonthTopVoter = new LinkedHashMap<User, Integer>();
+		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				TopVoterHandler.getInstance().loadLastMonth();
+				debug("Loaded last month top voters");
+			}
+		});
 		topVoter = new LinkedHashMap<TopVoter, LinkedHashMap<User, Integer>>();
 		for (TopVoter top : TopVoter.values()) {
 			topVoter.put(top, new LinkedHashMap<User, Integer>());
@@ -745,64 +789,90 @@ public class Main extends JavaPlugin {
 
 		metrics();
 
-		AdvancedCoreHook.getInstance().getJavascriptEngineRequests().add(new JavascriptPlaceholderRequest("User") {
+		// javascript api
+		getJavascriptEngineRequests().add(new JavascriptPlaceholderRequest("User") {
 
 			@Override
 			public Object getObject(OfflinePlayer player) {
-				return getUserManager().getVotingPluginUser(player);
+				return getVotingPluginUserManager().getVotingPluginUser(player);
 			}
 		});
+		getJavascriptEngine().put("VotingPluginHooks", VotingPluginHooks.getInstance());
 
 		loadTimer();
 
+		// placeholderapi loading
 		PlaceHolders.getInstance().load();
 
+		// MVDW placeholders, may be removed in the future
 		if (Bukkit.getPluginManager().isPluginEnabled("MVdWPlaceholderAPI")) {
 			MVdWPlaceholders.getInstance().loadMVdWPlaceholders();
 		}
 
 		// set columns
-		if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("TopVoterIgnore", "VARCHAR(5)");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("CheckWorld", "VARCHAR(5)");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("Reminded", "VARCHAR(5)");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("DisableBroadcast", "VARCHAR(5)");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("LastOnline", "VARCHAR(20)");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("PlayerName", "VARCHAR(30)");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("DailyTotal", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("WeeklyTotal", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("DayVoteStreak", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("BestDayVoteStreak", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("WeekVoteStreak", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("BestWeekVoteStreak", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("VotePartyVotes", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("MonthVoteStreak", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("Points", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("HighestDailyTotal", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("MileStoneTotal", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("AllTimeTotal", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("HighestMonthlyTotal", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("MilestoneCount", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("MonthTotal", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
+		if (getStorageType().equals(UserStorage.MYSQL)) {
+			getMysql().alterColumnType("TopVoterIgnore", "VARCHAR(5)");
+			getMysql().alterColumnType("CheckWorld", "VARCHAR(5)");
+			getMysql().alterColumnType("Reminded", "VARCHAR(5)");
+			getMysql().alterColumnType("DisableBroadcast", "VARCHAR(5)");
+			getMysql().alterColumnType("LastOnline", "VARCHAR(20)");
+			getMysql().alterColumnType("PlayerName", "VARCHAR(30)");
+			getMysql().alterColumnType("DailyTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("WeeklyTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("DayVoteStreak", "INT DEFAULT '0'");
+			getMysql().alterColumnType("BestDayVoteStreak", "INT DEFAULT '0'");
+			getMysql().alterColumnType("WeekVoteStreak", "INT DEFAULT '0'");
+			getMysql().alterColumnType("BestWeekVoteStreak", "INT DEFAULT '0'");
+			getMysql().alterColumnType("VotePartyVotes", "INT DEFAULT '0'");
+			getMysql().alterColumnType("MonthVoteStreak", "INT DEFAULT '0'");
+			getMysql().alterColumnType("Points", "INT DEFAULT '0'");
+			getMysql().alterColumnType("HighestDailyTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("MileStoneTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("AllTimeTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("HighestMonthlyTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("MilestoneCount", "INT DEFAULT '0'");
+			getMysql().alterColumnType("MonthTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
 		}
 
-		RewardHandler.getInstance().getInjectedRewards().add(new RewardInjectInt("Points", 0) {
+		// Add rewards
+		RewardHandler.getInstance().addInjectedReward(new RewardInjectInt("Points", 0) {
 
 			@Override
-			public void onRewardRequest(Reward reward, com.Ben12345rocks.AdvancedCore.UserManager.User user, int num,
+			public String onRewardRequest(Reward reward, com.Ben12345rocks.AdvancedCore.UserManager.User user, int num,
 					HashMap<String, String> placeholders) {
 				UserManager.getInstance().getVotingPluginUser(user).addPoints(num);
+				return null;
 			}
-		}.addEditButton(new EditGUIButton(new ItemBuilder(Material.PAPER), new EditGUIValueNumber("Points", null) {
+		}.synchronize().addEditButton(
+				new EditGUIButton(new ItemBuilder(Material.PAPER), new EditGUIValueNumber("Points", null) {
 
-			@Override
-			public void setValue(Player player, Number value) {
-				Reward reward = (Reward) getInv().getData("Reward");
-				reward.getConfig().set("Points", value.intValue());
-			}
-		})));
+					@Override
+					public void setValue(Player player, Number value) {
+						Reward reward = (Reward) getInv().getData("Reward");
+						reward.getConfig().set("Points", value.intValue());
+					}
+				})).validator(new RewardInjectValidator() {
+
+					@Override
+					public void onValidate(Reward reward, RewardInject inject, ConfigurationSection data) {
+						if (data.getInt(inject.getPath(), -1) == 0) {
+							warning(reward, inject, "Points can not be 0");
+						}
+					}
+				}));
+
+		for (final TopVoter top : TopVoter.values()) {
+			RewardHandler.getInstance().addPlaceholder(new RewardPlaceholderHandle("Total_" + top.toString()) {
+
+				@Override
+				public String getValue(Reward reward, com.Ben12345rocks.AdvancedCore.UserManager.User user) {
+					User vUser = UserManager.getInstance().getVotingPluginUser(user);
+					return "" + vUser.getTotal(top);
+				}
+			});
+		}
 
 		plugin.getLogger().info("Enabled VotingPlugin " + plugin.getDescription().getVersion());
 
@@ -837,15 +907,67 @@ public class Main extends JavaPlugin {
 				@Override
 				public void run() {
 					plugin.getLogger().warning(
-							"Detected an issue with voting sites, check the plugin startup log for more details");
+							"Detected an issue with voting sites, check the server startup log for more details");
 				}
 			}, 30l);
 		}
+		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				if (!checkVotifierLoaded()) {
+					plugin.getLogger().warning("Detected votifier not loaded properly, check startup for details");
+				}
+			}
+		});
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.bukkit.plugin.java.JavaPlugin#onEnable()
+	 */
+	@Override
+	public void onPreLoad() {
+		plugin = this;
+
+		// disable plugin for older versions below 1.12
 
 		if (NMSManager.getInstance().isVersion("1.7", "1.8", "1.9", "1.10", "1.11", "1.12")) {
-			plugin.getLogger().severe("Detected running " + NMSManager.getInstance().getVersion()
-					+ ", this version is not supported on this build. Support is limited");
+			plugin.getLogger().severe("Detected running " + Bukkit.getVersion()
+					+ ", this version is not supported on this build, read the plugin page. Disabling...");
+			if (!Config.getInstance().isOverrideVersionDisable()) {
+				Bukkit.getPluginManager().disablePlugin(this);
+				return;
+			} else {
+				plugin.getLogger().warning("Overriding version disable, beware of using this! This may cause issues!");
+			}
 		}
+
+		setupFiles();
+
+		loadVoteSites();
+
+		setJenkinsSite("ben12345rocks.com");
+		updateAdvancedCoreHook();
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.bukkit.plugin.java.JavaPlugin#onDisable()
+	 */
+	@Override
+	public void onUnLoad() {
+		new Timer().schedule(new TimerTask() {
+
+			@Override
+			public void run() {
+				Signs.getInstance().storeSigns();
+			}
+		}, 0);
+		HandlerList.unregisterAll(plugin);
+		plugin = null;
 	}
 
 	/**
@@ -871,6 +993,7 @@ public class Main extends JavaPlugin {
 		if (perm != null) {
 			if (Config.getInstance().getGiveDefaultPermission()) {
 				perm.setDefault(PermissionDefault.TRUE);
+				getLogger().info("Giving VotingPlugin.Player permission by default, can be disabled in the config");
 			} else {
 				perm.setDefault(PermissionDefault.OP);
 			}
@@ -894,6 +1017,7 @@ public class Main extends JavaPlugin {
 		pm.registerEvents(new PlayerInteract(this), this);
 		pm.registerEvents(new VotingPluginUpdateEvent(this), this);
 		pm.registerEvents(new PlayerCommandSendListener(this), this);
+		pm.registerEvents(new CoolDownCheck(this), this);
 
 		plugin.debug("Loaded Events");
 
@@ -902,49 +1026,39 @@ public class Main extends JavaPlugin {
 	/**
 	 * Reload.
 	 */
+	@Override
 	public void reload() {
 		setUpdate(true);
+
 		config.reloadData();
 		config.loadValues();
+
 		configVoteSites.reloadData();
+		checkYMLError();
+
 		updateAdvancedCoreHook();
 		plugin.loadVoteSites();
-		AdvancedCoreHook.getInstance().setConfigData(Config.getInstance().getData());
-		AdvancedCoreHook.getInstance().reload();
+		reloadAdvancedCore();
 		PlaceHolders.getInstance().load();
+		CoolDownCheck.getInstance().checkAll();
+		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				update();
+			}
+		});
 	}
 
 	private void setupFiles() {
-		try {
-			config = Config.getInstance();
-			config.setup();
-			config.loadValues();
-		} catch (Exception e) {
-			e.printStackTrace();
-			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+		config = Config.getInstance();
+		config.setup();
+		config.loadValues();
 
-				@Override
-				public void run() {
-					plugin.getLogger().severe("Failed to load Config.yml");
-					e.printStackTrace();
-				}
-			}, 10);
-		}
-		try {
-			configVoteSites = ConfigVoteSites.getInstance();
-			configVoteSites.setup();
-		} catch (Exception e) {
-			e.printStackTrace();
-			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+		configVoteSites = ConfigVoteSites.getInstance();
+		configVoteSites.setup();
 
-				@Override
-				public void run() {
-					plugin.getLogger().severe("Failed to load VoteSites.yml");
-					e.printStackTrace();
-				}
-
-			}, 10);
-		}
+		checkYMLError();
 
 		plugin.debug("Loaded Files");
 
@@ -961,14 +1075,14 @@ public class Main extends JavaPlugin {
 					update = false;
 
 					synchronized (plugin) {
-						if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
-							if (AdvancedCoreHook.getInstance().getMysql() == null) {
+						if (getStorageType().equals(UserStorage.MYSQL)) {
+							if (getMysql() == null) {
 								plugin.debug("MySQL not loaded yet");
 								return;
 							} else if (Config.getInstance().isClearCacheOnUpdate()) {
-								AdvancedCoreHook.getInstance().getMysql().clearCache();
+								getMysql().clearCache();
 							} else {
-								AdvancedCoreHook.getInstance().getMysql().clearCacheBasic();
+								getMysql().clearCacheBasic();
 							}
 						}
 
@@ -981,7 +1095,7 @@ public class Main extends JavaPlugin {
 								if (uuid != null && !uuid.isEmpty()) {
 									User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
 									users.add(user);
-									// AdvancedCoreHook.getInstance().extraDebug("Loading " + uuid);
+									// extraDebug("Loading " + uuid);
 									// java.lang.Thread.sleep(5000);
 								}
 							}
@@ -1000,8 +1114,8 @@ public class Main extends JavaPlugin {
 							time1 = ((System.currentTimeMillis() - time) / 1000);
 							plugin.debug("Background task finished in " + time1 + " seconds");
 						} catch (Exception ex) {
-							ex.printStackTrace();
 							plugin.getLogger().info("Looks like something went wrong.");
+							ex.printStackTrace();
 						}
 					}
 
@@ -1012,13 +1126,13 @@ public class Main extends JavaPlugin {
 	}
 
 	public void updateAdvancedCoreHook() {
-		AdvancedCoreHook.getInstance().getJavascriptEngine().put("VotingPlugin", this);
-		AdvancedCoreHook.getInstance().allowDownloadingFromSpigot(15358);
-		AdvancedCoreHook.getInstance().setConfigData(Config.getInstance().getData());
+		getJavascriptEngine().put("VotingPlugin", this);
+		allowDownloadingFromSpigot(15358);
+		setConfigData(Config.getInstance().getData());
 	}
 
 	private void writeConvertData(HashMap<User, HashMap<String, String>> data) {
-		boolean checkInt = AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL);
+		boolean checkInt = getStorageType().equals(UserStorage.MYSQL);
 		for (Entry<User, HashMap<String, String>> entry : data.entrySet()) {
 			try {
 				for (Entry<String, String> values : entry.getValue().entrySet()) {

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

@@ -14,10 +14,10 @@ import java.util.stream.Collectors;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.TimeChecker;
 import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
@@ -25,6 +25,7 @@ import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerReceivePointsEvent;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteCoolDownEndEvent;
 import com.Ben12345rocks.VotingPlugin.SpecialRewards.SpecialRewards;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
@@ -113,47 +114,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		setOfflineVotes(offlineVotes);
 	}
 
-	public boolean hasPercentageTotal(TopVoter top, double percentage, LocalDateTime time) {
-		int total = getTotal(top);
-		switch (top) {
-			case Daily:
-				return total / plugin.getVoteSites().size() * 100 > percentage;
-			case Monthly:
-				return total / (plugin.getVoteSites().size() * time.getMonth().length(false)) * 100 > percentage;
-			case Weekly:
-				return total / (plugin.getVoteSites().size() * 7) * 100 > percentage;
-			default:
-				return false;
-		}
-	}
-
-	public void checkDayVoteStreak() {
-		if (!voteStreakUpdatedToday(LocalDateTime.now())) {
-			if (!Config.getInstance().isVoteStreakRequirementUsePercentage()
-					|| hasPercentageTotal(TopVoter.Daily, Config.getInstance().getVoteStreakRequirementDay(), null)) {
-				addDayVoteStreak();
-				SpecialRewards.getInstance().checkVoteStreak(this, "Day");
-				setDayVoteStreakLastUpdate(System.currentTimeMillis());
-			}
-		}
-	}
-
-	public boolean voteStreakUpdatedToday(LocalDateTime time) {
-		return MiscUtils.getInstance().getTime(getDayVoteStreakLastUpdate()).getDayOfYear() == time.getDayOfYear();
-	}
-
-	public long getDayVoteStreakLastUpdate() {
-		String str = getData().getString("DayVoteStreakLastUpdate");
-		if (str.isEmpty()) {
-			return 0;
-		}
-		return Long.parseLong(str);
-	}
-
-	public void setDayVoteStreakLastUpdate(long time) {
-		getData().setString("DayVoteStreakLastUpdate", "" + time);
-	}
-
 	/**
 	 * Adds the points.
 	 */
@@ -177,7 +137,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		if (event.isCancelled()) {
 			return;
 		}
-
 		setPoints(getPoints() + event.getPoints());
 	}
 
@@ -242,8 +201,9 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		if (time == 0) {
 			return true;
 		}
-		LocalDateTime now = LocalDateTime.now();
-		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault());
+		LocalDateTime now = TimeChecker.getInstance().getTime();
+		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault())
+				.plusHours(Main.plugin.getOptions().getTimeHourOffSet());
 
 		if (!voteSite.isVoteDelayDaily()) {
 			int votedelay = ConfigVoteSites.getInstance().getVoteDelay(siteName);
@@ -302,6 +262,28 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		return true;
 	}
 
+	public void checkCoolDownEvents() {
+		for (VoteSite site : plugin.getVoteSites()) {
+			if (canVoteSite(site) != getLastCoolDownCheck(site)) {
+				plugin.debug(getPlayerName() + " vote cooldown ended: " + site.getKey());
+				PlayerVoteCoolDownEndEvent event = new PlayerVoteCoolDownEndEvent(this, site);
+				plugin.getServer().getPluginManager().callEvent(event);
+				setLastVoteCoolDownCheck(true, site);
+			}
+		}
+	}
+
+	public void checkDayVoteStreak() {
+		if (!voteStreakUpdatedToday(LocalDateTime.now())) {
+			if (!Config.getInstance().isVoteStreakRequirementUsePercentage()
+					|| hasPercentageTotal(TopVoter.Daily, Config.getInstance().getVoteStreakRequirementDay(), null)) {
+				addDayVoteStreak();
+				SpecialRewards.getInstance().checkVoteStreak(this, "Day");
+				setDayVoteStreakLastUpdate(System.currentTimeMillis());
+			}
+		}
+	}
+
 	public void clearOfflineRewards() {
 		setOfflineVotes(new ArrayList<String>());
 		setOfflineRewards(new ArrayList<String>());
@@ -340,6 +322,14 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		return getData().getInt("DayVoteStreak");
 	}
 
+	public long getDayVoteStreakLastUpdate() {
+		String str = getData().getString("DayVoteStreakLastUpdate");
+		if (str.isEmpty()) {
+			return 0;
+		}
+		return Long.parseLong(str);
+	}
+
 	public boolean getDisableBroadcast() {
 		return getUserData().getBoolean("DisableBroadcast");
 	}
@@ -369,6 +359,35 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		return getData().getInt("HighestWeeklyTotal");
 	}
 
+	public boolean getLastCoolDownCheck(VoteSite site) {
+		HashMap<VoteSite, Boolean> array = getLastCoolDownCheckArray();
+		if (array.containsKey(site)) {
+			return array.get(site).booleanValue();
+		}
+		return true;
+	}
+
+	public HashMap<VoteSite, Boolean> getLastCoolDownCheckArray() {
+		HashMap<VoteSite, Boolean> lastVotesCheck = new HashMap<VoteSite, Boolean>();
+		ArrayList<String> LastVotesCheckList = getUserData().getStringList("LastVoteCoolDownCheck");
+		for (String str : LastVotesCheckList) {
+			String[] data = str.split("//");
+			if (data.length > 1 && plugin.hasVoteSite(data[0])) {
+				VoteSite site = plugin.getVoteSite(data[0]);
+				if (site != null) {
+					Boolean value = Boolean.FALSE;
+					try {
+						value = Boolean.valueOf(data[1]);
+					} catch (NumberFormatException e) {
+						plugin.debug("Not value: " + data[1]);
+					}
+					lastVotesCheck.put(site, value);
+				}
+			}
+		}
+		return lastVotesCheck;
+	}
+
 	public int getLastMonthTotal() {
 		return getData().getInt("LastMonthTotal");
 	}
@@ -503,6 +522,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	}
 
 	public void giveOfflineOtherRewards() {
+		// old reward api, will be removed in the future
 		ArrayList<String> offlineRewards = getOfflineOtherRewards();
 		for (String str : offlineRewards) {
 			if (str.equalsIgnoreCase("FirstVote")) {
@@ -582,6 +602,20 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		return false;
 	}
 
+	public boolean hasPercentageTotal(TopVoter top, double percentage, LocalDateTime time) {
+		int total = getTotal(top);
+		switch (top) {
+			case Daily:
+				return total / plugin.getVoteSites().size() * 100 > percentage;
+			case Monthly:
+				return total / (plugin.getVoteSites().size() * time.getMonth().length(false)) * 100 > percentage;
+			case Weekly:
+				return total / (plugin.getVoteSites().size() * 7) * 100 > percentage;
+			default:
+				return false;
+		}
+	}
+
 	public boolean isReminded() {
 		return getUserData().getBoolean("Reminded");
 	}
@@ -603,11 +637,11 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	 * Off vote.
 	 */
 	public void offVote() {
-		if (!AdvancedCoreHook.getInstance().getOptions().isProcessRewards()) {
-			AdvancedCoreHook.getInstance().debug("Processing rewards is disabled");
+		if (!Main.plugin.getOptions().isProcessRewards()) {
+			Main.plugin.debug("Processing rewards is disabled");
 			return;
 		}
-		AdvancedCoreHook.getInstance().extraDebug("Checking offline vote site votes");
+		Main.plugin.extraDebug("Checking offline vote site votes");
 		Player player = getPlayer();
 		if (player != null) {
 			boolean topVoterIngorePerm = player.hasPermission("VotingPlugin.TopVoter.Ignore");
@@ -620,6 +654,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 				sendVoteEffects(true);
 			}
 
+			setOfflineVotes(new ArrayList<String>());
+
 			for (int i = 0; i < offlineVotes.size(); i++) {
 				if (plugin.hasVoteSite(offlineVotes.get(i))) {
 					plugin.debug("Giving offline site reward: " + offlineVotes.get(i));
@@ -629,8 +665,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 				}
 			}
 
-			setOfflineVotes(new ArrayList<String>());
-
 			giveOfflineOtherRewards();
 		}
 	}
@@ -669,9 +703,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	}
 
 	public void resetTotals(TopVoter topVoter) {
-		if (topVoter.equals(TopVoter.Monthly)) {
-			setLastMonthTotal(getTotal(TopVoter.Monthly));
-		}
 		setTotal(topVoter, 0);
 	}
 
@@ -688,7 +719,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 
 	@Deprecated
 	public void setAllTimeTotal(int allTimeTotal) {
-		getUserData().setInt("AllTimeTotal", allTimeTotal);
+		setTotal(TopVoter.AllTime, allTimeTotal);
 	}
 
 	public void setBestDayVoteStreak(int streak) {
@@ -705,7 +736,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 
 	@Deprecated
 	public void setDailyTotal(int total) {
-		getUserData().setInt("DailyTotal", total);
+		setTotal(TopVoter.Daily, total);
 	}
 
 	public void setDayVoteStreak(int streak) {
@@ -715,6 +746,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		}
 	}
 
+	public void setDayVoteStreakLastUpdate(long time) {
+		getData().setString("DayVoteStreakLastUpdate", "" + time);
+	}
+
 	public void setDisableBroadcast(boolean value) {
 		getUserData().setBoolean("DisableBroadcast", value);
 	}
@@ -746,10 +781,25 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		getData().setInt("HighestWeeklyTotal", total);
 	}
 
+	public void setLastCoolDownCheckArray(HashMap<VoteSite, Boolean> lastVotesCheck) {
+		ArrayList<String> data = new ArrayList<String>();
+		for (Entry<VoteSite, Boolean> entry : lastVotesCheck.entrySet()) {
+			String str = entry.getKey().getKey() + "//" + entry.getValue().booleanValue();
+			data.add(str);
+		}
+		getUserData().setStringList("LastVoteCoolDownCheck", data);
+	}
+
 	public void setLastMonthTotal(int total) {
 		getData().setInt("LastMonthTotal", total);
 	}
 
+	public void setLastVoteCoolDownCheck(boolean lastDelay, VoteSite voteSite) {
+		HashMap<VoteSite, Boolean> array = getLastCoolDownCheckArray();
+		array.put(voteSite, Boolean.valueOf(lastDelay));
+		setLastCoolDownCheckArray(array);
+	}
+
 	public void setLastVotes(HashMap<VoteSite, Long> lastVotes) {
 		ArrayList<String> data = new ArrayList<String>();
 		for (Entry<VoteSite, Long> entry : lastVotes.entrySet()) {
@@ -765,7 +815,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 
 	@Deprecated
 	public void setMonthTotal(int total) {
-		getData().setInt("MonthTotal", total);
+		setTotal(TopVoter.Monthly, total);
 	}
 
 	public void setMonthVoteStreak(int streak) {
@@ -820,6 +870,12 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 				getUserData().setInt("DailyTotal", value);
 				break;
 			case Monthly:
+				if (Config.getInstance().isLimitMonthlyVotes()) {
+					int days = TimeChecker.getInstance().getTime().getMonth().maxLength();
+					if (value > days) {
+						value = days * plugin.getVoteSites().size();
+					}
+				}
 				getData().setInt("MonthTotal", value);
 				break;
 			case Weekly:
@@ -841,7 +897,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 
 	@Deprecated
 	public void setWeeklyTotal(int total) {
-		getUserData().setInt("WeeklyTotal", total);
+		setTotal(TopVoter.Weekly, total);
 	}
 
 	public void setWeekVoteStreak(int streak) {
@@ -861,4 +917,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		return true;
 	}
 
+	public boolean voteStreakUpdatedToday(LocalDateTime time) {
+		return MiscUtils.getInstance().getTime(getDayVoteStreakLastUpdate()).getDayOfYear() == time.getDayOfYear();
+	}
+
 }

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

@@ -126,6 +126,8 @@ public class VoteSite {
 			}
 
 			MiscUtils.getInstance().broadcast(bc, players);
+		} else {
+			plugin.debug(user.getPlayerName() + " is vanished, not broadcasting");
 		}
 	}
 
@@ -142,6 +144,10 @@ public class VoteSite {
 		}
 	}
 
+	public ConfigurationSection getSiteData() {
+		return configVoteSites.getData(key);
+	}
+
 	/**
 	 * Give rewards.
 	 *

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Signs/SignHandler.java

@@ -9,8 +9,8 @@ import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.Sign;
 import org.bukkit.block.Skull;
+import org.bukkit.block.data.Directional;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
@@ -250,7 +250,7 @@ public class SignHandler {
 					}
 
 				} catch (Exception ex) {
-					AdvancedCoreHook.getInstance().debug(ex);
+					Main.plugin.debug(ex);
 				}
 			}
 		}, delay);
@@ -258,9 +258,9 @@ public class SignHandler {
 
 	public void updateSkulls(Location loc1, Location loc2) {
 		BlockState state = getLocation().getBlock().getState();
-		if (state instanceof Sign) {
-			org.bukkit.material.Sign s = (org.bukkit.material.Sign) state.getData();
-			Block b = location.getBlock().getRelative(s.getAttachedFace());
+		if (state instanceof Sign && state.getBlockData() instanceof Directional) {
+			Directional s = (Directional) state.getBlockData();
+			Block b = location.getBlock().getRelative(s.getFacing());
 			Block above = b.getRelative(BlockFace.UP);
 			if (checkSkull(above)) {
 				return;

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Test/VoteTester.java

@@ -2,9 +2,12 @@ package com.Ben12345rocks.VotingPlugin.Test;
 
 import java.util.ArrayList;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
+import com.Ben12345rocks.AdvancedCore.Rewards.Reward;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteEvent;
+import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 
 public class VoteTester {
@@ -17,6 +20,33 @@ public class VoteTester {
 
 	private Main plugin = Main.plugin;
 
+	public void testRewards(int amount, String name, String rewardName) {
+		long time1 = System.currentTimeMillis();
+		ArrayList<Long> timesPerReward = new ArrayList<Long>();
+		User user = UserManager.getInstance().getVotingPluginUser(name);
+		Reward reward = RewardHandler.getInstance().getReward(rewardName);
+		int rewardsGiven = 0;
+		for (int i = 0; i < amount; i++) {
+			long start1 = System.currentTimeMillis();
+			if (reward.canGiveReward(user, new RewardOptions())) {
+				rewardsGiven++;
+				RewardHandler.getInstance().giveReward(user, reward, new RewardOptions().setIgnoreRequirements(true));
+			}
+			long start2 = System.currentTimeMillis();
+			timesPerReward.add(start2 - start1);
+		}
+		long time2 = System.currentTimeMillis();
+		long time = time2 - time1;
+		long timeTotal = 0;
+		for (Long t : timesPerReward) {
+			timeTotal += t.longValue();
+		}
+		long timePerRewardAvg = timeTotal / timesPerReward.size();
+		Main.plugin.getLogger().info("Time to process rewards (" + amount + "): " + time + " ms, average per reward "
+				+ timePerRewardAvg + " ms. " + Main.plugin.getStorageType() + ", "
+				+ UserManager.getInstance().getAllUUIDs().size() + " users. " + rewardsGiven + " rewards given");
+	}
+
 	public void testVotes(int amount, String name, String site) {
 		long time1 = System.currentTimeMillis();
 		ArrayList<Long> timesPerVote = new ArrayList<Long>();
@@ -37,9 +67,8 @@ public class VoteTester {
 		long timePerVoteAvg = timeTotal / timesPerVote.size();
 		Main.plugin.getLogger()
 				.info("Time to process votes (" + amount + "): " + time + " ms, average per vote " + timePerVoteAvg
-						+ " ms. " + AdvancedCoreHook.getInstance().getStorageType() + ", "
-						+ UserManager.getInstance().getAllUUIDs().size() + " users. "
-						+ Main.plugin.getVoteSites().size() + " votesites");
+						+ " ms. " + Main.plugin.getStorageType() + ", " + UserManager.getInstance().getAllUUIDs().size()
+						+ " users. " + Main.plugin.getVoteSites().size() + " votesites");
 	}
 
 }

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/TopVoter/TopVoterHandler.java

@@ -16,7 +16,6 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.DateChangedEvent;
 import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.DayChangeEvent;
 import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.MonthChangeEvent;
@@ -97,10 +96,31 @@ public class TopVoterHandler implements Listener {
 		return place;
 	}
 
+	public void loadLastMonth() {
+		if (Config.getInstance().isLastMonthGUI()) {
+			plugin.getLastMonthTopVoter().clear();
+
+			LinkedHashMap<User, Integer> totals = new LinkedHashMap<User, Integer>();
+			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+				int total = user.getLastMonthTotal();
+				if (total > 0) {
+					totals.put(user, total);
+				}
+			}
+
+			plugin.getLastMonthTopVoter().putAll(sortByValues(totals, false));
+
+			plugin.debug("Loaded last month top voters");
+		}
+
+	}
+
 	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
 	public void onDateChanged(DateChangedEvent event) {
 		plugin.setUpdate(true);
 		plugin.update();
+		loadLastMonth();
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -119,7 +139,7 @@ public class TopVoterHandler implements Listener {
 		}
 
 		if (Config.getInstance().getStoreTopVotersDaily()) {
-			plugin.debug("Storing TopVoters Daily");
+			plugin.getLogger().info("Saving TopVoters Daily");
 			storeTopVoters(TopVoter.Daily);
 		}
 
@@ -162,13 +182,15 @@ public class TopVoterHandler implements Listener {
 				}
 			}
 
+			user.setLastMonthTotal(user.getTotal(TopVoter.Monthly));
+
 			if (user.getHighestMonthlyTotal() < user.getTotal(TopVoter.Monthly)) {
 				user.setHighestMonthlyTotal(user.getTotal(TopVoter.Monthly));
 			}
 		}
 
 		if (Config.getInstance().getStoreTopVotersMonthly()) {
-			plugin.debug("Storing TopVoters Monthly");
+			plugin.getLogger().info("Saving TopVoters Monthly");
 			storeTopVoters(TopVoter.Monthly);
 		}
 
@@ -193,6 +215,7 @@ public class TopVoterHandler implements Listener {
 				lastTotal = user.getTotal(TopVoter.Monthly);
 			}
 		}
+
 		resetTotals(TopVoter.Monthly);
 
 		if (Config.getInstance().getResetMilestonesMonthly()) {
@@ -231,7 +254,7 @@ public class TopVoterHandler implements Listener {
 		}
 
 		if (Config.getInstance().getStoreTopVotersWeekly()) {
-			plugin.debug("Storing TopVoters Weekly");
+			plugin.getLogger().info("Saving TopVoters Weekly");
 			storeTopVoters(TopVoter.Weekly);
 		}
 
@@ -462,7 +485,7 @@ public class TopVoterHandler implements Listener {
 			try {
 				line = line.replace("%player%", entry.getKey().getPlayerName());
 			} catch (Exception ex) {
-				AdvancedCoreHook.getInstance().debug(ex);
+				Main.plugin.debug(ex);
 			}
 			line = line.replace("%votes%", "" + entry.getValue());
 
@@ -489,7 +512,7 @@ public class TopVoterHandler implements Listener {
 			try {
 				line = line.replace("%player%", users.get(i).getPlayerName());
 			} catch (Exception ex) {
-				AdvancedCoreHook.getInstance().debug(ex);
+				Main.plugin.debug(ex);
 			}
 			line = line.replace("%votes%", "" + plugin.getTopVoter(TopVoter.Monthly).get(users.get(i)));
 			msg.add(line);
@@ -515,7 +538,7 @@ public class TopVoterHandler implements Listener {
 			try {
 				line = line.replace("%player%", entry.getKey().getPlayerName());
 			} catch (Exception ex) {
-				AdvancedCoreHook.getInstance().debug(ex);
+				Main.plugin.debug(ex);
 			}
 			line = line.replace("%votes%", "" + entry.getValue());
 

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Util/PlaceHolders/MVdWPlaceholders.java

@@ -2,7 +2,9 @@ package com.Ben12345rocks.VotingPlugin.Util.PlaceHolders;
 
 import org.bukkit.Bukkit;
 
+import com.Ben12345rocks.AdvancedCore.Util.Placeholder.PlaceHolder;
 import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 
 import be.maximvdw.placeholderapi.PlaceholderAPI;
@@ -49,7 +51,7 @@ public class MVdWPlaceholders {
 	public void loadMVdWPlaceholders() {
 		if (Bukkit.getPluginManager().isPluginEnabled("MVdWPlaceholderAPI")) {
 			// The plugin is enabled
-			for (final PlaceHolder place : PlaceHolders.getInstance().getPlaceholders()) {
+			for (final PlaceHolder<User> place : PlaceHolders.getInstance().getPlaceholders()) {
 				String str = place.getIdentifier();
 				if (!str.endsWith("_")) {
 					PlaceholderAPI.registerPlaceholder(Main.plugin, "VotingPlugin_" + str, new PlaceholderReplacer() {
@@ -66,7 +68,7 @@ public class MVdWPlaceholders {
 
 			}
 
-			for (final PlaceHolder place : PlaceHolders.getInstance().getNonPlayerPlaceholders()) {
+			for (final PlaceHolder<User> place : PlaceHolders.getInstance().getNonPlayerPlaceholders()) {
 				String str = place.getIdentifier();
 				if (!str.endsWith("_")) {
 					PlaceholderAPI.registerPlaceholder(Main.plugin, "VotingPlugin_" + str, new PlaceholderReplacer() {

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Util/PlaceHolders/PlaceHolder.java

@@ -1,56 +0,0 @@
-package com.Ben12345rocks.VotingPlugin.Util.PlaceHolders;
-
-import org.bukkit.OfflinePlayer;
-
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
-import com.Ben12345rocks.VotingPlugin.Objects.User;
-
-import lombok.Getter;
-
-public abstract class PlaceHolder {
-	@Getter
-	private String identifier;
-	@Getter
-	private boolean useStartsWith = false;
-	@Getter
-	private String description;
-
-	public PlaceHolder(String identifier) {
-		this.identifier = identifier;
-	}
-
-	public PlaceHolder(String identifier, boolean useStartsWith) {
-		this.identifier = identifier;
-		this.useStartsWith = useStartsWith;
-	}
-
-	public boolean hasDescription() {
-		return description != null;
-	}
-
-	public boolean matches(String identifier) {
-		if (isUseStartsWith()) {
-			if (StringUtils.getInstance().startsWithIgnoreCase(identifier, getIdentifier())) {
-				return true;
-			}
-		} else {
-			if (getIdentifier().equalsIgnoreCase(identifier)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public abstract String placeholderRequest(OfflinePlayer p, User user, String identifier);
-
-	public PlaceHolder useStartsWith() {
-		useStartsWith = true;
-		return this;
-	}
-
-	public PlaceHolder withDescription(String desc) {
-		description = desc;
-		return this;
-	}
-
-}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Util/PlaceHolders/PlaceHolders.java

@@ -7,6 +7,7 @@ import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
+import com.Ben12345rocks.AdvancedCore.Util.Placeholder.PlaceHolder;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Commands.Commands;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
@@ -40,10 +41,10 @@ public class PlaceHolders {
 	}
 
 	@Getter
-	private ArrayList<PlaceHolder> placeholders = new ArrayList<PlaceHolder>();
+	private ArrayList<PlaceHolder<User>> placeholders = new ArrayList<PlaceHolder<User>>();
 
 	@Getter
-	private ArrayList<PlaceHolder> nonPlayerPlaceholders = new ArrayList<PlaceHolder>();
+	private ArrayList<PlaceHolder<User>> nonPlayerPlaceholders = new ArrayList<PlaceHolder<User>>();
 
 	/**
 	 * Instantiates a new place holders.
@@ -64,7 +65,7 @@ public class PlaceHolders {
 	public String getPlaceHolder(OfflinePlayer p, String identifier) {
 		identifier = StringUtils.getInstance().replaceJavascript(p, identifier);
 
-		for (PlaceHolder placeholder : nonPlayerPlaceholders) {
+		for (PlaceHolder<User> placeholder : nonPlayerPlaceholders) {
 			if (placeholder.matches(identifier)) {
 				return placeholder.placeholderRequest(p, null, identifier);
 			}
@@ -72,13 +73,13 @@ public class PlaceHolders {
 
 		User user = UserManager.getInstance().getVotingPluginUser(p);
 
-		for (PlaceHolder placeholder : placeholders) {
+		for (PlaceHolder<User> placeholder : placeholders) {
 			if (placeholder.matches(identifier)) {
 				return placeholder.placeholderRequest(p, user, identifier);
 			}
 		}
 
-		return identifier;
+		return "Not a valid placeholder";
 	}
 
 	public String getPlaceHolder(Player p, String identifier) {
@@ -91,7 +92,7 @@ public class PlaceHolders {
 		nonPlayerPlaceholders.clear();
 
 		// older placeholders, might be removed in the future
-		placeholders.add(new PlaceHolder("total") {
+		placeholders.add(new PlaceHolder<User>("total") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -99,7 +100,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Month total"));
 
-		placeholders.add(new PlaceHolder("alltimetotal") {
+		placeholders.add(new PlaceHolder<User>("alltimetotal") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -107,7 +108,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Alltime total"));
 
-		placeholders.add(new PlaceHolder("lastmonthtotal") {
+		placeholders.add(new PlaceHolder<User>("lastmonthtotal") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -117,7 +118,7 @@ public class PlaceHolders {
 
 		// end of older placeholders
 
-		placeholders.add(new PlaceHolder("DisableBroadcast") {
+		placeholders.add(new PlaceHolder<User>("DisableBroadcast") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -125,7 +126,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Returns true/false if user has broadcast disabled"));
 
-		placeholders.add(new PlaceHolder("MilestoneCount") {
+		placeholders.add(new PlaceHolder<User>("MilestoneCount") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -135,7 +136,7 @@ public class PlaceHolders {
 
 		for (final String identifier : Config.getInstance().getIdentifiers()) {
 			if (Config.getInstance().getIdentifierLimit(identifier) > 0) {
-				placeholders.add(new PlaceHolder("VoteShopLimit_" + identifier) {
+				placeholders.add(new PlaceHolder<User>("VoteShopLimit_" + identifier) {
 
 					@Override
 					public String placeholderRequest(OfflinePlayer p, User user, String ident) {
@@ -146,7 +147,7 @@ public class PlaceHolders {
 		}
 
 		for (final TopVoter top : TopVoter.values()) {
-			placeholders.add(new PlaceHolder("Total_" + top.toString()) {
+			placeholders.add(new PlaceHolder<User>("Total_" + top.toString()) {
 
 				@Override
 				public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -155,7 +156,7 @@ public class PlaceHolders {
 			}.withDescription("User total for " + top.getName()));
 		}
 
-		placeholders.add(new PlaceHolder("BestDailyTotal") {
+		placeholders.add(new PlaceHolder<User>("BestDailyTotal") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -163,7 +164,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Best daily total"));
 
-		placeholders.add(new PlaceHolder("BestWeeklyTotal") {
+		placeholders.add(new PlaceHolder<User>("BestWeeklyTotal") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -171,7 +172,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Best weekly total"));
 
-		placeholders.add(new PlaceHolder("BestMonthlyTotal") {
+		placeholders.add(new PlaceHolder<User>("BestMonthlyTotal") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -179,7 +180,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Best monthly total"));
 
-		placeholders.add(new PlaceHolder("DailyVoteStreak") {
+		placeholders.add(new PlaceHolder<User>("DailyVoteStreak") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -187,7 +188,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Current daily votestreak"));
 
-		placeholders.add(new PlaceHolder("WeeklyVoteStreak") {
+		placeholders.add(new PlaceHolder<User>("WeeklyVoteStreak") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -195,7 +196,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Current weekly votestreak"));
 
-		placeholders.add(new PlaceHolder("MonthVoteStreak") {
+		placeholders.add(new PlaceHolder<User>("MonthVoteStreak") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -203,7 +204,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Current month votestreak"));
 
-		placeholders.add(new PlaceHolder("BestDailyVoteStreak") {
+		placeholders.add(new PlaceHolder<User>("BestDailyVoteStreak") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -211,7 +212,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Best daily votestreak"));
 
-		placeholders.add(new PlaceHolder("BestWeeklyVoteStreak") {
+		placeholders.add(new PlaceHolder<User>("BestWeeklyVoteStreak") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -219,7 +220,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Best weekly votestreak"));
 
-		placeholders.add(new PlaceHolder("BestMonthVoteStreak") {
+		placeholders.add(new PlaceHolder<User>("BestMonthVoteStreak") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -227,7 +228,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Best month votestreak"));
 
-		placeholders.add(new PlaceHolder("Points") {
+		placeholders.add(new PlaceHolder<User>("Points") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -235,7 +236,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("User points"));
 
-		placeholders.add(new PlaceHolder("CanVote") {
+		placeholders.add(new PlaceHolder<User>("CanVote") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -244,21 +245,21 @@ public class PlaceHolders {
 		}.withDescription("Return true/false if player can vote on all sites"));
 
 		for (final VoteSite voteSite : plugin.getVoteSites()) {
-			placeholders.add(new PlaceHolder("Next_" + voteSite.getKey()) {
+			placeholders.add(new PlaceHolder<User>("Next_" + voteSite.getKey()) {
 
 				@Override
 				public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
 					return Commands.getInstance().voteCommandNextInfo(user, voteSite);
 				}
 			}.withDescription("How long until user can vote on " + voteSite.getKey()));
-			placeholders.add(new PlaceHolder("Last_" + voteSite.getKey()) {
+			placeholders.add(new PlaceHolder<User>("Last_" + voteSite.getKey()) {
 
 				@Override
 				public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
 					return Commands.getInstance().voteCommandLastDuration(user, voteSite);
 				}
 			}.withDescription("How long ago user voted on " + voteSite.getKey()));
-			placeholders.add(new PlaceHolder("CanVote_" + voteSite.getKey()) {
+			placeholders.add(new PlaceHolder<User>("CanVote_" + voteSite.getKey()) {
 
 				@Override
 				public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -267,7 +268,7 @@ public class PlaceHolders {
 			}.withDescription("Whether or not player can vote on " + voteSite.getKey()));
 		}
 
-		placeholders.add(new PlaceHolder("Top_All_Position") {
+		placeholders.add(new PlaceHolder<User>("Top_All_Position") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -282,7 +283,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Get user top voter position"));
 
-		placeholders.add(new PlaceHolder("Top_AllVotes_") {
+		placeholders.add(new PlaceHolder<User>("Top_AllVotes_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -298,7 +299,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user votes at position in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_All_") {
+		placeholders.add(new PlaceHolder<User>("Top_All_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -314,7 +315,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user at postion in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_Month_Position") {
+		placeholders.add(new PlaceHolder<User>("Top_Month_Position") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -329,7 +330,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Get user top voter position"));
 
-		placeholders.add(new PlaceHolder("Top_Month_") {
+		placeholders.add(new PlaceHolder<User>("Top_Month_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -345,7 +346,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user at position in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_MonthVotes_") {
+		placeholders.add(new PlaceHolder<User>("Top_MonthVotes_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -361,7 +362,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user votes at position in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_Week_Position") {
+		placeholders.add(new PlaceHolder<User>("Top_Week_Position") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -376,7 +377,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Get user top voter position"));
 
-		placeholders.add(new PlaceHolder("Top_Week_") {
+		placeholders.add(new PlaceHolder<User>("Top_Week_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -392,7 +393,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user at postion in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_WeekVotes_") {
+		placeholders.add(new PlaceHolder<User>("Top_WeekVotes_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -408,7 +409,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user votes at position in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_Daily_Position") {
+		placeholders.add(new PlaceHolder<User>("Top_Daily_Position") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -423,7 +424,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Get user top voter position"));
 
-		placeholders.add(new PlaceHolder("Top_Daily_") {
+		placeholders.add(new PlaceHolder<User>("Top_Daily_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -439,7 +440,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user at postion in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_DailyVotes_") {
+		placeholders.add(new PlaceHolder<User>("Top_DailyVotes_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -457,7 +458,7 @@ public class PlaceHolders {
 
 		// non players
 
-		nonPlayerPlaceholders.add(new PlaceHolder("VotePartyVotesCurrent") {
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("VotePartyVotesCurrent") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -465,7 +466,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Current amount of voteparty votes"));
 
-		nonPlayerPlaceholders.add(new PlaceHolder("VotePartyVotesNeeded") {
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("VotePartyVotesNeeded") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -473,12 +474,60 @@ public class PlaceHolders {
 			}
 		}.withDescription("Voteparty votes needed"));
 
-		nonPlayerPlaceholders.add(new PlaceHolder("VotePartyVotesRequired") {
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("VotePartyVotesRequired") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
 				return Integer.toString(VoteParty.getInstance().getVotesRequired());
 			}
 		}.withDescription("Amount of votes needed for voteparty"));
+
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("GlobalMonthTotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int total = 0;
+				for (int num : Main.plugin.getTopVoter(TopVoter.Monthly).values()) {
+					total += num;
+				}
+				return Integer.toString(total);
+			}
+		}.withDescription("Global month total"));
+
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("GlobalAllTimeTotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int total = 0;
+				for (int num : Main.plugin.getTopVoter(TopVoter.AllTime).values()) {
+					total += num;
+				}
+				return Integer.toString(total);
+			}
+		}.withDescription("Global alltime total"));
+
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("GlobalWeeklyTotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int total = 0;
+				for (int num : Main.plugin.getTopVoter(TopVoter.Weekly).values()) {
+					total += num;
+				}
+				return Integer.toString(total);
+			}
+		}.withDescription("Global weekly total"));
+
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("GlobalDailyTotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int total = 0;
+				for (int num : Main.plugin.getTopVoter(TopVoter.Daily).values()) {
+					total += num;
+				}
+				return Integer.toString(total);
+			}
+		}.withDescription("Global daily total"));
 	}
 }

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/VotingPluginHooks.java

@@ -2,6 +2,7 @@ package com.Ben12345rocks.VotingPlugin;
 
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
 import com.Ben12345rocks.AdvancedCore.Rewards.Injected.RewardInject;
+import com.Ben12345rocks.AdvancedCore.Rewards.InjectedRequirement.RequirementInject;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 
 public class VotingPluginHooks {
@@ -11,12 +12,16 @@ public class VotingPluginHooks {
 		return instance;
 	}
 
-	public Main getMainClass() {
-		return Main.plugin;
+	public void addCustomRequirement(RequirementInject inject) {
+		RewardHandler.getInstance().addInjectedRequirements(inject);
 	}
 
 	public void addCustomReward(RewardInject inject) {
-		RewardHandler.getInstance().getInjectedRewards().add(inject);
+		RewardHandler.getInstance().addInjectedReward(inject);
+	}
+
+	public Main getMainClass() {
+		return Main.plugin;
 	}
 
 	public UserManager getUserManager() {