Update version number

Update to 1.13.1, bug fix for vote party
Add ability to disable /vote reward
2018-08-26 13:00:45 -04:00 · 2018-08-26 12:54:30 -04:00 · 2018-08-25 08:17:40 -04:00 · 2018-08-23 20:56:03 -04:00 · 2018-08-23 20:53:13 -04:00 · 2018-08-21 17:22:28 -04:00
34 changed files with 834 additions and 470 deletions
@@ -85,18 +85,6 @@ VoteReminding:
      FadeIn: 10
      ShowTime: 50
      FadeOut: 10
-  
-Commands:
-  # Wether or not the following commands will open GUIs rather than display text
-  UseGUI:
-    Today: true
-    TopVoter: true
-    Last: true
-    Next: true
-    Total: true
-    Vote: true
-    Best: true
-    Streak: true
    
 # ------------------------------------------------
 # Format
@@ -110,6 +98,24 @@ Commands:
 #
 # Set Message to '' (2 ') to disable message

+Commands:
+  # Wether or not the following commands will open GUIs rather than display text
+  UseGUI:
+    Today: true
+    TopVoter: true
+    Last: true
+    Next: true
+    Total: true
+    Vote: true
+    Best: true
+    Streak: true
+  # If true, you can right click a votesite from /vote (gui version) and open the vote reward gui for that site
+  # Can be used to display rewards for that site
+  VoteRewardFromVoteURL: false
+  # disable /vote reward commands
+  # Effective after restart
+  DisableVoteRewardGUIs: false
+
 Format:
  # CommandHandler help message
  HelpLine: '&3&l%Command% - &3%HelpMessage%'
@@ -166,7 +172,11 @@ Format:
        Title: '&3&l%player% Last Vote Times:'
        # Lines for each vote site
        # %time% = time, using timeformat below
-        Line: '&3%SiteName%: &6%time%'
+        # %timesince% = time since vote
+        Line: '&3%SiteName%: &6%timeSince% ago'
+        # Spelling of TimeType can be changed under Format.Commands.TimeFormats
+        TimeFormat: '%amount% %TimeType%'
+        NeverVoted: 'Never voted'
        
      # Format for /vote total
      Total:
@@ -231,9 +241,9 @@ Format:
      # %Points% = player points
      Points: '&a%Player% currently has &a&l%Points%&a Points!'
      
-  # Login message if player can vote on all sites
-  # Must be enabled in config.yml  
-  LoginMsg: '&cRemember to vote!'
+      ToggleBroadcast:
+        Enabled: '&cYou will now see vote broadcasts'
+        Disabled: '&cYou will no longer see vote broadcasts'
  
  # Msg on top voter award, will only send message if that place has a reward set
  # %place% = place - 1,2,3,etc
@@ -243,6 +253,16 @@ Format:
  # See https://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html
  TimeFormat: 'EEE, d MMM yyyy HH:mm'
  
+  TimeFomrats:
+    Day: 'Day'
+    Days: 'Days'
+    Hour: 'Hour'
+    Hours: 'Hours'
+    Minute: 'Minute'
+    Minutes: 'Minutes'
+    Second: 'Second'
+    Seconds: 'Seconds'
+  
  # Format for signs
  # SiteName may be all, depending on sign
  # %position% = position of player, set by sign
@@ -273,6 +293,8 @@ Format:
  PrevPage: '&aPrevious Page'
  NextPage: '&aNext Page'
  
+  InvFull: '&cInventory full, dropping items on ground'
+  
  # Display text
  # Used in /vote top (GUI)
  TopVoter:
@@ -312,7 +334,7 @@ GUI:
      Slot: 1
    Last:
      Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
        Data: 0
        Amount: 1
        Name: '&4Last'
@@ -344,6 +366,8 @@ GUI:
        Data: 0
        Amount: 1
        Name: '&4Vote Shop'
+        Lore:
+        - '&aYou currently have %points% points'
      Slot: 6
      
  # GUI for /vote url
@@ -436,25 +460,25 @@ GUI:
    BackButton: true
    DayTotal:
      Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
        Name: '&cDaily Total'
        Lore: '&c&lTotal: &c%Total%'
        Amount: 1
    WeekTotal:
      Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
        Name: '&cWeekly Total'
        Lore: '&c&lTotal: &c%Total%'
        Amount: 1
    MonthTotal:
      Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
        Name: '&cMonthly Total'
        Lore: '&c&lTotal: &c%Total%'
        Amount: 1
    AllTimeTotal:
      Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
        Name: '&cAllTime Total'
        Lore: '&c&lTotal: &c%Total%'
        Amount: 1
@@ -462,19 +486,19 @@ GUI:
    Name: 'VoteBest: %player%'
    DayBest:
      Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
        Name: '&cDaily Best'
        Lore: '&c&lBest: &c%Best%'
        Amount: 1
    WeekBest:
      Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
        Name: '&cWeekly Best'
        Lore: '&c&lBest: &c%Best%'
        Amount: 1
    MonthBest:
      Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
        Name: '&cMonthly Best'
        Lore: '&c&lBest: &c%Best%'
        Amount: 1
@@ -483,37 +507,37 @@ GUI:
    BackButton: false
    CurrentDayStreak:
      Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
        Name: '&cCurrent Daily Streak'
        Lore: '&c&lStreak: &c%Streak%'
        Amount: 1
    CurrentWeekStreak:
      Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
        Name: '&cCurrent Weekly Streak'
        Lore: '&c&lStreak: &c%Streak%'
        Amount: 1
    CurrentMonthStreak:
      Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
        Name: '&cCurrent Monthly Streak'
        Lore: '&c&lStreak: &c%Streak%'
        Amount: 1
    HighestDayStreak:
      Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
        Name: '&cHighest Daily Streak'
        Lore: '&c&lStreak: &c%Streak%'
        Amount: 1
    HighestWeekStreak:
      Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
        Name: '&cHighest Weekly Streak'
        Lore: '&c&lStreak: &c%Streak%'
        Amount: 1
    HighestMonthStreak:
      Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
        Name: '&cHighest Monthly Streak'
        Lore: '&c&lStreak: &c%Streak%'
        Amount: 1
@@ -530,6 +554,7 @@ BackButton:
  Name: '&8Back to VoteGUI'

 VoteShopBackButton: true
+VoteShopEnabled: true
 Shop:
  # Identifier
  # Used in placeholders for formats
@@ -546,6 +571,8 @@ Shop:
    - '&c&lCost: &c3 Voting Points'
    # Number of voting points this cost
    Cost: 3
+    # Permission required, leave blank for no permission
+    Permission: ''
    # Rewards to run if player buys succesfully
    Rewards:
      Items:
@@ -597,6 +624,8 @@ VoteParty:
  Enabled: false
  # Number of votes required to give rewards
  VotesRequired: 20
+  # Increase the amount of votes required on each vote party reached
+  #IncreaseVotesRquired: 10
  # If true, players who did not vote to reach the votes required will 
  # recieve the reward
  GiveAllPlayers: false
@@ -611,9 +640,12 @@ VoteParty:
  # Broadcast when vote party reached
  Broadcast: '&cReached the vote party amount!'
  # List of commands to execute, these only execute once.
+  # %player% does not work here
  Commands: []
  # Reward files to give
-  Rewards: []
+  Rewards: 
+    Commands:
+    - say %player%
  
 # Reset milestons at end of the month
 ResetMilestonesMonthly: false
@@ -710,6 +742,7 @@ EnableMonthlyAwards: true
 # Rewards to give
 MonthlyAwards:
  # Position. 1 is first in top voter, 2 is second, etc...
+  # Using 1-10 will reward players in first to tenth place with the same reward
  1:
    Rewards:
      Messages:
@@ -836,4 +869,7 @@ PurgeMin: 90

 # Whether or not to disable checking names on mojang, disable if you hit the rate limit
 # Shouldn't make a noticeable impact if set to false
-CheckNameMojang: true
+CheckNameMojang: false
+
+# Whether or not to create daily backups. (Only the most recent ones get saved)
+CreateBackups: true
@@ -32,7 +32,7 @@ VoteSites:
    VoteDelayDaily: false
    
    # If true, rewards can be executed offline (requires ForceOffline to be true in the reward)
-    # Setting this to true will execute the reward offline, NOT WHEN THE PLAYER IS OFFLINE
+    # Setting this to true will execute the reward offline while the player is offline
    # This basiclly disables offline voting if set to true, don't misinterpret this option
    ForceOffline: false
    
@@ -5,6 +5,7 @@ description: Highly Customizable Voting Listener!
 website: https://www.spigotmc.org/resources/votingplugin.15358/
 author: Ben12345rocks
 softdepend: [AdvancedCore]
+api-version: 1.13
 commands:
  vote:
    description: Vote command
@@ -1,9 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>5.12.5</version>
+	<version>5.15</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -148,6 +149,10 @@
 		<repository>
 			<id>jitpack.io</id>
 			<url>https://jitpack.io</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
 		</repository>
 	</repositories>
 	<dependencies>
@@ -161,7 +166,7 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.12.2-R0.1-SNAPSHOT</version>
+			<version>1.13.1-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -15,13 +15,13 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;

 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandle;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandler;
 import com.Ben12345rocks.AdvancedCore.Commands.GUI.UserGUI;
-import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
-import com.Ben12345rocks.AdvancedCore.Objects.TabCompleteHandle;
-import com.Ben12345rocks.AdvancedCore.Objects.TabCompleteHandler;
-import com.Ben12345rocks.AdvancedCore.Objects.UUID;
-import com.Ben12345rocks.AdvancedCore.Objects.UserStorage;
 import com.Ben12345rocks.AdvancedCore.Report.Report;
+import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
+import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory.ClickEvent;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventoryButton;
@@ -236,7 +236,7 @@ public class CommandLoader {
 					user.setMilestoneCount(user.getAllTimeTotal());
 				}
 				sendMessage(sender, "&cFinished");
-				
+
 			}
 		});

@@ -1015,10 +1015,6 @@ public class CommandLoader {

 		TabCompleteHandler.getInstance().addTabCompleteOption(new TabCompleteHandle("(Sitename)", sites) {

-			@Override
-			public void updateReplacements() {
-			}
-
 			@Override
 			public void reload() {
 				ArrayList<String> sites = new ArrayList<String>();
@@ -1027,6 +1023,10 @@ public class CommandLoader {
 				}
 				setReplace(sites);
 			}
+
+			@Override
+			public void updateReplacements() {
+			}
 		});
 	}

@@ -1078,25 +1078,27 @@ public class CommandLoader {
 			}
 		});

-		plugin.voteCommand.add(new CommandHandler(new String[] { "Reward" },
-				"VotingPlugin.Commands.Vote.Reward|" + playerPerm, "Open VoteReward GUI", false) {
+		if (!Config.getInstance().commandsDisableVoteRewardGUIs) {
+			plugin.voteCommand.add(new CommandHandler(new String[] { "Reward" },
+					"VotingPlugin.Commands.Vote.Reward|" + playerPerm, "Open VoteReward GUI", false) {

-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				PlayerGUIs.getInstance().voteReward((Player) sender, "");
+				@Override
+				public void execute(CommandSender sender, String[] args) {
+					PlayerGUIs.getInstance().voteReward((Player) sender, "");

-			}
-		});
+				}
+			});

-		plugin.voteCommand.add(new CommandHandler(new String[] { "Reward", "(SiteName)" },
-				"VotingPlugin.Commands.Vote.Reward|" + playerPerm, "Open VoteURL GUI for VoteSIte", false) {
+			plugin.voteCommand.add(new CommandHandler(new String[] { "Reward", "(SiteName)" },
+					"VotingPlugin.Commands.Vote.Reward|" + playerPerm, "Open VoteURL GUI for VoteSIte", false) {

-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				PlayerGUIs.getInstance().voteReward((Player) sender, args[1]);
+				@Override
+				public void execute(CommandSender sender, String[] args) {
+					PlayerGUIs.getInstance().voteReward((Player) sender, args[1]);

-			}
-		});
+				}
+			});
+		}

 		plugin.voteCommand.add(new CommandHandler(new String[] { "Last", "(player)" },
 				"VotingPlugin.Commands.Vote.Last.Other|" + modPerm, "See other players last votes") {
@@ -1146,6 +1148,23 @@ public class CommandLoader {
 			}
 		});

+		plugin.voteCommand.add(new CommandHandler(new String[] { "ToggleBroadcast" },
+				"VotingPlugin.Commands.Vote.ToggleBroadcast|" + playerPerm,
+				"Toggle whether or not you will recieve vote broadcasts", false) {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
+				boolean value = !user.getDisableBroadcast();
+				user.setDisableBroadcast(value);
+				if (!value) {
+					sendMessage(sender, Config.getInstance().formatCommandsVoteToggleBroadcastEnabled);
+				} else {
+					sendMessage(sender, Config.getInstance().formatCommandsVoteToggleBroadcastDisabled);
+				}
+			}
+		});
+
 		plugin.voteCommand.add(new CommandHandler(new String[] { "Next", "(player)" },
 				"VotingPlugin.Commands.Vote.Next.Other|" + modPerm, "See other players next votes") {

@@ -18,8 +18,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permission;

 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
-import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
-import com.Ben12345rocks.AdvancedCore.Objects.UUID;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
+import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
@@ -320,7 +320,7 @@ public class Commands {
 	 * @param page
 	 *            the page
 	 */
-	public void sendTopVoterAllTimeScoreBoard(Player player, int page) {
+	public void sendTopVoterAllTimeScoreBoard(final Player player, int page) {
 		if (AdvancedCoreHook.getInstance().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
 			ArrayList<User> users = plugin.convertSet(plugin.topVoterAllTime.keySet());
@@ -346,8 +346,7 @@ public class Commands {

 				@Override
 				public void run() {
-					SimpleScoreboard clear = new SimpleScoreboard("Empty");
-					clear.send(player);
+					player.setScoreboard(Bukkit.getScoreboardManager().getNewScoreboard());
 				}
 			}, 90);
 		}
@@ -361,7 +360,7 @@ public class Commands {
 	 * @param page
 	 *            the page
 	 */
-	public void sendTopVoterDailyScoreBoard(Player player, int page) {
+	public void sendTopVoterDailyScoreBoard(final Player player, int page) {
 		if (AdvancedCoreHook.getInstance().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
 			ArrayList<User> users = plugin.convertSet(plugin.topVoterDaily.keySet());
@@ -387,8 +386,7 @@ public class Commands {

 				@Override
 				public void run() {
-					SimpleScoreboard clear = new SimpleScoreboard("Empty");
-					clear.send(player);
+					player.setScoreboard(Bukkit.getScoreboardManager().getNewScoreboard());
 				}
 			}, 90);
 		}
@@ -402,7 +400,7 @@ public class Commands {
 	 * @param page
 	 *            the page
 	 */
-	public void sendTopVoterMonthlyScoreBoard(Player player, int page) {
+	public void sendTopVoterMonthlyScoreBoard(final Player player, int page) {
 		if (AdvancedCoreHook.getInstance().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
 			ArrayList<User> users = plugin.convertSet(plugin.topVoterMonthly.keySet());
@@ -428,8 +426,7 @@ public class Commands {

 				@Override
 				public void run() {
-					SimpleScoreboard clear = new SimpleScoreboard("Empty");
-					clear.send(player);
+					player.setScoreboard(Bukkit.getScoreboardManager().getNewScoreboard());
 				}
 			}, 90);
 		}
@@ -443,7 +440,7 @@ public class Commands {
 	 * @param page
 	 *            the page
 	 */
-	public void sendTopVoterWeeklyScoreBoard(Player player, int page) {
+	public void sendTopVoterWeeklyScoreBoard(final Player player, int page) {
 		if (AdvancedCoreHook.getInstance().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
 			ArrayList<User> users = plugin.convertSet(plugin.topVoterWeekly.keySet());
@@ -469,8 +466,7 @@ public class Commands {

 				@Override
 				public void run() {
-					SimpleScoreboard clear = new SimpleScoreboard("Empty");
-					clear.send(player);
+					player.setScoreboard(Bukkit.getScoreboardManager().getNewScoreboard());
 				}
 			}, 90);

@@ -485,7 +481,7 @@ public class Commands {
 	 * @param page
 	 *            the page
 	 */
-	public void sendVoteTodayScoreBoard(Player player, int page) {
+	public void sendVoteTodayScoreBoard(final Player player, int page) {
 		if (AdvancedCoreHook.getInstance().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();

@@ -508,8 +504,7 @@ public class Commands {

 				@Override
 				public void run() {
-					SimpleScoreboard clear = new SimpleScoreboard("Empty");
-					clear.send(player);
+					player.setScoreboard(Bukkit.getScoreboardManager().getNewScoreboard());
 				}
 			}, 90);

@@ -595,6 +590,7 @@ public class Commands {
 	 *            the vote site
 	 * @return the string
 	 */
+	@Deprecated
 	public String voteCommandLastDate(User user, VoteSite voteSite) {
 		long time = user.getTime(voteSite);
 		if (time > 0) {
@@ -605,11 +601,91 @@ public class Commands {
 		return "";
 	}

+	public String voteCommandLastDuration(User user, VoteSite voteSite) {
+		long time = user.getTime(voteSite);
+		if (time > 0) {
+			LocalDateTime now = LocalDateTime.now();
+			LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault());
+
+			Duration dur = Duration.between(lastVote, now);
+
+			long diffSecond = dur.getSeconds();
+			int diffDays = (int) (diffSecond / 60 / 60 / 24);
+			int diffHours = (int) (diffSecond / 60 / 60 - diffDays * 24);
+			int diffMinutes = (int) (diffSecond / 60 - diffHours * 60 - diffDays * 24 * 60);
+			int diffSeconds = (int) (diffSecond - diffMinutes * 60 - diffHours * 60 * 60 - diffDays * 24 * 60 * 60);
+
+			String info = "";
+			if (diffDays == 1) {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().formatCommandsVoteLastTimeFormat, "TimeType",
+								Config.getInstance().formatTimeFormatsDay), "amount", "" + diffDays);
+				info += " ";
+			} else if (diffDays > 1) {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().formatCommandsVoteLastTimeFormat, "TimeType",
+								Config.getInstance().formatTimeFormatsDays), "amount", "" + diffDays);
+				info += " ";
+			}
+
+			if (diffHours == 1) {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().formatCommandsVoteLastTimeFormat, "TimeType",
+								Config.getInstance().formatTimeFormatsHour), "amount", "" + diffHours);
+				info += " ";
+			} else if (diffHours > 1) {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().formatCommandsVoteLastTimeFormat, "TimeType",
+								Config.getInstance().formatTimeFormatsHours), "amount", "" + diffHours);
+				info += " ";
+			}
+
+			if (diffMinutes == 1) {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().formatCommandsVoteLastTimeFormat, "TimeType",
+								Config.getInstance().formatTimeFormatsMinute), "amount", "" + diffMinutes);
+				info += " ";
+			} else if (diffMinutes > 1) {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().formatCommandsVoteLastTimeFormat, "TimeType",
+								Config.getInstance().formatTimeFormatsMinutes), "amount", "" + diffMinutes);
+				info += " ";
+			}
+
+			if (diffSeconds == 1) {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().formatCommandsVoteLastTimeFormat, "TimeType",
+								Config.getInstance().formatTimeFormatsSecond), "amount", "" + diffSeconds);
+			} else {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().formatCommandsVoteLastTimeFormat, "TimeType",
+								Config.getInstance().formatTimeFormatsSeconds), "amount", "" + diffSeconds);
+			}
+
+			return info;
+		}
+		return Config.getInstance().formatCommandsVoteLastNeverVoted;
+	}
+
 	public String voteCommandLastLine(User user, VoteSite voteSite) {
 		String timeString = voteCommandLastDate(user, voteSite);
+		String timeSince = voteCommandLastDuration(user, voteSite);

-		return config.getFormatCommandsVoteLastLine().replace("%Month% %Day%, %Year% %Hour%:%Minute% %ampm%", "%time%")
-				.replace("%time%", timeString).replace("%SiteName%", voteSite.getDisplayName());
+		HashMap<String, String> placeholders = new HashMap<String, String>();
+		placeholders.put("time", timeString);
+		placeholders.put("SiteName", voteSite.getDisplayName());
+		placeholders.put("timesince", timeSince);
+
+		return StringUtils.getInstance().replacePlaceHolder(Config.getInstance().formatCommandsVoteLastLine,
+				placeholders);
 	}

 	/**
@@ -835,6 +911,8 @@ public class Commands {
 				msg = StringUtils.getInstance().replaceIgnoreCase(msg, "%url%", voteURL);
 				msg = StringUtils.getInstance().replaceIgnoreCase(msg, "%SiteName%", voteSite.getDisplayName());
 				msg = StringUtils.getInstance().replaceIgnoreCase(msg, "%player%", user.getPlayerName());
+				msg = StringUtils.getInstance().replacePlaceHolder(msg, "Next",
+						"" + voteCommandNextInfo(user, voteSite));
 				sites.add(msg);
 			}
 		}
@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

-import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
@@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

-import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.VotingPlugin.Main;

@@ -82,7 +82,7 @@ public class CommandAliases implements CommandExecutor {
 				}
 			}
 		}
-		
+
 		/*
 		 * for (String arg : cmdHandle.getArgs()[0].split("&")) { argsNew.set(0, arg);
 		 * if (cmdHandle.runCommand(sender, Utils.getInstance().convertArray(argsNew)))
@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

-import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
 import com.Ben12345rocks.VotingPlugin.Main;

 // TODO: Auto-generated Javadoc
@@ -82,7 +82,7 @@ public class AdminGUI {

 		lore = new ArrayList<String>();
 		buttons.add(new BInventoryButton("&cReload Plugin", ArrayUtils.getInstance().convert(lore),
-				new ItemStack(Material.STONE, 1, (short) 3)) {
+				new ItemStack(Material.STONE, 1)) {

 			@Override
 			public void onClick(ClickEvent event) {
@@ -1,9 +1,11 @@
 package com.Ben12345rocks.VotingPlugin.Commands.GUI;

 import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
 import java.util.Map.Entry;
 import java.util.Set;

+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
@@ -21,9 +23,9 @@ import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Commands.Commands;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
-import com.Ben12345rocks.VotingPlugin.Objects.TopVoter;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
+import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 import com.Ben12345rocks.VotingPlugin.VoteShop.VoteShop;
@@ -120,6 +122,7 @@ public class PlayerGUIs {
 			String[] lore = new String[1];

 			lore = ArrayUtils.getInstance().convert(Config.getInstance().getVoteGUISlotLore(slot));
+
 			if (lore.length == 0) {
 				if (slot.equalsIgnoreCase("url")) {
 					lore = Commands.getInstance().voteURLs(user);
@@ -147,7 +150,11 @@ public class PlayerGUIs {
 				}
 			}

-			builder.setLore(lore);
+			HashMap<String, String> placeholders = new HashMap<String, String>();
+			placeholders.put("points", "" + user.getPoints());
+
+			builder.setPlaceholders(placeholders);
+			builder.setLore(ArrayUtils.getInstance().convert(lore));

 			inv.addButton(Config.getInstance().getVoteGUISlotSlot(slot), new BInventoryButton(builder) {

@@ -324,7 +331,7 @@ public class PlayerGUIs {
 			for (VoteSite voteSite : plugin.voteToday.get(user).keySet()) {
 				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(Config.getInstance().getFormatTimeFormat());
 				String timeString = plugin.voteToday.get(user).get(voteSite).format(formatter);
-				String msg = "&6" + user.getPlayerName() + " : " + voteSite.getDisplayName() + " : " + timeString;
+				String msg = "&6" + voteSite.getDisplayName() + " : " + timeString;
 				inv.addButton(inv.getNextSlot(), new BInventoryButton(user.getPlayerName(), new String[] { msg },
 						MiscUtils.getInstance().setSkullOwner(user.getOfflinePlayer())) {

@@ -516,7 +523,7 @@ public class PlayerGUIs {
 			count++;
 		}

-		for (VoteSite voteSite : plugin.getVoteSites()) {
+		for (final VoteSite voteSite : plugin.getVoteSites()) {
 			ItemBuilder builder = new ItemBuilder(Config.getInstance().getVoteURLAlreadyVotedItemSection());
 			if (user.canVoteSite(voteSite)) {
 				builder = new ItemBuilder(Config.getInstance().getVoteURLCanVoteItemSection());
@@ -534,14 +541,18 @@ public class PlayerGUIs {
 					Player player = event.getWhoClicked();
 					if (player != null) {
 						player.closeInventory();
-						User user = UserManager.getInstance().getVotingPluginUser(player);
-						user.sendMessage(StringUtils.getInstance().replacePlaceHolder(
-								StringUtils.getInstance()
-										.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
-												Config.getInstance().getGUIVoteURLURLText(), "voteurl",
-												voteSite.getVoteURL()), "sitename", voteSite.getDisplayName()),
-								"player", player.getName()));

+						if (Config.getInstance().commandsVoteRewardFromVoteURL
+								&& event.getClick().equals(ClickType.RIGHT)) {
+							voteReward(player, voteSite.getKey());
+						} else {
+							User user = UserManager.getInstance().getVotingPluginUser(player);
+							user.sendMessage(StringUtils.getInstance().replacePlaceHolder(StringUtils.getInstance()
+									.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+											Config.getInstance().getGUIVoteURLURLText(), "voteurl",
+											voteSite.getVoteURL()), "sitename", voteSite.getDisplayName()),
+									"player", player.getName()));
+						}
 					}

 				}
@@ -589,7 +600,7 @@ public class PlayerGUIs {
 			}
 		});

-		inv.addButton(new BInventoryButton(new ItemBuilder(Material.WATCH).setName("&4Last Vote")
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.CLOCK).setName("&4Last Vote")
 				.addLoreLine(Commands.getInstance().voteCommandLastLine(user, site))) {

 			@Override
@@ -639,8 +650,13 @@ public class PlayerGUIs {
 							Player player = event.getWhoClicked();
 							if (player != null) {
 								player.closeInventory();
-								player.performCommand("vote reward " + site.getKey());
+								Bukkit.getScheduler().runTask(plugin, new Runnable() {

+									@Override
+									public void run() {
+										player.performCommand("vote reward " + site.getKey());
+									}
+								});
 							}

 						}
@@ -10,7 +10,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;

-import com.Ben12345rocks.AdvancedCore.Objects.TabCompleteHandler;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;

@@ -11,8 +11,8 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;

-import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
-import com.Ben12345rocks.AdvancedCore.Objects.TabCompleteHandler;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
@@ -28,6 +28,8 @@ public class AliasesTabCompleter implements TabCompleter {
 	/** The cmd handle. */
 	public CommandHandler cmdHandle;

+	private boolean adminCommand;
+
 	/*
 	 * (non-Javadoc)
 	 *
@@ -102,6 +104,4 @@ public class AliasesTabCompleter implements TabCompleter {
 		return this;
 	}

-	private boolean adminCommand;
-
 }
@@ -10,7 +10,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;

-import com.Ben12345rocks.AdvancedCore.Objects.TabCompleteHandler;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;

@@ -7,6 +7,9 @@ import java.util.Set;

 import org.bukkit.configuration.ConfigurationSection;

+import com.Ben12345rocks.AdvancedCore.Util.Annotation.AnnotationHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataBoolean;
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataString;
 import com.Ben12345rocks.AdvancedCore.YML.YMLFile;
 import com.Ben12345rocks.VotingPlugin.Main;

@@ -31,6 +34,51 @@ public class Config extends YMLFile {
 		return instance;
 	}

+	@ConfigDataString(path = "Format.Commands.Vote.ToggleBroadcasts.Enabled", defaultValue = "&cYou will now see vote broadcasts")
+	public String formatCommandsVoteToggleBroadcastEnabled;
+
+	@ConfigDataString(path = "Format.Commands.Vote.ToggleBroadcasts.Disabled", defaultValue = "&cYou will no longer see vote broadcasts")
+	public String formatCommandsVoteToggleBroadcastDisabled;
+
+	@ConfigDataBoolean(path = "Commands.VoteRewardFromVoteURL", defaultValue = false)
+	public boolean commandsVoteRewardFromVoteURL;
+
+	@ConfigDataString(path = "Format.Commands.Vote.Last.TimeFormat", defaultValue = "%amount% %TimeType%")
+	public String formatCommandsVoteLastTimeFormat;
+
+	@ConfigDataString(path = "Format.Commands.Vote.Last.Line", defaultValue = "&3%SiteName%: &6%timeSince% ago")
+	public String formatCommandsVoteLastLine;
+
+	@ConfigDataString(path = "Format.Commands.Vote.Last.NeverVoted", defaultValue = "Never voted")
+	public String formatCommandsVoteLastNeverVoted;
+
+	@ConfigDataString(path = "Format.TimeFormats.Days", defaultValue = "Days")
+	public String formatTimeFormatsDays;
+
+	@ConfigDataString(path = "Format.TimeFormats.Day", defaultValue = "Day")
+	public String formatTimeFormatsDay;
+
+	@ConfigDataString(path = "Format.TimeFormats.Hours", defaultValue = "Hours")
+	public String formatTimeFormatsHours;
+
+	@ConfigDataString(path = "Format.TimeFormats.Hour", defaultValue = "Hour")
+	public String formatTimeFormatsHour;
+
+	@ConfigDataString(path = "Format.TimeFormats.Minutes", defaultValue = "Minutes")
+	public String formatTimeFormatsMinutes;
+
+	@ConfigDataString(path = "Format.TimeFormats.Minute", defaultValue = "Minute")
+	public String formatTimeFormatsMinute;
+
+	@ConfigDataString(path = "Format.TimeFormats.Seconds", defaultValue = "Seconds")
+	public String formatTimeFormatsSeconds;
+
+	@ConfigDataString(path = "Format.TimeFormats.Second", defaultValue = "Second")
+	public String formatTimeFormatsSecond;
+
+	@ConfigDataBoolean(path = "Commands.DisableVoteRewardGUIs", defaultValue = false)
+	public boolean commandsDisableVoteRewardGUIs;
+
 	/**
 	 * Instantiates a new config.
 	 */
@@ -47,6 +95,10 @@ public class Config extends YMLFile {
 		return getData().getBoolean("AllowUnjoined");
 	}

+	public boolean getAddTotals() {
+		return getData().getBoolean("AddTotals", true);
+	}
+
 	/**
 	 * Gets the all sites reward.
 	 *
@@ -110,14 +162,18 @@ public class Config extends YMLFile {
 		return getData().getBoolean("BroadcastVote", true);
 	}

-	public boolean getDisableCheckOnWorldChange() {
-		return getData().getBoolean("DisableCheckOnWorldChange");
+	public boolean getCheckNameMojang() {
+		return getData().getBoolean("CheckNameMojang", true);
 	}

 	public boolean getClearCacheOnUpdate() {
 		return getData().getBoolean("ClearCacheOnUpdate");
 	}

+	public boolean getClearCacheOnVote() {
+		return getData().getBoolean("ClearCacheOnVote");
+	}
+
 	public boolean getCommandsUseGUIBest() {
 		return getData().getBoolean("Commands.UseGUI.Best");
 	}
@@ -150,6 +206,10 @@ public class Config extends YMLFile {
 		return getData().getBoolean("Commands.UseGUI.Vote", true);
 	}

+	public int getConvertDelay() {
+		return getData().getInt("ConvertDelay", 30000);
+	}
+
 	public boolean getCountFakeVotes() {
 		return getData().getBoolean("CountFakeVotes", true);
 	}
@@ -208,15 +268,8 @@ public class Config extends YMLFile {
 		return getData().getBoolean("Cumulative." + cumulative + ".VotesInSameWeek");
 	}

-	/**
-	 * Gets the daily award rewards path
-	 *
-	 * @param pos
-	 *            the pos
-	 * @return the daily award rewards
-	 */
-	public String getDailyAwardRewardsPath(int pos) {
-		return "DailyAwards." + pos + ".Rewards";
+	public String getDailyAwardRewardsPath(String path) {
+		return "DailyAwards." + path + ".Rewards";
 	}

 	/**
@@ -268,6 +321,10 @@ public class Config extends YMLFile {
 		return getData().getInt("DelayBetweenUpdates", 3);
 	}

+	public boolean getDisableCheckOnWorldChange() {
+		return getData().getBoolean("DisableCheckOnWorldChange");
+	}
+
 	public boolean getDisableNoServiceSiteMessage() {
 		return getData().getBoolean("DisableNoServiceSiteMessage");
 	}
@@ -351,15 +408,6 @@ public class Config extends YMLFile {

 	}

-	/**
-	 * Gets the commands vote last line.
-	 *
-	 * @return the commands vote last line
-	 */
-	public String getFormatCommandsVoteLastLine() {
-		return getData().getString("Format.Commands.Vote.Last.Line", "&3%SiteName%: &6%time%");
-	}
-
 	/**
 	 * Gets the commands vote last title.
 	 *
@@ -661,6 +709,10 @@ public class Config extends YMLFile {
 		return getData().getString("Format.TopVoter.Weekly", "Weekly");
 	}

+	public String getFormatUserNotExist() {
+		return getData().getString("Format.UserNotExist", "&cUser does not exist: %player%");
+	}
+
 	/**
 	 * Gets the vote help.
 	 *
@@ -671,6 +723,10 @@ public class Config extends YMLFile {
 		return (ArrayList<String>) getData().getList("Format.Commands.Vote.Help.Lines", new ArrayList<String>());
 	}

+	public boolean getGiveDefaultPermission() {
+		return getData().getBoolean("GiveDefaultPermission", true);
+	}
+
 	public ConfigurationSection getGUIVoteBestDayBestItem() {
 		return getData().getConfigurationSection("GUI.VoteBest.DayBest.Item");
 	}
@@ -807,14 +863,14 @@ public class Config extends YMLFile {
 		return getData().getString("GUI.VoteURL.Name", "&cVoteURL");
 	}

-	public String getGUIVoteURLURLText() {
-		return getData().getString("GUI.VoteURL.URLText", "%VoteUrl%");
-	}
-
 	public String getGUIVoteURLSiteName() {
 		return getData().getString("GUI.VoteURLSite.Name", "VoteSite %site%");
 	}

+	public String getGUIVoteURLURLText() {
+		return getData().getString("GUI.VoteURL.URLText", "%VoteUrl%");
+	}
+
 	public int getIdentifierCost(String identifier) {
 		return getData().getInt("Shop." + identifier + ".Cost");
 	}
@@ -845,10 +901,6 @@ public class Config extends YMLFile {
 		return new HashSet<String>();
 	}

-	public boolean getCheckNameMojang() {
-		return getData().getBoolean("CheckNameMojang", true);
-	}
-
 	public ConfigurationSection getIdentifierSection(String identifier) {
 		return getData().getConfigurationSection("Shop." + identifier);
 	}
@@ -930,15 +982,8 @@ public class Config extends YMLFile {
 		}
 	}

-	/**
-	 * Gets the monthly award rewards.
-	 *
-	 * @param pos
-	 *            the pos
-	 * @return the monthly award rewards
-	 */
-	public String getMonthlyAwardRewardsPath(int pos) {
-		return "MonthlyAwards." + pos + ".Rewards";
+	public String getMonthlyAwardRewardsPath(String path) {
+		return "MonthlyAwards." + path + ".Rewards";
 	}

 	/**
@@ -971,6 +1016,14 @@ public class Config extends YMLFile {
 		return getData().getInt("PointsOnVote", 1);
 	}

+	public int getPurgeMin() {
+		return getData().getInt("PurgeMin", 90);
+	}
+
+	public boolean getPurgeOldData() {
+		return getData().getBoolean("PurgeOldData");
+	}
+
 	/**
 	 * Gets the request API default method.
 	 *
@@ -1030,6 +1083,10 @@ public class Config extends YMLFile {
 		return getData().getBoolean("StoreTopVoters.Weekly");
 	}

+	public boolean getTopVoterAwardsTies() {
+		return getData().getBoolean("TopVoterAwardsTies", true);
+	}
+
 	public boolean getTopVoterIgnorePermission() {
 		return getData().getBoolean("TopVoterIgnorePermission");
 	}
@@ -1059,7 +1116,7 @@ public class Config extends YMLFile {
 	 */
 	@SuppressWarnings("unchecked")
 	public ArrayList<String> getVoteGUISlotLore(String slot) {
-		return (ArrayList<String>) getData().getList("GUI.VoteGUI." + slot + ".Lore", new ArrayList<String>());
+		return (ArrayList<String>) getData().getList("GUI.VoteGUI." + slot + ".Item.Lore", new ArrayList<String>());
 	}

 	/**
@@ -1094,6 +1151,11 @@ public class Config extends YMLFile {
 		return getData().getString("VoteParty.Broadcast", "");
 	}

+	@SuppressWarnings("unchecked")
+	public ArrayList<String> getVotePartyCommands() {
+		return (ArrayList<String>) getData().getList("VoteParty.Commands", new ArrayList<String>());
+	}
+
 	public boolean getVotePartyCountFakeVotes() {
 		return getData().getBoolean("VoteParty.CountFakeVotes", true);
 	}
@@ -1116,12 +1178,12 @@ public class Config extends YMLFile {
 		return getData().getBoolean("VoteParty.GiveAllPlayers");
 	}

-	public boolean getVotePartyResetEachDay() {
-		return getData().getBoolean("VoteParty.ResetEachDay");
+	public int getVotePartyIncreaseVotesRquired() {
+		return getData().getInt("VoteParty.IncreaseVotesRquired", 0);
 	}

-	public boolean getAddTotals() {
-		return getData().getBoolean("AddTotals", true);
+	public boolean getVotePartyResetEachDay() {
+		return getData().getBoolean("VoteParty.ResetEachDay");
 	}

 	public boolean getVotePartyResetMontly() {
@@ -1137,11 +1199,6 @@ public class Config extends YMLFile {
 		return "VoteParty.Rewards";
 	}

-	@SuppressWarnings("unchecked")
-	public ArrayList<String> getVotePartyCommands() {
-		return (ArrayList<String>) getData().getList("VoteParty.Commands", new ArrayList<String>());
-	}
-
 	/**
 	 * Gets the vote party votes required.
 	 *
@@ -1200,24 +1257,16 @@ public class Config extends YMLFile {
 		return getData().getBoolean("VoteShopBackButton", true);
 	}

-	public boolean getGiveDefaultPermission() {
-		return getData().getBoolean("GiveDefaultPermission", true);
+	public boolean getVoteShopEnabled() {
+		return getData().getBoolean("VoteShopEnabled", true);
 	}

 	public String getVoteShopName() {
 		return getData().getString("GUI.VoteShopName", "VoteShop");
 	}

-	public String getFormatUserNotExist() {
-		return getData().getString("Format.UserNotExist", "&cUser does not exist: %player%");
-	}
-
-	public boolean getPurgeOldData() {
-		return getData().getBoolean("PurgeOldData");
-	}
-
-	public int getPurgeMin() {
-		return getData().getInt("PurgeMin", 90);
+	public String getVoteShopPermission(String ident) {
+		return getData().getString("Shop." + ident + ".Permission", "");
 	}

 	/**
@@ -1349,15 +1398,8 @@ public class Config extends YMLFile {
 		return getData().getBoolean("GUI.VoteURL.ViewAllUrlsButtonEnabled");
 	}

-	/**
-	 * Gets the weekly award rewards.
-	 *
-	 * @param pos
-	 *            the pos
-	 * @return the weekly award rewards
-	 */
-	public String getWeeklyAwardRewardsPath(int pos) {
-		return "WeeklyAwards." + pos + ".Rewards";
+	public String getWeeklyAwardRewardsPath(String path) {
+		return "WeeklyAwards." + path + ".Rewards";
 	}

 	/**
@@ -1382,6 +1424,10 @@ public class Config extends YMLFile {
 		}
 	}

+	public void loadValues() {
+		new AnnotationHandler().load(getData(), this);
+	}
+
 	@Override
 	public void onFileCreation() {
 		plugin.saveResource("Config.yml", true);
@@ -1478,12 +1524,4 @@ public class Config extends YMLFile {
 		saveData();
 	}

-	public boolean getClearCacheOnVote() {
-		return getData().getBoolean("ClearCacheOnVote");
-	}
-
-	public boolean getTopVoterAwardsTies() {
-		return getData().getBoolean("TopVoterAwardsTies", true);
-	}
-
 }
@@ -10,7 +10,7 @@ import org.bukkit.configuration.ConfigurationSection;

 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
-import com.Ben12345rocks.VotingPlugin.Objects.SignHandler;
+import com.Ben12345rocks.VotingPlugin.Signs.SignHandler;

 // TODO: Auto-generated Javadoc
 /**
@@ -151,6 +151,10 @@ public class ServerData {
 		}
 	}

+	public int getVotePartyExtraRequired() {
+		return getData().getInt("VotePartyExtraRequired", 0);
+	}
+
 	/**
 	 * Next sign number.
 	 *
@@ -238,6 +242,11 @@ public class ServerData {
 		saveData();
 	}

+	public void setVotePartyExtraRequired(int value) {
+		getData().set("VotePartyExtraRequired", value);
+		saveData();
+	}
+
 	/**
 	 * Update values.
 	 */
@@ -9,7 +9,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;

 import com.Ben12345rocks.VotingPlugin.Main;
-import com.Ben12345rocks.VotingPlugin.Objects.SignHandler;
+import com.Ben12345rocks.VotingPlugin.Signs.SignHandler;

 // TODO: Auto-generated Javadoc
 /**
@@ -9,7 +9,7 @@ import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;

 import com.Ben12345rocks.VotingPlugin.Main;
-import com.Ben12345rocks.VotingPlugin.Objects.SignHandler;
+import com.Ben12345rocks.VotingPlugin.Signs.SignHandler;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;

 // TODO: Auto-generated Javadoc
@@ -7,7 +7,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerLoginEvent;

 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
-import com.Ben12345rocks.AdvancedCore.Objects.UserStorage;
+import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
@@ -33,21 +33,6 @@ public class PlayerVoteAllSitesEvent extends Event {
 		setUser(user);
 	}

-	/**
-	 * @return the user
-	 */
-	public User getUser() {
-		return user;
-	}
-
-	/**
-	 * @param user
-	 *            the user to set
-	 */
-	public void setUser(User user) {
-		this.user = user;
-	}
-
 	/*
 	 * (non-Javadoc)
 	 *
@@ -58,6 +43,13 @@ public class PlayerVoteAllSitesEvent extends Event {
 		return handlers;
 	}

+	/**
+	 * @return the user
+	 */
+	public User getUser() {
+		return user;
+	}
+
 	/**
 	 * Checks if is cancelled.
 	 *
@@ -77,4 +69,12 @@ public class PlayerVoteAllSitesEvent extends Event {
 		cancelled = bln;
 	}

+	/**
+	 * @param user
+	 *            the user to set
+	 */
+	public void setUser(User user) {
+		this.user = user;
+	}
+
 }
@@ -8,7 +8,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;

 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
-import com.Ben12345rocks.AdvancedCore.Objects.UserStorage;
+import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
@@ -46,7 +46,7 @@ public class VotiferEvent implements Listener {

 	public static void playerVote(final String playerName, final String voteSiteURL, final boolean realVote) {

-		if (!PlayerUtils.getInstance().isValidUser(playerName) && !config.allowUnJoined()) {
+		if (!config.allowUnJoined() && !PlayerUtils.getInstance().isValidUser(playerName)) {
 			plugin.getLogger().warning("Player " + playerName
 					+ " has not joined before, disregarding vote, set AllowUnjoined to true to prevent this");
 			return;
@@ -152,13 +152,12 @@ public class VotiferEvent implements Listener {
 		final String voteSite = vote.getServiceName();
 		final String voteUsername = vote.getUsername().trim();
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-			
+
 			@Override
 			public void run() {
 				ServerData.getInstance().addServiceSite(voteSite);
 			}
 		});
-		

 		if (voteUsername.length() == 0) {
 			plugin.getLogger().warning("No name from vote on " + voteSite);
@@ -25,14 +25,16 @@ import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;

 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
-import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
-import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
-import com.Ben12345rocks.AdvancedCore.Objects.UUID;
-import com.Ben12345rocks.AdvancedCore.Objects.UserStorage;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
+import com.Ben12345rocks.AdvancedCore.NMSManager.NMSManager;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
+import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
 import com.Ben12345rocks.AdvancedCore.Util.Javascript.JavascriptPlaceholderRequest;
 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.VotingPlugin.Commands.CommandLoader;
 import com.Ben12345rocks.VotingPlugin.Commands.Commands;
@@ -50,9 +52,9 @@ import com.Ben12345rocks.VotingPlugin.Events.PlayerJoinEvent;
 import com.Ben12345rocks.VotingPlugin.Events.SignChange;
 import com.Ben12345rocks.VotingPlugin.Events.VotiferEvent;
 import com.Ben12345rocks.VotingPlugin.Events.VotingPluginUpdateEvent;
-import com.Ben12345rocks.VotingPlugin.Objects.SignHandler;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
+import com.Ben12345rocks.VotingPlugin.Signs.SignHandler;
 import com.Ben12345rocks.VotingPlugin.Signs.Signs;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
@@ -129,41 +131,66 @@ public class Main extends JavaPlugin {
 		}
 		UserStorage cur = AdvancedCoreHook.getInstance().getStorageType();
 		AdvancedCoreHook.getInstance().setStorageType(from);
-		AdvancedCoreHook.getInstance().reload();
-		HashMap<User, HashMap<String, String>> data = new HashMap<User, HashMap<String, String>>();
-		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-			try {
-				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+		if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)
+				&& AdvancedCoreHook.getInstance().getMysql() != null) {
+			AdvancedCoreHook.getInstance().getMysql().clearCache();
+		}
+		ArrayList<String> uuids = new ArrayList<String>(UserManager.getInstance().getAllUUIDs());

-				HashMap<String, String> values = new HashMap<String, String>();
-				for (String key : user.getData().getKeys()) {
-					values.put(key, user.getData().getString(key));
-				}
-				data.put(user, values);
-				debug("[Convert] Added " + uuid);
-			} catch (Exception e) {
-				AdvancedCoreHook.getInstance().debug(e);
-				plugin.getLogger().warning("Exception occoured for '" + uuid + "': " + e.getMessage()
-						+ ", turn debug on to see full stack traces");
+		while (uuids.size() > 0) {
+			HashMap<User, HashMap<String, String>> data = new HashMap<User, HashMap<String, String>>();
+			AdvancedCoreHook.getInstance().setStorageType(from);
+			// AdvancedCoreHook.getInstance().setStorageType(to);
+
+			if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)
+					&& AdvancedCoreHook.getInstance().getMysql() != null) {
+				AdvancedCoreHook.getInstance().getMysql().clearCache();
 			}
+
+			ArrayList<String> converted = new ArrayList<String>();
+			int i = 0;
+			while (i < 250 && i < uuids.size()) {
+				String uuid = uuids.get(i);
+				try {
+					User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+
+					HashMap<String, String> values = new HashMap<String, String>();
+					for (String key : user.getData().getKeys()) {
+						String value = user.getData().getValue(key);
+						if (value != null && !value.isEmpty() && !value.equalsIgnoreCase("null")) {
+							values.put(key, value);
+						}
+					}
+					i++;
+					converted.add(uuid);
+					data.put(user, values);
+					debug("[Convert] Added " + uuid);
+				} catch (Exception e) {
+					AdvancedCoreHook.getInstance().debug(e);
+					plugin.getLogger().warning("Exception occoured for '" + uuid + "': " + e.getMessage()
+							+ ", turn debug on to see full stack traces");
+				}
+			}
+
+			try {
+				wait(Config.getInstance().getConvertDelay());
+			} catch (Exception e) {
+			}
+
+			uuids.removeAll(converted);
+
+			plugin.getLogger()
+					.info("Finished getting data from " + from.toString() + " Converting " + data.size() + " users");
+
+			AdvancedCoreHook.getInstance().setStorageType(to);
+			if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)
+					&& AdvancedCoreHook.getInstance().getMysql() != null) {
+				AdvancedCoreHook.getInstance().getMysql().clearCache();
+			}
+
+			writeConvertData(data);
 		}

-		plugin.getLogger().info("Finished getting data from " + from.toString());
-
-		AdvancedCoreHook.getInstance().setStorageType(to);
-		AdvancedCoreHook.getInstance().reload();
-
-		for (Entry<User, HashMap<String, String>> entry : data.entrySet()) {
-			try {
-				for (Entry<String, String> values : entry.getValue().entrySet()) {
-					entry.getKey().getData().setString(values.getKey(), values.getValue());
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-				plugin.getLogger().warning("Exception occoured for '" + entry.getKey().getUUID() + "': "
-						+ e.getMessage() + ", turn debug on to see full stack traces");
-			}
-		}
 		AdvancedCoreHook.getInstance().setStorageType(cur);
 		AdvancedCoreHook.getInstance().reload();

@@ -184,6 +211,34 @@ public class Main extends JavaPlugin {
 		AdvancedCoreHook.getInstance().debug(plugin, message);
 	}

+	public ArrayList<CommandHandler> getAdminVoteCommand() {
+		return adminVoteCommand;
+	}
+
+	public ArrayList<SignHandler> getSigns() {
+		return signs;
+	}
+
+	public LinkedHashMap<User, Integer> getTopVoterAllTime() {
+		return topVoterAllTime;
+	}
+
+	public LinkedHashMap<User, Integer> getTopVoterDaily() {
+		return topVoterDaily;
+	}
+
+	public LinkedHashMap<User, Integer> getTopVoterMonthly() {
+		return topVoterMonthly;
+	}
+
+	public LinkedHashMap<User, Integer> getTopVoterWeekly() {
+		return topVoterWeekly;
+	}
+
+	public Updater getUpdater() {
+		return updater;
+	}
+
 	/**
 	 * Gets the user.
 	 *
@@ -199,6 +254,14 @@ public class Main extends JavaPlugin {
 		return UserManager.getInstance();
 	}

+	public ArrayList<CommandHandler> getVoteCommand() {
+		return voteCommand;
+	}
+
+	public Logger getVoteLog() {
+		return voteLog;
+	}
+
 	public VoteParty getVoteParty() {
 		return VoteParty.getInstance();
 	}
@@ -260,6 +323,10 @@ public class Main extends JavaPlugin {
 		return voteSites;
 	}

+	public LinkedHashMap<User, HashMap<VoteSite, LocalDateTime>> getVoteToday() {
+		return voteToday;
+	}
+
 	public boolean hasVoteSite(String site) {
 		String siteName = getVoteSiteName(site);
 		for (VoteSite voteSite : getVoteSites()) {
@@ -270,6 +337,14 @@ public class Main extends JavaPlugin {
 		return false;
 	}

+	public boolean isUpdate() {
+		return update;
+	}
+
+	public boolean isUpdateStarted() {
+		return updateStarted;
+	}
+
 	private void loadTimer() {
 		Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {

@@ -644,11 +719,9 @@ public class Main extends JavaPlugin {

 		setupFiles();
 		loadVoteSites();
+		AdvancedCoreHook.getInstance().setJenkinsSite("ben12345rocks.com");
 		updateAdvancedCoreHook();
 		AdvancedCoreHook.getInstance().loadHook(this);
-		if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
-			debug("UseBatchUpdates: " + AdvancedCoreHook.getInstance().getMysql().isUseBatchUpdates());
-		}
 		registerCommands();
 		registerEvents();
 		checkVotifier();
@@ -696,11 +769,44 @@ public class Main extends JavaPlugin {

 		loadTimer();

+		// set columns
+		if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("TopVoterIgnore", "VARCHAR(5)");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("CheckWorld", "VARCHAR(5)");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("Reminded", "VARCHAR(5)");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("DisableBroadcast", "VARCHAR(5)");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("LastOnline", "VARCHAR(20)");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("PlayerName", "VARCHAR(20)");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("DailyTotal", "INT DEFAULT '0'");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("WeeklyTotal", "INT DEFAULT '0'");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("DayVoteStreak", "INT DEFAULT '0'");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("BestDayVoteStreak", "INT DEFAULT '0'");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("WeekVoteStreak", "INT DEFAULT '0'");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("BestWeekVoteStreak", "INT DEFAULT '0'");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("VotePartyVotes", "INT DEFAULT '0'");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("MonthVoteStreak", "INT DEFAULT '0'");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("Points", "INT DEFAULT '0'");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("HighestDailyTotal", "INT DEFAULT '0'");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("MileStoneTotal", "INT DEFAULT '0'");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("AllTimeTotal", "INT DEFAULT '0'");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("HighestMonthlyTotal", "INT DEFAULT '0'");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("MilestoneCount", "INT DEFAULT '0'");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("MonthTotal", "INT DEFAULT '0'");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
+
+		}
+
 		plugin.getLogger().info("Enabled VotingPlugin " + plugin.getDescription().getVersion());

+		boolean hasRewards = RewardHandler.getInstance().hasRewards(ConfigVoteSites.getInstance().getData(),
+				ConfigVoteSites.getInstance().getEverySiteRewardPath());
+
+		boolean noIssues = true;
 		ArrayList<String> services = ServerData.getInstance().getServiceSites();
 		for (VoteSite site : getVoteSites()) {
-			if (!site.hasRewards()) {
+			if (!site.hasRewards() && !hasRewards) {
+				noIssues = false;
 				plugin.getLogger().warning("No rewards detected for the site: " + site.getKey()
 						+ ". See https://github.com/Ben12345rocks/AdvancedCore/wiki/Rewards on how to add rewards");
 			}
@@ -712,59 +818,27 @@ public class Main extends JavaPlugin {
 				}
 			}
 			if (!contains) {
+				noIssues = false;
 				plugin.getLogger().warning("No vote has been recieved from " + site.getServiceSite()
 						+ ", may be an invalid service site. Vote on the site and look in console for a service site, if you get nothing then there is an issue with votifier");
 			}
 		}

-	}
+		if (!noIssues) {
+			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {

-	public LinkedHashMap<User, Integer> getTopVoterAllTime() {
-		return topVoterAllTime;
-	}
+				@Override
+				public void run() {
+					plugin.getLogger().warning(
+							"Detected an issue with voting sites, check the plugin startup log for more details");
+				}
+			}, 30l);
+		}

-	public LinkedHashMap<User, Integer> getTopVoterMonthly() {
-		return topVoterMonthly;
-	}
-
-	public LinkedHashMap<User, Integer> getTopVoterWeekly() {
-		return topVoterWeekly;
-	}
-
-	public LinkedHashMap<User, Integer> getTopVoterDaily() {
-		return topVoterDaily;
-	}
-
-	public Updater getUpdater() {
-		return updater;
-	}
-
-	public ArrayList<CommandHandler> getVoteCommand() {
-		return voteCommand;
-	}
-
-	public ArrayList<CommandHandler> getAdminVoteCommand() {
-		return adminVoteCommand;
-	}
-
-	public LinkedHashMap<User, HashMap<VoteSite, LocalDateTime>> getVoteToday() {
-		return voteToday;
-	}
-
-	public ArrayList<SignHandler> getSigns() {
-		return signs;
-	}
-
-	public Logger getVoteLog() {
-		return voteLog;
-	}
-
-	public boolean isUpdate() {
-		return update;
-	}
-
-	public boolean isUpdateStarted() {
-		return updateStarted;
+		if (NMSManager.getInstance().isVersion("1.7", "1.8", "1.9", "1.10", "1.11", "1.12")) {
+			plugin.getLogger().warning("Detected running " + NMSManager.getInstance().getVersion()
+					+ ", this version is not supported on this build");
+		}
 	}

 	/**
@@ -826,6 +900,7 @@ public class Main extends JavaPlugin {
 	public void reload() {
 		setUpdate(true);
 		config.reloadData();
+		config.loadValues();
 		configVoteSites.reloadData();
 		updateAdvancedCoreHook();
 		plugin.loadVoteSites();
@@ -846,6 +921,7 @@ public class Main extends JavaPlugin {
 		try {
 			config = Config.getInstance();
 			config.setup();
+			config.loadValues();
 		} catch (Exception e) {
 			e.printStackTrace();
 			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
@@ -939,4 +1015,30 @@ public class Main extends JavaPlugin {
 		AdvancedCoreHook.getInstance().setConfigData(Config.getInstance().getData());
 	}

+	private void writeConvertData(HashMap<User, HashMap<String, String>> data) {
+		boolean checkInt = AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL);
+		for (Entry<User, HashMap<String, String>> entry : data.entrySet()) {
+			try {
+				for (Entry<String, String> values : entry.getValue().entrySet()) {
+					String value = values.getValue();
+					if (value != null && !value.equalsIgnoreCase("null")) {
+						if (checkInt) {
+							if (StringUtils.getInstance().isInt(value)) {
+								entry.getKey().getData().setInt(values.getKey(), Integer.parseInt(value));
+							} else {
+								entry.getKey().getData().setString(values.getKey(), value);
+							}
+						} else {
+							entry.getKey().getData().setString(values.getKey(), value);
+						}
+					}
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+				plugin.getLogger().warning("Exception occoured for '" + entry.getKey().getUUID() + "': "
+						+ e.getMessage() + ", turn debug on to see full stack traces");
+			}
+		}
+	}
+
 }
@@ -14,9 +14,10 @@ import java.util.stream.Collectors;
 import org.bukkit.entity.Player;

 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
-import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
-import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
-import com.Ben12345rocks.AdvancedCore.Objects.UUID;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
+import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
@@ -30,7 +31,7 @@ import com.Ben12345rocks.VotingPlugin.VoteReminding.VoteReminding;
 /**
 * The Class User.
 */
-public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
+public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {

 	/** The plugin. */
 	static Main plugin = Main.plugin;
@@ -204,7 +205,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {

 			return now.isAfter(nextvote);
 		} else {
-			if (now.getDayOfYear() != lastVote.getDayOfYear() && now.getYear() != lastVote.getYear()) {
+			if (now.getDayOfYear() != lastVote.getDayOfYear() || now.getYear() != lastVote.getYear()) {
 				return true;
 			}
 			return false;
@@ -250,6 +251,12 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return true;
 	}

+	public void clearOfflineRewards() {
+		setOfflineVotes(new ArrayList<String>());
+		setOfflineRewards(new ArrayList<String>());
+		setOfflineOtherRewards(new ArrayList<String>());
+	}
+
 	public void clearTotals() {
 		setAllTimeTotal(0);
 		resetDailyTotalVotes();
@@ -281,6 +288,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return getData().getInt("DayVoteStreak");
 	}

+	public boolean getDisableBroadcast() {
+		return getUserData().getBoolean("DisableBroadcast");
+	}
+
 	public HashMap<String, Boolean> getHasGottenMilestone() {
 		HashMap<String, Boolean> hasGottenMilestone = new HashMap<String, Boolean>();
 		ArrayList<String> milestoneList = getUserData().getStringList("GottenMileStones");
@@ -306,6 +317,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return getData().getInt("HighestWeeklyTotal");
 	}

+	public int getLastMonthTotal() {
+		return getData().getInt("LastMonthTotal");
+	}
+
 	public HashMap<VoteSite, Long> getLastVotes() {
 		HashMap<VoteSite, Long> lastVotes = new HashMap<VoteSite, Long>();
 		ArrayList<String> LastVotesList = getUserData().getStringList("LastVotes");
@@ -353,10 +368,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return getData().getInt("MonthTotal");
 	}

-	public int getLastMonthTotal() {
-		return getData().getInt("LastMonthTotal");
-	}
-
 	public int getMonthVoteStreak() {
 		return getData().getInt("MonthVoteStreak");
 	}
@@ -405,25 +416,13 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return getData().getInt("WeekVoteStreak");
 	}

-	/**
-	 * Give daily top voter award.
-	 *
-	 * @param place
-	 *            the place
-	 */
-	public void giveDailyTopVoterAward(int place) {
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getDailyAwardRewardsPath(place))
+	public void giveDailyTopVoterAward(int place, String path) {
+		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getDailyAwardRewardsPath(path))
 				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Daily").send(this);
 	}

-	/**
-	 * Give monthly top voter award.
-	 *
-	 * @param place
-	 *            the place
-	 */
-	public void giveMonthlyTopVoterAward(int place) {
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getMonthlyAwardRewardsPath(place))
+	public void giveMonthlyTopVoterAward(int place, String path) {
+		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getMonthlyAwardRewardsPath(path))
 				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Monthly").send(this);
 	}

@@ -435,7 +434,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 			} else if (str.equalsIgnoreCase("AllSites")) {
 				OtherVoteReward.getInstance().giveAllSitesRewards(this, false);
 			} else if (str.equalsIgnoreCase("VoteParty")) {
-				VoteParty.getInstance().giveReward(this);
+				VoteParty.getInstance().giveReward(this, false);
 			} else if (str.contains("Cumulative")) {
 				String st = str.substring("Cumulative".length());
 				if (StringUtils.getInstance().isInt(st)) {
@@ -456,36 +455,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 						}
 					}
 				}
-			} else if (str.contains("MonthlyTopVoter")) {
-				String st = str.substring("MontlyTopVoter".length());
-				if (StringUtils.getInstance().isInt(st)) {
-					int place = Integer.parseInt(st);
-					if (place > 0) {
-						if (Config.getInstance().getMonthlyAwardsEnabled()) {
-							giveMonthlyTopVoterAward(place);
-						}
-					}
-				}
-			} else if (str.contains("WeeklyTopVoter")) {
-				String st = str.substring("WeeklyTopVoter".length());
-				if (StringUtils.getInstance().isInt(st)) {
-					int place = Integer.parseInt(st);
-					if (place > 0) {
-						if (Config.getInstance().getWeeklyAwardsEnabled()) {
-							giveWeeklyTopVoterAward(place);
-						}
-					}
-				}
-			} else if (str.contains("DailyTopVoter")) {
-				String st = str.substring("DailyTopVoter".length());
-				if (StringUtils.getInstance().isInt(st)) {
-					int place = Integer.parseInt(st);
-					if (place > 0) {
-						if (Config.getInstance().getDailyAwardsEnabled()) {
-							giveDailyTopVoterAward(place);
-						}
-					}
-				}
 			} else if (str.contains("VoteStreak")) {
 				String[] args = str.split("_");
 				if (args.length > 2) {
@@ -507,14 +476,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		}
 	}

-	/**
-	 * Give weekly top voter award.
-	 *
-	 * @param place
-	 *            the place
-	 */
-	public void giveWeeklyTopVoterAward(int place) {
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getWeeklyAwardRewardsPath(place))
+	public void giveWeeklyTopVoterAward(int place, String path) {
+		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getWeeklyAwardRewardsPath(path))
 				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Weekly").send(this);
 	}

@@ -645,7 +608,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 */
 	public void sendVoteEffects(boolean online) {
 		RewardHandler.getInstance().giveReward(this, Config.getInstance().getData(),
-				Config.getInstance().getAnySiteRewardsPath(), online);
+				Config.getInstance().getAnySiteRewardsPath(), new RewardOptions().setOnline(online));
 	}

 	public void setAllTimeTotal(int allTimeTotal) {
@@ -675,6 +638,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		}
 	}

+	public void setDisableBroadcast(boolean value) {
+		getUserData().setBoolean("DisableBroadcast", value);
+	}
+
 	public void setHasGotteMilestone(int votesRequired, boolean b) {
 		HashMap<String, Boolean> hasGottenMilestone = getHasGottenMilestone();
 		hasGottenMilestone.put("" + votesRequired, b);
@@ -702,6 +669,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		getData().setInt("HighestWeeklyTotal", total);
 	}

+	public void setLastMonthTotal(int total) {
+		getData().setInt("LastMonthTotal", total);
+	}
+
 	public void setLastVotes(HashMap<VoteSite, Long> lastVotes) {
 		ArrayList<String> data = new ArrayList<String>();
 		for (Entry<VoteSite, Long> entry : lastVotes.entrySet()) {
@@ -719,10 +690,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		getData().setInt("MonthTotal", total);
 	}

-	public void setLastMonthTotal(int total) {
-		getData().setInt("LastMonthTotal", total);
-	}
-
 	public void setMonthVoteStreak(int streak) {
 		getData().setInt("MonthVoteStreak", streak);
 		if (getBestMonthVoteStreak() < streak) {
@@ -791,10 +758,4 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return true;
 	}

-	public void clearOfflineRewards() {
-		setOfflineVotes(new ArrayList<String>());
-		setOfflineRewards(new ArrayList<String>());
-		setOfflineOtherRewards(new ArrayList<String>());
-	}
-
 }
@@ -1,18 +1,23 @@
 package com.Ben12345rocks.VotingPlugin.Objects;

+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Player;

-import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
-import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
+import com.Ben12345rocks.AdvancedCore.Rewards.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;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;

-// TODO: Auto-generated Javadoc
 /**
 * The Class VoteSite.
 */
@@ -84,8 +89,20 @@ public class VoteSite {
 		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);
+			HashMap<String, String> placeholders = new HashMap<String, String>();
+			placeholders.put("player", playerName);
+			placeholders.put("nickname",
+					(user.getPlayer() != null) ? user.getPlayer().getDisplayName() : user.getPlayerName());
+			placeholders.put("sitename", getDisplayName());
+			bc = StringUtils.getInstance().replacePlaceHolder(bc, placeholders);
+			ArrayList<Player> players = new ArrayList<Player>();
+			for (Player p : Bukkit.getOnlinePlayers()) {
+				if (!UserManager.getInstance().getVotingPluginUser(p).getDisableBroadcast()) {
+					players.add(p);
+				}
+			}
+
+			MiscUtils.getInstance().broadcast(bc, players);
 		}
 	}

@@ -170,10 +187,6 @@ 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.
 	 *
@@ -186,6 +199,10 @@ public class VoteSite {
 		giveRewards(user, online);
 	}

+	public boolean hasRewards() {
+		return RewardHandler.getInstance().hasRewards(configVoteSites.getData(), configVoteSites.getRewardsPath(key));
+	}
+
 	/**
 	 * Inits the.
 	 */
@@ -4,8 +4,9 @@ import java.util.Set;

 import org.bukkit.Bukkit;

-import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
-import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
@@ -233,7 +234,7 @@ public class OtherVoteReward {
 			return;
 		}
 		RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-				Config.getInstance().getAllSitesRewardPath(), online);
+				Config.getInstance().getAllSitesRewardPath(), new RewardOptions().setOnline(online));
 	}

 	/**
@@ -261,7 +262,7 @@ public class OtherVoteReward {
 	 */
 	public void giveFirstVoteRewards(User user, boolean online) {
 		RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-				Config.getInstance().getFirstVoteRewardsPath(), online);
+				Config.getInstance().getFirstVoteRewardsPath(), new RewardOptions().setOnline(online));
 	}

 	/**
@@ -284,5 +285,4 @@ public class OtherVoteReward {
 				.setOnline(online).withPlaceHolder("Type", type).withPlaceHolder("Streak", "" + votes).send(user);
 	}

-	
 }
@@ -1,10 +1,11 @@
-package com.Ben12345rocks.VotingPlugin.Objects;
+package com.Ben12345rocks.VotingPlugin.Signs;

 import java.util.ArrayList;

 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.Sign;
 import org.bukkit.block.Skull;
@@ -15,6 +16,7 @@ import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
+import com.Ben12345rocks.VotingPlugin.Objects.User;

 // TODO: Auto-generated Javadoc
 /**
@@ -72,6 +74,17 @@ public class SignHandler {
 		playerName = "";
 	}

+	@SuppressWarnings("deprecation")
+	private boolean checkSkull(Block block) {
+		if (block.getState() instanceof Skull) {
+			Skull skull = (Skull) block.getState();
+			skull.setOwner(playerName);
+			skull.update();
+			return true;
+		}
+		return false;
+	}
+
 	/**
 	 * Check skulls.
 	 */
@@ -311,14 +324,20 @@ public class SignHandler {
 		}, delay);
 	}

-	@SuppressWarnings("deprecation")
 	public void updateSkulls(Location loc1, Location loc2) {
-		for (Block block : MiscUtils.getInstance().getRegionBlocks(location.getWorld(), loc1, loc2)) {
-			if (block.getState() instanceof Skull) {
-				Skull skull = (Skull) block.getState();
-				skull.setOwner(playerName);
-				skull.update();
+		BlockState state = getLocation().getBlock().getState();
+		if (state instanceof Sign) {
+			org.bukkit.material.Sign s = (org.bukkit.material.Sign) state.getData();
+			Block b = location.getBlock().getRelative(s.getAttachedFace());
+			Block above = b.getRelative(BlockFace.UP);
+			if (checkSkull(above)) {
+				return;
 			}
+
+		}
+
+		for (Block block : MiscUtils.getInstance().getRegionBlocks(location.getWorld(), loc1, loc2)) {
+			checkSkull(block);
 		}
 	}
 }
@@ -6,7 +6,6 @@ import org.bukkit.Location;

 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
-import com.Ben12345rocks.VotingPlugin.Objects.SignHandler;

 // TODO: Auto-generated Javadoc
 /**
@@ -1,4 +1,4 @@
-package com.Ben12345rocks.VotingPlugin.Objects;
+package com.Ben12345rocks.VotingPlugin.TopVoter;

 import java.util.ArrayList;

@@ -51,19 +51,28 @@ public enum TopVoter {
 	}

 	public TopVoter prev() {
-		switch (this) {
-		case AllTime:
-			return Daily;
-		case Daily:
-			return Weekly;
-		case Monthly:
-			return AllTime;
-		case Weekly:
-			return Monthly;
-		default:
-			return AllTime;
-
+		ArrayList<TopVoter> list = new ArrayList<TopVoter>();
+		if (Config.getInstance().getLoadTopVoterAllTime()) {
+			list.add(TopVoter.AllTime);
 		}
-
+		if (Config.getInstance().getLoadTopVoterMonthly()) {
+			list.add(TopVoter.Monthly);
+		}
+		if (Config.getInstance().getLoadTopVoterWeekly()) {
+			list.add(TopVoter.Weekly);
+		}
+		if (Config.getInstance().getLoadTopVoterDaily()) {
+			list.add(TopVoter.Daily);
+		}
+		for (int i = list.size() - 1; i >= 0; i--) {
+			if (list.get(i).equals(this)) {
+				int prev = i - 1;
+				if (prev < 0) {
+					prev = list.size() - 1;
+				}
+				return TopVoter.values()[prev];
+			}
+		}
+		return TopVoter.AllTime;
 	}
 }
@@ -17,12 +17,12 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;

 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
-import com.Ben12345rocks.AdvancedCore.Listeners.DateChangedEvent;
-import com.Ben12345rocks.AdvancedCore.Listeners.DayChangeEvent;
-import com.Ben12345rocks.AdvancedCore.Listeners.MonthChangeEvent;
-import com.Ben12345rocks.AdvancedCore.Listeners.PreDateChangedEvent;
-import com.Ben12345rocks.AdvancedCore.Listeners.WeekChangeEvent;
-import com.Ben12345rocks.AdvancedCore.Objects.UUID;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.DateChangedEvent;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.DayChangeEvent;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.MonthChangeEvent;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.PreDateChangedEvent;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.WeekChangeEvent;
+import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.AdvancedCore.YML.YMLFileHandler;
@@ -77,15 +77,29 @@ public class TopVoterHandler implements Listener {
 		return ArrayUtils.getInstance().convert(msg);
 	}

-	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
-	public void onDateChanged(DateChangedEvent event) {
-		plugin.setUpdate(true);
+	private HashMap<Integer, String> handlePlaces(Set<String> places) {
+		HashMap<Integer, String> place = new HashMap<Integer, String>();
+		for (String p : places) {
+			String[] data = p.split("-");
+			try {
+				if (data.length > 1) {
+					for (int i = Integer.parseInt(data[0]); i < Integer.parseInt(data[1]); i++) {
+						place.put(i, p);
+					}
+				} else {
+					place.put(Integer.parseInt(data[0]), p);
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+
+		return place;
 	}

 	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
-	public void onPreDateChanged(PreDateChangedEvent event) {
+	public void onDateChanged(DateChangedEvent event) {
 		plugin.setUpdate(true);
-		plugin.update();
 	}

 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -111,7 +125,7 @@ public class TopVoterHandler implements Listener {
 		}

 		if (Config.getInstance().getDailyAwardsEnabled()) {
-			Set<String> places = Config.getInstance().getDailyPossibleRewardPlaces();
+			HashMap<Integer, String> places = handlePlaces(Config.getInstance().getDailyPossibleRewardPlaces());
 			int i = 0;
 			int lastTotal = -1;
 			for (User user : plugin.topVoterDaily.keySet()) {
@@ -123,8 +137,8 @@ public class TopVoterHandler implements Listener {
 					} else {
 						i++;
 					}
-					if (places.contains(Integer.toString(i))) {
-						user.giveDailyTopVoterAward(i);
+					if (places.containsKey(i)) {
+						user.giveDailyTopVoterAward(i, places.get(i));
 					}
 				}
 				lastTotal = user.getDailyTotal();
@@ -156,7 +170,7 @@ public class TopVoterHandler implements Listener {
 		}

 		if (Config.getInstance().getMonthlyAwardsEnabled()) {
-			Set<String> places = Config.getInstance().getMonthlyPossibleRewardPlaces();
+			HashMap<Integer, String> places = handlePlaces(Config.getInstance().getMonthlyPossibleRewardPlaces());
 			int i = 0;
 			int lastTotal = -1;
 			for (User user : plugin.topVoterMonthly.keySet()) {
@@ -169,8 +183,8 @@ public class TopVoterHandler implements Listener {
 					} else {
 						i++;
 					}
-					if (places.contains(Integer.toString(i))) {
-						user.giveMonthlyTopVoterAward(i);
+					if (places.containsKey(i)) {
+						user.giveMonthlyTopVoterAward(i, places.get(i));
 					}
 				}
 				lastTotal = user.getMonthTotal();
@@ -186,7 +200,12 @@ public class TopVoterHandler implements Listener {
 			}

 		}
+	}

+	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
+	public void onPreDateChanged(PreDateChangedEvent event) {
+		plugin.setUpdate(true);
+		plugin.update();
 	}

 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -211,7 +230,7 @@ public class TopVoterHandler implements Listener {
 		}

 		if (Config.getInstance().getWeeklyAwardsEnabled()) {
-			Set<String> places = Config.getInstance().getWeeklyPossibleRewardPlaces();
+			HashMap<Integer, String> places = handlePlaces(Config.getInstance().getWeeklyPossibleRewardPlaces());
 			int i = 0;
 			int lastTotal = -1;
 			for (User user : plugin.topVoterWeekly.keySet()) {
@@ -223,8 +242,8 @@ public class TopVoterHandler implements Listener {
 					} else {
 						i++;
 					}
-					if (places.contains(Integer.toString(i))) {
-						user.giveWeeklyTopVoterAward(i);
+					if (places.containsKey(i)) {
+						user.giveWeeklyTopVoterAward(i, places.get(i));
 					}
 				}
 				lastTotal = user.getWeeklyTotal();
@@ -5,7 +5,7 @@ import java.util.ArrayList;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;

-import com.Ben12345rocks.AdvancedCore.Objects.UUID;
+import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Objects.User;

@@ -32,6 +32,10 @@ public class UserManager {
 		return com.Ben12345rocks.AdvancedCore.UserManager.UserManager.getInstance().getAllUUIDs();
 	}

+	public User getVotingPluginUser(java.util.UUID uuid) {
+		return getVotingPluginUser(new UUID(uuid.toString()));
+	}
+
 	public User getVotingPluginUser(OfflinePlayer player) {
 		return getVotingPluginUser(player.getName());
 	}
@@ -49,8 +53,4 @@ public class UserManager {
 	public User getVotingPluginUser(UUID uuid) {
 		return new User(uuid);
 	}
-
-	public User getVotingPluginUser(java.util.UUID uuid) {
-		return getVotingPluginUser(new UUID(uuid.toString()));
-	}
 }
@@ -2,12 +2,12 @@ package com.Ben12345rocks.VotingPlugin.Util.PlaceHolders;

 import java.util.Map.Entry;

+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;

 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 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.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
@@ -51,9 +51,19 @@ public class PlaceHolders {
 		PlaceHolders.plugin = plugin;
 	}

-	public synchronized String getPlaceHolder(Player p, String identifier) {
+	public String getPlaceHolder(OfflinePlayer p, String identifier) {
 		identifier = StringUtils.getInstance().replaceJavascript(p, identifier);

+		// %VotingPlugin_VotePartyVotesNeeded - Number of votes needed until
+		// vote party rewards
+		if (identifier.equalsIgnoreCase("VotePartyVotesNeeded")) {
+			return Integer.toString(VoteParty.getInstance().getNeededVotes());
+		} else if (identifier.equalsIgnoreCase("VotePartyVotesCurrent")) {
+			return Integer.toString(VoteParty.getInstance().getTotalVotes());
+		} else if (identifier.equalsIgnoreCase("VotePartyVotesRequired")) {
+			return Integer.toString(VoteParty.getInstance().getVotesRequired());
+		}
+
 		User user = UserManager.getInstance().getVotingPluginUser(p);

 		// %VotingPlugin_total% - Total votes of all vote sites
@@ -103,16 +113,6 @@ public class PlaceHolders {
 			return Integer.toString(user.getPoints());
 		}

-		// %VotingPlugin_VotePartyVotesNeeded - Number of votes needed until
-		// vote party rewards
-		if (identifier.equalsIgnoreCase("VotePartyVotesNeeded")) {
-			return Integer.toString(VoteParty.getInstance().getNeededVotes());
-		} else if (identifier.equalsIgnoreCase("VotePartyVotesCurrent")) {
-			return Integer.toString(VoteParty.getInstance().getTotalVotes());
-		} else if (identifier.equalsIgnoreCase("VotePartyVotesRequired")) {
-			return Integer.toString(Config.getInstance().getVotePartyVotesRequired());
-		}
-
 		// %VotingPlugin_canvote% - Whether or not a player can vote on all
 		// sites
 		if (identifier.equalsIgnoreCase("canvote")) {
@@ -230,13 +230,18 @@ public class PlaceHolders {
 		return identifier;
 	}

+	public String getPlaceHolder(Player p, String identifier) {
+		identifier = StringUtils.getInstance().replaceJavascript(p, identifier);
+		return getPlaceHolder((OfflinePlayer) p, identifier);
+	}
+
 	public String playerLastVote(User user, String siteName) {
 		if (!ConfigVoteSites.getInstance().getVoteSitesNames().contains(siteName)) {
 			return "";
 		}

 		VoteSite voteSite = plugin.getVoteSite(siteName);
-		return Commands.getInstance().voteCommandLastDate(user, voteSite);
+		return Commands.getInstance().voteCommandLastDuration(user, voteSite);
 	}

 	public String playerNextVote(User user, String siteName) {
@@ -1,3 +1,4 @@
+
 package com.Ben12345rocks.VotingPlugin.VoteParty;

 import java.util.ArrayList;
@@ -8,10 +9,10 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

-import com.Ben12345rocks.AdvancedCore.Listeners.DayChangeEvent;
-import com.Ben12345rocks.AdvancedCore.Listeners.MonthChangeEvent;
-import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
-import com.Ben12345rocks.AdvancedCore.Objects.UUID;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.DayChangeEvent;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.MonthChangeEvent;
+import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
@@ -86,8 +87,8 @@ public class VoteParty implements Listener {
 	 * Check.
 	 */
 	public void check() {
-		if (getTotalVotes() >= Config.getInstance().getVotePartyVotesRequired()) {
-			setTotalVotes(getTotalVotes() - Config.getInstance().getVotePartyVotesRequired());
+		if (getTotalVotes() >= getVotesRequired()) {
+			setTotalVotes(getTotalVotes() - getVotesRequired());

 			VotePartyEvent event = new VotePartyEvent();
 			Bukkit.getPluginManager().callEvent(event);
@@ -96,6 +97,11 @@ public class VoteParty implements Listener {
 			}
 			giveRewards();
 			MiscUtils.getInstance().broadcast(Config.getInstance().getVotePartyBroadcast());
+
+			if (Config.getInstance().getVotePartyIncreaseVotesRquired() > 0) {
+				ServerData.getInstance().setVotePartyExtraRequired(ServerData.getInstance().getVotePartyExtraRequired()
+						+ Config.getInstance().getVotePartyIncreaseVotesRquired());
+			}
 		}

 	}
@@ -109,7 +115,7 @@ public class VoteParty implements Listener {
 	public void commandVoteParty(CommandSender sender) {
 		if (Config.getInstance().getVotePartyEnabled()) {
 			ArrayList<String> msg = Config.getInstance().getFormatCommandsVoteParty();
-			int votesRequired = Config.getInstance().getVotePartyVotesRequired();
+			int votesRequired = getVotesRequired();
 			int votes = getTotalVotes();
 			int neededVotes = votesRequired - votes;
 			HashMap<String, String> placeholders = new HashMap<String, String>();
@@ -129,7 +135,7 @@ public class VoteParty implements Listener {
 	 * @return the needed votes
 	 */
 	public int getNeededVotes() {
-		int votesRequired = Config.getInstance().getVotePartyVotesRequired();
+		int votesRequired = getVotesRequired();
 		int votes = getTotalVotes();
 		int neededVotes = votesRequired - votes;
 		return neededVotes;
@@ -158,13 +164,22 @@ public class VoteParty implements Listener {
 		return new ArrayList<String>();
 	}

+	public int getVotesRequired() {
+		int required = Config.getInstance().getVotePartyVotesRequired();
+		int extra = ServerData.getInstance().getVotePartyExtraRequired();
+		if (extra > 0) {
+			return required + extra;
+		}
+		return required;
+	}
+
 	/**
 	 * Give reward.
 	 *
 	 * @param user
 	 *            the user
 	 */
-	public void giveReward(User user) {
+	public void giveReward(User user, boolean online) {
 		/*
 		 * if (PlayerUtils.getInstance().isPlayerOnline(user.getPlayerName())) { if
 		 * (user.getVotePartyVotes() >= Config.getInstance().getUserVotesRequired()) {
@@ -173,7 +188,7 @@ public class VoteParty implements Listener {
 		 * user.addOfflineOtherReward("VoteParty"); }
 		 */
 		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getVotePartyRewardsPath())
-				.setOnline(user.isOnline())
+				.setOnline(online)
 				.withPlaceHolder("VotesRequired", "" + Config.getInstance().getVotePartyVotesRequired()).send(user);
 	}

@@ -195,12 +210,12 @@ public class VoteParty implements Listener {
 		if (Config.getInstance().getVotePartyGiveAllPlayers()) {
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-				giveReward(user);
+				giveReward(user, true);
 			}
 		} else {
 			for (String uuid : getVotedUsers()) {
 				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-				giveReward(user);
+				giveReward(user, true);
 			}
 		}
 		reset();
@@ -226,6 +241,7 @@ public class VoteParty implements Listener {

 	public void reset() {
 		setVotedUsers(new ArrayList<String>());
+		setTotalVotes(0);
 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
 			if (user.getVotePartyVotes() != 0) {
@@ -3,7 +3,7 @@ package com.Ben12345rocks.VotingPlugin.VoteReminding;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

-import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
@@ -2,11 +2,13 @@ package com.Ben12345rocks.VotingPlugin.VoteShop;

 import org.bukkit.entity.Player;

-import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
 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.Item.ItemBuilder;
+import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Commands.GUI.PlayerGUIs;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
@@ -30,35 +32,49 @@ public class VoteShop {
 	}

 	public void voteShop(Player player) {
+		if (!Config.getInstance().getVoteShopEnabled()) {
+			player.sendMessage(StringUtils.getInstance().colorize("&cVote shop disabled"));
+			return;
+		}
 		BInventory inv = new BInventory(Config.getInstance().getVoteShopName());

 		for (String identifier : Config.getInstance().getIdentifiers()) {

-			ItemBuilder builder = new ItemBuilder(Config.getInstance().getIdentifierSection(identifier));
+			String perm = Config.getInstance().getVoteShopPermission(identifier);
+			boolean hasPerm = false;
+			if (perm.isEmpty()) {
+				hasPerm = true;
+			} else {
+				hasPerm = player.hasPermission(perm);
+			}

-			inv.addButton(Config.getInstance().getIdentifierSlot(identifier), new BInventoryButton(builder) {
+			if (hasPerm) {
+				ItemBuilder builder = new ItemBuilder(Config.getInstance().getIdentifierSection(identifier));

-				@Override
-				public void onClick(ClickEvent event) {
-					Player player = event.getWhoClicked();
+				inv.addButton(Config.getInstance().getIdentifierSlot(identifier), new BInventoryButton(builder) {

-					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));
+					@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), new RewardOptions());
+								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()) {
Author	SHA1	Message	Date
Ben12345rocks	8f66733fe7	Update version number	2018-08-26 13:00:45 -04:00
Ben12345rocks	1bafb69f84	Update to 1.13.1, bug fix for vote party	2018-08-26 12:54:30 -04:00
Ben12345rocks	ed5ced8b31	Add ability to disable /vote reward	2018-08-25 08:17:40 -04:00
Ben12345rocks	468747847c	Minor changes	2018-08-23 20:56:03 -04:00
Ben12345rocks	d28ccc85ac	Updates	2018-08-23 20:53:13 -04:00
Ben12345rocks	9b5d6333d1	Remove unneeded duplicate name	2018-08-21 17:22:28 -04:00
Ben12345rocks	99307f15c7	Add warning about running versions older than 1.13	2018-08-20 20:06:23 -04:00
Ben12345rocks	8e9db014d1	Bug fix	2018-08-20 19:40:58 -04:00
Ben12345rocks	5e88782475	Bug fix	2018-08-20 19:40:17 -04:00
Ben12345rocks	ba50789744	Remove unneeded debug	2018-08-20 19:30:24 -04:00
Ben12345rocks	f06e2d8045	Update to redesigned reward system	2018-08-18 21:03:19 -04:00
Ben12345rocks	58e7143a0a	Bug fix	2018-08-13 19:16:11 -04:00
Ben12345rocks	0ee3706190	Update version number to 5.14.2	2018-08-11 11:29:31 -04:00
Ben12345rocks	9f7fc3dafd	Bug fix	2018-08-11 11:29:03 -04:00
Ben12345rocks	d8ce4a9578	Minor config addition	2018-08-11 11:03:45 -04:00
Ben12345rocks	574e8d4a54	Update version number to 5.14.1	2018-08-11 10:59:09 -04:00
Ben12345rocks	19a7a6a733	Change /vote last to show time since vote	2018-08-11 10:43:43 -04:00
Ben12345rocks	1e131e57c3	Minor config change	2018-08-05 12:28:35 -04:00
Ben12345rocks	57795bdb23	Update version number	2018-07-25 19:17:46 -04:00
Ben12345rocks	52bbb76aad	Change version to beta	2018-07-22 14:55:01 -04:00
Ben12345rocks	1257ac4600	Update to 1.13	2018-07-22 13:56:34 -04:00
Ben12345rocks	64ffc38405	Convert many users at a time	2018-07-22 13:36:20 -04:00
Ben12345rocks	f8009b05bc	Bug fixes	2018-07-22 13:28:14 -04:00
Ben12345rocks	114f217046	Bug fixes	2018-07-21 21:44:56 -04:00
Ben12345rocks	2de309cccc	Bug fix	2018-07-21 18:38:52 -04:00
Ben12345rocks	7f827857bc	Improvements	2018-07-21 17:13:02 -04:00
Ben12345rocks	75e244f678	Quick change	2018-07-18 17:02:58 -04:00
Ben12345rocks	a346f28df1	Bug fix	2018-07-18 17:00:56 -04:00
Ben12345rocks	afa57566da	Update version number	2018-07-16 16:56:17 -04:00
Ben12345rocks	6f46469ff6	Add nickname to broadcast	2018-07-15 20:54:55 -04:00
Ben12345rocks	7edf33a448	Undo, for bug fix	2018-07-15 19:10:39 -04:00
Ben12345rocks	4d7b30eb20	Update config	2018-07-15 15:39:44 -04:00
Ben12345rocks	ed8d92e4a4	Update to 1.13	2018-07-15 15:04:47 -04:00
Ben12345rocks	f7e62f5790	Disable syncing placeholders	2018-07-15 14:17:27 -04:00
Ben12345rocks	84146236b1	Update version number, bug fix	2018-07-15 14:10:18 -04:00
Ben12345rocks	97c4ee3564	Bug fixes	2018-07-15 14:04:30 -04:00
Ben12345rocks	f8547c5d86	Bug fix	2018-07-15 13:49:14 -04:00
Ben12345rocks	c97acf7a29	Many improvements	2018-07-15 13:42:45 -04:00
Ben12345rocks	fbbb11a4b0	Bug fix	2018-07-14 19:59:39 -04:00
Ben12345rocks	e517bb43b8	Minor changes	2018-07-14 19:47:26 -04:00
Ben12345rocks	e43ef1ea3e	Silence erros	2018-07-08 15:00:30 -04:00
Ben12345rocks	7ab78f30d5	Update version number	2018-07-07 19:55:31 -04:00
Ben12345rocks	668bc34157	Update version number	2018-07-06 08:45:17 -04:00
Ben12345rocks	5f89b30628	Change default option	2018-07-05 09:00:56 -04:00
Ben12345rocks	2145c9bc40	Mysql database improvements	2018-07-04 21:53:06 -04:00
Ben12345rocks	fdb3bca7f8	Add ability to require permsission for voteshop	2018-06-16 19:58:49 -04:00
Ben12345rocks	c96610d137	Add support for offline placeholders from new placeholderapi update	2018-06-13 16:54:50 -04:00
Ben12345rocks	be6414602d	Add config option to disable vote shop	2018-06-03 12:36:11 -04:00
Ben12345rocks	a7b2d8010c	Update version number	2018-05-07 20:09:23 -04:00
Ben12345rocks	4ccc5def2b	Update version number	2018-05-06 12:55:22 -04:00
Ben12345rocks	5378d4e372	Slight bug fix	2018-05-04 16:57:37 -04:00
Ben12345rocks	8d37d39b1c	Update version number	2018-04-21 20:54:13 -04:00
Ben12345rocks	473a83604c	Add config option for delay	2018-04-16 19:19:08 -04:00
Ben12345rocks	4f72fbab78	Bug fix	2018-04-15 21:14:38 -04:00
Ben12345rocks	1f62d68aed	Add a delay	2018-04-15 20:53:35 -04:00
Ben12345rocks	7c063bbe68	Only convert 500 users at a time	2018-04-15 20:23:54 -04:00
Ben12345rocks	4c11df4b37	Bug fix	2018-04-14 21:27:11 -04:00
Ben12345rocks	f859caf1ee	Bug fix	2018-04-14 10:29:03 -04:00
Ben12345rocks	566d688b57	Javadoc fixes	2018-03-30 09:09:34 -04:00
Ben12345rocks	e4209b15c3	Update version number	2018-03-30 08:37:17 -04:00
Ben12345rocks	bd5b26805a	Update config	2018-03-25 13:05:22 -04:00
Ben12345rocks	27c43b8e8e	New way to do multiple places for top voter	2018-03-25 12:55:41 -04:00
Ben12345rocks	5b719141fe	Change default config	2018-03-22 16:52:57 -04:00
Ben12345rocks	f8ee0bba17	Bug fixes	2018-03-22 16:52:05 -04:00
Ben12345rocks	d5ea3c60a9	Implement new vote party system type	2018-03-22 16:50:46 -04:00
Ben12345rocks	3be9eaf47a	Slight performance improvement	2018-03-21 19:12:07 -04:00
Ben12345rocks	f385927958	implement config option for backups	2018-03-18 21:00:51 -04:00
Ben12345rocks	ec491a937c	Bug fix	2018-03-11 12:44:40 -04:00
Ben12345rocks	7bf879a08f	Bug fix	2018-03-11 12:41:20 -04:00
Ben	18a0e1f338	Merge pull request #364 from Ben12345rocks/5.12.7 5.12.7	2018-03-11 12:31:24 -04:00
Ben12345rocks	c7cbf0230c	Update version number	2018-03-11 12:31:09 -04:00
Ben12345rocks	cee519176a	Bug fix, closes #363	2018-03-07 20:07:31 -05:00
Ben12345rocks	50d75449c0	Make error messages more clear	2018-03-05 19:21:54 -05:00
Ben12345rocks	316fbf7e62	Add next placeholder to text version of /vote	2018-03-05 19:11:25 -05:00
Ben12345rocks	7c82cbc6b4	Add new config option	2018-03-04 19:33:14 -05:00
Ben12345rocks	8387b48e6b	Code cleanup	2018-03-04 12:33:44 -05:00
Ben12345rocks	0e806a2985	Bug fixes	2018-03-03 21:21:17 -05:00
Ben12345rocks	d06041cfd8	Bug fix	2018-02-17 20:51:35 -05:00
Ben12345rocks	1a257a3858	Add placeholder	2018-02-17 20:31:19 -05:00
Ben12345rocks	90c0104de3	Update to 5.12.6	2018-02-17 20:27:37 -05:00