Javadoc fixes

5.10.3

VotingPlugin/.classpath

@@ -11,7 +11,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

VotingPlugin/.settings/org.eclipse.jdt.core.prefs

@@ -2,8 +2,11 @@ eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -64,12 +67,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -81,7 +86,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=info
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
@@ -92,6 +97,9 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
@@ -99,6 +107,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedImport=warning
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

VotingPlugin/Resources/Config.yml

@@ -19,6 +19,10 @@ MySQL:
   Password: ''
   # Max number of connections
   MaxConnections: 1
+  # Maxium size of caching mysql
+  # -1 for no limit
+  # Affecting this value may affect performance
+  MaxSize: -1
 
 # Let players who never joined before vote
 # Recommend: False (Will prevent creating random user data files)
@@ -104,12 +108,6 @@ Commands:
 # Set Message to '' (2 ') to disable message
 
 Format:
-  # Message when player tries to run command without required permissions
-  NoPerms: '&cYou do not have enough permission!'
-  
-  # Message when player types a command but does not input a number where needed
-  NotNumber: '&cError on &6%arg%&c, number expected!'
-  
   # CommandHandler help message
   HelpLine: '&3&l%Command% - &3%HelpMessage%'
 
@@ -156,7 +154,7 @@ Format:
           # If there is an error finding out time until next vote
           Error: '&cCould not caculate time until next vote!'
           # For sites that have this, requires votedelaydaily to be set to true in the site
-          VoteDelayDaily: 'Tomorrow'
+          VoteDelayDaily: '%hours% Hours and %minutes% Minutes'
           
        # Format for /vote last
       Last:
@@ -263,6 +261,21 @@ Format:
   # Shop messages when using the /vote shop
   ShopPurchase: '&aYou bought the %Identifier% for %Points% Points!'
   ShopFailed: '&cYou do not have %Points% points to purhcase this!'
+  
+  # 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'
+  
+  # Display text
+  # Used in /vote top (GUI)
+  TopVoter:
+    Daily: 'Daily'
+    Weekly: 'Weekly'
+    Monthly: 'Monthly'
+    AllTime: 'AllTime'
 
 # ------------------------------------------------
 # GUI Options
@@ -343,6 +356,7 @@ GUI:
   VoteURL:
     # GUI Name
     Name: '&cVoteURL'
+    BackButton: true
     SiteName: '&c%Name%'
     SeeURL: '&cClick to see URL'
     NextVote: '&cCan Vote In: %Info%'
@@ -352,10 +366,16 @@ GUI:
         Material: 'REDSTONE_BLOCK'
         Data: 0 
         Amount: 1
+        Name: '&4All Voting Sites'
+        Lore:
+        - '&cClick Me'
       CanVoteItem:
         Material: 'EMERALD_BLOCK'
         Data: 0
         Amount: 1
+        Name: '&4All Voting Sites'
+        Lore:
+        - '&cClick Me'
     AlreadyVotedItem:
       Material: 'REDSTONE_BLOCK'
       Data: 0 
@@ -392,12 +412,16 @@ GUI:
           Slot: 0
   VoteLast:
     Name: 'VoteLast: %player%'
+    BackButton: true
   VoteNext:
     Name: 'VoteNext: %player%'
+    BackButton: true
   VoteToday:
     Name: 'VoteToday'
+    BackButton: true
   VoteTop:
     Name: 'VoteTop %topvoter%'
+    BackButton: false
     Item:
       Name: '&3&l%position%: &3%player%'
       Lore: '&3&lVotes: &3%votes%'
@@ -413,6 +437,7 @@ GUI:
     Size: 27
   VoteTotal:
     Name: 'VoteTotal: %player%'
+    BackButton: true
     DayTotal:
       Item:
         Material: 'WATCH'
@@ -458,7 +483,8 @@ GUI:
         Lore: '&c&lBest: &c%Best%'
         Amount: 1
   VoteStreak:
-    Name: 'VoteBest: %player%'
+    Name: 'VoteStreak: %player%'
+    BackButton: false
     CurrentDayStreak:
       Item:
         Material: 'WATCH'
@@ -500,7 +526,14 @@ GUI:
   VoteGUIName: '&cVoteGUI: &c&l%player%'
   VoteRewardName: 'VoteReward'
   VoteShopName: 'VoteShop'
+  
+BackButton:
+  Material: 'PAPER'
+  Data: 0
+  Amount: 1
+  Name: '&8Back to VoteGUI'
 
+VoteShopBackButton: true
 Shop:
   # Identifier
   # Used in placeholders for formats
@@ -573,6 +606,8 @@ VoteParty:
   GiveAllPlayers: false
   # If true, the vote count will reset each day
   ResetEachDay: false
+  # Count votes from /av vote?
+  CountFakeVotes: true
   # Number of user votes that apply to vote party total the user needs to get rewards
   UserVotesRequired: 0
   # Broadcast when vote party reached
@@ -599,6 +634,7 @@ VoteStreak:
   Day:
     # Number of days in a row
     # Each day requires one vote
+    # Add a - to give a reward for every multiple (e.g. 2-)
     '2':
       # Enabled or not
       Enabled: false
@@ -671,7 +707,7 @@ EnableMonthlyAwards: true
 MonthlyAwards:
   # Position. 1 is first in top voter, 2 is second, etc...
   1:
-   Rewards:
+    Rewards:
       Messages:
         Player: '&aYou came in first place in %TopVoter%!'
   2:
@@ -755,6 +791,25 @@ LogVotesToFile: false
 # Longer times result in longer wait in stuff updating after a vote, like topvoter
 DelayBetweenUpdates: 3
 
+# Clear cache on update, setting to true reduces performance
+ClearCacheOnUpdate: false
+
 # Set to true to disable no service site message on voting
 # You should never have to touch this if everything is setup properly
+# Will also disable a few other warnings about vote sites
 DisableNoServiceSiteMessage: false
+
+# Used in special cases
+# Much slower, but may work better
+AlternateUUIDLookup: false
+
+# Shouldn't need to change this
+AutoKillInvs: true
+
+# Count fake votes
+# If true fake votes will give points and totals
+CountFakeVotes: true
+
+# Give VotingPlugin.Player by default
+# Requires restart to take affect
+GiveDefaultPermission: true

VotingPlugin/Resources/VoteSites.yml

@@ -31,6 +31,9 @@ VoteSites:
     # Reset vote delay each day (for certain sites that do this)
     VoteDelayDaily: false
     
+    # If true, rewards can be executed offline (required ForceOffline to be true in the reward)
+    GiveOffline: false
+    
     # VoteSite Material for GUI's
     Item:
       Material: 'DIAMOND'

VotingPlugin/Resources/plugin.yml

@@ -8,8 +8,6 @@ softdepend: [AdvancedCore]
 commands:
   vote:
     description: Vote command
-  v:
-    description: Vote command
   adminvote:
     description: Admin commands for VotingPlugin
   av:
@@ -158,10 +156,33 @@ commands:
   adminvoteClearCache:
     description: Command Alias
     aliases: avClearCache
+  adminvoteConvertFrom:
+    description: Command Alias
+    aliases: avConvertFrom
+  adminvoteRemovePoints:
+    description: Command Alias
+    aliases: avRemovePoints
+  adminvoteServiceSites:
+    description: Command Alias
+    aliases: avServiceSites
+  adminvoteSetVotePartyCount:
+    description: Command Alias
+    aliases: avSetVotePartyCount
+  adminvoteClearOfflineVotes:
+    description: Command Alias
+    aliases: avClearOfflineVotes
+  adminvoteGiveAll:
+    description: Command Alias
+    aliases: avGiveAll
+  adminvoteGiveAllOnline:
+    description: Command Alias
+    aliases: avGiveAllOnline
+  adminvoteForceTimeChanged:
+    description: Command Alias
+    aliases: avForceTimeChanged
 permissions:
   VotingPlugin.Player:
     description: Allows basic access player commands
-    default: true
   VotingPlugin.Mod:
     description: Allows mod access player commands
   VotingPlugin.Admin:

VotingPlugin/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>5.9.2</version>
+	<version>5.10.3</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -161,7 +161,7 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.12-R0.1-SNAPSHOT</version>
+			<version>1.12.2-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

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

@@ -38,7 +38,9 @@ import com.Ben12345rocks.VotingPlugin.Commands.GUI.PlayerGUIs;
 import com.Ben12345rocks.VotingPlugin.Commands.TabCompleter.AliasesTabCompleter;
 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.Events.VotiferEvent;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
@@ -105,6 +107,13 @@ public class CommandLoader {
 		CommandLoader.plugin = plugin;
 	}
 
+	/**
+	 * @return the adminPerm
+	 */
+	public String getAdminPerm() {
+		return adminPerm;
+	}
+
 	/**
 	 * Gets the commands.
 	 *
@@ -114,26 +123,26 @@ public class CommandLoader {
 		return commands;
 	}
 
+	/**
+	 * @return the modPerm
+	 */
+	public String getModPerm() {
+		return modPerm;
+	}
+
+	/**
+	 * @return the playerPerm
+	 */
+	public String getPlayerPerm() {
+		return playerPerm;
+	}
+
 	/**
 	 * Load admin vote command.
 	 */
 	private void loadAdminVoteCommand() {
 		plugin.adminVoteCommand = new ArrayList<CommandHandler>();
 
-		plugin.adminVoteCommand
-				.add(new CommandHandler(new String[] { "TriggerPlayerVoteEvent", "(player)", "(Sitename)" },
-						"VotingPlugin.Commands.AdminVote.TriggerPlayerVoteEvent|" + adminPerm,
-						"Trigger vote event, used for testing") {
-
-					@Override
-					public void execute(CommandSender sender, String[] args) {
-						PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(args[2]),
-								UserManager.getInstance().getVotingPluginUser(args[1]));
-						plugin.getServer().getPluginManager().callEvent(voteEvent);
-
-					}
-				});
-
 		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "ConvertFrom", "GAL" },
 				"VotingPlugin.Commands.AdminVote.ConvertFrom.GAL|" + adminPerm, "Convert from GAL") {
 
@@ -187,7 +196,8 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				if (Bukkit.getServer().getPluginManager().getPlugin("VoteRoulette") != null) {
 					for (OfflinePlayer offPlayer : Bukkit.getOfflinePlayers()) {
-						Voter voter = VoteRoulette.getInstance().getVoterManager().getVoter(offPlayer.getUniqueId(),
+						VoteRoulette.getInstance();
+						Voter voter = VoteRoulette.getVoterManager().getVoter(offPlayer.getUniqueId(),
 								offPlayer.getName());
 						User user = UserManager.getInstance().getVotingPluginUser(offPlayer);
 						user.setAllTimeTotal(user.getAllTimeTotal() + voter.getStatSheet().getLifetimeVotes());
@@ -217,7 +227,20 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 				user.addPoints(Integer.parseInt(args[2]));
-				sender.sendMessage(StringUtils.getInstance().colorize("&cGave " + args[1] + " " + args[2] + " points"));
+				sender.sendMessage(StringUtils.getInstance().colorize("&cGave " + args[1] + " " + args[2] + " points"
+						+ ", " + args[1] + " now has " + user.getPoints() + " points"));
+			}
+		});
+
+		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "RemovePoints", "(player)", "(number)" },
+				"VotingPlugin.Commands.AdminVote.RemovePoints|" + adminPerm, "Remove voting points") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+				user.removePoints(Integer.parseInt(args[2]));
+				sender.sendMessage(StringUtils.getInstance().colorize("&cRemoved " + args[2] + " points from " + args[1]
+						+ ", " + args[1] + " now has " + user.getPoints() + " points"));
 			}
 		});
 
@@ -231,6 +254,28 @@ public class CommandLoader {
 			}
 		});
 
+		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "ServiceSites" },
+				"VotingPlugin.Commands.AdminVote.ServiceSites|" + adminPerm,
+				"See a list of all service sites the server got") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				sendMessage(sender, "&cEvery service site the server has gotten:");
+
+				for (String serviceSites : ServerData.getInstance().getServiceSites()) {
+					boolean hasSite = plugin.hasVoteSite(serviceSites);
+					if (hasSite) {
+						String siteName = plugin.getVoteSiteName(serviceSites);
+						sendMessage(sender, serviceSites + " : Current site = " + siteName);
+					} else {
+						sendMessage(sender,
+								serviceSites + " : No site with this service site, did you do something wrong?");
+					}
+				}
+
+			}
+		});
+
 		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "Help&?", "(number)" },
 				"VotingPlugin.Commands.AdminVote.Help|" + adminPerm, "See this page") {
 
@@ -277,8 +322,27 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				CommandAdminVote.getInstance().version(sender);
+				if (sender instanceof Player) {
+					Player player = (Player) sender;
+					Bukkit.getScheduler().runTask(plugin, new Runnable() {
 
+						@Override
+						public void run() {
+							player.performCommand("bukkit:version " + plugin.getName());
+						}
+					});
+
+				} else {
+					Bukkit.getScheduler().runTask(plugin, new Runnable() {
+
+						@Override
+						public void run() {
+							Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(),
+									"bukkit:version " + plugin.getName());
+						}
+					});
+
+				}
 			}
 		});
 
@@ -426,8 +490,9 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				CommandAdminVote.getInstance().Vote(sender, args[1], args[2]);
-
+				VotiferEvent.playerVote(args[1], args[2], false);
+				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(args[2]), args[1]);
+				plugin.getServer().getPluginManager().callEvent(voteEvent);
 			}
 		});
 
@@ -457,7 +522,8 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						CommandAdminVote.getInstance().setVoteSiteServiceSite(sender, args[1], args[3]);
+						CommandAdminVote.getInstance().setVoteSiteServiceSite(sender, plugin.getVoteSiteName(args[1]),
+								args[3]);
 					}
 				});
 
@@ -467,7 +533,8 @@ public class CommandLoader {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						CommandAdminVote.getInstance().setVoteSiteVoteURL(sender, args[1], args[3]);
+						CommandAdminVote.getInstance().setVoteSiteVoteURL(sender, plugin.getVoteSiteName(args[1]),
+								args[3]);
 					}
 				});
 
@@ -478,7 +545,8 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 
-						CommandAdminVote.getInstance().setVoteSitePriority(sender, args[1], Integer.parseInt(args[3]));
+						CommandAdminVote.getInstance().setVoteSitePriority(sender, plugin.getVoteSiteName(args[1]),
+								Integer.parseInt(args[3]));
 
 					}
 				});
@@ -490,7 +558,8 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 
-						CommandAdminVote.getInstance().setVoteSiteVoteDelay(sender, args[1], Integer.parseInt(args[3]));
+						CommandAdminVote.getInstance().setVoteSiteVoteDelay(sender, plugin.getVoteSiteName(args[1]),
+								Integer.parseInt(args[3]));
 
 					}
 				});
@@ -520,7 +589,7 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 
-						CommandAdminVote.getInstance().setVoteSiteEnabled(sender, args[1],
+						CommandAdminVote.getInstance().setVoteSiteEnabled(sender, plugin.getVoteSiteName(args[1]),
 								Boolean.parseBoolean(args[3]));
 
 					}
@@ -532,7 +601,7 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 
-				CommandAdminVote.getInstance().checkVoteSite(sender, args[1]);
+				CommandAdminVote.getInstance().checkVoteSite(sender, plugin.getVoteSiteName(args[1]));
 
 			}
 		});
@@ -548,6 +617,29 @@ public class CommandLoader {
 			}
 		});
 
+		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "SetVotePartyCount", "(number)" },
+				"VotingPlugin.Commands.AdminVote.SetVotePartyCount|" + adminPerm, "Set voteparty count") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				plugin.getVoteParty().setTotalVotes(Integer.parseInt(args[1]));
+				sendMessage(sender, "&cSet vote party count to " + args[1]);
+			}
+		});
+
+		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "ClearOfflineVotes" },
+				"VotingPlugin.Commands.AdminVote.ClearOfflineVotes|" + adminPerm, "Clear all offline votes") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+					User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+					user.setOfflineVotes(new ArrayList<String>());
+				}
+				sender.sendMessage(StringUtils.getInstance().colorize("&cCleared"));
+			}
+		});
+
 		ArrayList<CommandHandler> avCommands = com.Ben12345rocks.AdvancedCore.Commands.CommandLoader.getInstance()
 				.getBasicAdminCommands("VotingPlugin");
 		for (CommandHandler cmd : avCommands) {
@@ -567,7 +659,7 @@ public class CommandLoader {
 				String[] args = cmdHandle.getArgs()[0].split("&");
 				for (String arg : args) {
 					try {
-						plugin.getCommand("vote" + arg).setExecutor(new CommandAliases(cmdHandle));
+						plugin.getCommand("vote" + arg).setExecutor(new CommandAliases(cmdHandle, false));
 
 						plugin.getCommand("vote" + arg)
 								.setTabCompleter(new AliasesTabCompleter().setCMDHandle(cmdHandle));
@@ -584,7 +676,7 @@ public class CommandLoader {
 				String[] args = cmdHandle.getArgs()[0].split("&");
 				for (String arg : args) {
 					try {
-						plugin.getCommand("adminvote" + arg).setExecutor(new CommandAliases(cmdHandle));
+						plugin.getCommand("adminvote" + arg).setExecutor(new CommandAliases(cmdHandle, true));
 
 						plugin.getCommand("adminvote" + arg)
 								.setTabCompleter(new AliasesTabCompleter().setCMDHandle(cmdHandle));
@@ -631,9 +723,9 @@ public class CommandLoader {
 
 													@Override
 													public void onInput(Player player, String value) {
-
-														CommandAdminVote.getInstance().Vote(player,
-																UserGUI.getInstance().getCurrentPlayer(player), value);
+														VotiferEvent.playerVote(
+																UserGUI.getInstance().getCurrentPlayer(player), value,
+																false);
 
 														player.sendMessage("Forced vote for "
 																+ UserGUI.getInstance().getCurrentPlayer(player)
@@ -707,11 +799,10 @@ public class CommandLoader {
 												int mileStone = Integer.parseInt(mileStoneName);
 
 												inv.addButton(inv.getNextSlot(),
-														new BInventoryButton("" + mileStone,
-																new String[] {
-																		"Enabled: " + Config.getInstance()
-																				.getMilestoneRewardEnabled(mileStone),
-																		"&cClick to set wether this has been completed or not" },
+														new BInventoryButton("" + mileStone, new String[] {
+																"Enabled: " + Config.getInstance()
+																		.getMilestoneRewardEnabled(mileStone),
+																"&cClick to set wether this has been completed or not" },
 																new ItemStack(Material.STONE)) {
 
 															@Override
@@ -853,11 +944,16 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				if (!Config.getInstance().getCommandsUseGUILast()) {
-					CommandVote.getInstance().lastOther(sender, args[1]);
-				} else if (sender instanceof Player) {
-					PlayerGUIs.getInstance().openVoteLast((Player) sender,
-							UserManager.getInstance().getVotingPluginUser(args[1]));
+				if (com.Ben12345rocks.AdvancedCore.UserManager.UserManager.getInstance().userExist(args[1])) {
+					if (!Config.getInstance().getCommandsUseGUILast()) {
+						CommandVote.getInstance().lastOther(sender, args[1]);
+					} else if (sender instanceof Player) {
+						PlayerGUIs.getInstance().openVoteLast((Player) sender,
+								UserManager.getInstance().getVotingPluginUser(args[1]));
+					}
+				} else {
+					sendMessage(sender, StringUtils.getInstance()
+							.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
 				}
 
 			}
@@ -882,11 +978,16 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				if (!Config.getInstance().getCommandsUseGUINext()) {
-					CommandVote.getInstance().nextOther(sender, args[1]);
-				} else if (sender instanceof Player) {
-					PlayerGUIs.getInstance().openVoteNext((Player) sender,
-							UserManager.getInstance().getVotingPluginUser(args[1]));
+				if (com.Ben12345rocks.AdvancedCore.UserManager.UserManager.getInstance().userExist(args[1])) {
+					if (!Config.getInstance().getCommandsUseGUINext()) {
+						CommandVote.getInstance().nextOther(sender, args[1]);
+					} else if (sender instanceof Player) {
+						PlayerGUIs.getInstance().openVoteNext((Player) sender,
+								UserManager.getInstance().getVotingPluginUser(args[1]));
+					}
+				} else {
+					sendMessage(sender, StringUtils.getInstance()
+							.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
 				}
 			}
 		});
@@ -896,8 +997,13 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-
-				CommandVote.getInstance().pointsOther(sender, UserManager.getInstance().getVotingPluginUser(args[1]));
+				if (com.Ben12345rocks.AdvancedCore.UserManager.UserManager.getInstance().userExist(args[1])) {
+					CommandVote.getInstance().pointsOther(sender,
+							UserManager.getInstance().getVotingPluginUser(args[1]));
+				} else {
+					sendMessage(sender, StringUtils.getInstance()
+							.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
+				}
 
 			}
 		});
@@ -949,7 +1055,13 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				Player player = (Player) sender;
-				PlayerGUIs.getInstance().openVoteGUI(player, UserManager.getInstance().getVotingPluginUser(args[1]));
+				if (com.Ben12345rocks.AdvancedCore.UserManager.UserManager.getInstance().userExist(args[1])) {
+					PlayerGUIs.getInstance().openVoteGUI(player,
+							UserManager.getInstance().getVotingPluginUser(args[1]));
+				} else {
+					sendMessage(sender, StringUtils.getInstance()
+							.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
+				}
 
 			}
 		});
@@ -1084,11 +1196,16 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				if (!Config.getInstance().getCommandsUseGUITotal()) {
-					CommandVote.getInstance().totalOther(sender, args[1]);
-				} else if (sender instanceof Player) {
-					PlayerGUIs.getInstance().openVoteTotal((Player) sender,
-							UserManager.getInstance().getVotingPluginUser(args[1]));
+				if (com.Ben12345rocks.AdvancedCore.UserManager.UserManager.getInstance().userExist(args[1])) {
+					if (!Config.getInstance().getCommandsUseGUITotal()) {
+						CommandVote.getInstance().totalOther(sender, args[1]);
+					} else if (sender instanceof Player) {
+						PlayerGUIs.getInstance().openVoteTotal((Player) sender,
+								UserManager.getInstance().getVotingPluginUser(args[1]));
+					}
+				} else {
+					sendMessage(sender, StringUtils.getInstance()
+							.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
 				}
 
 			}
@@ -1123,15 +1240,20 @@ public class CommandLoader {
 		});
 
 		plugin.voteCommand.add(new CommandHandler(new String[] { "Best", "(player)" },
-				"VotingPlugin.Commands.Vote.Best.Other|" + playerPerm, "View someone's best voting") {
+				"VotingPlugin.Commands.Vote.Best.Other|" + modPerm, "View someone's best voting") {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				if (!Config.getInstance().getCommandsUseGUIBest()) {
-					sender.sendMessage(Commands.getInstance().best(sender, args[1]));
-				} else if (sender instanceof Player) {
-					PlayerGUIs.getInstance().openVoteBest((Player) sender,
-							UserManager.getInstance().getVotingPluginUser(args[1]));
+				if (com.Ben12345rocks.AdvancedCore.UserManager.UserManager.getInstance().userExist(args[1])) {
+					if (!Config.getInstance().getCommandsUseGUIBest()) {
+						sender.sendMessage(Commands.getInstance().best(sender, args[1]));
+					} else if (sender instanceof Player) {
+						PlayerGUIs.getInstance().openVoteBest((Player) sender,
+								UserManager.getInstance().getVotingPluginUser(args[1]));
+					}
+				} else {
+					sendMessage(sender, StringUtils.getInstance()
+							.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
 				}
 			}
 		});
@@ -1141,7 +1263,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				if (!Config.getInstance().getCommandsUseGUIBest()) {
+				if (!Config.getInstance().getCommandsUseGUIStreak()) {
 					sender.sendMessage(Commands.getInstance().streak(sender, sender.getName()));
 				} else {
 					PlayerGUIs.getInstance().openVoteStreak((Player) sender,
@@ -1151,15 +1273,20 @@ public class CommandLoader {
 		});
 
 		plugin.voteCommand.add(new CommandHandler(new String[] { "Streak", "(player)" },
-				"VotingPlugin.Commands.Vote.Streak.Other|" + playerPerm, "View someone's voting streak") {
+				"VotingPlugin.Commands.Vote.Streak.Other|" + modPerm, "View someone's voting streak") {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				if (!Config.getInstance().getCommandsUseGUIStreak()) {
-					sender.sendMessage(Commands.getInstance().streak(sender, args[1]));
-				} else if (sender instanceof Player) {
-					PlayerGUIs.getInstance().openVoteStreak((Player) sender,
-							UserManager.getInstance().getVotingPluginUser(args[1]));
+				if (com.Ben12345rocks.AdvancedCore.UserManager.UserManager.getInstance().userExist(args[1])) {
+					if (!Config.getInstance().getCommandsUseGUIStreak()) {
+						sender.sendMessage(Commands.getInstance().streak(sender, args[1]));
+					} else if (sender instanceof Player) {
+						PlayerGUIs.getInstance().openVoteStreak((Player) sender,
+								UserManager.getInstance().getVotingPluginUser(args[1]));
+					}
+				} else {
+					sendMessage(sender, StringUtils.getInstance()
+							.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
 				}
 			}
 		});
@@ -1192,27 +1319,6 @@ public class CommandLoader {
 		plugin.voteCommand.addAll(avCommands);
 	}
 
-	/**
-	 * @return the adminPerm
-	 */
-	public String getAdminPerm() {
-		return adminPerm;
-	}
-
-	/**
-	 * @return the modPerm
-	 */
-	public String getModPerm() {
-		return modPerm;
-	}
-
-	/**
-	 * @return the playerPerm
-	 */
-	public String getPlayerPerm() {
-		return playerPerm;
-	}
-
 	/**
 	 * Sets the commands.
 	 *

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

@@ -197,7 +197,7 @@ public class Commands {
 		ArrayList<String> msg = new ArrayList<String>();
 
 		for (CommandHandler handle : plugin.voteCommand) {
-			msg.add(handle.getHelpLineCommand("/v") + " : " + handle.getPerm());
+			msg.add(handle.getHelpLineCommand("/vote") + " : " + handle.getPerm());
 		}
 
 		for (CommandHandler handle : plugin.adminVoteCommand) {
@@ -467,16 +467,10 @@ public class Commands {
 		return ArrayUtils.getInstance().convert(ArrayUtils.getInstance().colorize(msg));
 	}
 
-	/**
-	 * Update vote today.
-	 */
-	public void updateVoteToday() {
-		ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
-
+	public void updateVoteToday(ArrayList<User> users) {
 		plugin.voteToday.clear();
 
-		for (String uuid : uuids) {
-			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+		for (User user : users) {
 			HashMap<VoteSite, LocalDateTime> times = new HashMap<VoteSite, LocalDateTime>();
 			for (VoteSite voteSite : plugin.getVoteSites()) {
 				long time = user.getTime(voteSite);
@@ -530,9 +524,13 @@ public class Commands {
 	 * @return the string
 	 */
 	public String voteCommandLastDate(User user, VoteSite voteSite) {
-		Date date = new Date(user.getTime(voteSite));
-		String timeString = new SimpleDateFormat(config.getFormatTimeFormat()).format(date);
-		return timeString;
+		long time = user.getTime(voteSite);
+		if (time > 0) {
+			Date date = new Date(time);
+			String timeString = new SimpleDateFormat(config.getFormatTimeFormat()).format(date);
+			return timeString;
+		}
+		return "";
 	}
 
 	public String voteCommandLastLine(User user, VoteSite voteSite) {
@@ -613,13 +611,22 @@ public class Commands {
 				}
 			}
 		} else {
-			if (lastVote.getDayOfYear()==now.getDayOfYear() && lastVote.getYear()==now.getYear()) {
-				info = config.getFormatCommandsVoteNextInfoVoteDelayDaily();
+			if (lastVote.getDayOfYear() == now.getDayOfYear() && lastVote.getYear() == now.getYear()) {
+				LocalDateTime midnight = LocalDateTime.now().plusDays(1).withHour(0).withMinute(0);
+				Duration dur = Duration.between(now, midnight);
+
+				int diffHours = (int) (dur.getSeconds() / (60 * 60));
+				long diffMinutes = dur.getSeconds() / 60 - diffHours * 60;
+
+				String timeMsg = config.getFormatCommandsVoteNextInfoVoteDelayDaily();
+				timeMsg = StringUtils.getInstance().replaceIgnoreCase(timeMsg, "%hours%", Integer.toString(diffHours));
+				timeMsg = StringUtils.getInstance().replaceIgnoreCase(timeMsg, "%minutes%", Long.toString(diffMinutes));
+				info = timeMsg;
+
 			} else {
 				info = config.getFormatCommandsVoteNextInfoCanVote();
 			}
-			
-			
+
 		}
 		return info;
 	}
@@ -703,9 +710,9 @@ public class Commands {
 		boolean requirePerms = config.getFormatCommandsVoteHelpRequirePermission();
 
 		for (CommandHandler cmdHandle : plugin.voteCommand) {
-			if (sender.hasPermission(cmdHandle.getPerm()) && requirePerms) {
+			if (cmdHandle.hasPerm(sender)) {
 				unsorted.put(cmdHandle.getHelpLineCommand("/vote"), cmdHandle.getHelpLine("/vote"));
-			} else {
+			} else if (!requirePerms) {
 				unsorted.put(cmdHandle.getHelpLineCommand("/vote"), cmdHandle.getHelpLine("/vote"));
 			}
 		}
@@ -750,7 +757,7 @@ public class Commands {
 
 		}
 	}
-	
+
 	public String[] voteURLs(User user) {
 		ArrayList<String> sites = new ArrayList<String>();
 

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

@@ -16,7 +16,6 @@ import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Commands.Commands;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
-import com.Ben12345rocks.VotingPlugin.Events.VotiferEvent;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
@@ -440,33 +439,4 @@ public class CommandAdminVote implements CommandExecutor {
 
 	}
 
-	/**
-	 * Version.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void version(CommandSender sender) {
-		if (sender instanceof Player) {
-			Player player = (Player) sender;
-			player.performCommand("bukkit:version " + plugin.getName());
-		} else {
-			Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), "bukkit:version " + plugin.getName());
-		}
-	}
-
-	/**
-	 * Vote.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param playerName
-	 *            the player name
-	 * @param voteSite
-	 *            the vote site
-	 */
-	public void Vote(CommandSender sender, String playerName, String voteSite) {
-		VotiferEvent.playerVote(playerName, voteSite);
-	}
-
 }

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

@@ -23,14 +23,11 @@ public class CommandAliases implements CommandExecutor {
 	/** The cmd handle. */
 	private CommandHandler cmdHandle;
 
-	/**
-	 * Instantiates a new command aliases.
-	 *
-	 * @param cmdHandle
-	 *            the cmd handle
-	 */
-	public CommandAliases(CommandHandler cmdHandle) {
+	private boolean adminCommand;
+
+	public CommandAliases(CommandHandler cmdHandle, boolean adminCommand) {
 		this.cmdHandle = cmdHandle;
+		this.adminCommand = adminCommand;
 	}
 
 	/*
@@ -51,10 +48,14 @@ public class CommandAliases implements CommandExecutor {
 		plugin.debug("Attempting cmd...");
 		plugin.debug("Inputed args: " + ArrayUtils.getInstance().makeStringList(argsNew));
 
-		ArrayList<CommandHandler> cmdHandlers = new ArrayList<CommandHandler>();
-		cmdHandlers.addAll(plugin.voteCommand);
-		cmdHandlers.addAll(plugin.adminVoteCommand);
-		for (CommandHandler cmdHandle : cmdHandlers) {
+		ArrayList<CommandHandler> handles = new ArrayList<CommandHandler>();
+		if (adminCommand) {
+			handles.addAll(plugin.adminVoteCommand);
+		} else {
+			handles.addAll(plugin.voteCommand);
+		}
+
+		for (CommandHandler cmdHandle : handles) {
 			if (cmdHandle.getArgs().length > args.length) {
 				for (String arg : cmdHandle.getArgs()[0].split("&")) {
 					if (cmd.getName().equalsIgnoreCase("vote" + arg)
@@ -81,16 +82,19 @@ public class CommandAliases implements CommandExecutor {
 				}
 			}
 		}
-
+		
 		/*
-		 * for (String arg : cmdHandle.getArgs()[0].split("&")) { argsNew.set(0,
-		 * arg); if (cmdHandle.runCommand(sender,
-		 * Utils.getInstance().convertArray(argsNew))) { plugin.debug(
-		 * "cmd found, ran cmd"); return true; } }
+		 * for (String arg : cmdHandle.getArgs()[0].split("&")) { argsNew.set(0, arg);
+		 * if (cmdHandle.runCommand(sender, Utils.getInstance().convertArray(argsNew)))
+		 * { plugin.debug( "cmd found, ran cmd"); return true; } }
 		 */
 
 		// invalid command
-		sender.sendMessage(ChatColor.RED + "No valid arguments, see /vote help!");
+		if (adminCommand) {
+			sender.sendMessage(ChatColor.RED + "No valid arguments, see /adminvote help!");
+		} else {
+			sender.sendMessage(ChatColor.RED + "No valid arguments, see /vote help!");
+		}
 		return true;
 	}
 }

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

@@ -2,6 +2,7 @@ package com.Ben12345rocks.VotingPlugin.Commands.GUI;
 
 import java.util.ArrayList;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -11,12 +12,16 @@ import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory.ClickEvent;
 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.ValueRequest.InputMethod;
 import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.ValueRequest;
+import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.ValueRequestBuilder;
 import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.Listeners.BooleanListener;
 import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.Listeners.NumberListener;
 import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.Listeners.StringListener;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.Events.VotiferEvent;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
 
 public class AdminGUI {
@@ -140,53 +145,73 @@ public class AdminGUI {
 	public void openAdminGUIVoteSiteSite(Player player, VoteSite voteSite) {
 		BInventory inv = new BInventory("VoteSite: " + voteSite.getDisplayName());
 		inv.setMeta(player, "VoteSite", voteSite);
-		inv.addButton(inv.getNextSlot(),
-				new BInventoryButton("SetPriority", new String[0], new ItemStack(Material.STONE)) {
+
+		inv.addButton(new BInventoryButton(voteSite.getItem().setName("&cForce vote")) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				ArrayList<String> playerNames = new ArrayList<String>();
+				for (Player p : Bukkit.getOnlinePlayers()) {
+					playerNames.add(p.getName());
+				}
+				new ValueRequestBuilder(new StringListener() {
 
 					@Override
-					public void onClick(ClickEvent event) {
-						Player player = event.getWhoClicked();
-						new ValueRequest().requestNumber(player, "" + voteSite.getPriority(), null,
-								new NumberListener() {
-
-									@Override
-									public void onInput(Player player, Number value) {
-										VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
-										ConfigVoteSites.getInstance().setPriority(voteSite.getKey(), value.intValue());
-										player.sendMessage("Set Priority");
-										plugin.reload();
-
-									}
-								});
-					}
-				});
-
-		inv.addButton(inv.getNextSlot(),
-				new BInventoryButton("SetServiceSite", new String[0], new ItemStack(Material.STONE)) {
-
-					@Override
-					public void onClick(ClickEvent event) {
-						if (event.getWhoClicked() instanceof Player) {
-							Player player = event.getWhoClicked();
-
-							new ValueRequest().requestString(player, voteSite.getServiceSite(), null,
-									new StringListener() {
-
-										@Override
-										public void onInput(Player player, String value) {
-											VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
-											String siteName = voteSite.getKey();
-											ConfigVoteSites.getInstance().setServiceSite(siteName, value);
-											player.sendMessage("Set ServiceSite");
-											plugin.reload();
-										}
-									});
+					public void onInput(Player player, String value) {
+						Object ob = PlayerUtils.getInstance().getPlayerMeta(player, "VoteSite");
+						if (ob != null) {
+							VoteSite site = (VoteSite) ob;
+							VotiferEvent.playerVote(value, site.getServiceSite(), false);
 						}
+					}
+				}, ArrayUtils.getInstance().convert(playerNames)).usingMethod(InputMethod.INVENTORY)
+						.allowCustomOption(true).request(event.getWhoClicked());
+			}
+		});
+
+		inv.addButton(new BInventoryButton("SetPriority", new String[0], new ItemStack(Material.STONE)) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				Player player = event.getWhoClicked();
+				new ValueRequest().requestNumber(player, "" + voteSite.getPriority(), null, new NumberListener() {
+
+					@Override
+					public void onInput(Player player, Number value) {
+						VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
+						ConfigVoteSites.getInstance().setPriority(voteSite.getKey(), value.intValue());
+						player.sendMessage("Set Priority");
+						plugin.reload();
 
 					}
 				});
+			}
+		});
 
-		inv.addButton(inv.getNextSlot(), new BInventoryButton("SetName", new String[0], new ItemStack(Material.STONE)) {
+		inv.addButton(new BInventoryButton("SetServiceSite", new String[0], new ItemStack(Material.STONE)) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				if (event.getWhoClicked() instanceof Player) {
+					Player player = event.getWhoClicked();
+
+					new ValueRequest().requestString(player, voteSite.getServiceSite(), null, new StringListener() {
+
+						@Override
+						public void onInput(Player player, String value) {
+							VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
+							String siteName = voteSite.getKey();
+							ConfigVoteSites.getInstance().setServiceSite(siteName, value);
+							player.sendMessage("Set ServiceSite");
+							plugin.reload();
+						}
+					});
+				}
+
+			}
+		});
+
+		inv.addButton(new BInventoryButton("SetName", new String[0], new ItemStack(Material.STONE)) {
 
 			@Override
 			public void onClick(ClickEvent event) {
@@ -207,54 +232,51 @@ public class AdminGUI {
 			}
 		});
 
-		inv.addButton(inv.getNextSlot(),
-				new BInventoryButton("SetVoteURL", new String[0], new ItemStack(Material.STONE)) {
+		inv.addButton(new BInventoryButton("SetVoteURL", new String[0], new ItemStack(Material.STONE)) {
 
-					@Override
-					public void onClick(ClickEvent event) {
-						if (event.getWhoClicked() instanceof Player) {
-							Player player = event.getWhoClicked();
+			@Override
+			public void onClick(ClickEvent event) {
+				if (event.getWhoClicked() instanceof Player) {
+					Player player = event.getWhoClicked();
 
-							new ValueRequest().requestString(player, voteSite.getVoteURL(), null, new StringListener() {
+					new ValueRequest().requestString(player, voteSite.getVoteURL(), null, new StringListener() {
 
-								@Override
-								public void onInput(Player player, String value) {
-									VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
-									String siteName = voteSite.getKey();
-									ConfigVoteSites.getInstance().setVoteURL(siteName, value);
-									player.sendMessage("Set VoteURL");
-									plugin.reload();
-
-								}
-							});
+						@Override
+						public void onInput(Player player, String value) {
+							VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
+							String siteName = voteSite.getKey();
+							ConfigVoteSites.getInstance().setVoteURL(siteName, value);
+							player.sendMessage("Set VoteURL");
+							plugin.reload();
 
 						}
+					});
 
-					}
-				});
+				}
 
-		inv.addButton(inv.getNextSlot(),
-				new BInventoryButton("SetVoteDelay", new String[0], new ItemStack(Material.STONE)) {
+			}
+		});
+
+		inv.addButton(new BInventoryButton("SetVoteDelay", new String[0], new ItemStack(Material.STONE)) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				Player player = event.getWhoClicked();
+				new ValueRequest().requestNumber(player, "" + voteSite.getVoteDelay(), null, new NumberListener() {
 
 					@Override
-					public void onClick(ClickEvent event) {
-						Player player = event.getWhoClicked();
-						new ValueRequest().requestNumber(player, "" + voteSite.getVoteDelay(), null,
-								new NumberListener() {
-
-									@Override
-									public void onInput(Player player, Number value) {
-										VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
-										String siteName = voteSite.getKey();
-										ConfigVoteSites.getInstance().setVoteDelay(siteName, value.intValue());
-										player.sendMessage("Set VoteDelay");
-										plugin.reload();
-
-									}
-								});
+					public void onInput(Player player, Number value) {
+						VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
+						String siteName = voteSite.getKey();
+						ConfigVoteSites.getInstance().setVoteDelay(siteName, value.intValue());
+						player.sendMessage("Set VoteDelay");
+						plugin.reload();
 
 					}
 				});
+
+			}
+		});
 		inv.addButton(inv.getNextSlot(),
 				new BInventoryButton("SetEnabled", new String[0], new ItemStack(Material.STONE)) {
 

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

@@ -4,8 +4,11 @@ import java.time.format.DateTimeFormatter;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import org.bukkit.ChatColor;
 import org.bukkit.Material;
+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.Util.Inventory.BInventory;
@@ -47,6 +50,14 @@ public class PlayerGUIs {
 	private PlayerGUIs() {
 	}
 
+	public ItemBuilder getBackButton() {
+		ConfigurationSection sec = Config.getInstance().getBackButton();
+		if (sec != null) {
+			return new ItemBuilder(sec);
+		}
+		return new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI");
+	}
+
 	public User getSelectedPlayer(Player player) {
 		User str = (User) PlayerUtils.getInstance().getPlayerMeta(player, "SelectedPlayerGUIs");
 		return str;
@@ -88,12 +99,16 @@ public class PlayerGUIs {
 	}
 
 	public void openVoteGUI(Player player, User user) {
+		if (user == null) {
+			user = UserManager.getInstance().getVotingPluginUser(player);
+			setSelectedPlayer(player, user);
+		}
 		if ((!player.getName().equals(user.getPlayerName())
 				&& !player.hasPermission("VotingPlugin.Commands.Vote.GUI.Other")
 				&& !player.hasPermission("VotingPlugin.Mod"))
 				|| (!player.hasPermission("VotingPlugin.Commands.Vote.GUI")
 						&& !player.hasPermission("VotingPlugin.Player"))) {
-			player.sendMessage(AdvancedCoreHook.getInstance().getFormatNoPerms());
+			player.sendMessage(StringUtils.getInstance().colorize(AdvancedCoreHook.getInstance().getFormatNoPerms()));
 			return;
 		}
 		setSelectedPlayer(player, user);
@@ -168,7 +183,7 @@ public class PlayerGUIs {
 			});
 		}
 
-		BInventory.openInventory(player, inv);
+		inv.openInventory(player);
 	}
 
 	public void openVoteLast(Player player, User user) {
@@ -176,23 +191,27 @@ public class PlayerGUIs {
 		BInventory inv = new BInventory(StringUtils.getInstance()
 				.replacePlaceHolder(Config.getInstance().getGUIVoteLastName(), "player", user.getPlayerName()));
 		for (VoteSite site : plugin.getVoteSites()) {
-			inv.addButton(inv.getNextSlot(),
-					new BInventoryButton(new ItemBuilder(site.getItem()).setName(site.getDisplayName())
-							.setLore(Commands.getInstance().voteCommandLastLine(user, site)).setAmountNone(1)) {
+			inv.addButton(inv.getNextSlot(), new BInventoryButton(site.getItem().setName(site.getDisplayName())
+					.setLore(Commands.getInstance().voteCommandLastLine(user, site)).setAmountNone(1)) {
 
-						@Override
-						public void onClick(ClickEvent clickEvent) {
+				@Override
+				public void onClick(ClickEvent clickEvent) {
 
-						}
-					});
+				}
+			});
+		}
+
+		if (Config.getInstance().getGUIVoteLastBackButton()) {
+			inv.addButton(new BInventoryButton(getBackButton()) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+
+			});
 		}
-		inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
 
-			@Override
-			public void onClick(ClickEvent event) {
-				openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-			}
-		});
 		inv.openInventory(player);
 	}
 
@@ -201,24 +220,26 @@ public class PlayerGUIs {
 		BInventory inv = new BInventory(StringUtils.getInstance()
 				.replacePlaceHolder(Config.getInstance().getGUIVoteNextName(), "player", user.getPlayerName()));
 		for (VoteSite site : plugin.getVoteSites()) {
-			inv.addButton(inv.getNextSlot(),
-					new BInventoryButton(new ItemBuilder(site.getItem()).setName(site.getDisplayName())
-							.setLore(Commands.getInstance().voteCommandNextInfo(user, site)).setAmountNone(1)) {
+			inv.addButton(inv.getNextSlot(), new BInventoryButton(site.getItem().setName(site.getDisplayName())
+					.setLore(Commands.getInstance().voteCommandNextInfo(user, site)).setAmountNone(1)) {
 
-						@Override
-						public void onClick(ClickEvent clickEvent) {
+				@Override
+				public void onClick(ClickEvent clickEvent) {
 
-						}
-					});
+				}
+			});
 		}
 
-		inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+		if (Config.getInstance().getGUIVoteNextBackButton()) {
+			inv.addButton(new BInventoryButton(getBackButton()) {
 
-			@Override
-			public void onClick(ClickEvent event) {
-				openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-			}
-		});
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+
+			});
+		}
 		inv.openInventory(player);
 	}
 
@@ -283,18 +304,21 @@ public class PlayerGUIs {
 					}
 				});
 
-		inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+		if (Config.getInstance().getGUIVoteStreakBackButton()) {
+			inv.addButton(new BInventoryButton(getBackButton()) {
 
-			@Override
-			public void onClick(ClickEvent event) {
-				openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-			}
-		});
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+			});
+		}
 
 		inv.openInventory(player);
 	}
 
 	public void openVoteToday(Player player) {
+		setSelectedPlayer(player, null);
 		BInventory inv = new BInventory(Config.getInstance().getGUIVoteTodayName());
 		for (User user : plugin.voteToday.keySet()) {
 
@@ -303,7 +327,7 @@ public class PlayerGUIs {
 				String timeString = plugin.voteToday.get(user).get(voteSite).format(formatter);
 				String msg = "&6" + user.getPlayerName() + " : " + voteSite.getDisplayName() + " : " + timeString;
 				inv.addButton(inv.getNextSlot(), new BInventoryButton(user.getPlayerName(), new String[] { msg },
-						MiscUtils.getInstance().setSkullOwner(user.getPlayerName())) {
+						MiscUtils.getInstance().setSkullOwner(user.getOfflinePlayer())) {
 
 					@Override
 					public void onClick(ClickEvent clickEvent) {
@@ -315,13 +339,17 @@ public class PlayerGUIs {
 				});
 			}
 		}
-		inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
 
-			@Override
-			public void onClick(ClickEvent event) {
-				openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-			}
-		});
+		if (Config.getInstance().getGUIVoteTodayBackButton()) {
+			inv.addButton(new BInventoryButton(getBackButton()) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+
+			});
+		}
 		inv.openInventory(player);
 	}
 
@@ -333,16 +361,16 @@ public class PlayerGUIs {
 		Set<Entry<User, Integer>> users = null;
 		String topVoter = "";
 		if (top.equals(TopVoter.Monthly)) {
-			topVoter = "Monthly";
+			topVoter = Config.getInstance().getFormatTopVoterMonthly();
 			users = plugin.topVoterMonthly.entrySet();
 		} else if (top.equals(TopVoter.Weekly)) {
-			topVoter = "Weekly";
+			topVoter = Config.getInstance().getFormatTopVoterWeekly();
 			users = plugin.topVoterWeekly.entrySet();
 		} else if (top.equals(TopVoter.Daily)) {
-			topVoter = "Daily";
+			topVoter = Config.getInstance().getFormatTopVoterDaily();
 			users = plugin.topVoterDaily.entrySet();
 		} else {
-			topVoter = "AllTime";
+			topVoter = Config.getInstance().getFormatTopVoterAllTime();
 			users = plugin.topVoterAllTime.entrySet();
 		}
 		inv = new BInventory(StringUtils.getInstance().replacePlaceHolder(Config.getInstance().getGUIVoteTopName(),
@@ -350,7 +378,7 @@ public class PlayerGUIs {
 		int pos = 1;
 		for (Entry<User, Integer> entry : users) {
 			inv.addButton(new BInventoryButton(
-					new ItemBuilder(MiscUtils.getInstance().setSkullOwner(entry.getKey().getPlayerName()))
+					new ItemBuilder(MiscUtils.getInstance().setSkullOwner(entry.getKey().getOfflinePlayer()))
 							.setName(Config.getInstance().getGUIVoteTopItemName())
 							.addLoreLine(Config.getInstance().getGUIVoteTopItemLore())
 							.addPlaceholder("position", "" + pos)
@@ -359,8 +387,10 @@ public class PlayerGUIs {
 
 				@Override
 				public void onClick(ClickEvent clickEvent) {
-					User user = UserManager.getInstance()
-							.getVotingPluginUser(clickEvent.getClickedItem().getItemMeta().getDisplayName());
+					ItemBuilder item = new ItemBuilder(clickEvent.getClickedItem());
+					String name = ChatColor.stripColor(item.getName()).split(":")[1].trim();
+
+					User user = UserManager.getInstance().getVotingPluginUser(name);
 					openVoteGUI(player, user);
 				}
 			});
@@ -368,23 +398,31 @@ public class PlayerGUIs {
 		}
 		final TopVoter cur = top;
 		inv.getPageButtons().add(new BInventoryButton(
-				new ItemBuilder(Config.getInstance().getGUIVoteTopSwitchItem()).addPlaceholder("Top", cur.toString())) {
+				new ItemBuilder(Config.getInstance().getGUIVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				openVoteTop(player, cur.next());
+				if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
+					openVoteTop(player, cur.next());
+				} else {
+					openVoteTop(player, cur.prev());
+				}
 			}
 		});
-		inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
 
-			@Override
-			public void onClick(ClickEvent event) {
-				openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-			}
-		});
+		if (Config.getInstance().getGUIVoteTopBackButton()) {
+			inv.getPageButtons().add(new BInventoryButton(getBackButton().setSlot(1)) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+			});
+		}
 		inv.setPages(true);
 		inv.setMaxInvSize(Config.getInstance().getGUIVoteTopSize());
 		inv.openInventory(player);
+
 	}
 
 	public void openVoteTotal(Player player, User user) {
@@ -422,13 +460,16 @@ public class PlayerGUIs {
 			public void onClick(ClickEvent clickEvent) {
 			}
 		});
-		inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
 
-			@Override
-			public void onClick(ClickEvent event) {
-				openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-			}
-		});
+		if (Config.getInstance().getGUIVoteTotalBackButton()) {
+			inv.addButton(new BInventoryButton(getBackButton()) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+			});
+		}
 		inv.openInventory(player);
 	}
 
@@ -439,6 +480,7 @@ public class PlayerGUIs {
 	 *            the player
 	 */
 	public void openVoteURL(Player player) {
+		setSelectedPlayer(player, null);
 		BInventory inv = new BInventory(Config.getInstance().getGUIVoteURLName());
 
 		User user = UserManager.getInstance().getVotingPluginUser(player);
@@ -451,8 +493,12 @@ public class PlayerGUIs {
 				builderAll = new ItemBuilder(Config.getInstance().getVoteURLCanVoteAllUrlsButtonItemSection());
 			}
 
-			builderAll.setName("&4All Voting Sites");
-			builderAll.setLore("&cClick Me");
+			if (!builderAll.hasCustomDisplayName()) {
+				builderAll.setName("&4All Voting Sites");
+			}
+			if (!builderAll.hasCustomLore()) {
+				builderAll.setLore("&cClick Me");
+			}
 
 			inv.addButton(count, new BInventoryButton(builderAll) {
 
@@ -498,15 +544,18 @@ public class PlayerGUIs {
 			count++;
 		}
 
-		inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+		if (Config.getInstance().getGUIVoteURLBackButton()) {
+			inv.addButton(new BInventoryButton(getBackButton()) {
 
-			@Override
-			public void onClick(ClickEvent event) {
-				openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-			}
-		});
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+			});
+		}
+
+		inv.openInventory(player);
 
-		BInventory.openInventory(player, inv);
 	}
 
 	public void openVoteURL(Player player, String voteSite) {
@@ -544,13 +593,15 @@ public class PlayerGUIs {
 			}
 		});
 
-		inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI")) {
+		if (Config.getInstance().getGUIVoteURLBackButton()) {
+			inv.addButton(new BInventoryButton(getBackButton()) {
 
-			@Override
-			public void onClick(ClickEvent event) {
-				openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-			}
-		});
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+			});
+		}
 		inv.openInventory(player);
 	}
 
@@ -573,7 +624,7 @@ public class PlayerGUIs {
 			int count = 0;
 			for (VoteSite voteSite : plugin.getVoteSites()) {
 				try {
-					ItemBuilder builder = new ItemBuilder(voteSite.getItem());
+					ItemBuilder builder = voteSite.getItem();
 					final VoteSite site = voteSite;
 
 					inv.addButton(count, new BInventoryButton(builder) {
@@ -609,6 +660,7 @@ public class PlayerGUIs {
 								}
 
 							}
+
 						});
 			}
 		}

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

@@ -56,6 +56,10 @@ public class Config extends YMLFile {
 		return "AllSites";
 	}
 
+	public boolean getAlternateUUIDLookup() {
+		return getData().getBoolean("AlternateUUIDLookup");
+	}
+
 	/**
 	 * Gets the rewards.
 	 *
@@ -79,6 +83,14 @@ public class Config extends YMLFile {
 		return getData().getBoolean("AutoDownload");
 	}
 
+	public boolean getAutoKillInvs() {
+		return getData().getBoolean("AutoKillInvs", true);
+	}
+
+	public ConfigurationSection getBackButton() {
+		return getData().getConfigurationSection("BackButton");
+	}
+
 	/**
 	 * Gets the black list.
 	 *
@@ -102,6 +114,10 @@ public class Config extends YMLFile {
 		return getData().getBoolean("CheckOnWorldChange");
 	}
 
+	public boolean getClearCacheOnUpdate() {
+		return getData().getBoolean("ClearCacheOnUpdate");
+	}
+
 	public boolean getCommandsUseGUIBest() {
 		return getData().getBoolean("Commands.UseGUI.Best");
 	}
@@ -134,6 +150,10 @@ public class Config extends YMLFile {
 		return getData().getBoolean("Commands.UseGUI.Vote", true);
 	}
 
+	public boolean getCountFakeVotes() {
+		return getData().getBoolean("CountFakeVotes", true);
+	}
+
 	/**
 	 * Gets the cumulative reward enabled.
 	 *
@@ -379,7 +399,8 @@ public class Config extends YMLFile {
 	}
 
 	public String getFormatCommandsVoteNextInfoVoteDelayDaily() {
-		return getData().getString("Format.Commands.Vote.Next.Info.VoteDelayDaily", "Tomorrow");
+		return getData().getString("Format.Commands.Vote.Next.Info.VoteDelayDaily",
+				"%hours% Hours and %minutes% Minutes");
 	}
 
 	/**
@@ -511,6 +532,10 @@ public class Config extends YMLFile {
 		return getData().getString("Format.HelpLine", "&3&l%Command% - &3%HelpMessage%");
 	}
 
+	public String getFormatNextPage() {
+		return getData().getString("Format.NextPage", "&aNext Page");
+	}
+
 	/**
 	 * Gets the format no perms.
 	 *
@@ -533,6 +558,10 @@ public class Config extends YMLFile {
 		return 10;
 	}
 
+	public String getFormatPrevPage() {
+		return getData().getString("Format.PrevPage", "&aPrevious Page");
+	}
+
 	public String getFormatShopFailedMsg() {
 		String msg = getData().getString("Format.ShopFailed", "&cYou do not have %Points% points to purhcase this!");
 
@@ -605,6 +634,18 @@ public class Config extends YMLFile {
 
 	}
 
+	public String getFormatTopVoterAllTime() {
+		return getData().getString("Format.TopVoter.AllTime", "AllTime");
+	}
+
+	public String getFormatTopVoterDaily() {
+		return getData().getString("Format.TopVoter.Daily", "Daily");
+	}
+
+	public String getFormatTopVoterMonthly() {
+		return getData().getString("Format.TopVoter.Monthly", "Monthly");
+	}
+
 	/**
 	 * Gets the top voter reward msg.
 	 *
@@ -616,6 +657,10 @@ public class Config extends YMLFile {
 
 	}
 
+	public String getFormatTopVoterWeekly() {
+		return getData().getString("Format.TopVoter.Weekly", "Weekly");
+	}
+
 	/**
 	 * Gets the vote help.
 	 *
@@ -646,10 +691,18 @@ public class Config extends YMLFile {
 		return getData().getString("GUI.VoteGUIName", "&cVoteGUI: &c&l%player%");
 	}
 
+	public boolean getGUIVoteLastBackButton() {
+		return getData().getBoolean("GUI.VoteLast.BackButton");
+	}
+
 	public String getGUIVoteLastName() {
 		return getData().getString("GUI.VoteLast.Name", "VoteLast: %player%");
 	}
 
+	public boolean getGUIVoteNextBackButton() {
+		return getData().getBoolean("GUI.VoteNext.BackButton");
+	}
+
 	public String getGUIVoteNextName() {
 		return getData().getString("GUI.VoteNext.Name", "VoteNext: %player%");
 	}
@@ -658,6 +711,10 @@ public class Config extends YMLFile {
 		return getData().getString("GUI.VoteRewardName", "VoteReward");
 	}
 
+	public boolean getGUIVoteStreakBackButton() {
+		return getData().getBoolean("GUI.VoteStreak.BackButton");
+	}
+
 	public ConfigurationSection getGUIVoteStreakCurrentDayStreakItem() {
 		return getData().getConfigurationSection("GUI.VoteStreak.CurrentDayStreak.Item");
 	}
@@ -686,10 +743,18 @@ public class Config extends YMLFile {
 		return getData().getString("GUI.VoteStreak.Name", "VoteStreak");
 	}
 
+	public boolean getGUIVoteTodayBackButton() {
+		return getData().getBoolean("GUI.VoteToday.BackButton");
+	}
+
 	public String getGUIVoteTodayName() {
 		return getData().getString("GUI.VoteToday.Name", "VoteToday");
 	}
 
+	public boolean getGUIVoteTopBackButton() {
+		return getData().getBoolean("GUI.VoteToday.BackButton");
+	}
+
 	public String getGUIVoteTopItemLore() {
 		return getData().getString("GUI.VoteTop.Item.Lore", "&3&lVotes: &3%votes%");
 	}
@@ -714,6 +779,10 @@ public class Config extends YMLFile {
 		return getData().getConfigurationSection("GUI.VoteTotal.AllTimeTotal.Item");
 	}
 
+	public boolean getGUIVoteTotalBackButton() {
+		return getData().getBoolean("GUI.VoteTotal.BackButton");
+	}
+
 	public ConfigurationSection getGUIVoteTotalDayTotalItem() {
 		return getData().getConfigurationSection("GUI.VoteTotal.DayTotal.Item");
 	}
@@ -730,6 +799,10 @@ public class Config extends YMLFile {
 		return getData().getConfigurationSection("GUI.VoteTotal.WeekTotal.Item");
 	}
 
+	public boolean getGUIVoteURLBackButton() {
+		return getData().getBoolean("GUI.VoteURL.BackButton");
+	}
+
 	public String getGUIVoteURLName() {
 		return getData().getString("GUI.VoteURL.Name", "&cVoteURL");
 	}
@@ -806,10 +879,6 @@ public class Config extends YMLFile {
 		return getData().getBoolean("LogVotesToFile");
 	}
 
-	public boolean getResetMilestonesMonthly() {
-		return getData().getBoolean("ResetMilestonesMonthly");
-	}
-
 	/**
 	 * Gets the milestone reward enabled.
 	 *
@@ -894,6 +963,10 @@ public class Config extends YMLFile {
 		return getData().getInt("MySQL.MaxConnections", 1);
 	}
 
+	public int getMysqlMaxSize() {
+		return getData().getInt("MySQL.MaxSize", -1);
+	}
+
 	public String getMySqlPassword() {
 		return getData().getString("MySQL.Password", "");
 	}
@@ -910,6 +983,10 @@ public class Config extends YMLFile {
 		return getData().getString("MySQL.Username", "");
 	}
 
+	public int getPointsOnVote() {
+		return getData().getInt("PointsOnVote", 1);
+	}
+
 	/**
 	 * Gets the request API default method.
 	 *
@@ -929,6 +1006,10 @@ public class Config extends YMLFile {
 		return (ArrayList<String>) getData().getList("RequestAPI.DisabledMethods", new ArrayList<String>());
 	}
 
+	public boolean getResetMilestonesMonthly() {
+		return getData().getBoolean("ResetMilestonesMonthly");
+	}
+
 	/**
 	 * Gets the send scoreboards.
 	 *
@@ -1025,6 +1106,14 @@ public class Config extends YMLFile {
 		return getData().getInt("GUI.VoteGUI." + slot + ".Slot");
 	}
 
+	public String getVotePartyBroadcast() {
+		return getData().getString("VoteParty.Broadcast", "");
+	}
+
+	public boolean getVotePartyCountFakeVotes() {
+		return getData().getBoolean("VoteParty.CountFakeVotes", true);
+	}
+
 	/**
 	 * Gets the vote party enabled.
 	 *
@@ -1056,14 +1145,6 @@ public class Config extends YMLFile {
 		return "VoteParty.Rewards";
 	}
 
-	public String getVotePartyBroadcast() {
-		return getData().getString("VoteParty.Broadcast", "");
-	}
-
-	public int getPointsOnVote() {
-		return getData().getInt("PointsOnVote", 1);
-	}
-
 	/**
 	 * Gets the vote party votes required.
 	 *
@@ -1118,10 +1199,22 @@ public class Config extends YMLFile {
 		return "VoteReminding.Rewards";
 	}
 
+	public boolean getVoteShopBackButton() {
+		return getData().getBoolean("VoteShopBackButton", true);
+	}
+
+	public boolean getGiveDefaultPermission() {
+		return getData().getBoolean("GiveDefaultPermission", true);
+	}
+
 	public String getVoteShopName() {
 		return getData().getString("GUI.VoteShopName", "VoteShop");
 	}
 
+	public String getFormatUserNotExist() {
+		return getData().getString("Format.UserNotExist", "&cUser does not exist: %player%");
+	}
+
 	/**
 	 * Gets the vote site items.
 	 *
@@ -1166,12 +1259,12 @@ public class Config extends YMLFile {
 		return getData().getInt("VotesRequired");
 	}
 
-	public boolean getVoteStreakRewardEnabled(String type, int votestreak) {
-		return getData().getBoolean("VoteStreak." + type + "." + votestreak + ".Enabled");
+	public boolean getVoteStreakRewardEnabled(String type, String s) {
+		return getData().getBoolean("VoteStreak." + type + "." + s + ".Enabled");
 	}
 
-	public String getVoteStreakRewardsPath(String type, int votestreak) {
-		return "VoteStreak." + type + "." + votestreak + ".Rewards";
+	public String getVoteStreakRewardsPath(String type, String string) {
+		return "VoteStreak." + type + "." + string + ".Rewards";
 	}
 
 	public Set<String> getVoteStreakVotes(String type) {

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

@@ -55,7 +55,7 @@ public class ConfigVoteSites extends YMLFile {
 			String org = siteName;
 			siteName = siteName.replace(".", "_");
 			plugin.getLogger().warning("VoteSite " + siteName
-					+ " doe not exist, creating one, set AutoCreateVoteSites to false to prevent this");
+					+ " does not exist, creating one, set AutoCreateVoteSites to false to prevent this");
 			setEnabled(siteName, true);
 			setServiceSite(siteName, org);
 			setVoteURL(siteName, "VoteURL");
@@ -81,6 +81,10 @@ public class ConfigVoteSites extends YMLFile {
 		return getData(site).getString("Name");
 	}
 
+	public String getEverySiteRewardPath() {
+		return "EverySiteReward";
+	}
+
 	public ConfigurationSection getItem(String site) {
 		return getData(site).getConfigurationSection("Item");
 	}
@@ -107,10 +111,6 @@ public class ConfigVoteSites extends YMLFile {
 		return "VoteSites." + siteName + ".Rewards";
 	}
 
-	public String getEverySiteRewardPath() {
-		return "EverySiteReward";
-	}
-
 	/**
 	 * Gets the service site.
 	 *
@@ -144,10 +144,6 @@ public class ConfigVoteSites extends YMLFile {
 		return getData(siteName).getBoolean("Enabled");
 	}
 
-	public boolean getVoteSiteResetVoteDelayDaily(String siteName) {
-		return getData(siteName).getBoolean("VoteDelayDaily");
-	}
-
 	/**
 	 * Gets the vote site file.
 	 *
@@ -170,6 +166,14 @@ public class ConfigVoteSites extends YMLFile {
 
 	}
 
+	public boolean getVoteSiteGiveOffline(String site) {
+		return getData(site).getBoolean("GiveOffline");
+	}
+
+	public boolean getVoteSiteResetVoteDelayDaily(String siteName) {
+		return getData(siteName).getBoolean("VoteDelayDaily");
+	}
+
 	/**
 	 * Gets the vote sites load.
 	 *

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Data/ServerData.java

@@ -1,5 +1,6 @@
 package com.Ben12345rocks.VotingPlugin.Data;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -47,6 +48,12 @@ public class ServerData {
 		ServerData.plugin = plugin;
 	}
 
+	public void addServiceSite(String site) {
+		ArrayList<String> l = getServiceSites();
+		l.add(site);
+		setServiceSites(l);
+	}
+
 	/**
 	 * Adds the sign.
 	 *
@@ -88,6 +95,11 @@ public class ServerData {
 		return data;
 	}
 
+	@SuppressWarnings("unchecked")
+	public ArrayList<String> getServiceSites() {
+		return (ArrayList<String>) getData().getList("ServiceSites", new ArrayList<String>());
+	}
+
 	/**
 	 * Gets the sign data.
 	 *
@@ -185,6 +197,11 @@ public class ServerData {
 		com.Ben12345rocks.AdvancedCore.Data.ServerData.getInstance().saveData();
 	}
 
+	public void setServiceSites(ArrayList<String> list) {
+		getData().set("ServiceSites", list);
+		saveData();
+	}
+
 	/**
 	 * Sets the sign.
 	 *

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

@@ -3,7 +3,6 @@ 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;
 
 // TODO: Auto-generated Javadoc
@@ -25,7 +24,7 @@ public class PlayerVoteEvent extends Event {
 	}
 
 	/** The player. */
-	private User player;
+	private String player;
 
 	/** The vote site. */
 	private VoteSite voteSite;
@@ -33,17 +32,9 @@ public class PlayerVoteEvent extends Event {
 	/** The cancelled. */
 	private boolean cancelled;
 
-	/**
-	 * Instantiates a new player vote event.
-	 *
-	 * @param voteSite
-	 *            the vote site
-	 * @param player
-	 *            the player
-	 */
-	public PlayerVoteEvent(VoteSite voteSite, User player) {
+	public PlayerVoteEvent(VoteSite voteSite, String voteUsername) {
 		super();
-		setPlayer(player);
+		setPlayer(voteUsername);
 		setVoteSite(voteSite);
 	}
 
@@ -62,7 +53,7 @@ public class PlayerVoteEvent extends Event {
 	 *
 	 * @return the player
 	 */
-	public User getPlayer() {
+	public String getPlayer() {
 		return player;
 	}
 
@@ -94,14 +85,8 @@ public class PlayerVoteEvent extends Event {
 		cancelled = bln;
 	}
 
-	/**
-	 * Sets the player.
-	 *
-	 * @param player
-	 *            the new player
-	 */
-	public void setPlayer(User player) {
-		this.player = player;
+	public void setPlayer(String voteUsername) {
+		this.player = voteUsername;
 	}
 
 	/**

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

@@ -7,9 +7,12 @@ 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.AdvancedCore.Util.Misc.PlayerUtils;
 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.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
 import com.Ben12345rocks.VotingPlugin.OtherRewards.OtherVoteReward;
@@ -33,39 +36,46 @@ public class VotiferEvent implements Listener {
 	/** The plugin. */
 	static Main plugin = Main.plugin;
 
-	/**
-	 * Player vote.
-	 *
-	 * @param playerName
-	 *            the player name
-	 * @param voteSiteURL
-	 *            the vote site URL
-	 */
 	public static void playerVote(final String playerName, final String voteSiteURL) {
+		playerVote(playerName, voteSiteURL, true);
+	}
+
+	public static void playerVote(final String playerName, final String voteSiteURL, final boolean realVote) {
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 			@Override
 			public void run() {
-				synchronized (plugin) {
-					User user = UserManager.getInstance().getVotingPluginUser(playerName);
-					if (!user.hasLoggedOnBefore() && !config.allowUnJoined()) {
+				synchronized (configVoteSites) {
+					if (!PlayerUtils.getInstance().isValidUser(playerName) && !config.allowUnJoined()) {
 						plugin.getLogger().warning("Player " + playerName
 								+ " has not joined before, disregarding vote, set AllowUnjoined to true to prevent this");
 						return;
 					}
+					User user = UserManager.getInstance().getVotingPluginUser(playerName);
 
 					VoteSite voteSite = plugin.getVoteSite(voteSiteURL);
 					if (voteSite == null) {
 						if (!Config.getInstance().getDisableNoServiceSiteMessage()) {
 							plugin.getLogger().warning("No voting site with the service site: '" + voteSiteURL + "'");
+							plugin.getLogger().warning(
+									"Please read here on how to fix it: https://github.com/Ben12345rocks/VotingPlugin/wiki/Common-Problems");
+
+							ArrayList<String> services = new ArrayList<String>();
+							for (VoteSite site : plugin.getVoteSites()) {
+								services.add(site.getServiceSite());
+							}
+							plugin.getLogger().warning(
+									"Current service sites: " + ArrayUtils.getInstance().makeStringList(services));
 						}
 						return;
 					}
 
 					// vote party
 					if (Config.getInstance().getVotePartyEnabled()) {
-						VoteParty.getInstance().addTotal(user);
-						VoteParty.getInstance().addVotePlayer(user);
-						VoteParty.getInstance().check();
+						if (Config.getInstance().getVotePartyCountFakeVotes() || realVote) {
+							VoteParty.getInstance().addTotal(user);
+							VoteParty.getInstance().addVotePlayer(user);
+							VoteParty.getInstance().check();
+						}
 					}
 
 					// broadcast vote if enabled in config
@@ -81,10 +91,12 @@ public class VotiferEvent implements Listener {
 					OtherVoteReward.getInstance().checkFirstVote(user);
 
 					// add to total votes
-					user.addTotal();
-					user.addTotalDaily();
-					user.addTotalWeekly();
-					user.addPoints();
+					if (Config.getInstance().getCountFakeVotes() || realVote) {
+						user.addTotal();
+						user.addTotalDaily();
+						user.addTotalWeekly();
+						user.addPoints();
+					}
 
 					user.setReminded(false);
 
@@ -94,11 +106,14 @@ public class VotiferEvent implements Listener {
 					OtherVoteReward.getInstance().checkCumualativeVotes(user);
 					OtherVoteReward.getInstance().checkMilestone(user);
 
-					if (user.isOnline()) {
+					if (user.isOnline() || voteSite.isGiveOffline()) {
 						user.playerVote(voteSite, true, false);
+						user.closeInv();
 					} else {
 						user.addOfflineVote(voteSite.getKey());
-						plugin.debug("Offline vote set for " + playerName + " on " + voteSite.getKey());
+						// plugin.debug(ArrayUtils.getInstance().makeStringList(user.getOfflineVotes()));
+						plugin.debug("Offline vote set for " + playerName + " (" + user.getUUID() + ") on "
+								+ voteSite.getKey());
 					}
 
 					plugin.setUpdate(true);
@@ -129,7 +144,8 @@ public class VotiferEvent implements Listener {
 
 		Vote vote = event.getVote();
 		final String voteSite = vote.getServiceName();
-		final String voteUsername = vote.getUsername();
+		final String voteUsername = vote.getUsername().trim();
+		ServerData.getInstance().addServiceSite(voteSite);
 
 		if (voteUsername.length() == 0) {
 			plugin.getLogger().warning("No name from vote on " + voteSite);
@@ -141,16 +157,13 @@ public class VotiferEvent implements Listener {
 		plugin.debug("PlayerUsername: " + voteUsername);
 		plugin.debug("VoteSite: " + voteSite);
 
-		
-
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 			@Override
 			public void run() {
 				String voteSiteName = plugin.getVoteSiteName(voteSite);
-				
-				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName),
-						UserManager.getInstance().getVotingPluginUser(voteUsername));
+
+				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName), voteUsername);
 				plugin.getServer().getPluginManager().callEvent(voteEvent);
 
 				if (voteEvent.isCancelled()) {
@@ -169,7 +182,7 @@ public class VotiferEvent implements Listener {
 					ConfigVoteSites.getInstance().generateVoteSite(voteSiteName);
 				}
 
-				playerVote(voteUsername, voteSite);
+				playerVote(voteUsername, voteSite, true);
 
 			}
 		});

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

@@ -8,6 +8,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -15,8 +16,10 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
+import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -30,7 +33,6 @@ import com.Ben12345rocks.AdvancedCore.Util.Javascript.JavascriptPlaceholderReque
 import com.Ben12345rocks.AdvancedCore.Util.Logger.Logger;
 import com.Ben12345rocks.AdvancedCore.Util.Metrics.BStatsMetrics;
 import com.Ben12345rocks.AdvancedCore.Util.Metrics.MCStatsMetrics;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Updater.Updater;
 import com.Ben12345rocks.AdvancedCore.mysql.MySQL;
 import com.Ben12345rocks.VotingPlugin.Commands.CommandLoader;
@@ -74,16 +76,16 @@ public class Main extends JavaPlugin {
 	public static Main plugin;
 
 	/** The top voter monthly. */
-	public HashMap<User, Integer> topVoterAllTime;
+	public LinkedHashMap<User, Integer> topVoterAllTime;
 
 	/** The top voter monthly. */
-	public HashMap<User, Integer> topVoterMonthly;
+	public LinkedHashMap<User, Integer> topVoterMonthly;
 
 	/** The top voter weekly. */
-	public HashMap<User, Integer> topVoterWeekly;
+	public LinkedHashMap<User, Integer> topVoterWeekly;
 
 	/** The top voter daily. */
-	public HashMap<User, Integer> topVoterDaily;
+	public LinkedHashMap<User, Integer> topVoterDaily;
 
 	/** The updater. */
 	public Updater updater;
@@ -98,7 +100,7 @@ public class Main extends JavaPlugin {
 	private List<VoteSite> voteSites;
 
 	/** The vote today. */
-	public HashMap<User, HashMap<VoteSite, LocalDateTime>> voteToday;
+	public LinkedHashMap<User, HashMap<VoteSite, LocalDateTime>> voteToday;
 
 	/** The signs. */
 	public ArrayList<SignHandler> signs;
@@ -108,6 +110,8 @@ public class Main extends JavaPlugin {
 
 	private boolean update = true;
 
+	private boolean updateStarted = false;
+
 	/**
 	 * Check votifier.
 	 */
@@ -190,6 +194,10 @@ public class Main extends JavaPlugin {
 		return UserManager.getInstance();
 	}
 
+	public VoteParty getVoteParty() {
+		return VoteParty.getInstance();
+	}
+
 	/**
 	 * Gets the vote site.
 	 *
@@ -228,11 +236,16 @@ public class Main extends JavaPlugin {
 			for (String siteName : sites) {
 				String URL = ConfigVoteSites.getInstance().getServiceSite(siteName);
 				if (URL != null) {
-					if (URL.equals(url)) {
+					if (URL.equalsIgnoreCase(url)) {
 						return siteName;
 					}
 				}
 			}
+			for (String siteName : sites) {
+				if (siteName.equalsIgnoreCase(url)) {
+					return siteName;
+				}
+			}
 		}
 		return url;
 
@@ -252,6 +265,23 @@ public class Main extends JavaPlugin {
 		return false;
 	}
 
+	private void loadMySQL() {
+		if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
+			Thread.getInstance().run(new Runnable() {
+
+				@Override
+				public void run() {
+					AdvancedCoreHook.getInstance()
+							.setMysql(new MySQL("VotingPlugin_Users", Config.getInstance().getMySqlHost(),
+									Config.getInstance().getMySqlPort(), Config.getInstance().getMySqlDatabase(),
+									Config.getInstance().getMySqlUsername(), Config.getInstance().getMySqlPassword(),
+									Config.getInstance().getMySqlMaxConnections()));
+				}
+			});
+
+		}
+	}
+
 	private void loadTimer() {
 		AdvancedCoreHook.getInstance().getTimer().schedule(new TimerTask() {
 
@@ -405,14 +435,13 @@ public class Main extends JavaPlugin {
 			@Override
 			public String getValue() {
 				for (String s : Config.getInstance().getVoteStreakVotes("Day")) {
-					if (StringUtils.getInstance().isInt(s)) {
-						int streak = Integer.parseInt(s);
-						if (Config.getInstance().getVoteStreakRewardEnabled("Day", streak)
-								&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-										Config.getInstance().getVoteStreakRewardsPath("Day", streak))) {
-							return "True";
-						}
+
+					if (Config.getInstance().getVoteStreakRewardEnabled("Day", s)
+							&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
+									Config.getInstance().getVoteStreakRewardsPath("Day", s))) {
+						return "True";
 					}
+
 				}
 				return "False";
 			}
@@ -423,15 +452,14 @@ public class Main extends JavaPlugin {
 			@Override
 			public String getValue() {
 				for (String s : Config.getInstance().getVoteStreakVotes("Week")) {
-					if (StringUtils.getInstance().isInt(s)) {
-						int streak = Integer.parseInt(s);
-						if (Config.getInstance().getVoteStreakRewardEnabled("Week", streak)
-								&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-										Config.getInstance().getVoteStreakRewardsPath("Week", streak))) {
-							return "True";
-						}
+
+					if (Config.getInstance().getVoteStreakRewardEnabled("Week", s)
+							&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
+									Config.getInstance().getVoteStreakRewardsPath("Week", s))) {
+						return "True";
 					}
 				}
+
 				return "False";
 			}
 		});
@@ -441,15 +469,14 @@ public class Main extends JavaPlugin {
 			@Override
 			public String getValue() {
 				for (String s : Config.getInstance().getVoteStreakVotes("Month")) {
-					if (StringUtils.getInstance().isInt(s)) {
-						int streak = Integer.parseInt(s);
-						if (Config.getInstance().getVoteStreakRewardEnabled("Month", streak)
-								&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-										Config.getInstance().getVoteStreakRewardsPath("Month", streak))) {
-							return "True";
-						}
+
+					if (Config.getInstance().getVoteStreakRewardEnabled("Month", s)
+							&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
+									Config.getInstance().getVoteStreakRewardsPath("Month", s))) {
+						return "True";
 					}
 				}
+
 				return "False";
 			}
 		});
@@ -624,6 +651,9 @@ public class Main extends JavaPlugin {
 		loadVoteSites();
 		updateAdvancedCoreHook();
 		AdvancedCoreHook.getInstance().loadHook(this);
+		if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
+			debug("UseBatchUpdates: " + AdvancedCoreHook.getInstance().getMysql().isUseBatchUpdates());
+		}
 		registerCommands();
 		registerEvents();
 		checkVotifier();
@@ -642,11 +672,11 @@ public class Main extends JavaPlugin {
 			}
 		});
 
-		topVoterMonthly = new HashMap<User, Integer>();
-		topVoterWeekly = new HashMap<User, Integer>();
-		topVoterDaily = new HashMap<User, Integer>();
-		voteToday = new HashMap<User, HashMap<VoteSite, LocalDateTime>>();
-		topVoterAllTime = new HashMap<User, Integer>();
+		topVoterMonthly = new LinkedHashMap<User, Integer>();
+		topVoterWeekly = new LinkedHashMap<User, Integer>();
+		topVoterDaily = new LinkedHashMap<User, Integer>();
+		voteToday = new LinkedHashMap<User, HashMap<VoteSite, LocalDateTime>>();
+		topVoterAllTime = new LinkedHashMap<User, Integer>();
 
 		voteLog = new Logger(plugin, new File(plugin.getDataFolder() + File.separator + "Log", "votelog.txt"));
 
@@ -664,14 +694,20 @@ public class Main extends JavaPlugin {
 		AdvancedCoreHook.getInstance().getJavascriptEngineRequests().add(new JavascriptPlaceholderRequest("User") {
 
 			@Override
-			public Object getObject(Player player) {
+			public Object getObject(OfflinePlayer player) {
 				return getUserManager().getVotingPluginUser(player);
 			}
 		});
 
+		loadTimer();
+
 		plugin.getLogger().info("Enabled VotingPlgin " + plugin.getDescription().getVersion());
 
-		loadTimer();
+		for (VoteSite site : getVoteSites()) {
+			if (!site.hasRewards() && !Config.getInstance().getDisableNoServiceSiteMessage()) {
+				plugin.getLogger().warning("No rewards detected for the site: " + site.getKey());
+			}
+		}
 
 	}
 
@@ -685,8 +721,8 @@ public class Main extends JavaPlugin {
 		// /vote, /v
 		getCommand("vote").setExecutor(new CommandVote(this));
 		getCommand("vote").setTabCompleter(new VoteTabCompleter());
-		getCommand("v").setExecutor(new CommandVote(this));
-		getCommand("v").setTabCompleter(new VoteTabCompleter());
+		// getCommand("v").setExecutor(new CommandVote(this));
+		// getCommand("v").setTabCompleter(new VoteTabCompleter());
 
 		// /adminvote, /av
 		getCommand("adminvote").setExecutor(new CommandAdminVote(this));
@@ -694,6 +730,12 @@ public class Main extends JavaPlugin {
 		getCommand("av").setExecutor(new CommandAdminVote(this));
 		getCommand("av").setTabCompleter(new AdminVoteTabCompleter());
 
+		if (Config.getInstance().getGiveDefaultPermission()) {
+			Bukkit.getPluginManager().getPermission("VotingPlugin.Player").setDefault(PermissionDefault.TRUE);
+		} else {
+			Bukkit.getPluginManager().getPermission("VotingPlugin.Player").setDefault(PermissionDefault.OP);
+		}
+
 		plugin.debug("Loaded Commands");
 
 	}
@@ -754,10 +796,35 @@ public class Main extends JavaPlugin {
 	 * Setup files.
 	 */
 	public void setupFiles() {
-		config = Config.getInstance();
-		configVoteSites = ConfigVoteSites.getInstance();
-		config.setup();
-		configVoteSites.setup();
+		try {
+			config = Config.getInstance();
+			config.setup();
+		} catch (Exception e) {
+			e.printStackTrace();
+			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+
+				@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() {
+
+				@Override
+				public void run() {
+					plugin.getLogger().severe("Failed to load VoteSites.yml");
+					e.printStackTrace();
+				}
+
+			}, 10);
+		}
 
 		plugin.debug("Loaded Files");
 
@@ -767,7 +834,9 @@ public class Main extends JavaPlugin {
 	 * Update.
 	 */
 	public void update() {
-		if (update && plugin != null) {
+		if (update && plugin != null && !updateStarted) {
+			updateStarted = true;
+			update = false;
 			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 				@Override
@@ -777,18 +846,36 @@ public class Main extends JavaPlugin {
 							if (AdvancedCoreHook.getInstance().getMysql() == null) {
 								plugin.debug("MySQL not loaded yet");
 								return;
-							} else {
+							} else if (Config.getInstance().getClearCacheOnUpdate()) {
 								AdvancedCoreHook.getInstance().getMysql().clearCache();
+							} else {
+								AdvancedCoreHook.getInstance().getMysql().clearCacheBasic();
 							}
 						}
-						update = false;
+
 						plugin.debug("Starting background task");
+						long time = System.currentTimeMillis();
 						try {
-							TopVoterHandler.getInstance().updateTopVoters();
-							Commands.getInstance().updateVoteToday();
+							ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
+							ArrayList<User> users = new ArrayList<User>();
+							for (String uuid : uuids) {
+								User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+								users.add(user);
+							}
+							update = false;
+							long time1 = ((System.currentTimeMillis() - time) / 1000);
+							plugin.debug("Finished loading player data in " + time1 + " seconds, " + users.size()
+									+ " users");
+							TopVoterHandler.getInstance().updateTopVoters(users);
+							Commands.getInstance().updateVoteToday(users);
 							ServerData.getInstance().updateValues();
 							Signs.getInstance().updateSigns();
-							plugin.debug("Background task ran");
+
+							for (Player player : Bukkit.getOnlinePlayers()) {
+								UserManager.getInstance().getVotingPluginUser(player).offVote();
+							}
+							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.");
@@ -797,15 +884,17 @@ public class Main extends JavaPlugin {
 				}
 
 			});
+			updateStarted = false;
 		}
 	}
 
 	public void updateAdvancedCoreHook() {
+		AdvancedCoreHook.getInstance().setMaxMysqlSize(Config.getInstance().getMysqlMaxSize());
 		AdvancedCoreHook.getInstance().setAutoDownload(Config.getInstance().getAutoDownload());
 		AdvancedCoreHook.getInstance().getJavascriptEngine().put("VotingPlugin", this);
 		AdvancedCoreHook.getInstance().allowDownloadingFromSpigot(15358);
 		AdvancedCoreHook.getInstance().setExtraDebug(Config.getInstance().getExtraDebug());
-		AdvancedCoreHook.getInstance().setStorageType(UserStorage.valueOf(Config.getInstance().getDataStorage()));
+		AdvancedCoreHook.getInstance().setStorageType(UserStorage.value(Config.getInstance().getDataStorage()));
 		loadMySQL();
 
 		AdvancedCoreHook.getInstance().setCheckOnWorldChange(Config.getInstance().getCheckOnWorldChange());
@@ -818,23 +907,10 @@ public class Main extends JavaPlugin {
 		AdvancedCoreHook.getInstance().setHelpLine(Config.getInstance().getFormatHelpLine());
 		AdvancedCoreHook.getInstance().setLogDebugToFile(Config.getInstance().getLogDebugToFile());
 		AdvancedCoreHook.getInstance().setSendScoreboards(Config.getInstance().getSendScoreboards());
-	}
-
-	private void loadMySQL() {
-		if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
-			Thread.getInstance().run(new Runnable() {
-
-				@Override
-				public void run() {
-					AdvancedCoreHook.getInstance()
-							.setMysql(new MySQL("VotingPlugin_Users", Config.getInstance().getMySqlHost(),
-									Config.getInstance().getMySqlPort(), Config.getInstance().getMySqlDatabase(),
-									Config.getInstance().getMySqlUsername(), Config.getInstance().getMySqlPassword(),
-									Config.getInstance().getMySqlMaxConnections()));
-				}
-			});
-
-		}
+		AdvancedCoreHook.getInstance().setAlternateUUIDLookUp(Config.getInstance().getAlternateUUIDLookup());
+		AdvancedCoreHook.getInstance().setAutoKillInvs(Config.getInstance().getAutoKillInvs());
+		AdvancedCoreHook.getInstance().setPrevPageTxt(Config.getInstance().getFormatPrevPage());
+		AdvancedCoreHook.getInstance().setNextPageTxt(Config.getInstance().getFormatNextPage());
 	}
 
 }

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

@@ -5,10 +5,7 @@ import java.util.ArrayList;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 
 public enum TopVoter {
-	AllTime,
-	Monthly,
-	Weekly,
-	Daily;
+	AllTime, Monthly, Weekly, Daily;
 
 	public static TopVoter getDefault() {
 		TopVoter top = getTopVoter(Config.getInstance().getVoteTopDefault());
@@ -24,7 +21,7 @@ public enum TopVoter {
 				return value;
 			}
 		}
-		return null;
+		return AllTime;
 	}
 
 	public TopVoter next() {
@@ -52,4 +49,21 @@ public enum TopVoter {
 		}
 		return TopVoter.AllTime;
 	}
+
+	public TopVoter prev() {
+		switch (this) {
+		case AllTime:
+			return Daily;
+		case Daily:
+			return Weekly;
+		case Monthly:
+			return AllTime;
+		case Weekly:
+			return Monthly;
+		default:
+			return AllTime;
+
+		}
+
+	}
 }

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

@@ -11,13 +11,12 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
+import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
 import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
 import com.Ben12345rocks.AdvancedCore.Objects.UUID;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
@@ -113,7 +112,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 * Adds the points.
 	 */
 	public void addPoints() {
-		addPoints(Config.getInstance().getPointsOnVote());
+		int points = Config.getInstance().getPointsOnVote();
+		if (points != 0) {
+			addPoints(points);
+		}
 	}
 
 	/**
@@ -131,6 +133,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 *
 	 */
 	public void addTotal() {
+		setMilestoneCount(getMilestoneCount() + 1);
 		addMonthTotal();
 		addAllTimeTotal();
 	}
@@ -157,14 +160,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		setWeekVoteStreak(getWeekVoteStreak() + 1);
 	}
 
-	public int getMilestoneCount() {
-		return getData().getInt("MilestoneCount", getAllTimeTotal());
-	}
-
-	public void setMilestoneCount(int value) {
-		getData().setInt("MilestoneCount", value);
-	}
-
 	/**
 	 * Can vote all.
 	 *
@@ -261,21 +256,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		setWeeklyTotal(0);
 	}
 
-	/**
-	 * Daily top voter award.
-	 *
-	 * @param place
-	 *            the place
-	 */
-	public void dailyTopVoterAward(int place) {
-		if (PlayerUtils.getInstance().isPlayerOnline(getPlayerName())) {
-			// online
-			giveDailyTopVoterAward(place);
-		} else {
-			addOfflineOtherReward("DailyTopVoter" + place);
-		}
-	}
-
 	public int getAllTimeTotal() {
 		return getUserData().getInt("AllTimeTotal");
 	}
@@ -364,6 +344,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return sorted;
 	}
 
+	public int getMilestoneCount() {
+		return getData().getInt("MilestoneCount", getAllTimeTotal());
+	}
+
 	public int getMonthTotal() {
 		return getData().getInt("MonthTotal");
 	}
@@ -423,13 +407,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 *            the place
 	 */
 	public void giveDailyTopVoterAward(int place) {
-		RewardHandler.getInstance().giveReward(this, Config.getInstance().getData(),
-				Config.getInstance().getDailyAwardRewardsPath(place));
-		Player player = Bukkit.getPlayer(java.util.UUID.fromString(getUUID()));
-		if (player != null) {
-			player.sendMessage(StringUtils.getInstance()
-					.colorize(Config.getInstance().getFormatTopVoterRewardMsg().replace("%place%", "" + place)));
-		}
+		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getDailyAwardRewardsPath(place))
+				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Daily").send(this);
 	}
 
 	/**
@@ -439,13 +418,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 *            the place
 	 */
 	public void giveMonthlyTopVoterAward(int place) {
-		RewardHandler.getInstance().giveReward(this, Config.getInstance().getData(),
-				Config.getInstance().getMonthlyAwardRewardsPath(place));
-		Player player = Bukkit.getPlayer(java.util.UUID.fromString(getUUID()));
-		if (player != null) {
-			player.sendMessage(StringUtils.getInstance()
-					.colorize(Config.getInstance().getFormatTopVoterRewardMsg().replace("%place%", "" + place)));
-		}
+		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getMonthlyAwardRewardsPath(place))
+				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Monthly").send(this);
 	}
 
 	public void giveOfflineOtherRewards() {
@@ -511,14 +485,11 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 				if (args.length > 2) {
 					String type = args[1];
 					String st = args[2];
-					if (StringUtils.getInstance().isInt(st)) {
-						int streakRequired = Integer.parseInt(st);
-						if (streakRequired != 0) {
-							if (Config.getInstance().getVoteStreakRewardEnabled(type, streakRequired)) {
-								OtherVoteReward.getInstance().giveVoteStreakReward(this, false, type, streakRequired);
-							}
-						}
+
+					if (Config.getInstance().getVoteStreakRewardEnabled(type, st)) {
+						OtherVoteReward.getInstance().giveVoteStreakReward(this, false, type, "" + st, -1);
 					}
+
 				}
 			} else {
 				plugin.debug("Reward handle for " + str + " does not exist!");
@@ -535,13 +506,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 *            the place
 	 */
 	public void giveWeeklyTopVoterAward(int place) {
-		RewardHandler.getInstance().giveReward(this, Config.getInstance().getData(),
-				Config.getInstance().getWeeklyAwardRewardsPath(place));
-		Player player = Bukkit.getPlayer(java.util.UUID.fromString(getUUID()));
-		if (player != null) {
-			player.sendMessage(StringUtils.getInstance()
-					.colorize(Config.getInstance().getFormatTopVoterRewardMsg().replace("%place%", "" + place)));
-		}
+		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getWeeklyAwardRewardsPath(place))
+				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Weekly").send(this);
 	}
 
 	/**
@@ -585,21 +551,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		}
 	}
 
-	/**
-	 * Monthly top voter award.
-	 *
-	 * @param place
-	 *            the place
-	 */
-	public void monthlyTopVoterAward(int place) {
-		if (PlayerUtils.getInstance().isPlayerOnline(getPlayerName())) {
-			// online
-			giveMonthlyTopVoterAward(place);
-		} else {
-			addOfflineOtherReward("MonthlyTopVoter" + place);
-		}
-	}
-
 	/**
 	 * Off vote.
 	 */
@@ -608,16 +559,22 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		if (player != null) {
 			setTopVoterIgnore(player.hasPermission("VotingPlugin.TopVoter.Ignore"));
 			ArrayList<String> offlineVotes = getOfflineVotes();
+			// plugin.debug(ArrayUtils.getInstance().makeStringList(offlineVotes));
 			if (offlineVotes.size() > 0) {
 				sendVoteEffects(true);
 			}
 
 			for (int i = 0; i < offlineVotes.size(); i++) {
 				if (plugin.hasVoteSite(offlineVotes.get(i))) {
+					plugin.debug("Giving offline site reward: " + offlineVotes.get(i));
 					playerVote(plugin.getVoteSite(offlineVotes.get(i)), false, true);
+				} else {
+					plugin.debug("Site doesn't exist: " + offlineVotes.get(i));
 				}
 			}
-			setOfflineVotes(new ArrayList<String>());
+			if (!offlineVotes.isEmpty()) {
+				setOfflineVotes(new ArrayList<String>());
+			}
 
 			giveOfflineOtherRewards();
 		}
@@ -742,6 +699,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		getUserData().setStringList("LastVotes", data);
 	}
 
+	public void setMilestoneCount(int value) {
+		getData().setInt("MilestoneCount", value);
+	}
+
 	public void setMonthTotal(int total) {
 		getData().setInt("MonthTotal", total);
 	}
@@ -804,19 +765,4 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		}
 	}
 
-	/**
-	 * Weekly top voter award.
-	 *
-	 * @param place
-	 *            the place
-	 */
-	public void weeklyTopVoterAward(int place) {
-		if (PlayerUtils.getInstance().isPlayerOnline(getPlayerName())) {
-			// online
-			giveWeeklyTopVoterAward(place);
-		} else {
-			addOfflineOtherReward("WeeklyTopVoter" + place);
-		}
-	}
-
 }

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

@@ -1,8 +1,11 @@
 package com.Ben12345rocks.VotingPlugin.Objects;
 
+import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 
 import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
+import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Item.ItemBuilder;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
@@ -40,7 +43,7 @@ public class VoteSite {
 
 	/** The enabled. */
 	private boolean enabled;
-	
+
 	private boolean voteDelayDaily;
 
 	/** The priority. */
@@ -48,6 +51,8 @@ public class VoteSite {
 
 	private ConfigurationSection item;
 
+	private boolean giveOffline;
+
 	/**
 	 * Instantiates a new vote site.
 	 *
@@ -69,20 +74,6 @@ public class VoteSite {
 		init();
 	}
 
-	/**
-	 * @return the voteDelayDaily
-	 */
-	public boolean isVoteDelayDaily() {
-		return voteDelayDaily;
-	}
-
-	/**
-	 * @param voteDelayDaily the voteDelayDaily to set
-	 */
-	public void setVoteDelayDaily(boolean voteDelayDaily) {
-		this.voteDelayDaily = voteDelayDaily;
-	}
-
 	/**
 	 * Broadcast vote.
 	 *
@@ -90,10 +81,12 @@ public class VoteSite {
 	 *            the user
 	 */
 	public void broadcastVote(User user) {
-		String playerName = user.getPlayerName();
-		String bc = StringUtils.getInstance().colorize(config.getFormatBroadCastMsg());
-		bc = bc.replace("%player%", playerName).replace("%SiteName%", getDisplayName());
-		MiscUtils.getInstance().broadcast(bc);
+		if (!user.isVanished()) {
+			String playerName = user.getPlayerName();
+			String bc = StringUtils.getInstance().colorize(config.getFormatBroadCastMsg());
+			bc = bc.replace("%player%", playerName).replace("%SiteName%", getDisplayName());
+			MiscUtils.getInstance().broadcast(bc);
+		}
 	}
 
 	/**
@@ -106,8 +99,14 @@ public class VoteSite {
 	/**
 	 * @return the item
 	 */
-	public ConfigurationSection getItem() {
-		return item;
+	public ItemBuilder getItem() {
+		if (item == null) {
+			plugin.getLogger().warning("Invalid item section in site: " + key);
+			return new ItemBuilder(Material.STONE, 1).setName("&cInvalid item for site: " + key)
+					.setLore("&cInvalid item for site: " + key);
+		} else {
+			return new ItemBuilder(item);
+		}
 	}
 
 	/**
@@ -171,6 +170,10 @@ public class VoteSite {
 				.withPlaceHolder("VoteDelay", "" + getVoteDelay()).withPlaceHolder("VoteURL", getVoteURL()).send(user);
 	}
 
+	public boolean hasRewards() {
+		return RewardHandler.getInstance().hasRewards(configVoteSites.getData(), configVoteSites.getRewardsPath(key));
+	}
+
 	/**
 	 * Give site reward.
 	 *
@@ -198,6 +201,7 @@ public class VoteSite {
 		}
 		item = configVoteSites.getItem(key);
 		voteDelayDaily = configVoteSites.getVoteSiteResetVoteDelayDaily(key);
+		giveOffline = configVoteSites.getVoteSiteGiveOffline(key);
 	}
 
 	/**
@@ -209,6 +213,20 @@ public class VoteSite {
 		return enabled;
 	}
 
+	/**
+	 * @return the giveOffline
+	 */
+	public boolean isGiveOffline() {
+		return giveOffline;
+	}
+
+	/**
+	 * @return the voteDelayDaily
+	 */
+	public boolean isVoteDelayDaily() {
+		return voteDelayDaily;
+	}
+
 	/**
 	 * @param displayName
 	 *            the displayName to set
@@ -227,6 +245,22 @@ public class VoteSite {
 		this.enabled = enabled;
 	}
 
+	/**
+	 * @param giveOffline
+	 *            the giveOffline to set
+	 */
+	public void setGiveOffline(boolean giveOffline) {
+		this.giveOffline = giveOffline;
+	}
+
+	/**
+	 * @param item
+	 *            the item to set
+	 */
+	public void setItem(ConfigurationSection item) {
+		this.item = item;
+	}
+
 	/**
 	 * @param key
 	 *            the key to set
@@ -265,6 +299,14 @@ public class VoteSite {
 		this.voteDelay = voteDelay;
 	}
 
+	/**
+	 * @param voteDelayDaily
+	 *            the voteDelayDaily to set
+	 */
+	public void setVoteDelayDaily(boolean voteDelayDaily) {
+		this.voteDelayDaily = voteDelayDaily;
+	}
+
 	/**
 	 * Sets the vote URL.
 	 *

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/OtherRewards/OtherVoteReward.java

@@ -170,12 +170,18 @@ public class OtherVoteReward {
 
 		Set<String> streaks = Config.getInstance().getVoteStreakVotes(type);
 		for (String streak : streaks) {
-			if (StringUtils.getInstance().isInt(streak)) {
-				int streakRequired = Integer.parseInt(streak);
+			String s = streak.replaceAll("-", "");
+			boolean multiple = false;
+			if (streak.contains("-")) {
+				// multiple
+				multiple = true;
+			}
+			if (StringUtils.getInstance().isInt(s)) {
+				int streakRequired = Integer.parseInt(s);
 				if (streakRequired != 0) {
-					if (Config.getInstance().getVoteStreakRewardEnabled(type, streakRequired)
+					if (Config.getInstance().getVoteStreakRewardEnabled(type, streak)
 							&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-									Config.getInstance().getVoteStreakRewardsPath(type, streakRequired))) {
+									Config.getInstance().getVoteStreakRewardsPath(type, "" + streak))) {
 						int curStreak = 0;
 						if (type.equalsIgnoreCase("day")) {
 							curStreak = user.getDayVoteStreak();
@@ -184,12 +190,20 @@ public class OtherVoteReward {
 						} else if (type.equalsIgnoreCase("month")) {
 							curStreak = user.getMonthVoteStreak();
 						}
-						if (curStreak == streakRequired) {
-							giveVoteStreakReward(user, user.isOnline(), type, streakRequired);
-							gotReward = true;
-						}
-						if (gotReward) {
-							plugin.debug(user.getPlayerName() + " got VoteStreak " + streakRequired + " for " + type);
+						if (!multiple) {
+							if (curStreak == streakRequired) {
+								giveVoteStreakReward(user, user.isOnline(), type, "" + streakRequired, curStreak);
+								gotReward = true;
+								plugin.debug(
+										user.getPlayerName() + " got VoteStreak " + streakRequired + " for " + type);
+							}
+						} else {
+							if (curStreak != 0 && curStreak % streakRequired == 0) {
+								giveVoteStreakReward(user, user.isOnline(), type, streakRequired + "-", curStreak);
+								gotReward = true;
+								plugin.debug(
+										user.getPlayerName() + " got VoteStreak " + streakRequired + "* for " + type);
+							}
 						}
 					}
 				}
@@ -257,8 +271,8 @@ public class OtherVoteReward {
 				.setOnline(online).withPlaceHolder("Milestone", "" + milestone).send(user);
 	}
 
-	public void giveVoteStreakReward(User user, boolean online, String type, int streak) {
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getVoteStreakRewardsPath(type, streak))
-				.setOnline(online).withPlaceHolder("Type", type).withPlaceHolder("Streak", "" + streak).send(user);
+	public void giveVoteStreakReward(User user, boolean online, String type, String string, int votes) {
+		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getVoteStreakRewardsPath(type, string))
+				.setOnline(online).withPlaceHolder("Type", type).withPlaceHolder("Streak", "" + votes).send(user);
 	}
 }

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

@@ -13,6 +13,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
@@ -75,12 +76,12 @@ public class TopVoterHandler implements Listener {
 		return ArrayUtils.getInstance().convert(msg);
 	}
 
-	@EventHandler
+	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
 	public void onDateChanged(DateChangedEvent event) {
-		updateTopVoters();
+		plugin.setUpdate(true);
 	}
 
-	@EventHandler
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onDayChange(DayChangeEvent event) {
 
 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
@@ -109,7 +110,7 @@ public class TopVoterHandler implements Listener {
 				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
 					i++;
 					if (places.contains(Integer.toString(i))) {
-						user.dailyTopVoterAward(i);
+						user.giveDailyTopVoterAward(i);
 					}
 				}
 			}
@@ -118,7 +119,7 @@ public class TopVoterHandler implements Listener {
 
 	}
 
-	@EventHandler
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onMonthChange(MonthChangeEvent event) {
 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
@@ -146,7 +147,7 @@ public class TopVoterHandler implements Listener {
 				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
 					i++;
 					if (places.contains(Integer.toString(i))) {
-						user.monthlyTopVoterAward(i);
+						user.giveMonthlyTopVoterAward(i);
 					}
 				}
 			}
@@ -164,7 +165,7 @@ public class TopVoterHandler implements Listener {
 
 	}
 
-	@EventHandler
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onWeekChange(WeekChangeEvent event) {
 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
@@ -192,7 +193,7 @@ public class TopVoterHandler implements Listener {
 				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
 					i++;
 					if (places.contains(Integer.toString(i))) {
-						user.weeklyTopVoterAward(i);
+						user.giveWeeklyTopVoterAward(i);
 					}
 				}
 			}
@@ -232,18 +233,10 @@ public class TopVoterHandler implements Listener {
 		}
 	}
 
-	/**
-	 * Sort by values.
-	 *
-	 * @param unsortMap
-	 *            the unsort map
-	 * @param order
-	 *            the order, false for high to low
-	 * @return the hash map
-	 */
-	public HashMap<User, Integer> sortByValues(HashMap<User, Integer> unsortMap, final boolean order) {
+	public LinkedHashMap<User, Integer> sortByValues(LinkedHashMap<User, Integer> topVoterAllTime,
+			final boolean order) {
 
-		List<Entry<User, Integer>> list = new LinkedList<Entry<User, Integer>>(unsortMap.entrySet());
+		List<Entry<User, Integer>> list = new LinkedList<Entry<User, Integer>>(topVoterAllTime.entrySet());
 
 		// Sorting the list based on values
 		Collections.sort(list, new Comparator<Entry<User, Integer>>() {
@@ -259,7 +252,7 @@ public class TopVoterHandler implements Listener {
 		});
 
 		// Maintaining insertion order with the help of LinkedList
-		HashMap<User, Integer> sortedMap = new LinkedHashMap<User, Integer>();
+		LinkedHashMap<User, Integer> sortedMap = new LinkedHashMap<User, Integer>();
 		for (Entry<User, Integer> entry : list) {
 			sortedMap.put(entry.getKey(), entry.getValue());
 		}
@@ -556,12 +549,10 @@ public class TopVoterHandler implements Listener {
 		return ArrayUtils.getInstance().convert(msg);
 	}
 
-	public synchronized void updateTopVoters() {
-		ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
+	public synchronized void updateTopVoters(ArrayList<User> users1) {
 		ArrayList<User> users = new ArrayList<User>();
 		ArrayList<String> blackList = getTopVoterBlackList();
-		for (String uuid : uuids) {
-			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+		for (User user : users1) {
 			if (!blackList.contains(user.getPlayerName())) {
 				if ((!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore())
 						&& !user.isBanned()) {

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/UserManager/UserManager.java

@@ -42,7 +42,7 @@ public class UserManager {
 
 	@SuppressWarnings("deprecation")
 	public User getVotingPluginUser(String playerName) {
-		return new User(playerName);
+		return new User(com.Ben12345rocks.AdvancedCore.UserManager.UserManager.getInstance().getProperName(playerName));
 	}
 
 	@SuppressWarnings("deprecation")

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/VoteParty/VoteParty.java

@@ -152,11 +152,9 @@ public class VoteParty implements Listener {
 	 */
 	public void giveReward(User user) {
 		/*
-		 * if (PlayerUtils.getInstance().isPlayerOnline(user.getPlayerName())) {
-		 * if (user.getVotePartyVotes() >=
-		 * Config.getInstance().getUserVotesRequired()) {
-		 * RewardHandler.getInstance().giveReward(user,
-		 * Config.getInstance().getData(),
+		 * if (PlayerUtils.getInstance().isPlayerOnline(user.getPlayerName())) { if
+		 * (user.getVotePartyVotes() >= Config.getInstance().getUserVotesRequired()) {
+		 * RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
 		 * Config.getInstance().getVotePartyRewardsPath()); } } else {
 		 * user.addOfflineOtherReward("VoteParty"); }
 		 */

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/VoteReminding/VoteReminding.java

@@ -116,6 +116,7 @@ public class VoteReminding {
 		if (Config.getInstance().getVoteRemindingEnabled()
 				&& (!UserManager.getInstance().getAllUUIDs().contains(user.getUUID()) || user.canVoteAll())) {
 			giveReward(user);
+			user.setReminded(true);
 			plugin.debug(user.getPlayerName() + " was reminded!");
 
 		}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/VoteShop/VoteShop.java

@@ -8,6 +8,7 @@ import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory.ClickEvent;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventoryButton;
 import com.Ben12345rocks.AdvancedCore.Util.Item.ItemBuilder;
 import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Commands.GUI.PlayerGUIs;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
@@ -35,30 +36,41 @@ public class VoteShop {
 
 			ItemBuilder builder = new ItemBuilder(Config.getInstance().getIdentifierSection(identifier));
 
-			inv.addButton(Config.getInstance().getIdentifierSlot(identifier),
-					new BInventoryButton(builder) {
+			inv.addButton(Config.getInstance().getIdentifierSlot(identifier), 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);
-							int points = Config.getInstance().getIdentifierCost(identifier);
-							String identifier = Config.getInstance().getIdentifierFromSlot(event.getSlot());
-							if (identifier != null) {
-								if (user.removePoints(points)) {
-									RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-											Config.getInstance().getIdentifierRewardsPath(identifier));
-									user.sendMessage(Config.getInstance().getFormatShopPurchaseMsg()
-											.replace("%Identifier%", identifier).replace("%Points%", "" + points));
-								} else {
-									user.sendMessage(Config.getInstance().getFormatShopFailedMsg()
-											.replace("%Identifier%", identifier).replace("%Points%", "" + points));
-								}
-							}
+					User user = UserManager.getInstance().getVotingPluginUser(player);
+					int points = Config.getInstance().getIdentifierCost(identifier);
+					String identifier = Config.getInstance().getIdentifierFromSlot(event.getSlot());
+					if (identifier != null) {
+						if (user.removePoints(points)) {
+							RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
+									Config.getInstance().getIdentifierRewardsPath(identifier));
+							user.sendMessage(Config.getInstance().getFormatShopPurchaseMsg()
+									.replace("%Identifier%", identifier).replace("%Points%", "" + points));
+						} else {
+							user.sendMessage(Config.getInstance().getFormatShopFailedMsg()
+									.replace("%Identifier%", identifier).replace("%Points%", "" + points));
 						}
+					}
+				}
+
+			});
+		}
+
+		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.openInventory(player);