Javadoc fix

5.12.7

VotingPlugin/Resources/Config.yml

@@ -28,7 +28,7 @@ MySQL:
   #UseSSL: true
 
 # Let players who never joined before vote
-# Recommend: False (Will prevent creating random user data files)
+# Recommend: False (Will prevent creating random user data)
 AllowUnjoined: false
 
 # If true, plugin will send scoreboards on some commands
@@ -36,11 +36,13 @@ SendScoreboards: true
 
 # If true, plugin will automaticly generate votesites
 # Disable this if you experience issues with sites being created randomly
+# Most cases this will work all the time
 AutoCreateVoteSites: true
 
 # Automaticly download the latest version
 # Will require a restart to actually update
-# Note that updates take 30-40 minutes to load before they can be downloaded
+# Note: It takes 30-40 minutes before being able to download the latest build
+# You can also use /av download
 AutoDownload: false
 
 # ------------------------------------------------
@@ -85,18 +87,9 @@ 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
+    ActionBar:
+      Message: '&cRemember to vote'
+      Delay: 30
     
 # ------------------------------------------------
 # Format
@@ -110,11 +103,30 @@ 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%'
 
   # Broadcast vote message
+  # Set to an empty message to disable
   BroadcastMsg: '&6[&4Broadcast&6] &2Thanks &c%player% &2for voting on %SiteName%'
   
   # Broadcast only when player is online
@@ -165,7 +177,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:
@@ -230,9 +246,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
@@ -242,6 +258,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
@@ -272,6 +298,8 @@ Format:
   PrevPage: '&aPrevious Page'
   NextPage: '&aNext Page'
   
+  InvFull: '&cInventory full, dropping items on ground'
+  
   # Display text
   # Used in /vote top (GUI)
   TopVoter:
@@ -301,49 +329,44 @@ GUI:
         # You can set skulls of the player using the following
         # Remove the # to enable
         #Skull: '%Player%'
-      Slot: 0
     Next:
       Item:
         Material: 'COMPASS'
         Data: 0
         Amount: 1
         Name: '&4Next'
-      Slot: 1
     Last:
       Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
         Data: 0
         Amount: 1
         Name: '&4Last'
-      Slot: 2
     Total:
       Item:
         Material: 'CHEST'
         Data: 0
         Amount: 1
         Name: '&4Total'
-      Slot: 3
     Top:
       Item:
         Material: 'SIGN'
         Data: 0
         Amount: 1
         Name: '&4Top'
-      Slot: 4
     Today:
       Item:
         Material: 'BOOK'
         Data: 0
         Amount: 1
         Name: '&4Today'
-      Slot: 5
     Shop:
       Item:
         Material: 'DIAMOND'
         Data: 0
         Amount: 1
         Name: '&4Vote Shop'
-      Slot: 6
+        Lore:
+        - '&aYou currently have %points% points'
       
   # GUI for /vote url
   # And /vote if enabled in Config.yml
@@ -404,7 +427,6 @@ GUI:
           # Remove this line for no lore
           Lore:
           - '&4Line 1'
-          Slot: 0
   VoteLast:
     Name: 'VoteLast: %player%'
     BackButton: true
@@ -435,25 +457,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
@@ -461,19 +483,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
@@ -482,37 +504,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
@@ -529,6 +551,7 @@ BackButton:
   Name: '&8Back to VoteGUI'
 
 VoteShopBackButton: true
+VoteShopEnabled: true
 Shop:
   # Identifier
   # Used in placeholders for formats
@@ -545,14 +568,16 @@ Shop:
     - '&c&lCost: &c3 Voting Points'
     # Number of voting points this cost
     Cost: 3
+    # Permission required, leave blank for no permission
+    Permission: ''
+    # Limit how many times you can buy this
+    #Limit: 3
     # Rewards to run if player buys succesfully
     Rewards:
       Items:
         Diamond:
           Material: 'DIAMOND'
-          Amount: 1
-    # Slot
-    Slot: 0          
+          Amount: 1     
      
 # ------------------------------------------------
 # Extra Rewards
@@ -596,6 +621,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
@@ -610,9 +637,16 @@ 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 to give
+  Rewards: 
+    Commands:
+    - say %player%
+    Items:
+      DIAMOND:
+        Material: 'DIAMOND'
+        Amount: 1
   
 # Reset milestons at end of the month
 ResetMilestonesMonthly: false
@@ -633,7 +667,7 @@ VoteStreak:
   Day:
     # Number of days in a row
     # Each day requires one vote
-    # Add a - to give a reward for every multiple (e.g. 2-)
+    # Add a - to give a reward for every multiple (e.g. 2- = 2,4,6,8, and so on)
     '2':
       # Enabled or not
       Enabled: false
@@ -664,10 +698,11 @@ VoteStreak:
           
   
 # ONLY USE THIS FOR TITLES/SOUNDS AND OTHER EFFECTS
-# IT WILL ONLY RUN ONE TIME FOR ANY NUMBER OF OFFLINE VOTES
+# IT WILL ONLY RUN ONE TIME FOR ANY NUMBER OF OFFLINE VOTES (3 offline votes = 1 AnySiteReward)
 # Any reward files listed here are ran on vote of any site
 # It is recommended to add rewards to each site instead of here
 # Using forceoffline won't work here
+# Use EverySiteReward in VoteSites.yml for a global reward for each site
 AnySiteRewards: []
 
 
@@ -681,13 +716,16 @@ BlackList:
 
 # If true players with the permission 'VotingPlugin.TopVoter.Ignore' will act 
 # as if there name was added on the the blacklist above
-# This also applies for ops
+# This also applies for players with op
 TopVoterIgnorePermission: false
 
 # /vote top default data displayed
 # Valid Options: AllTime, Monthly, Weekly, Daily
 VoteTopDefault: Monthly
 
+# Whether or not to have ties on top voter rewards
+TopVoterAwardsTies: true
+
 # These are required to be enabled in order for top voter awards to work
 LoadTopVoter:
   AllTime: true
@@ -706,6 +744,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:
@@ -755,10 +794,6 @@ PointsOnVote: 1
 # Not really recommended
 AddTotals: true
 
-# Disable checking on world change
-# May improve performance
-DisableCheckOnWorldChange: false
-
 # Debug
 Debug: false
 
@@ -808,13 +843,6 @@ ClearCacheOnVote: false
 # Will also disable a few other warnings about vote sites
 DisableNoServiceSiteMessage: false
 
-# Used in special cases
-# Much slower, but may work better
-AlternateUUIDLookup: false
-
-# Shouldn't need to change this
-AutoKillInvs: true
-
 # Count fake votes
 # If true fake votes will give points and totals
 CountFakeVotes: true
@@ -830,6 +858,24 @@ PurgeOldData: false
 # Minimum number of days offline in order to purge
 PurgeMin: 90
 
+# Whether or not to create daily backups. (Only the most recent ones get kept)
+CreateBackups: true
+
+# ###############################################################
+# Deprecated options, don't recommend using any of these
+
 # 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
+
+# Shouldn't need to change this
+#AutoKillInvs: true
+
+# Used in special cases
+# Much slower, but may work better
+# Not recommended in newer versions
+#AlternateUUIDLookup: false
+
+# Disable checking on world change
+# May improve performance
+#DisableCheckOnWorldChange: false

VotingPlugin/Resources/VoteSites.yml

@@ -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
     

VotingPlugin/Resources/plugin.yml

@@ -4,7 +4,7 @@ main: com.Ben12345rocks.VotingPlugin.Main
 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
@@ -57,13 +57,17 @@ commands:
   votestreak:
     description: A command
     aliases: vstreak
+  votetogglebroadcast:
+    description: A command
+    aliases: vtogglebroadcast
   votepoints:
     description: A command
     aliases: vpoints
   votegivereward:
     description: A command
-  voteselectChoiceReward:
+  votechoices:
     description: A command
+    alaises: vchoices
   adminvotehelp:
     description: Open adminvote help
     aliases: avhelp
@@ -183,6 +187,33 @@ commands:
   adminvoteplayername:
     description: Command Alias
     aliases: avplayername
+  adminvoteResyncMilestones:
+    description: Command Alias
+    aliases: avResyncMilestones
+  adminvoteClearOfflineRewards:
+    description: Command Alias
+    aliases: avClearOfflineRewards
+  adminvoteUserRemove:
+    description: Command Alias
+    aliases: avUserRemove
+  adminvotePurge:
+    description: Command Alias
+    aliases: avPurge
+  adminvoteJavascript:
+    description: Command Alias
+    aliases: avJavascript
+  adminvoteStatus:
+    description: Command Alias
+    aliases: avStatus
+  adminvoteTest:
+    description: Command Alias
+    aliases: avTest
+  adminvotePlaceholders:
+    description: Command Alias
+    aliases: avPlaceholders
+  adminvoteDownloadJenkins:
+    description: Command Alias
+    aliases: avDownloadJenkins
 permissions:
   VotingPlugin.Player:
     description: Allows basic access player commands

VotingPlugin/pom.xml

@@ -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.2</version>
+	<version>5.16</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -138,6 +139,31 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>3.1.0</version>
+				<executions>
+					<execution>
+						<id>copy-resources</id>
+						<phase>install</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${user.home}/Documents/Test Server/plugins</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${basedir}/target</directory>
+									<includes>
+										<include>${project.artifactId}.jar</include>
+									</includes>
+								</resource>
+							</resources>
+							<overwrite>true</overwrite>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 	<repositories>
@@ -148,6 +174,10 @@
 		<repository>
 			<id>jitpack.io</id>
 			<url>https://jitpack.io</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
 		</repository>
 	</repositories>
 	<dependencies>
@@ -161,7 +191,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>

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

@@ -15,13 +15,12 @@ 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;
@@ -43,13 +42,15 @@ import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteEvent;
-import com.Ben12345rocks.VotingPlugin.Events.VotiferEvent;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
+import com.Ben12345rocks.VotingPlugin.Test.VoteTester;
+import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+import com.Ben12345rocks.VotingPlugin.Util.PlaceHolders.PlaceHolder;
+import com.Ben12345rocks.VotingPlugin.Util.PlaceHolders.PlaceHolders;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
-import com.Ben12345rocks.VotingPlugin.VoteShop.VoteShop;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Table;
 import com.google.common.collect.Table.Cell;
@@ -159,7 +160,7 @@ public class CommandLoader {
 						String name = entry.getRowKey();
 						int total = entry.getColumnKey();
 						User user = UserManager.getInstance().getVotingPluginUser(name);
-						user.setAllTimeTotal(user.getAllTimeTotal() + total);
+						user.setTotal(TopVoter.AllTime, user.getTotal(TopVoter.AllTime) + total);
 					}
 					sender.sendMessage("Totals added");
 
@@ -205,8 +206,10 @@ public class CommandLoader {
 						Voter voter = VoteRoulette.getVoterManager().getVoter(offPlayer.getUniqueId(),
 								offPlayer.getName());
 						User user = UserManager.getInstance().getVotingPluginUser(offPlayer);
-						user.setAllTimeTotal(user.getAllTimeTotal() + voter.getStatSheet().getLifetimeVotes());
-						user.setMonthTotal(user.getMonthTotal() + voter.getStatSheet().getCurrentMonthVotes());
+						user.setTotal(TopVoter.AllTime,
+								user.getTotal(TopVoter.AllTime) + voter.getStatSheet().getLifetimeVotes());
+						user.setTotal(TopVoter.Monthly,
+								user.getTotal(TopVoter.Monthly) + voter.getStatSheet().getCurrentMonthVotes());
 					}
 				} else {
 					sender.sendMessage("VoteRoulette not loaded");
@@ -225,6 +228,21 @@ public class CommandLoader {
 			}
 		});
 
+		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "ResyncMilestones" },
+				"VotingPlugin.Commands.AdminVote.SetResyncMilestones|" + adminPerm, "Resync Milestones") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				sendMessage(sender, "&cStarting...");
+				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+					User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+					user.setMilestoneCount(user.getTotal(TopVoter.AllTime));
+				}
+				sendMessage(sender, "&cFinished");
+
+			}
+		});
+
 		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "AddPoints", "(player)", "(number)" },
 				"VotingPlugin.Commands.AdminVote.AddPoints|" + adminPerm, "Add to players voting points") {
 
@@ -266,13 +284,13 @@ public class CommandLoader {
 			}
 		});
 
-		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "ServiceSites" },
+		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "ServiceSites&Status" },
 				"VotingPlugin.Commands.AdminVote.ServiceSites|" + adminPerm,
 				"See a list of all service sites the server got") {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				sendMessage(sender, "&cEvery service site the server has gotten:");
+				sendMessage(sender, "&cEvery service site the server has gotten from votifier:");
 
 				for (String serviceSites : ServerData.getInstance().getServiceSites()) {
 					boolean hasSite = plugin.hasVoteSite(serviceSites);
@@ -305,17 +323,6 @@ public class CommandLoader {
 			}
 		});
 
-		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "Report" },
-				"VotingPlugin.Commands.AdminVote.Report|" + adminPerm, "Create a zip file to send for debuging") {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				Report.getInstance().create();
-				sender.sendMessage("Created Zip File!");
-
-			}
-		});
-
 		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "Perms" },
 				"VotingPlugin.Commands.AdminVote.Perms|" + adminPerm, "List permissions") {
 
@@ -511,7 +518,8 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				UserManager.getInstance().getVotingPluginUser(args[2]).setMonthTotal(Integer.parseInt(args[3]));
+				UserManager.getInstance().getVotingPluginUser(args[2]).setTotal(TopVoter.Monthly,
+						Integer.parseInt(args[3]));
 				sender.sendMessage(
 						StringUtils.getInstance().colorize("&cSet month total for '" + args[2] + "' to " + args[3]));
 			}
@@ -522,7 +530,8 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				UserManager.getInstance().getVotingPluginUser(args[2]).setAllTimeTotal(Integer.parseInt(args[3]));
+				UserManager.getInstance().getVotingPluginUser(args[2]).setTotal(TopVoter.AllTime,
+						Integer.parseInt(args[3]));
 				sender.sendMessage(
 						StringUtils.getInstance().colorize("&cSet alltime total for '" + args[2] + "' to " + args[3]));
 			}
@@ -533,7 +542,8 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				UserManager.getInstance().getVotingPluginUser(args[2]).setWeeklyTotal(Integer.parseInt(args[3]));
+				UserManager.getInstance().getVotingPluginUser(args[2]).setTotal(TopVoter.Weekly,
+						Integer.parseInt(args[3]));
 				sender.sendMessage(
 						StringUtils.getInstance().colorize("&cSet week total for '" + args[2] + "' to " + args[3]));
 			}
@@ -544,7 +554,8 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				UserManager.getInstance().getVotingPluginUser(args[2]).setDailyTotal(Integer.parseInt(args[3]));
+				UserManager.getInstance().getVotingPluginUser(args[2]).setTotal(TopVoter.Daily,
+						Integer.parseInt(args[3]));
 				sender.sendMessage(
 						StringUtils.getInstance().colorize("&cSet day total for '" + args[2] + "' to " + args[3]));
 			}
@@ -566,9 +577,16 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				VotiferEvent.playerVote(args[1], args[2], false);
-				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(args[2]), args[1]);
+				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(args[2]), args[1], args[2], false);
+				sendMessage(sender, "&cTriggering vote...");
+				if (voteEvent.getVoteSite() != null) {
+					if (!voteEvent.getVoteSite().isVaidServiceSite()) {
+						sendMessage(sender, "&cPossible issue with service site, has the server gotten the vote from "
+								+ voteEvent.getServiceSite() + "?");
+					}
+				}
 				plugin.getServer().getPluginManager().callEvent(voteEvent);
+
 			}
 		});
 
@@ -591,7 +609,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				AdvancedCoreHook.getInstance().setDebug(true);
+				AdvancedCoreHook.getInstance().getOptions().setDebug(true);
 			}
 		});
 
@@ -772,6 +790,60 @@ public class CommandLoader {
 			}
 		});
 
+		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "Test", "(Player)", "(sitename)", "(number)" },
+				"VotingPlugin.Commands.AdminVote.Test|" + adminPerm, "Test voting times") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				VoteTester.getInstance().testVotes(Integer.parseInt(args[3]), args[1], args[2]);
+				if (isPlayer(sender)) {
+					sendMessage(sender, "&cSee console for details");
+				}
+			}
+		});
+
+		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "Placeholders" },
+				"VotingPlugin.Commands.AdminVote.Placeholders|" + adminPerm,
+				"See possible placeholderapi placeholders") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				ArrayList<String> msg = new ArrayList<String>();
+				msg.add("&cPlaceholders:");
+				for (PlaceHolder placeholder : PlaceHolders.getInstance().getPlaceholders()) {
+					String identifier = placeholder.getIdentifier();
+					if (identifier.endsWith("_")) {
+						identifier += "#";
+					}
+					msg.add("%VotingPlugin_" + identifier + "%");
+				}
+
+				sendMessage(sender, msg);
+			}
+		});
+
+		plugin.adminVoteCommand.add(new CommandHandler(new String[] { "Placeholders", "(player)" },
+				"VotingPlugin.Commands.AdminVote.Placeholders.Players|" + adminPerm,
+				"See possible placeholderapi placeholders with player values") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				ArrayList<String> msg = new ArrayList<String>();
+				msg.add("&cPlaceholders:");
+				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+				for (PlaceHolder placeholder : PlaceHolders.getInstance().getPlaceholders()) {
+					String identifier = placeholder.getIdentifier();
+					if (identifier.endsWith("_")) {
+						identifier += "1";
+					}
+					msg.add("%VotingPlugin_" + identifier + "% = "
+							+ placeholder.placeholderRequest(user.getOfflinePlayer(), user, identifier));
+				}
+
+				sendMessage(sender, msg);
+			}
+		});
+
 		ArrayList<CommandHandler> avCommands = com.Ben12345rocks.AdvancedCore.Commands.CommandLoader.getInstance()
 				.getBasicAdminCommands("VotingPlugin");
 		for (CommandHandler cmd : avCommands) {
@@ -855,9 +927,11 @@ public class CommandLoader {
 
 													@Override
 													public void onInput(Player player, String value) {
-														VotiferEvent.playerVote(
-																UserGUI.getInstance().getCurrentPlayer(player), value,
-																false);
+														PlayerVoteEvent voteEvent = new PlayerVoteEvent(
+																plugin.getVoteSite(value),
+																UserGUI.getInstance().getCurrentPlayer(player),
+																plugin.getVoteSiteServiceSite(value), false);
+														plugin.getServer().getPluginManager().callEvent(voteEvent);
 
 														player.sendMessage("Forced vote for "
 																+ UserGUI.getInstance().getCurrentPlayer(player)
@@ -901,7 +975,7 @@ public class CommandLoader {
 												"Player");
 										User user = UserManager.getInstance().getVotingPluginUser(playerName);
 										new ValueRequest().requestNumber(clickEvent.getPlayer(),
-												"" + user.getMonthTotal(), new Number[] { 0, 10, 50, 100 },
+												"" + user.getTotal(TopVoter.Monthly), new Number[] { 0, 10, 50, 100 },
 												new NumberListener() {
 
 													@Override
@@ -910,7 +984,7 @@ public class CommandLoader {
 																.getMeta(clickEvent.getPlayer(), "Player");
 														User user = UserManager.getInstance()
 																.getVotingPluginUser(playerName);
-														user.setMonthTotal(value.intValue());
+														user.setTotal(TopVoter.Monthly, value.intValue());
 														player.sendMessage(
 																StringUtils.getInstance().colorize("&cTotal set"));
 													}
@@ -1000,10 +1074,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>();
@@ -1012,6 +1082,10 @@ public class CommandLoader {
 				}
 				setReplace(sites);
 			}
+
+			@Override
+			public void updateReplacements() {
+			}
 		});
 	}
 
@@ -1040,7 +1114,7 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				VoteShop.getInstance().voteShop((Player) sender);
+				PlayerGUIs.getInstance().openVoteShop((Player) sender);
 			}
 		});
 
@@ -1063,25 +1137,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") {
@@ -1131,6 +1207,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") {
 

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

@@ -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;
@@ -29,6 +29,7 @@ import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
+import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 
 import net.md_5.bungee.api.chat.TextComponent;
@@ -320,10 +321,10 @@ public class Commands {
 	 * @param page
 	 *            the page
 	 */
-	public void sendTopVoterAllTimeScoreBoard(Player player, int page) {
-		if (AdvancedCoreHook.getInstance().isSendScoreboards()) {
+	public void sendTopVoterAllTimeScoreBoard(final Player player, int page) {
+		if (AdvancedCoreHook.getInstance().getOptions().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
-			ArrayList<User> users = plugin.convertSet(plugin.topVoterAllTime.keySet());
+			ArrayList<User> users = plugin.convertSet(plugin.getTopVoter(TopVoter.AllTime).keySet());
 
 			int pageSize = (users.size() / pagesize);
 			if ((users.size() % pagesize) != 0) {
@@ -337,7 +338,7 @@ public class Commands {
 
 			for (int i = (page - 1) * pagesize; (i < users.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 				scoreboard.add("" + (i + 1) + ": " + users.get(i).getPlayerName(),
-						plugin.topVoterAllTime.get(users.get(i)));
+						plugin.getTopVoter(TopVoter.AllTime).get(users.get(i)));
 			}
 			scoreboard.build();
 			scoreboard.send(player);
@@ -346,8 +347,7 @@ public class Commands {
 
 				@Override
 				public void run() {
-					SimpleScoreboard clear = new SimpleScoreboard("Empty");
-					clear.send(player);
+					player.setScoreboard(Bukkit.getScoreboardManager().getNewScoreboard());
 				}
 			}, 90);
 		}
@@ -361,10 +361,10 @@ public class Commands {
 	 * @param page
 	 *            the page
 	 */
-	public void sendTopVoterDailyScoreBoard(Player player, int page) {
-		if (AdvancedCoreHook.getInstance().isSendScoreboards()) {
+	public void sendTopVoterDailyScoreBoard(final Player player, int page) {
+		if (AdvancedCoreHook.getInstance().getOptions().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
-			ArrayList<User> users = plugin.convertSet(plugin.topVoterDaily.keySet());
+			ArrayList<User> users = plugin.convertSet(plugin.getTopVoter(TopVoter.Daily).keySet());
 
 			int pageSize = (users.size() / pagesize);
 			if ((users.size() % pagesize) != 0) {
@@ -378,7 +378,7 @@ public class Commands {
 
 			for (int i = (page - 1) * pagesize; (i < users.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 				scoreboard.add("" + (i + 1) + ": " + users.get(i).getPlayerName(),
-						plugin.topVoterDaily.get(users.get(i)));
+						plugin.getTopVoter(TopVoter.Daily).get(users.get(i)));
 			}
 			scoreboard.build();
 			scoreboard.send(player);
@@ -387,8 +387,7 @@ public class Commands {
 
 				@Override
 				public void run() {
-					SimpleScoreboard clear = new SimpleScoreboard("Empty");
-					clear.send(player);
+					player.setScoreboard(Bukkit.getScoreboardManager().getNewScoreboard());
 				}
 			}, 90);
 		}
@@ -402,10 +401,10 @@ public class Commands {
 	 * @param page
 	 *            the page
 	 */
-	public void sendTopVoterMonthlyScoreBoard(Player player, int page) {
-		if (AdvancedCoreHook.getInstance().isSendScoreboards()) {
+	public void sendTopVoterMonthlyScoreBoard(final Player player, int page) {
+		if (AdvancedCoreHook.getInstance().getOptions().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
-			ArrayList<User> users = plugin.convertSet(plugin.topVoterMonthly.keySet());
+			ArrayList<User> users = plugin.convertSet(plugin.getTopVoter(TopVoter.Monthly).keySet());
 
 			int pageSize = (users.size() / pagesize);
 			if ((users.size() % pagesize) != 0) {
@@ -419,7 +418,7 @@ public class Commands {
 
 			for (int i = (page - 1) * pagesize; (i < users.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 				scoreboard.add("" + (i + 1) + ": " + users.get(i).getPlayerName(),
-						plugin.topVoterMonthly.get(users.get(i)));
+						plugin.getTopVoter(TopVoter.Monthly).get(users.get(i)));
 			}
 			scoreboard.build();
 			scoreboard.send(player);
@@ -428,8 +427,7 @@ public class Commands {
 
 				@Override
 				public void run() {
-					SimpleScoreboard clear = new SimpleScoreboard("Empty");
-					clear.send(player);
+					player.setScoreboard(Bukkit.getScoreboardManager().getNewScoreboard());
 				}
 			}, 90);
 		}
@@ -443,10 +441,10 @@ public class Commands {
 	 * @param page
 	 *            the page
 	 */
-	public void sendTopVoterWeeklyScoreBoard(Player player, int page) {
-		if (AdvancedCoreHook.getInstance().isSendScoreboards()) {
+	public void sendTopVoterWeeklyScoreBoard(final Player player, int page) {
+		if (AdvancedCoreHook.getInstance().getOptions().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
-			ArrayList<User> users = plugin.convertSet(plugin.topVoterWeekly.keySet());
+			ArrayList<User> users = plugin.convertSet(plugin.getTopVoter(TopVoter.Weekly).keySet());
 
 			int pageSize = (users.size() / pagesize);
 			if ((users.size() % pagesize) != 0) {
@@ -460,7 +458,7 @@ public class Commands {
 
 			for (int i = (page - 1) * pagesize; (i < users.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 				scoreboard.add("" + (i + 1) + ": " + users.get(i).getPlayerName(),
-						plugin.topVoterWeekly.get(users.get(i)));
+						plugin.getTopVoter(TopVoter.Weekly).get(users.get(i)));
 			}
 			scoreboard.build();
 			scoreboard.send(player);
@@ -469,8 +467,7 @@ public class Commands {
 
 				@Override
 				public void run() {
-					SimpleScoreboard clear = new SimpleScoreboard("Empty");
-					clear.send(player);
+					player.setScoreboard(Bukkit.getScoreboardManager().getNewScoreboard());
 				}
 			}, 90);
 
@@ -485,8 +482,8 @@ public class Commands {
 	 * @param page
 	 *            the page
 	 */
-	public void sendVoteTodayScoreBoard(Player player, int page) {
-		if (AdvancedCoreHook.getInstance().isSendScoreboards()) {
+	public void sendVoteTodayScoreBoard(final Player player, int page) {
+		if (AdvancedCoreHook.getInstance().getOptions().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
 
 			String[] voteToday = voteToday();
@@ -508,8 +505,7 @@ public class Commands {
 
 				@Override
 				public void run() {
-					SimpleScoreboard clear = new SimpleScoreboard("Empty");
-					clear.send(player);
+					player.setScoreboard(Bukkit.getScoreboardManager().getNewScoreboard());
 				}
 			}, 90);
 
@@ -595,6 +591,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 +602,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);
 	}
 
 	/**
@@ -713,10 +790,10 @@ public class Commands {
 	public String[] voteCommandTotal(User user) {
 		ArrayList<String> msg = new ArrayList<String>();
 
-		int daily = user.getDailyTotal();
-		int weekly = user.getWeeklyTotal();
-		int month = user.getMonthTotal();
-		int all = user.getAllTimeTotal();
+		int daily = user.getTotal(TopVoter.Daily);
+		int weekly = user.getTotal(TopVoter.Weekly);
+		int month = user.getTotal(TopVoter.Monthly);
+		int all = user.getTotal(TopVoter.AllTime);
 
 		for (String s : config.getFormatCommandsVoteTotal()) {
 			String str = StringUtils.getInstance().replaceIgnoreCase(s, "%DailyTotal%", "" + daily);
@@ -749,10 +826,10 @@ public class Commands {
 
 		for (String uuid : uuids) {
 			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			daily += user.getDailyTotal();
-			weekly += user.getWeeklyTotal();
-			month += user.getMonthTotal();
-			all += user.getAllTimeTotal();
+			daily += user.getTotal(TopVoter.Daily);
+			weekly += user.getTotal(TopVoter.Weekly);
+			month += user.getTotal(TopVoter.Monthly);
+			all += user.getTotal(TopVoter.AllTime);
 		}
 
 		for (String s : config.getFormatCommandsVoteTotalAll()) {
@@ -835,15 +912,17 @@ 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);
 			}
 		}
 		if (user != null) {
 			HashMap<String, String> phs = new HashMap<String, String>();
-			phs.put("DailyTotal", "" + user.getDailyTotal());
-			phs.put("WeekTotal", "" + user.getWeeklyTotal());
-			phs.put("MonthTotal", "" + user.getMonthTotal());
-			phs.put("Total", "" + user.getAllTimeTotal());
+			phs.put("DailyTotal", "" + user.getTotal(TopVoter.Daily));
+			phs.put("WeekTotal", "" + user.getTotal(TopVoter.Weekly));
+			phs.put("MonthTotal", "" + user.getTotal(TopVoter.Monthly));
+			phs.put("Total", "" + user.getTotal(TopVoter.AllTime));
 
 			sites = ArrayUtils.getInstance().replacePlaceHolder(sites, phs);
 		}

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

@@ -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;

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

@@ -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)))

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

@@ -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

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

@@ -8,20 +8,22 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
+import com.Ben12345rocks.AdvancedCore.Util.EditGUI.EditGUI;
+import com.Ben12345rocks.AdvancedCore.Util.EditGUI.EditGUIButton;
+import com.Ben12345rocks.AdvancedCore.Util.EditGUI.EditGUIValueType;
 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.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
 import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.InputMethod;
 import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.ValueRequest;
 import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.ValueRequestBuilder;
-import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.Listeners.BooleanListener;
-import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.Listeners.NumberListener;
 import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.Listeners.StringListener;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
-import com.Ben12345rocks.VotingPlugin.Events.VotiferEvent;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteEvent;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
 
 public class AdminGUI {
@@ -52,41 +54,34 @@ public class AdminGUI {
 	 */
 	public ArrayList<BInventoryButton> adminGUIButtons() {
 		ArrayList<BInventoryButton> buttons = new ArrayList<BInventoryButton>();
-		ArrayList<String> lore = new ArrayList<String>();
-		lore.add("&cOnly enabled sites are listed in this section");
-		lore.add("&cMiddle Click to create");
-		buttons.add(new BInventoryButton("&cVoteSites", ArrayUtils.getInstance().convert(lore),
+		buttons.add(new BInventoryButton("&cVoteSites",
+				new String[] { "&cOnly enabled sites are listed in this section", "&cMiddle Click to create" },
 				new ItemStack(Material.STONE)) {
 
 			@Override
 			public void onClick(ClickEvent event) {
-				if (event.getWhoClicked() instanceof Player) {
-					Player player = event.getWhoClicked();
-					if (event.getClick().equals(ClickType.MIDDLE)) {
+				Player player = event.getPlayer();
+				if (event.getClick().equals(ClickType.MIDDLE)) {
+					new ValueRequest().requestString(player, new StringListener() {
 
-						new ValueRequest().requestString(player, new StringListener() {
-
-							@Override
-							public void onInput(Player player, String value) {
-								ConfigVoteSites.getInstance().generateVoteSite(value);
-								player.sendMessage("Generated site");
-								plugin.reload();
-							}
-						});
-					} else {
-						openAdminGUIVoteSites(player);
-					}
+						@Override
+						public void onInput(Player player, String value) {
+							ConfigVoteSites.getInstance().generateVoteSite(value);
+							player.sendMessage("Generated site");
+							plugin.reload();
+						}
+					});
+				} else {
+					openAdminGUIVoteSites(player);
 				}
 			}
 		});
 
-		lore = new ArrayList<String>();
-		buttons.add(new BInventoryButton("&cReload Plugin", ArrayUtils.getInstance().convert(lore),
-				new ItemStack(Material.STONE, 1, (short) 3)) {
+		buttons.add(new BInventoryButton("&cReload Plugin", new String[] {}, new ItemStack(Material.STONE, 1)) {
 
 			@Override
 			public void onClick(ClickEvent event) {
-				event.getPlayer().performCommand("av reload");
+				plugin.reload();
 			}
 
 		});
@@ -115,8 +110,6 @@ public class AdminGUI {
 			lore.add("ServiceSite: " + voteSite.getServiceSite());
 			lore.add("VoteURL: " + voteSite.getVoteURL());
 			lore.add("VoteDelay: " + voteSite.getVoteDelay());
-			// lore.add("Rewards: " +
-			// ArrayUtils.getInstance().makeStringList(voteSite.getRewards()));
 
 			inv.addButton(count, new BInventoryButton(voteSite.getKey(), ArrayUtils.getInstance().convert(lore),
 					new ItemStack(Material.STONE)) {
@@ -143,7 +136,7 @@ public class AdminGUI {
 	 *            the vote site
 	 */
 	public void openAdminGUIVoteSiteSite(Player player, VoteSite voteSite) {
-		BInventory inv = new BInventory("VoteSite: " + voteSite.getDisplayName());
+		EditGUI inv = new EditGUI("VoteSite: " + voteSite.getDisplayName());
 		inv.setMeta(player, "VoteSite", voteSite);
 
 		inv.addButton(new BInventoryButton(voteSite.getItem().setName("&cForce vote")) {
@@ -161,7 +154,8 @@ public class AdminGUI {
 						Object ob = PlayerUtils.getInstance().getPlayerMeta(player, "VoteSite");
 						if (ob != null) {
 							VoteSite site = (VoteSite) ob;
-							VotiferEvent.playerVote(value, site.getServiceSite(), false);
+							PlayerVoteEvent voteEvent = new PlayerVoteEvent(site, value, site.getServiceSite(), false);
+							plugin.getServer().getPluginManager().callEvent(voteEvent);
 						}
 					}
 				}, ArrayUtils.getInstance().convert(playerNames)).usingMethod(InputMethod.INVENTORY)
@@ -169,137 +163,99 @@ public class AdminGUI {
 			}
 		});
 
-		inv.addButton(new BInventoryButton("SetPriority", new String[0], new ItemStack(Material.STONE)) {
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.DIAMOND), "Priority", voteSite.getPriority(),
+				EditGUIValueType.NUMBER) {
 
 			@Override
-			public void onClick(ClickEvent event) {
-				Player player = event.getWhoClicked();
-				new ValueRequest().requestNumber(player, "" + voteSite.getPriority(), null, new NumberListener() {
-
-					@Override
-					public void onInput(Player player, Number value) {
-						VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
-						ConfigVoteSites.getInstance().setPriority(voteSite.getKey(), value.intValue());
-						player.sendMessage("Set Priority");
-						plugin.reload();
-
-					}
-				});
+			public void setValue(Player player, Object value) {
+				VoteSite voteSite = (VoteSite) getMeta(player, "VoteSite");
+				ConfigVoteSites.getInstance().setPriority(voteSite.getKey(), (int) value);
+				plugin.reload();
 			}
 		});
 
-		inv.addButton(new BInventoryButton("SetServiceSite", new String[0], new ItemStack(Material.STONE)) {
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.DIAMOND), "ServiceSite", voteSite.getServiceSite(),
+				EditGUIValueType.STRING) {
 
 			@Override
-			public void onClick(ClickEvent event) {
-				if (event.getWhoClicked() instanceof Player) {
-					Player player = event.getWhoClicked();
-
-					new ValueRequest().requestString(player, voteSite.getServiceSite(), null, new StringListener() {
-
-						@Override
-						public void onInput(Player player, String value) {
-							VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
-							String siteName = voteSite.getKey();
-							ConfigVoteSites.getInstance().setServiceSite(siteName, value);
-							player.sendMessage("Set ServiceSite");
-							plugin.reload();
-						}
-					});
-				}
-
+			public void setValue(Player player, Object value) {
+				VoteSite voteSite = (VoteSite) getMeta(player, "VoteSite");
+				String siteName = voteSite.getKey();
+				ConfigVoteSites.getInstance().setServiceSite(siteName, (String) value);
+				plugin.reload();
 			}
 		});
 
-		inv.addButton(new BInventoryButton("SetName", new String[0], new ItemStack(Material.STONE)) {
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.DIAMOND), "Name", voteSite.getDisplayName(),
+				EditGUIValueType.STRING) {
 
 			@Override
-			public void onClick(ClickEvent event) {
-				if (event.getWhoClicked() instanceof Player) {
-					Player player = event.getWhoClicked();
-					new ValueRequest().requestString(player, voteSite.getServiceSite(), null, new StringListener() {
-
-						@Override
-						public void onInput(Player player, String value) {
-							VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
-							ConfigVoteSites.getInstance().setDisplayName(voteSite.getKey(), value);
-							player.sendMessage("Set name");
-							plugin.reload();
-						}
-					});
-				}
-
+			public void setValue(Player player, Object value) {
+				VoteSite voteSite = (VoteSite) getMeta(player, "VoteSite");
+				ConfigVoteSites.getInstance().setDisplayName(voteSite.getKey(), (String) value);
+				plugin.reload();
 			}
 		});
 
-		inv.addButton(new BInventoryButton("SetVoteURL", new String[0], new ItemStack(Material.STONE)) {
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.DIAMOND), "VoteURL", voteSite.getVoteURL(),
+				EditGUIValueType.STRING) {
 
 			@Override
-			public void onClick(ClickEvent event) {
-				if (event.getWhoClicked() instanceof Player) {
-					Player player = event.getWhoClicked();
-
-					new ValueRequest().requestString(player, voteSite.getVoteURL(), null, new StringListener() {
-
-						@Override
-						public void onInput(Player player, String value) {
-							VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
-							String siteName = voteSite.getKey();
-							ConfigVoteSites.getInstance().setVoteURL(siteName, value);
-							player.sendMessage("Set VoteURL");
-							plugin.reload();
-
-						}
-					});
-
-				}
-
+			public void setValue(Player player, Object value) {
+				VoteSite voteSite = (VoteSite) getMeta(player, "VoteSite");
+				String siteName = voteSite.getKey();
+				ConfigVoteSites.getInstance().setVoteURL(siteName, (String) value);
+				plugin.reload();
 			}
 		});
 
-		inv.addButton(new BInventoryButton("SetVoteDelay", new String[0], new ItemStack(Material.STONE)) {
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.DIAMOND), "VoteDelay", voteSite.getVoteDelay(),
+				EditGUIValueType.NUMBER) {
 
 			@Override
-			public void onClick(ClickEvent event) {
-				Player player = event.getWhoClicked();
-				new ValueRequest().requestNumber(player, "" + voteSite.getVoteDelay(), null, new NumberListener() {
-
-					@Override
-					public void onInput(Player player, Number value) {
-						VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
-						String siteName = voteSite.getKey();
-						ConfigVoteSites.getInstance().setVoteDelay(siteName, value.intValue());
-						player.sendMessage("Set VoteDelay");
-						plugin.reload();
-
-					}
-				});
-
+			public void setValue(Player player, Object value) {
+				VoteSite voteSite = (VoteSite) getMeta(player, "VoteSite");
+				String siteName = voteSite.getKey();
+				ConfigVoteSites.getInstance().setVoteDelay(siteName, (int) value);
+				plugin.reload();
 			}
 		});
-		inv.addButton(inv.getNextSlot(),
-				new BInventoryButton("SetEnabled", new String[0], new ItemStack(Material.STONE)) {
 
-					@Override
-					public void onClick(ClickEvent event) {
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.DIAMOND), "Enabled", voteSite.isEnabled(),
+				EditGUIValueType.BOOLEAN) {
 
-						Player player = event.getWhoClicked();
-						new ValueRequest().requestBoolean(player,
-								"" + ConfigVoteSites.getInstance().getVoteSiteEnabled(voteSite.getKey()),
-								new BooleanListener() {
+			@Override
+			public void setValue(Player player, Object value) {
+				VoteSite voteSite = (VoteSite) getMeta(player, "VoteSite");
+				String siteName = voteSite.getKey();
+				ConfigVoteSites.getInstance().setEnabled(siteName, (boolean) value);
+				plugin.reload();
+			}
+		});
 
-									@Override
-									public void onInput(Player player, boolean value) {
-										VoteSite voteSite = (VoteSite) event.getMeta("VoteSite");
-										String siteName = voteSite.getKey();
-										ConfigVoteSites.getInstance().setEnabled(siteName, value);
-										player.sendMessage("Set Enabled");
-										plugin.reload();
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.DIAMOND), "ForceOffline", voteSite.isGiveOffline(),
+				EditGUIValueType.BOOLEAN) {
 
-									}
-								});
-					}
-				});
+			@Override
+			public void setValue(Player player, Object value) {
+				VoteSite voteSite = (VoteSite) getMeta(player, "VoteSite");
+				String siteName = voteSite.getKey();
+				ConfigVoteSites.getInstance().setForceOffline(siteName, (boolean) value);
+				plugin.reload();
+			}
+		});
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.DIAMOND), "VoteDelayDaily",
+				voteSite.isVoteDelayDaily(), EditGUIValueType.BOOLEAN) {
+
+			@Override
+			public void setValue(Player player, Object value) {
+				VoteSite voteSite = (VoteSite) getMeta(player, "VoteSite");
+				String siteName = voteSite.getKey();
+				ConfigVoteSites.getInstance().setVoteDelayDaily(siteName, (boolean) value);
+				plugin.reload();
+			}
+		});
 
 		inv.openInventory(player);
 	}

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

@@ -1,6 +1,7 @@
 package com.Ben12345rocks.VotingPlugin.Commands.GUI;
 
 import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
 import java.util.Map.Entry;
 import java.util.Set;
 
@@ -10,6 +11,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 
 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory.ClickEvent;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventoryButton;
@@ -21,12 +24,11 @@ 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;
 
 public class PlayerGUIs {
 	static PlayerGUIs instance = new PlayerGUIs();
@@ -62,6 +64,90 @@ public class PlayerGUIs {
 		return str;
 	}
 
+	public void openVoteShop(Player player) {
+		if (!Config.getInstance().getVoteShopEnabled()) {
+			player.sendMessage(StringUtils.getInstance().colorize("&cVote shop disabled"));
+			return;
+		}
+		BInventory inv = new BInventory(Config.getInstance().getVoteShopName());
+
+		for (final String identifier : Config.getInstance().getIdentifiers()) {
+
+			String perm = Config.getInstance().getVoteShopPermission(identifier);
+			boolean hasPerm = false;
+			if (perm.isEmpty()) {
+				hasPerm = true;
+			} else {
+				hasPerm = player.hasPermission(perm);
+			}
+
+			int limit = Config.getInstance().getIdentifierLimit(identifier);
+
+			boolean limitPass = true;
+			if (limit > 0) {
+				User user = UserManager.getInstance().getVotingPluginUser(player);
+				if (user.getVoteShopIdentifierLimit(identifier) >= limit) {
+					limitPass = false;
+				}
+			}
+
+			if (hasPerm && limitPass) {
+				ItemBuilder builder = new ItemBuilder(Config.getInstance().getIdentifierSection(identifier));
+
+				inv.addButton(new BInventoryButton(builder) {
+
+					@Override
+					public void onClick(ClickEvent event) {
+						Player player = event.getWhoClicked();
+
+						User user = UserManager.getInstance().getVotingPluginUser(player);
+						String identifier = (String) getData("identifier");
+						int limit = (int) getData("Limit");
+						int points = Config.getInstance().getIdentifierCost(identifier);
+						if (identifier != null) {
+							HashMap<String, String> placeholders = new HashMap<String, String>();
+							placeholders.put("identifier", identifier);
+							placeholders.put("points", "" + points);
+							placeholders.put("limit", "" + limit);
+							if (user.removePoints(points)) {
+
+								RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
+										Config.getInstance().getIdentifierRewardsPath(identifier),
+										new RewardOptions().setPlaceholders(placeholders));
+
+								user.sendMessage(StringUtils.getInstance().replacePlaceHolder(
+										Config.getInstance().getFormatShopPurchaseMsg(), placeholders));
+								if (limit > 0) {
+									user.setVoteShopIdentifierLimit(identifier,
+											user.getVoteShopIdentifierLimit(identifier) + 1);
+								}
+							} else {
+								user.sendMessage(StringUtils.getInstance().replacePlaceHolder(
+										Config.getInstance().getFormatShopFailedMsg(), placeholders));
+							}
+						}
+					}
+
+				}.addData("identifier", identifier).addData("Limit", limit));
+			}
+		}
+
+		if (Config.getInstance().getVoteShopBackButton()) {
+			inv.addButton(new BInventoryButton(PlayerGUIs.getInstance().getBackButton()) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					PlayerGUIs.getInstance().openVoteGUI(event.getPlayer(),
+							UserManager.getInstance().getVotingPluginUser(player));
+				}
+
+			});
+
+		}
+
+		inv.openInventory(player);
+	}
+
 	public void openVoteBest(Player player, User user) {
 		setSelectedPlayer(player, user);
 		BInventory inv = new BInventory(StringUtils.getInstance()
@@ -107,7 +193,8 @@ public class PlayerGUIs {
 				&& !player.hasPermission("VotingPlugin.Mod"))
 				|| (!player.hasPermission("VotingPlugin.Commands.Vote.GUI")
 						&& !player.hasPermission("VotingPlugin.Player"))) {
-			player.sendMessage(StringUtils.getInstance().colorize(AdvancedCoreHook.getInstance().getFormatNoPerms()));
+			player.sendMessage(
+					StringUtils.getInstance().colorize(AdvancedCoreHook.getInstance().getOptions().getFormatNoPerms()));
 			return;
 		}
 		setSelectedPlayer(player, user);
@@ -120,6 +207,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,9 +235,13 @@ public class PlayerGUIs {
 				}
 			}
 
-			builder.setLore(lore);
+			HashMap<String, String> placeholders = new HashMap<String, String>();
+			placeholders.put("points", "" + user.getPoints());
 
-			inv.addButton(Config.getInstance().getVoteGUISlotSlot(slot), new BInventoryButton(builder) {
+			builder.setPlaceholders(placeholders);
+			builder.setLore(ArrayUtils.getInstance().convert(lore));
+
+			inv.addButton(new BInventoryButton(builder) {
 
 				@Override
 				public void onClick(ClickEvent event) {
@@ -174,7 +266,7 @@ public class PlayerGUIs {
 						} else if (slot.equalsIgnoreCase("help")) {
 							player.performCommand("vote help");
 						} else if (slot.equalsIgnoreCase("shop")) {
-							VoteShop.getInstance().voteShop(player);
+							openVoteShop(player);
 						}
 					}
 
@@ -324,7 +416,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())) {
 
@@ -356,24 +448,14 @@ public class PlayerGUIs {
 		if (top == null) {
 			top = TopVoter.getDefault();
 		}
-		BInventory inv = null;
 		Set<Entry<User, Integer>> users = null;
-		String topVoter = "";
-		if (top.equals(TopVoter.Monthly)) {
-			topVoter = Config.getInstance().getFormatTopVoterMonthly();
-			users = plugin.topVoterMonthly.entrySet();
-		} else if (top.equals(TopVoter.Weekly)) {
-			topVoter = Config.getInstance().getFormatTopVoterWeekly();
-			users = plugin.topVoterWeekly.entrySet();
-		} else if (top.equals(TopVoter.Daily)) {
-			topVoter = Config.getInstance().getFormatTopVoterDaily();
-			users = plugin.topVoterDaily.entrySet();
-		} else {
-			topVoter = Config.getInstance().getFormatTopVoterAllTime();
-			users = plugin.topVoterAllTime.entrySet();
-		}
-		inv = new BInventory(StringUtils.getInstance().replacePlaceHolder(Config.getInstance().getGUIVoteTopName(),
-				"topvoter", topVoter));
+
+		String topVoter = top.getName();
+		users = plugin.getTopVoter(top).entrySet();
+
+		BInventory inv = new BInventory(StringUtils.getInstance()
+				.replacePlaceHolder(Config.getInstance().getGUIVoteTopName(), "topvoter", topVoter));
+
 		int pos = 1;
 		for (Entry<User, Integer> entry : users) {
 
@@ -387,7 +469,7 @@ public class PlayerGUIs {
 
 				@Override
 				public void onClick(ClickEvent clickEvent) {
-					//ItemBuilder item = new ItemBuilder(clickEvent.getClickedItem());
+					// ItemBuilder item = new ItemBuilder(clickEvent.getClickedItem());
 					// String name = ChatColor.stripColor(item.getName()).split(":")[1].trim();
 					String name = (String) clickEvent.getButton().getData("player");
 
@@ -397,6 +479,7 @@ public class PlayerGUIs {
 			}.addData("player", entry.getKey().getPlayerName()));
 			pos++;
 		}
+
 		final TopVoter cur = top;
 		inv.getPageButtons().add(new BInventoryButton(
 				new ItemBuilder(Config.getInstance().getGUIVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
@@ -420,6 +503,7 @@ public class PlayerGUIs {
 				}
 			});
 		}
+
 		inv.setPages(true);
 		inv.setMaxInvSize(Config.getInstance().getGUIVoteTopSize());
 		inv.openInventory(player);
@@ -430,37 +514,17 @@ public class PlayerGUIs {
 		setSelectedPlayer(player, user);
 		BInventory inv = new BInventory(StringUtils.getInstance()
 				.replacePlaceHolder(Config.getInstance().getGUIVoteTotalName(), "player", user.getPlayerName()));
-		inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteTotalDayTotalItem())
-				.addPlaceholder("Total", "" + user.getDailyTotal())) {
 
-			@Override
-			public void onClick(ClickEvent clickEvent) {
+		for (TopVoter top : TopVoter.values()) {
+			inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteTotalItem(top))
+					.addPlaceholder("Total", "" + user.getTotal(top)).addPlaceholder("topvoter", top.getName())) {
 
-			}
-		});
-		inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteTotalWeekTotalItem())
-				.addPlaceholder("Total", "" + user.getWeeklyTotal())) {
+				@Override
+				public void onClick(ClickEvent clickEvent) {
 
-			@Override
-			public void onClick(ClickEvent clickEvent) {
-
-			}
-		});
-		inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteTotalMonthTotalItem())
-				.addPlaceholder("Total", "" + user.getMonthTotal())) {
-
-			@Override
-			public void onClick(ClickEvent clickEvent) {
-
-			}
-		});
-		inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteTotalAllTimeTotalItem())
-				.addPlaceholder("Total", "" + user.getAllTimeTotal())) {
-
-			@Override
-			public void onClick(ClickEvent clickEvent) {
-			}
-		});
+				}
+			});
+		}
 
 		if (Config.getInstance().getGUIVoteTotalBackButton()) {
 			inv.addButton(new BInventoryButton(getBackButton()) {
@@ -469,6 +533,7 @@ public class PlayerGUIs {
 				public void onClick(ClickEvent event) {
 					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
 				}
+
 			});
 		}
 		inv.openInventory(player);
@@ -516,9 +581,8 @@ 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());
 			} else {
@@ -535,14 +599,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()));
+						}
 					}
 
 				}
@@ -590,7 +658,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
@@ -627,26 +695,19 @@ public class PlayerGUIs {
 		BInventory inv = new BInventory(Config.getInstance().getGUIVoteRewardName());
 
 		if ((siteName == null) || (siteName == "")) {
-			int count = 0;
 			for (VoteSite voteSite : plugin.getVoteSites()) {
 				try {
 					ItemBuilder builder = voteSite.getItem();
-					final VoteSite site = voteSite;
 
-					inv.addButton(count, new BInventoryButton(builder) {
+					inv.addButton(new BInventoryButton(builder) {
 
 						@Override
 						public void onClick(ClickEvent event) {
 							Player player = event.getWhoClicked();
-							if (player != null) {
-								player.closeInventory();
-								player.performCommand("vote reward " + site.getKey());
-
-							}
 
+							voteReward(player, (String) getData("site"));
 						}
-					});
-					count++;
+					}.addData("site", voteSite.getKey()));
 				} catch (Exception ex) {
 
 				}
@@ -660,10 +721,6 @@ public class PlayerGUIs {
 
 							@Override
 							public void onClick(ClickEvent event) {
-								Player player = event.getWhoClicked();
-								if (player != null) {
-									player.closeInventory();
-								}
 
 							}
 

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

@@ -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;
 

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

@@ -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;
-
 }

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

@@ -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;
 

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

@@ -7,8 +7,12 @@ 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;
+import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -31,6 +35,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 +96,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 +163,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", false);
 	}
 
 	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 +207,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 +269,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 +322,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 +409,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 +710,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 +724,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");
 	}
@@ -779,6 +836,22 @@ public class Config extends YMLFile {
 		return getData().getConfigurationSection("GUI.VoteTotal.AllTimeTotal.Item");
 	}
 
+	public ConfigurationSection getGUIVoteTotalItem(TopVoter top) {
+		switch (top) {
+		case AllTime:
+			return getGUIVoteTotalAllTimeTotalItem();
+		case Daily:
+			return getGUIVoteTotalDayTotalItem();
+		case Monthly:
+			return getGUIVoteTotalMonthTotalItem();
+		case Weekly:
+			return getGUIVoteTotalWeekTotalItem();
+		default:
+			return getGUIVoteTotalAllTimeTotalItem();
+
+		}
+	}
+
 	public boolean getGUIVoteTotalBackButton() {
 		return getData().getBoolean("GUI.VoteTotal.BackButton");
 	}
@@ -807,29 +880,20 @@ 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");
 	}
 
-	public String getIdentifierFromSlot(int slot) {
-		for (String identifier : getIdentifiers()) {
-			if (getIdentifierSlot(identifier) == slot) {
-				return identifier;
-			}
-		}
-		return null;
-	}
-
-	public int getIdentifierItemAmount(String identifier) {
-		return getData().getInt("Shop." + identifier + ".Item.Amount");
+	public int getIdentifierLimit(String identifier) {
+		return getData().getInt("Shop." + identifier + ".Limit", -1);
 	}
 
 	public String getIdentifierRewardsPath(String identifier) {
@@ -845,18 +909,10 @@ 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);
 	}
 
-	public int getIdentifierSlot(String identifier) {
-		return getData().getInt("Shop." + identifier + ".Slot");
-	}
-
 	public boolean getLoadTopVoterAllTime() {
 		return getData().getBoolean("LoadTopVoter.AllTime", true);
 	}
@@ -930,15 +986,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 +1020,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 +1087,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 +1120,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>());
 	}
 
 	/**
@@ -1087,13 +1148,18 @@ public class Config extends YMLFile {
 	 * @return the vote GUI slot slot
 	 */
 	public int getVoteGUISlotSlot(String slot) {
-		return getData().getInt("GUI.VoteGUI." + slot + ".Slot");
+		return getData().getInt("GUI.VoteGUI." + slot + ".Slot", -1);
 	}
 
 	public String getVotePartyBroadcast() {
 		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 +1182,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 +1203,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 +1261,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 +1402,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 +1428,10 @@ public class Config extends YMLFile {
 		}
 	}
 
+	public void loadValues() {
+		new AnnotationHandler().load(getData(), this);
+	}
+
 	@Override
 	public void onFileCreation() {
 		plugin.saveResource("Config.yml", true);
@@ -1478,8 +1528,19 @@ public class Config extends YMLFile {
 		saveData();
 	}
 
-	public boolean getClearCacheOnVote() {
-		return getData().getBoolean("ClearCacheOnVote");
+	public boolean getLoadTopVoter(TopVoter top) {
+		switch (top) {
+		case AllTime:
+			return getLoadTopVoterAllTime();
+		case Daily:
+			return getLoadTopVoterDaily();
+		case Monthly:
+			return getLoadTopVoterMonthly();
+		case Weekly:
+			return getLoadTopVoterWeekly();
+		default:
+			return false;
+		}
 	}
 
 }

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

@@ -432,4 +432,13 @@ public class ConfigVoteSites extends YMLFile {
 		return pass;
 	}
 
+	public void setForceOffline(String siteName, boolean value) {
+		set(siteName, "ForceOffline", value);
+
+	}
+
+	public void setVoteDelayDaily(String siteName, boolean value) {
+		set(siteName, "VoteDelayDaily", value);
+	}
+
 }

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

@@ -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.
 	 */

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

@@ -9,7 +9,7 @@ import com.Ben12345rocks.VotingPlugin.Objects.User;
 /**
  * The Class PlayerVoteEvent.
  */
-public class PlayerVoteAllSitesEvent extends Event {
+public class PlayerSpecialRewardEvent extends Event {
 
 	/** The Constant handlers. */
 	private static final HandlerList handlers = new HandlerList();
@@ -24,30 +24,32 @@ public class PlayerVoteAllSitesEvent extends Event {
 	}
 
 	private User user;
+	private SpecialRewardType type;
+
+	/**
+	 * @return the type
+	 */
+	public SpecialRewardType getType() {
+		return type;
+	}
+
+	/**
+	 * @param type
+	 *            the type to set
+	 */
+	public void setType(SpecialRewardType type) {
+		this.type = type;
+	}
 
 	/** The cancelled. */
 	private boolean cancelled;
 
-	public PlayerVoteAllSitesEvent(User user) {
+	public PlayerSpecialRewardEvent(User user, SpecialRewardType type) {
 		super();
+		setType(type);
 		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 +60,13 @@ public class PlayerVoteAllSitesEvent extends Event {
 		return handlers;
 	}
 
+	/**
+	 * @return the user
+	 */
+	public User getUser() {
+		return user;
+	}
+
 	/**
 	 * Checks if is cancelled.
 	 *
@@ -77,4 +86,12 @@ public class PlayerVoteAllSitesEvent extends Event {
 		cancelled = bln;
 	}
 
+	/**
+	 * @param user
+	 *            the user to set
+	 */
+	public void setUser(User user) {
+		this.user = user;
+	}
+
 }

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

@@ -32,10 +32,12 @@ public class PlayerVoteEvent extends Event {
 	/** The cancelled. */
 	private boolean cancelled;
 
-	public PlayerVoteEvent(VoteSite voteSite, String voteUsername) {
-		super();
+	public PlayerVoteEvent(VoteSite voteSite, String voteUsername, String serviceSite, boolean realVote) {
+		super(true);
 		setPlayer(voteUsername);
 		setVoteSite(voteSite);
+		setRealVote(realVote);
+		setServiceSite(serviceSite);
 	}
 
 	/*
@@ -99,4 +101,30 @@ public class PlayerVoteEvent extends Event {
 		this.voteSite = voteSite;
 	}
 
+	private boolean realVote = true;
+
+	public void setRealVote(boolean b) {
+		realVote = b;
+	}
+
+	/**
+	 * @return the realVote
+	 */
+	public boolean isRealVote() {
+		return realVote;
+	}
+
+	private String serviceSite = "";
+
+	public void setServiceSite(String value) {
+		serviceSite = value;
+	}
+
+	/**
+	 * @return the serviceSite
+	 */
+	public String getServiceSite() {
+		return serviceSite;
+	}
+
 }

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

@@ -0,0 +1,33 @@
+package com.Ben12345rocks.VotingPlugin.Events;
+
+public enum SpecialRewardType {
+	ALLSITE, CUMMULATIVE, MILESTONE, VOTESTREAK, FIRSTVOTE;
+
+	private int amount = -1;
+	private String type = "";
+
+	/**
+	 * @return the type
+	 */
+	public String getType() {
+		return type;
+	}
+
+	public SpecialRewardType setType(String type) {
+		this.type = type;
+		return this;
+	}
+
+	public SpecialRewardType setAmount(int num) {
+		amount = num;
+		return this;
+	}
+
+	/**
+	 * @return the amount
+	 */
+	public int getAmount() {
+		return amount;
+	}
+
+}

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

@@ -1,199 +0,0 @@
-package com.Ben12345rocks.VotingPlugin.Events;
-
-import java.util.ArrayList;
-
-import org.bukkit.Bukkit;
-import org.bukkit.event.EventHandler;
-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.Util.Misc.ArrayUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
-import com.Ben12345rocks.VotingPlugin.Main;
-import com.Ben12345rocks.VotingPlugin.Config.Config;
-import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
-import com.Ben12345rocks.VotingPlugin.Data.ServerData;
-import com.Ben12345rocks.VotingPlugin.Objects.User;
-import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
-import com.Ben12345rocks.VotingPlugin.OtherRewards.OtherVoteReward;
-import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
-import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
-import com.vexsoftware.votifier.model.Vote;
-import com.vexsoftware.votifier.model.VotifierEvent;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class VotiferEvent.
- */
-public class VotiferEvent implements Listener {
-
-	/** The config. */
-	static Config config = Config.getInstance();
-
-	/** The config vote sites. */
-	static ConfigVoteSites configVoteSites = ConfigVoteSites.getInstance();
-
-	/** The plugin. */
-	static Main plugin = Main.plugin;
-
-	private static Object object = new Object();
-
-	public static void playerVote(final String playerName, final String voteSiteURL) {
-		playerVote(playerName, voteSiteURL, true);
-	}
-
-	public static void playerVote(final String playerName, final String voteSiteURL, final boolean realVote) {
-
-		if (!PlayerUtils.getInstance().isValidUser(playerName) && !config.allowUnJoined()) {
-			plugin.getLogger().warning("Player " + playerName
-					+ " has not joined before, disregarding vote, set AllowUnjoined to true to prevent this");
-			return;
-		}
-
-		User user = UserManager.getInstance().getVotingPluginUser(playerName);
-
-		VoteSite voteSite = plugin.getVoteSite(voteSiteURL);
-		if (voteSite == null) {
-			if (!Config.getInstance().getDisableNoServiceSiteMessage()) {
-				plugin.getLogger().warning("No voting site with the service site: '" + voteSiteURL + "'");
-				plugin.getLogger().warning(
-						"Please read here on how to fix it: https://github.com/Ben12345rocks/VotingPlugin/wiki/Common-Problems");
-
-				ArrayList<String> services = new ArrayList<String>();
-				for (VoteSite site : plugin.getVoteSites()) {
-					services.add(site.getServiceSite());
-				}
-				plugin.getLogger()
-						.warning("Current service sites: " + ArrayUtils.getInstance().makeStringList(services));
-			}
-			return;
-		}
-
-		synchronized (object) {
-
-			// vote party
-			VoteParty.getInstance().vote(user, realVote);
-
-			// broadcast vote if enabled in config
-			if (config.getBroadCastVotesEnabled()) {
-				if (!Config.getInstance().getFormatBroadcastWhenOnline() || user.isOnline()) {
-					voteSite.broadcastVote(user);
-				}
-			}
-
-			// update last vote time
-			user.setTime(voteSite);
-
-			OtherVoteReward.getInstance().checkFirstVote(user);
-
-			if (user.isReminded()) {
-				user.setReminded(false);
-			}
-
-			// check if player has voted on all sites in one day
-
-			if (user.isOnline() || voteSite.isGiveOffline()) {
-				user.playerVote(voteSite, true, false);
-				user.closeInv();
-			} else {
-				user.addOfflineVote(voteSite.getKey());
-				// plugin.debug(ArrayUtils.getInstance().makeStringList(user.getOfflineVotes()));
-				plugin.debug(
-						"Offline vote set for " + playerName + " (" + user.getUUID() + ") on " + voteSite.getKey());
-			}
-
-			// add to total votes
-			if (Config.getInstance().getCountFakeVotes() || realVote) {
-				if (Config.getInstance().getAddTotals()) {
-					user.addTotal();
-					user.addTotalDaily();
-					user.addTotalWeekly();
-				}
-				user.addPoints();
-			}
-
-			OtherVoteReward.getInstance().checkAllSites(user);
-			OtherVoteReward.getInstance().checkCumualativeVotes(user);
-			OtherVoteReward.getInstance().checkMilestone(user);
-
-			if (Config.getInstance().getClearCacheOnVote()) {
-				if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
-					AdvancedCoreHook.getInstance().getMysql().removePlayer(user.getUUID());
-				}
-			}
-		}
-
-		plugin.setUpdate(true);
-
-	}
-
-	/**
-	 * Instantiates a new votifer event.
-	 *
-	 * @param plugin
-	 *            the plugin
-	 */
-	public VotiferEvent(Main plugin) {
-		VotiferEvent.plugin = plugin;
-	}
-
-	/**
-	 * On votifer event.
-	 *
-	 * @param event
-	 *            the event
-	 */
-	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
-	public void onVotiferEvent(VotifierEvent event) {
-
-		Vote vote = event.getVote();
-		final String voteSite = vote.getServiceName();
-		final String voteUsername = vote.getUsername().trim();
-		ServerData.getInstance().addServiceSite(voteSite);
-
-		if (voteUsername.length() == 0) {
-			plugin.getLogger().warning("No name from vote on " + voteSite);
-			return;
-		}
-
-		plugin.getLogger().info("Recieved a vote from '" + voteSite + "' by player '" + voteUsername + "'!");
-
-		plugin.debug("PlayerUsername: " + voteUsername);
-		plugin.debug("VoteSite: " + voteSite);
-
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				String voteSiteName = plugin.getVoteSiteName(voteSite);
-
-				ArrayList<String> sites = configVoteSites.getVoteSitesNames();
-				if (sites != null) {
-					if (!sites.contains(voteSiteName) && Config.getInstance().getAutoCreateVoteSites()) {
-						plugin.getLogger()
-								.warning("VoteSite " + voteSiteName + " doe not exist, generaterating one...");
-						ConfigVoteSites.getInstance().generateVoteSite(voteSiteName);
-					}
-				} else if (Config.getInstance().getAutoCreateVoteSites()) {
-					plugin.getLogger().warning("VoteSite " + voteSiteName + " doe not exist, generaterating one...");
-					ConfigVoteSites.getInstance().generateVoteSite(voteSiteName);
-				}
-
-				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName), voteUsername);
-				plugin.getServer().getPluginManager().callEvent(voteEvent);
-
-				if (voteEvent.isCancelled()) {
-					plugin.debug("Vote cancelled");
-					return;
-				}
-
-				playerVote(voteUsername, voteSite, true);
-
-			}
-		});
-
-	}
-
-}

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

@@ -1,4 +1,4 @@
-package com.Ben12345rocks.VotingPlugin.Events;
+package com.Ben12345rocks.VotingPlugin.Listeners;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -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
 /**

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

@@ -1,4 +1,4 @@
-package com.Ben12345rocks.VotingPlugin.Events;
+package com.Ben12345rocks.VotingPlugin.Listeners;
 
 import org.bukkit.block.Sign;
 import org.bukkit.entity.Player;
@@ -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

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

@@ -1,4 +1,4 @@
-package com.Ben12345rocks.VotingPlugin.Events;
+package com.Ben12345rocks.VotingPlugin.Listeners;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -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;
@@ -58,8 +58,7 @@ public class PlayerJoinEvent implements Listener {
 					user.loginMessage();
 
 					if (user.getData().hasData()) {
-						// give offline vote (if they voted
-						// offline)
+						// give offline vote (if they voted offline)
 
 						user.offVote();
 

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

@@ -0,0 +1,146 @@
+package com.Ben12345rocks.VotingPlugin.Listeners;
+
+import java.util.ArrayList;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
+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;
+import com.Ben12345rocks.VotingPlugin.Config.Config;
+import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteEvent;
+import com.Ben12345rocks.VotingPlugin.Objects.User;
+import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
+import com.Ben12345rocks.VotingPlugin.SpecialRewards.SpecialRewards;
+import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class VotiferEvent.
+ */
+public class PlayerVoteListener implements Listener {
+
+	/** The config. */
+	static Config config = Config.getInstance();
+
+	/** The config vote sites. */
+	static ConfigVoteSites configVoteSites = ConfigVoteSites.getInstance();
+
+	/** The plugin. */
+	static Main plugin = Main.plugin;
+
+	private static Object object = new Object();
+
+	/**
+	 * Instantiates a new votifer event.
+	 *
+	 * @param plugin
+	 *            the plugin
+	 */
+	public PlayerVoteListener(Main plugin) {
+		PlayerVoteListener.plugin = plugin;
+	}
+
+	/**
+	 * On votifer event.
+	 *
+	 * @param event
+	 *            the event
+	 */
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void onplayerVote(PlayerVoteEvent event) {
+		String playerName = event.getPlayer();
+		if (!PlayerUtils.getInstance().isValidUser(playerName)) {
+			if (!config.allowUnJoined()) {
+				plugin.getLogger().warning("Player " + playerName
+						+ " has not joined before, disregarding vote, set AllowUnjoined to true to prevent this");
+				return;
+			}
+		}
+
+		VoteSite voteSite = event.getVoteSite();
+
+		// check valid service sites
+		if (voteSite == null) {
+			if (!Config.getInstance().getDisableNoServiceSiteMessage()) {
+				plugin.getLogger().warning("No voting site with the service site: '" + event.getServiceSite() + "'");
+				plugin.getLogger().warning(
+						"Please read here on how to fix it: https://github.com/Ben12345rocks/VotingPlugin/wiki/Common-Problems");
+
+				ArrayList<String> services = new ArrayList<String>();
+				for (VoteSite site : plugin.getVoteSites()) {
+					services.add(site.getServiceSite());
+				}
+				plugin.getLogger()
+						.warning("Current known service sites: " + ArrayUtils.getInstance().makeStringList(services));
+			}
+			return;
+		}
+
+		User user = UserManager.getInstance().getVotingPluginUser(playerName);
+
+		synchronized (object) {
+
+			// vote party
+			VoteParty.getInstance().vote(user, event.isRealVote());
+
+			// broadcast vote if enabled in config
+			if (config.getBroadCastVotesEnabled()) {
+				if (!Config.getInstance().getFormatBroadcastWhenOnline() || user.isOnline()) {
+					voteSite.broadcastVote(user);
+				}
+			}
+
+			// update last vote time
+			user.setTime(voteSite);
+
+			// check first vote rewards
+			SpecialRewards.getInstance().checkFirstVote(user);
+
+			if (user.isReminded()) {
+				user.setReminded(false);
+			}
+
+			// check if player has voted on all sites in one day
+
+			if (user.isOnline() || voteSite.isGiveOffline()) {
+				user.playerVote(voteSite, true, false);
+				user.closeInv();
+			} else {
+				user.addOfflineVote(voteSite.getKey());
+				plugin.debug(
+						"Offline vote set for " + playerName + " (" + user.getUUID() + ") on " + voteSite.getKey());
+			}
+
+			// add to total votes
+			if (Config.getInstance().getCountFakeVotes() || event.isRealVote()) {
+				if (Config.getInstance().getAddTotals()) {
+					user.addTotal();
+					user.addTotalDaily();
+					user.addTotalWeekly();
+				}
+				user.addPoints();
+			}
+
+			// other rewards
+			SpecialRewards.getInstance().checkAllSites(user);
+			SpecialRewards.getInstance().checkCumualativeVotes(user);
+			SpecialRewards.getInstance().checkMilestone(user);
+
+			if (Config.getInstance().getClearCacheOnVote()) {
+				if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
+					AdvancedCoreHook.getInstance().getMysql().removePlayer(user.getUUID());
+				}
+			}
+		}
+
+		plugin.setUpdate(true);
+	}
+
+}

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

@@ -1,4 +1,4 @@
-package com.Ben12345rocks.VotingPlugin.Events;
+package com.Ben12345rocks.VotingPlugin.Listeners;
 
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;

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

@@ -0,0 +1,105 @@
+package com.Ben12345rocks.VotingPlugin.Listeners;
+
+import java.util.ArrayList;
+
+import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Config.Config;
+import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.Data.ServerData;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteEvent;
+import com.vexsoftware.votifier.model.Vote;
+import com.vexsoftware.votifier.model.VotifierEvent;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class VotiferEvent.
+ */
+public class VotiferEvent implements Listener {
+
+	/** The config. */
+	static Config config = Config.getInstance();
+
+	/** The config vote sites. */
+	static ConfigVoteSites configVoteSites = ConfigVoteSites.getInstance();
+
+	/** The plugin. */
+	static Main plugin = Main.plugin;
+
+	/**
+	 * Instantiates a new votifer event.
+	 *
+	 * @param plugin
+	 *            the plugin
+	 */
+	public VotiferEvent(Main plugin) {
+		VotiferEvent.plugin = plugin;
+	}
+
+	/**
+	 * On votifer event.
+	 *
+	 * @param event
+	 *            the event
+	 */
+	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
+	public void onVotiferEvent(VotifierEvent event) {
+
+		Vote vote = event.getVote();
+		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);
+			return;
+		}
+
+		plugin.getLogger().info("Recieved a vote from '" + voteSite + "' by player '" + voteUsername + "'!");
+
+		plugin.debug("PlayerUsername: " + voteUsername);
+		plugin.debug("VoteSite: " + voteSite);
+
+		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				String voteSiteName = plugin.getVoteSiteName(voteSite);
+
+				ArrayList<String> sites = configVoteSites.getVoteSitesNames();
+				if (sites != null) {
+					if (!sites.contains(voteSiteName) && Config.getInstance().getAutoCreateVoteSites()) {
+						plugin.getLogger()
+								.warning("VoteSite " + voteSiteName + " doe not exist, generaterating one...");
+						ConfigVoteSites.getInstance().generateVoteSite(voteSiteName);
+					}
+				} else if (Config.getInstance().getAutoCreateVoteSites()) {
+					plugin.getLogger().warning("VoteSite " + voteSiteName + " doe not exist, generaterating one...");
+					ConfigVoteSites.getInstance().generateVoteSite(voteSiteName);
+				}
+
+				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName), voteUsername,
+						voteSite, true);
+				plugin.getServer().getPluginManager().callEvent(voteEvent);
+
+				if (voteEvent.isCancelled()) {
+					plugin.debug("Vote cancelled");
+					return;
+				}
+
+			}
+		});
+
+	}
+
+}

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

@@ -1,4 +1,4 @@
-package com.Ben12345rocks.VotingPlugin.Events;
+package com.Ben12345rocks.VotingPlugin.Listeners;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

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

@@ -25,17 +25,17 @@ 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.Thread.Thread;
+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.AdvancedCore.mysql.MySQL;
 import com.Ben12345rocks.VotingPlugin.Commands.CommandLoader;
 import com.Ben12345rocks.VotingPlugin.Commands.Commands;
 import com.Ben12345rocks.VotingPlugin.Commands.Executers.CommandAdminVote;
@@ -46,19 +46,22 @@ import com.Ben12345rocks.VotingPlugin.Commands.TabCompleter.VoteTabCompleter;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
-import com.Ben12345rocks.VotingPlugin.Events.BlockBreak;
-import com.Ben12345rocks.VotingPlugin.Events.PlayerInteract;
-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.Listeners.BlockBreak;
+import com.Ben12345rocks.VotingPlugin.Listeners.PlayerInteract;
+import com.Ben12345rocks.VotingPlugin.Listeners.PlayerJoinEvent;
+import com.Ben12345rocks.VotingPlugin.Listeners.PlayerVoteListener;
+import com.Ben12345rocks.VotingPlugin.Listeners.SignChange;
+import com.Ben12345rocks.VotingPlugin.Listeners.VotiferEvent;
+import com.Ben12345rocks.VotingPlugin.Listeners.VotingPluginUpdateEvent;
 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.TopVoter;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
+import com.Ben12345rocks.VotingPlugin.Updater.CheckUpdate;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
-import com.Ben12345rocks.VotingPlugin.Util.Updater.CheckUpdate;
+import com.Ben12345rocks.VotingPlugin.Util.PlaceHolders.PlaceHolders;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
 import com.Ben12345rocks.VotingPlugin.VoteReminding.VoteReminding;
 
@@ -76,17 +79,18 @@ public class Main extends JavaPlugin {
 	/** The plugin. */
 	public static Main plugin;
 
-	/** The top voter monthly. */
-	public LinkedHashMap<User, Integer> topVoterAllTime;
+	private LinkedHashMap<TopVoter, LinkedHashMap<User, Integer>> topVoter;
 
-	/** The top voter monthly. */
-	public LinkedHashMap<User, Integer> topVoterMonthly;
+	/**
+	 * @return the topVoter
+	 */
+	public LinkedHashMap<TopVoter, LinkedHashMap<User, Integer>> getTopVoter() {
+		return topVoter;
+	}
 
-	/** The top voter weekly. */
-	public LinkedHashMap<User, Integer> topVoterWeekly;
-
-	/** The top voter daily. */
-	public LinkedHashMap<User, Integer> topVoterDaily;
+	public LinkedHashMap<User, Integer> getTopVoter(TopVoter top) {
+		return topVoter.get(top);
+	}
 
 	/** The updater. */
 	public Updater updater;
@@ -130,43 +134,69 @@ public class Main extends JavaPlugin {
 			throw new RuntimeException("Invalid Storage Method");
 		}
 		UserStorage cur = AdvancedCoreHook.getInstance().getStorageType();
-		AdvancedCoreHook.getInstance().setStorageType(from);
-		loadMySQL();
-		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));
+		AdvancedCoreHook.getInstance().getOptions().setStorageType(from);
+		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().getOptions().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().getOptions().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);
-		loadMySQL();
-
-		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().getOptions().setStorageType(cur);
+		AdvancedCoreHook.getInstance().reload();
 
 		plugin.getLogger().info("Finished convertting");
 	}
@@ -185,6 +215,32 @@ 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.
 	 *
@@ -200,6 +256,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();
 	}
@@ -257,10 +321,36 @@ public class Main extends JavaPlugin {
 
 	}
 
+	public String getVoteSiteServiceSite(String name) {
+		ArrayList<String> sites = ConfigVoteSites.getInstance().getVoteSitesNames();
+		if (name == null) {
+			return null;
+		}
+		if (sites != null) {
+			for (String siteName : sites) {
+				String URL = ConfigVoteSites.getInstance().getServiceSite(siteName);
+				if (URL != null) {
+					if (URL.equalsIgnoreCase(name)) {
+						return URL;
+					}
+					if (name.equalsIgnoreCase(siteName)) {
+						return URL;
+					}
+				}
+			}
+		}
+		return name;
+
+	}
+
 	public List<VoteSite> getVoteSites() {
 		return voteSites;
 	}
 
+	public LinkedHashMap<User, HashMap<VoteSite, LocalDateTime>> getVoteToday() {
+		return voteToday;
+	}
+
 	public boolean hasVoteSite(String site) {
 		String siteName = getVoteSiteName(site);
 		for (VoteSite voteSite : getVoteSites()) {
@@ -271,22 +361,16 @@ public class Main extends JavaPlugin {
 		return false;
 	}
 
-	private void loadMySQL() {
-		if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
-			Thread.getInstance().run(new Runnable() {
+	public boolean isUpdate() {
+		return update;
+	}
 
-				@Override
-				public void run() {
-					AdvancedCoreHook.getInstance()
-							.setMysql(new MySQL("VotingPlugin_Users", Config.getInstance().getMySql()));
-				}
-			});
-
-		}
+	public boolean isUpdateStarted() {
+		return updateStarted;
 	}
 
 	private void loadTimer() {
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+		Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
 
 			@Override
 			public void run() {
@@ -298,7 +382,7 @@ public class Main extends JavaPlugin {
 					}
 				}, 1000, 1000 * 60 * Config.getInstance().getDelayBetweenUpdates());
 			}
-		});
+		}, 40L);
 
 	}
 
@@ -534,7 +618,7 @@ public class Main extends JavaPlugin {
 
 			@Override
 			public String getValue() {
-				return Config.getInstance().getDataStorage();
+				return Config.getInstance().getDataStorage().toUpperCase();
 			}
 		});
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("DisableCheckOnWorldChange") {
@@ -659,11 +743,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();
@@ -675,18 +757,18 @@ public class Main extends JavaPlugin {
 		plugin.signs = new ArrayList<SignHandler>();
 
 		Bukkit.getScheduler().runTask(plugin, new Runnable() {
-
+			
 			@Override
 			public void run() {
 				Signs.getInstance().loadSigns();
 			}
 		});
 
-		topVoterMonthly = new LinkedHashMap<User, Integer>();
-		topVoterWeekly = new LinkedHashMap<User, Integer>();
-		topVoterDaily = new LinkedHashMap<User, Integer>();
+		topVoter = new LinkedHashMap<TopVoter, LinkedHashMap<User, Integer>>();
+		for (TopVoter top : TopVoter.values()) {
+			topVoter.put(top, new LinkedHashMap<User, Integer>());
+		}
 		voteToday = new LinkedHashMap<User, HashMap<VoteSite, LocalDateTime>>();
-		topVoterAllTime = new LinkedHashMap<User, Integer>();
 
 		voteLog = new Logger(plugin, new File(plugin.getDataFolder() + File.separator + "Log", "votelog.txt"));
 
@@ -711,11 +793,46 @@ public class Main extends JavaPlugin {
 
 		loadTimer();
 
+		PlaceHolders.getInstance().load();
+
+		// 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");
 			}
@@ -727,59 +844,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");
+		}
 	}
 
 	/**
@@ -822,6 +907,7 @@ public class Main extends JavaPlugin {
 
 		pm.registerEvents(new PlayerJoinEvent(this), this);
 		pm.registerEvents(new VotiferEvent(this), this);
+		pm.registerEvents(new PlayerVoteListener(this), this);
 
 		pm.registerEvents(new SignChange(this), this);
 
@@ -841,10 +927,13 @@ public class Main extends JavaPlugin {
 	public void reload() {
 		setUpdate(true);
 		config.reloadData();
+		config.loadValues();
 		configVoteSites.reloadData();
 		updateAdvancedCoreHook();
 		plugin.loadVoteSites();
+		AdvancedCoreHook.getInstance().setConfigData(Config.getInstance().getData());
 		AdvancedCoreHook.getInstance().reload();
+		PlaceHolders.getInstance().load();
 		// loadTimer();
 
 	}
@@ -860,6 +949,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() {
@@ -948,32 +1038,35 @@ public class Main extends JavaPlugin {
 	}
 
 	public void updateAdvancedCoreHook() {
-		AdvancedCoreHook.getInstance().setAutoDownload(Config.getInstance().getAutoDownload());
 		AdvancedCoreHook.getInstance().getJavascriptEngine().put("VotingPlugin", this);
 		AdvancedCoreHook.getInstance().allowDownloadingFromSpigot(15358);
-		AdvancedCoreHook.getInstance().setExtraDebug(Config.getInstance().getExtraDebug());
-		AdvancedCoreHook.getInstance().setStorageType(UserStorage.value(Config.getInstance().getDataStorage()));
-		loadMySQL();
+		AdvancedCoreHook.getInstance().setConfigData(Config.getInstance().getData());
+	}
 
-		AdvancedCoreHook.getInstance()
-				.setDisableCheckOnWorldChange(Config.getInstance().getDisableCheckOnWorldChange());
-		AdvancedCoreHook.getInstance().setDebug(Config.getInstance().getDebugEnabled());
-		AdvancedCoreHook.getInstance().setDebugIngame(Config.getInstance().getDebugInfoIngame());
-		AdvancedCoreHook.getInstance().setDefaultRequestMethod(Config.getInstance().getRequestAPIDefaultMethod());
-		AdvancedCoreHook.getInstance().setDisabledRequestMethods(Config.getInstance().getRequestAPIDisabledMethods());
-		AdvancedCoreHook.getInstance().setFormatNoPerms(Config.getInstance().getFormatNoPerms());
-		AdvancedCoreHook.getInstance().setFormatNotNumber(Config.getInstance().getFormatNotNumber());
-		AdvancedCoreHook.getInstance().setHelpLine(Config.getInstance().getFormatHelpLine());
-		AdvancedCoreHook.getInstance().setLogDebugToFile(Config.getInstance().getLogDebugToFile());
-		AdvancedCoreHook.getInstance().setSendScoreboards(Config.getInstance().getSendScoreboards());
-		AdvancedCoreHook.getInstance().setAlternateUUIDLookUp(Config.getInstance().getAlternateUUIDLookup());
-		AdvancedCoreHook.getInstance().setAutoKillInvs(Config.getInstance().getAutoKillInvs());
-		AdvancedCoreHook.getInstance().setPrevPageTxt(Config.getInstance().getFormatPrevPage());
-		AdvancedCoreHook.getInstance().setNextPageTxt(Config.getInstance().getFormatNextPage());
-
-		AdvancedCoreHook.getInstance().setPurgeOldData(Config.getInstance().getPurgeOldData());
-		AdvancedCoreHook.getInstance().setPurgeMinimumDays(Config.getInstance().getPurgeMin());
-		AdvancedCoreHook.getInstance().setCheckNameMojang(Config.getInstance().getCheckNameMojang());
+	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");
+			}
+		}
 	}
 
 }

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

@@ -14,15 +14,17 @@ 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;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
-import com.Ben12345rocks.VotingPlugin.OtherRewards.OtherVoteReward;
+import com.Ben12345rocks.VotingPlugin.SpecialRewards.SpecialRewards;
+import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
 import com.Ben12345rocks.VotingPlugin.VoteReminding.VoteReminding;
 
@@ -30,7 +32,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 +206,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,13 +252,19 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return true;
 	}
 
-	public void clearTotals() {
-		setAllTimeTotal(0);
-		resetDailyTotalVotes();
-		resetMonthlyTotalVotes();
-		setWeeklyTotal(0);
+	public void clearOfflineRewards() {
+		setOfflineVotes(new ArrayList<String>());
+		setOfflineRewards(new ArrayList<String>());
+		setOfflineOtherRewards(new ArrayList<String>());
 	}
 
+	public void clearTotals() {
+		for (TopVoter top : TopVoter.values()) {
+			resetTotals(top);
+		}
+	}
+
+	@Deprecated
 	public int getAllTimeTotal() {
 		return getUserData().getInt("AllTimeTotal");
 	}
@@ -273,6 +281,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return getData().getInt("BestWeekVoteStreak");
 	}
 
+	@Deprecated
 	public int getDailyTotal() {
 		return getUserData().getInt("DailyTotal");
 	}
@@ -281,6 +290,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 +319,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");
@@ -349,12 +366,17 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return getData().getInt("MilestoneCount", getAllTimeTotal());
 	}
 
+	@Deprecated
 	public int getMonthTotal() {
 		return getData().getInt("MonthTotal");
 	}
 
-	public int getLastMonthTotal() {
-		return getData().getInt("LastMonthTotal");
+	public int getVoteShopIdentifierLimit(String identifier) {
+		return getData().getInt("VoteShopLimit" + identifier);
+	}
+
+	public void setVoteShopIdentifierLimit(String identifier, int value) {
+		getData().setInt("VoteShopLimit" + identifier, value);
 	}
 
 	public int getMonthVoteStreak() {
@@ -397,6 +419,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return getUserData().getInt("VotePartyVotes");
 	}
 
+	@Deprecated
 	public int getWeeklyTotal() {
 		return getUserData().getInt("WeeklyTotal");
 	}
@@ -405,25 +428,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);
 	}
 
@@ -431,18 +442,18 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		ArrayList<String> offlineRewards = getOfflineOtherRewards();
 		for (String str : offlineRewards) {
 			if (str.equalsIgnoreCase("FirstVote")) {
-				OtherVoteReward.getInstance().giveFirstVoteRewards(this, false);
+				SpecialRewards.getInstance().giveFirstVoteRewards(this, false);
 			} else if (str.equalsIgnoreCase("AllSites")) {
-				OtherVoteReward.getInstance().giveAllSitesRewards(this, false);
+				SpecialRewards.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)) {
 					int votesRequired = Integer.parseInt(st);
 					if (votesRequired != 0) {
 						if (Config.getInstance().getCumulativeRewardEnabled(votesRequired)) {
-							OtherVoteReward.getInstance().giveCumulativeVoteReward(this, false, votesRequired);
+							SpecialRewards.getInstance().giveCumulativeVoteReward(this, false, votesRequired);
 						}
 					}
 				}
@@ -452,37 +463,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 					int votesRequired = Integer.parseInt(st);
 					if (votesRequired > 0) {
 						if (Config.getInstance().getMilestoneRewardEnabled(votesRequired)) {
-							OtherVoteReward.getInstance().giveMilestoneVoteReward(this, true, votesRequired);
-						}
-					}
-				}
-			} 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);
+							SpecialRewards.getInstance().giveMilestoneVoteReward(this, true, votesRequired);
 						}
 					}
 				}
@@ -493,7 +474,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 					String st = args[2];
 
 					if (Config.getInstance().getVoteStreakRewardEnabled(type, st)) {
-						OtherVoteReward.getInstance().giveVoteStreakReward(this, false, type, "" + st, -1);
+						SpecialRewards.getInstance().giveVoteStreakReward(this, false, type, "" + st, -1);
 					}
 
 				}
@@ -507,14 +488,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);
 	}
 
@@ -606,7 +581,48 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 				&& broadcast) {
 			voteSite.broadcastVote(this);
 		}
-		voteSite.giveSiteReward(this, online);
+		voteSite.giveRewards(this, online);
+	}
+
+	public int getTotal(TopVoter top) {
+		switch (top) {
+		case AllTime:
+			return getUserData().getInt("AllTimeTotal");
+		case Daily:
+			return getUserData().getInt("DailyTotal");
+		case Monthly:
+			return getData().getInt("MonthTotal");
+		case Weekly:
+			return getUserData().getInt("WeeklyTotal");
+		}
+		return 0;
+	}
+
+	public void setTotal(TopVoter top, int value) {
+		switch (top) {
+		case AllTime:
+			getUserData().setInt("AllTimeTotal", value);
+			break;
+		case Daily:
+			getUserData().setInt("DailyTotal", value);
+			break;
+		case Monthly:
+			getData().setInt("MonthTotal", value);
+			break;
+		case Weekly:
+			getUserData().setInt("WeeklyTotal", value);
+			break;
+		default:
+			break;
+
+		}
+	}
+
+	public void resetTotals(TopVoter topVoter) {
+		if (topVoter.equals(TopVoter.Monthly)) {
+			setLastMonthTotal(getTotal(TopVoter.Monthly));
+		}
+		setTotal(topVoter, 0);
 	}
 
 	/**
@@ -624,19 +640,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return false;
 	}
 
-	public void resetDailyTotalVotes() {
-		setDailyTotal(0);
-	}
-
-	public void resetMonthlyTotalVotes() {
-		setLastMonthTotal(getMonthTotal());
-		setMonthTotal(0);
-	}
-
-	public void resetWeeklyTotalVotes() {
-		setWeeklyTotal(0);
-	}
-
 	/**
 	 * Send vote effects.
 	 *
@@ -645,9 +648,10 @@ 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));
 	}
 
+	@Deprecated
 	public void setAllTimeTotal(int allTimeTotal) {
 		getUserData().setInt("AllTimeTotal", allTimeTotal);
 	}
@@ -664,6 +668,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		getData().setInt("BestWeekVoteStreak", streak);
 	}
 
+	@Deprecated
 	public void setDailyTotal(int total) {
 		getUserData().setInt("DailyTotal", total);
 	}
@@ -675,6 +680,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 +711,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()) {
@@ -715,14 +728,11 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		getData().setInt("MilestoneCount", value);
 	}
 
+	@Deprecated
 	public void setMonthTotal(int total) {
 		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) {
@@ -770,6 +780,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		getUserData().setInt("VotePartyVotes", value);
 	}
 
+	@Deprecated
 	public void setWeeklyTotal(int total) {
 		getUserData().setInt("WeeklyTotal", total);
 	}
@@ -791,10 +802,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>());
-	}
-
 }

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

@@ -1,18 +1,25 @@
 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.ArrayUtils;
 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.Data.ServerData;
+import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 
-// TODO: Auto-generated Javadoc
 /**
  * The Class VoteSite.
  */
@@ -84,8 +91,21 @@ 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());
+			placeholders.put("servicesite", getServiceSite());
+			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);
 		}
 	}
 
@@ -173,17 +193,9 @@ public class VoteSite {
 	public boolean hasRewards() {
 		return RewardHandler.getInstance().hasRewards(configVoteSites.getData(), configVoteSites.getRewardsPath(key));
 	}
-
-	/**
-	 * Give site reward.
-	 *
-	 * @param user
-	 *            the user
-	 * @param online
-	 *            the online
-	 */
-	public void giveSiteReward(User user, boolean online) {
-		giveRewards(user, online);
+	
+	public boolean isVaidServiceSite() {
+		return ArrayUtils.getInstance().containsIgnoreCase(ServerData.getInstance().getServiceSites(), getServiceSite());
 	}
 
 	/**

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

@@ -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,8 @@ 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;
+import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -72,6 +75,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.
 	 */
@@ -236,13 +250,13 @@ public class SignHandler {
 
 			ArrayList<User> users = null;
 			if (data.equalsIgnoreCase("all")) {
-				users = plugin.convertSet(plugin.topVoterAllTime.keySet());
+				users = plugin.convertSet(plugin.getTopVoter(TopVoter.AllTime).keySet());
 			} else if (data.equalsIgnoreCase("monthly")) {
-				users = plugin.convertSet(plugin.topVoterMonthly.keySet());
+				users = plugin.convertSet(plugin.getTopVoter(TopVoter.Monthly).keySet());
 			} else if (data.equalsIgnoreCase("weekly")) {
-				users = plugin.convertSet(plugin.topVoterWeekly.keySet());
+				users = plugin.convertSet(plugin.getTopVoter(TopVoter.Weekly).keySet());
 			} else if (data.equalsIgnoreCase("daily")) {
-				users = plugin.convertSet(plugin.topVoterDaily.keySet());
+				users = plugin.convertSet(plugin.getTopVoter(TopVoter.Daily).keySet());
 			}
 
 			if (users != null && users.size() >= position) {
@@ -251,13 +265,13 @@ public class SignHandler {
 
 				votes = 0;
 				if (data.equalsIgnoreCase("all")) {
-					votes = plugin.topVoterAllTime.get(user);
+					votes = plugin.getTopVoter(TopVoter.AllTime).get(user);
 				} else if (data.equalsIgnoreCase("monthly")) {
-					votes = plugin.topVoterMonthly.get(user);
+					votes = plugin.getTopVoter(TopVoter.Monthly).get(user);
 				} else if (data.equalsIgnoreCase("weekly")) {
-					votes = plugin.topVoterWeekly.get(user);
+					votes = plugin.getTopVoter(TopVoter.Weekly).get(user);
 				} else if (data.equalsIgnoreCase("daily")) {
-					votes = plugin.topVoterDaily.get(user);
+					votes = plugin.getTopVoter(TopVoter.Daily).get(user);
 				}
 
 				for (int j = 0; j < lines.size(); j++) {
@@ -311,14 +325,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);
 		}
 	}
 }

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

@@ -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
 /**
@@ -87,6 +86,7 @@ public class Signs {
 	 * Update signs.
 	 */
 	public void updateSigns() {
+		int time = 0;
 		for (int i = plugin.signs.size() - 1; i >= 0; i--) {
 			if (!plugin.signs.get(i).isValid()) {
 				plugin.debug("Sign " + i + " invalid, removing from data.");
@@ -94,7 +94,8 @@ public class Signs {
 				plugin.signs.remove(i);
 			} else {
 				plugin.signs.get(i).updateLines();
-				plugin.signs.get(i).updateSign(i * 3);
+				plugin.signs.get(i).updateSign(time);
+				time += 5;
 			}
 		}
 

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/SpecialRewards/SpecialRewards.java

@@ -1,23 +1,26 @@
-package com.Ben12345rocks.VotingPlugin.OtherRewards;
+package com.Ben12345rocks.VotingPlugin.SpecialRewards;
 
 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;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
-import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteAllSitesEvent;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerSpecialRewardEvent;
+import com.Ben12345rocks.VotingPlugin.Events.SpecialRewardType;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
+import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 
 // TODO: Auto-generated Javadoc
 /**
  * The Class OtherVoteReward.
  */
-public class OtherVoteReward {
+public class SpecialRewards {
 
 	/** The config. */
 	static Config config = Config.getInstance();
@@ -26,7 +29,7 @@ public class OtherVoteReward {
 	static ConfigVoteSites configVoteSites = ConfigVoteSites.getInstance();
 
 	/** The instance. */
-	static OtherVoteReward instance = new OtherVoteReward();
+	static SpecialRewards instance = new SpecialRewards();
 
 	/** The plugin. */
 	static Main plugin = Main.plugin;
@@ -36,14 +39,14 @@ public class OtherVoteReward {
 	 *
 	 * @return single instance of OtherVoteReward
 	 */
-	public static OtherVoteReward getInstance() {
+	public static SpecialRewards getInstance() {
 		return instance;
 	}
 
 	/**
 	 * Instantiates a new other vote reward.
 	 */
-	private OtherVoteReward() {
+	private SpecialRewards() {
 	}
 
 	/**
@@ -52,8 +55,8 @@ public class OtherVoteReward {
 	 * @param plugin
 	 *            the plugin
 	 */
-	public OtherVoteReward(Main plugin) {
-		OtherVoteReward.plugin = plugin;
+	public SpecialRewards(Main plugin) {
+		SpecialRewards.plugin = plugin;
 	}
 
 	/**
@@ -90,11 +93,11 @@ public class OtherVoteReward {
 									Config.getInstance().getCumulativeRewardsPath(votesRequired))) {
 						int total = 0;
 						if (Config.getInstance().getCumulativeVotesInSameDay(votesRequired)) {
-							total = user.getDailyTotal();
+							total = user.getTotal(TopVoter.Daily);
 						} else if (Config.getInstance().getCumulativeVotesInSameWeek(votesRequired)) {
-							total = user.getWeeklyTotal();
+							total = user.getTotal(TopVoter.Weekly);
 						} else {
-							total = user.getAllTimeTotal();
+							total = user.getTotal(TopVoter.AllTime);
 						}
 
 						if ((total % votesRequired) == 0 && total != 0) {
@@ -226,14 +229,14 @@ public class OtherVoteReward {
 	 *            the online
 	 */
 	public void giveAllSitesRewards(User user, boolean online) {
-		PlayerVoteAllSitesEvent event = new PlayerVoteAllSitesEvent(user);
+		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user, SpecialRewardType.ALLSITE);
 		Bukkit.getPluginManager().callEvent(event);
 
 		if (event.isCancelled()) {
 			return;
 		}
 		RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-				Config.getInstance().getAllSitesRewardPath(), online);
+				Config.getInstance().getAllSitesRewardPath(), new RewardOptions().setOnline(online));
 	}
 
 	/**
@@ -247,6 +250,14 @@ public class OtherVoteReward {
 	 *            the cumulative
 	 */
 	public void giveCumulativeVoteReward(User user, boolean online, int cumulative) {
+		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user,
+				SpecialRewardType.CUMMULATIVE.setAmount(cumulative));
+		Bukkit.getPluginManager().callEvent(event);
+
+		if (event.isCancelled()) {
+			return;
+		}
+
 		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getCumulativeRewardsPath(cumulative))
 				.setOnline(online).withPlaceHolder("Cumulative", "" + cumulative).send(user);
 	}
@@ -260,8 +271,14 @@ public class OtherVoteReward {
 	 *            the online
 	 */
 	public void giveFirstVoteRewards(User user, boolean online) {
+		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user, SpecialRewardType.FIRSTVOTE);
+		Bukkit.getPluginManager().callEvent(event);
+
+		if (event.isCancelled()) {
+			return;
+		}
 		RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-				Config.getInstance().getFirstVoteRewardsPath(), online);
+				Config.getInstance().getFirstVoteRewardsPath(), new RewardOptions().setOnline(online));
 	}
 
 	/**
@@ -275,14 +292,27 @@ public class OtherVoteReward {
 	 *            the milestone
 	 */
 	public void giveMilestoneVoteReward(User user, boolean online, int milestone) {
+		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user,
+				SpecialRewardType.MILESTONE.setAmount(milestone));
+		Bukkit.getPluginManager().callEvent(event);
+
+		if (event.isCancelled()) {
+			return;
+		}
 		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getMilestoneRewardsPath(milestone))
 				.setOnline(online).withPlaceHolder("Milestone", "" + milestone).send(user);
 	}
 
 	public void giveVoteStreakReward(User user, boolean online, String type, String string, int votes) {
+		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user,
+				SpecialRewardType.VOTESTREAK.setType(type).setAmount(votes));
+		Bukkit.getPluginManager().callEvent(event);
+
+		if (event.isCancelled()) {
+			return;
+		}
 		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getVoteStreakRewardsPath(type, string))
 				.setOnline(online).withPlaceHolder("Type", type).withPlaceHolder("Streak", "" + votes).send(user);
 	}
 
-	
 }

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

@@ -0,0 +1,44 @@
+package com.Ben12345rocks.VotingPlugin.Test;
+
+import java.util.ArrayList;
+
+import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
+import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteEvent;
+import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+
+public class VoteTester {
+
+	private static VoteTester instance = new VoteTester();
+	private Main plugin = Main.plugin;
+
+	public static VoteTester getInstance() {
+		return instance;
+	}
+
+	public void testVotes(int amount, String name, String site) {
+		long time1 = System.currentTimeMillis();
+		ArrayList<Long> timesPerVote = new ArrayList<Long>();
+		for (int i = 0; i < amount; i++) {
+			long start1 = System.currentTimeMillis();
+			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(site), name,
+					plugin.getVoteSiteServiceSite(site), false);
+			plugin.getServer().getPluginManager().callEvent(voteEvent);
+			long start2 = System.currentTimeMillis();
+			timesPerVote.add(start2 - start1);
+		}
+		long time2 = System.currentTimeMillis();
+		long time = time2 - time1;
+		long timeTotal = 0;
+		for (Long t : timesPerVote) {
+			timeTotal += t.longValue();
+		}
+		long timePerVoteAvg = timeTotal / timesPerVote.size();
+		Main.plugin.getLogger()
+				.info("Time to process votes (" + amount + "): " + time + " ms, average per vote " + timePerVoteAvg
+						+ " ms. " + AdvancedCoreHook.getInstance().getStorageType() + ", "
+						+ UserManager.getInstance().getAllUUIDs().size() + " users. "
+						+ Main.plugin.getVoteSites().size() + " votesites");
+	}
+
+}

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

@@ -1,4 +1,4 @@
-package com.Ben12345rocks.VotingPlugin.Objects;
+package com.Ben12345rocks.VotingPlugin.TopVoter;
 
 import java.util.ArrayList;
 
@@ -51,19 +51,40 @@ 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;
+	}
 
+	public String getName() {
+		if (this.equals(TopVoter.Monthly)) {
+			return Config.getInstance().getFormatTopVoterMonthly();
+		} else if (this.equals(TopVoter.Weekly)) {
+			return Config.getInstance().getFormatTopVoterWeekly();
+		} else if (this.equals(TopVoter.Daily)) {
+			return Config.getInstance().getFormatTopVoterDaily();
+		} else {
+			return Config.getInstance().getFormatTopVoterAllTime();
+		}
 	}
 }

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

@@ -17,19 +17,19 @@ 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;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
-import com.Ben12345rocks.VotingPlugin.OtherRewards.OtherVoteReward;
+import com.Ben12345rocks.VotingPlugin.SpecialRewards.SpecialRewards;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 
 public class TopVoterHandler implements Listener {
@@ -66,67 +66,84 @@ public class TopVoterHandler implements Listener {
 
 	public String[] getTopVotersWeekly() {
 		ArrayList<String> msg = new ArrayList<String>();
-		ArrayList<User> users = plugin.convertSet(plugin.topVoterWeekly.keySet());
+		ArrayList<User> users = plugin.convertSet(plugin.getTopVoter(TopVoter.Weekly).keySet());
 		for (int i = 0; i < users.size(); i++) {
 			String line = Config.getInstance().getFormatCommandVoteTopLine().replace("%num%", "" + (i + 1))
 					.replace("%player%", users.get(i).getPlayerName())
-					.replace("%votes%", "" + plugin.topVoterWeekly.get(users.get(i)));
+					.replace("%votes%", "" + plugin.getTopVoter(TopVoter.Weekly).get(users.get(i)));
 			msg.add(line);
 		}
 		msg = ArrayUtils.getInstance().colorize(msg);
 		return ArrayUtils.getInstance().convert(msg);
 	}
 
+	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 onDateChanged(DateChangedEvent event) {
 		plugin.setUpdate(true);
 	}
 
-	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
-	public void onPreDateChanged(PreDateChangedEvent event) {
-		plugin.setUpdate(true);
-		plugin.update();
-	}
-
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onDayChange(DayChangeEvent event) {
-
 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getDailyTotal() == 0 && user.getDayVoteStreak() != 0) {
+			if (user.getTotal(TopVoter.Daily) == 0 && user.getDayVoteStreak() != 0) {
 				user.setDayVoteStreak(0);
 			} else {
 				user.addDayVoteStreak();
 			}
-			OtherVoteReward.getInstance().checkVoteStreak(user, "Day");
+			SpecialRewards.getInstance().checkVoteStreak(user, "Day");
 
-			if (user.getHighestDailyTotal() < user.getDailyTotal()) {
-				user.setHighestDailyTotal(user.getDailyTotal());
+			if (user.getHighestDailyTotal() < user.getTotal(TopVoter.Daily)) {
+				user.setHighestDailyTotal(user.getTotal(TopVoter.Daily));
 			}
 		}
 
 		if (Config.getInstance().getStoreTopVotersDaily()) {
 			plugin.debug("Storing TopVoters Daily");
-			storeDailyTopVoters();
+			storeTopVoters(TopVoter.Daily);
 		}
 
 		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()) {
+			for (User user : plugin.getTopVoter(TopVoter.Daily).keySet()) {
 				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-					if (user.getDailyTotal() != lastTotal) {
+					if (Config.getInstance().getTopVoterAwardsTies()) {
+						if (user.getTotal(TopVoter.Daily) != lastTotal) {
+							i++;
+						}
+					} else {
 						i++;
 					}
-					if (places.contains(Integer.toString(i))) {
-						user.giveDailyTopVoterAward(i);
+					if (places.containsKey(i)) {
+						user.giveDailyTopVoterAward(i, places.get(i));
 					}
 				}
-				lastTotal = user.getDailyTotal();
+				lastTotal = user.getTotal(TopVoter.Daily);
 			}
 		}
-		resetDailyTotals();
+		resetTotals(TopVoter.Daily);
 
 	}
 
@@ -134,41 +151,45 @@ public class TopVoterHandler implements Listener {
 	public void onMonthChange(MonthChangeEvent event) {
 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getMonthTotal() == 0 && user.getMonthVoteStreak() != 0) {
+			if (user.getTotal(TopVoter.Monthly) == 0 && user.getMonthVoteStreak() != 0) {
 				user.setMonthVoteStreak(0);
 			} else {
 				user.addMonthVoteStreak();
-				OtherVoteReward.getInstance().checkVoteStreak(user, "Month");
+				SpecialRewards.getInstance().checkVoteStreak(user, "Month");
 			}
 
-			if (user.getHighestMonthlyTotal() < user.getMonthTotal()) {
-				user.setHighestMonthlyTotal(user.getMonthTotal());
+			if (user.getHighestMonthlyTotal() < user.getTotal(TopVoter.Monthly)) {
+				user.setHighestMonthlyTotal(user.getTotal(TopVoter.Monthly));
 			}
 		}
 
 		if (Config.getInstance().getStoreTopVotersMonthly()) {
 			plugin.debug("Storing TopVoters Monthly");
-			storeMonthlyTopVoters();
+			storeTopVoters(TopVoter.Monthly);
 		}
 
 		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()) {
+			for (User user : plugin.getTopVoter(TopVoter.Monthly).keySet()) {
 
 				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-					if (user.getMonthTotal() != lastTotal) {
+					if (Config.getInstance().getTopVoterAwardsTies()) {
+						if (user.getTotal(TopVoter.Monthly) != lastTotal) {
+							i++;
+						}
+					} else {
 						i++;
 					}
-					if (places.contains(Integer.toString(i))) {
-						user.giveMonthlyTopVoterAward(i);
+					if (places.containsKey(i)) {
+						user.giveMonthlyTopVoterAward(i, places.get(i));
 					}
 				}
-				lastTotal = user.getMonthTotal();
+				lastTotal = user.getTotal(TopVoter.Monthly);
 			}
 		}
-		resetMonthlyTotals();
+		resetTotals(TopVoter.Monthly);
 
 		if (Config.getInstance().getResetMilestonesMonthly()) {
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
@@ -178,47 +199,56 @@ 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)
 	public void onWeekChange(WeekChangeEvent event) {
 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getWeeklyTotal() == 0 && user.getWeekVoteStreak() != 0) {
+			if (user.getTotal(TopVoter.Weekly) == 0 && user.getWeekVoteStreak() != 0) {
 				user.setWeekVoteStreak(0);
 			} else {
 				user.addWeekVoteStreak();
-				OtherVoteReward.getInstance().checkVoteStreak(user, "Week");
+				SpecialRewards.getInstance().checkVoteStreak(user, "Week");
 			}
 
-			if (user.getHighestWeeklyTotal() < user.getWeeklyTotal()) {
-				user.setHighestWeeklyTotal(user.getWeeklyTotal());
+			if (user.getHighestWeeklyTotal() < user.getTotal(TopVoter.Weekly)) {
+				user.setHighestWeeklyTotal(user.getTotal(TopVoter.Weekly));
 			}
 		}
 
 		if (Config.getInstance().getStoreTopVotersWeekly()) {
 			plugin.debug("Storing TopVoters Weekly");
-			storeWeeklyTopVoters();
+			storeTopVoters(TopVoter.Weekly);
 		}
 
 		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()) {
+			for (User user : plugin.getTopVoter(TopVoter.Weekly).keySet()) {
 				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-					if (user.getWeeklyTotal() != lastTotal) {
+					if (Config.getInstance().getTopVoterAwardsTies()) {
+						if (user.getTotal(TopVoter.Weekly) != lastTotal) {
+							i++;
+						}
+					} else {
 						i++;
 					}
-					if (places.contains(Integer.toString(i))) {
-						user.giveWeeklyTopVoterAward(i);
+					if (places.containsKey(i)) {
+						user.giveWeeklyTopVoterAward(i, places.get(i));
 					}
 				}
-				lastTotal = user.getWeeklyTotal();
+				lastTotal = user.getTotal(TopVoter.Weekly);
 			}
 		}
-		resetWeeklyTotals();
+		resetTotals(TopVoter.Weekly);
 
 	}
 
@@ -226,29 +256,11 @@ public class TopVoterHandler implements Listener {
 		plugin.getServer().getPluginManager().registerEvents(this, plugin);
 	}
 
-	public void resetDailyTotals() {
+	public void resetTotals(TopVoter topVoter) {
 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getDailyTotal() != 0) {
-				user.resetDailyTotalVotes();
-			}
-		}
-	}
-
-	public void resetMonthlyTotals() {
-		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getMonthTotal() != 0) {
-				user.resetMonthlyTotalVotes();
-			}
-		}
-	}
-
-	public void resetWeeklyTotals() {
-		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getWeeklyTotal() != 0) {
-				user.resetWeeklyTotalVotes();
+			if (user.getTotal(topVoter) != 0) {
+				user.resetTotals(topVoter);
 			}
 		}
 	}
@@ -280,56 +292,30 @@ public class TopVoterHandler implements Listener {
 		return sortedMap;
 	}
 
-	public void storeDailyTopVoters() {
-		LocalDateTime time = LocalDateTime.now().minusHours(5);
-		String month = time.getMonth().toString();
-		int year = time.getYear();
-		int day = time.getDayOfMonth();
-		YMLFileHandler file = new YMLFileHandler(new File(plugin.getDataFolder(),
-				"TopVoter" + File.separator + "Daily" + File.separator + year + "_" + month + "_" + day + ".yml"));
-		file.setup();
-		ArrayList<String> topVoters = new ArrayList<String>();
-		int count = 1;
-		for (Entry<User, Integer> entry : plugin.topVoterDaily.entrySet()) {
-			topVoters.add(count + ": " + entry.getKey().getPlayerName() + ": " + entry.getValue());
-			count++;
-		}
-		file.getData().set("Day", topVoters);
-		file.saveData();
-	}
-
-	public void storeMonthlyTopVoters() {
-		LocalDateTime time = LocalDateTime.now().minusHours(10);
-		String month = time.getMonth().toString();
-		int year = time.getYear();
-		YMLFileHandler file = new YMLFileHandler(new File(plugin.getDataFolder(),
-				"TopVoter" + File.separator + "Monthly" + File.separator + month + "_" + year + ".yml"));
-		file.setup();
-		ArrayList<String> topVoters = new ArrayList<String>();
-		int count = 1;
-		for (Entry<User, Integer> entry : plugin.topVoterMonthly.entrySet()) {
-			topVoters.add(count + ": " + entry.getKey().getPlayerName() + ": " + entry.getValue());
-			count++;
-		}
-		file.getData().set("Month", topVoters);
-		file.saveData();
-	}
-
-	public void storeWeeklyTopVoters() {
-		LocalDateTime time = LocalDateTime.now().minusHours(10);
+	public void storeTopVoters(TopVoter top) {
+		LocalDateTime time = LocalDateTime.now().minusDays(1);
 		String month = time.getMonth().toString();
 		int year = time.getYear();
 		int week = time.getDayOfYear();
-		YMLFileHandler file = new YMLFileHandler(new File(plugin.getDataFolder(),
-				"TopVoter" + File.separator + "Weekly" + File.separator + year + "_" + month + "_" + week + ".yml"));
+		int day = time.getDayOfMonth();
+		String fileName = "TopVoter" + File.separator + top.toString() + File.separator + year + "_" + month;
+
+		if (top.equals(TopVoter.Daily)) {
+			fileName += "_" + day;
+		} else if (top.equals(TopVoter.Weekly)) {
+			fileName += "_" + week;
+		}
+		fileName += ".yml";
+
+		YMLFileHandler file = new YMLFileHandler(new File(plugin.getDataFolder(), fileName));
 		file.setup();
 		ArrayList<String> topVoters = new ArrayList<String>();
 		int count = 1;
-		for (Entry<User, Integer> entry : plugin.topVoterWeekly.entrySet()) {
+		for (Entry<User, Integer> entry : plugin.getTopVoter(top).entrySet()) {
 			topVoters.add(count + ": " + entry.getKey().getPlayerName() + ": " + entry.getValue());
 			count++;
 		}
-		file.getData().set("Week", topVoters);
+		file.getData().set(top.toString(), topVoters);
 		file.saveData();
 	}
 
@@ -345,7 +331,7 @@ public class TopVoterHandler implements Listener {
 		ArrayList<String> msg = new ArrayList<String>();
 		ArrayList<String> topVoters = new ArrayList<String>();
 		int count = 1;
-		for (Entry<User, Integer> entry : plugin.topVoterAllTime.entrySet()) {
+		for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.AllTime).entrySet()) {
 			String line = Config.getInstance().getFormatCommandVoteTopLine();
 			line = line.replace("%num%", "" + count);
 			line = line.replace("%player%", entry.getKey().getPlayerName());
@@ -385,7 +371,7 @@ public class TopVoterHandler implements Listener {
 		ArrayList<String> msg = new ArrayList<String>();
 		ArrayList<String> topVoters = new ArrayList<String>();
 		int count = 1;
-		for (Entry<User, Integer> entry : plugin.topVoterDaily.entrySet()) {
+		for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.Daily).entrySet()) {
 			String line = Config.getInstance().getFormatCommandVoteTopLine();
 			line = line.replace("%num%", "" + count);
 			line = line.replace("%player%", entry.getKey().getPlayerName());
@@ -425,7 +411,7 @@ public class TopVoterHandler implements Listener {
 		ArrayList<String> msg = new ArrayList<String>();
 		ArrayList<String> topVoters = new ArrayList<String>();
 		int count = 1;
-		for (Entry<User, Integer> entry : plugin.topVoterMonthly.entrySet()) {
+		for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.Monthly).entrySet()) {
 			String line = Config.getInstance().getFormatCommandVoteTopLine();
 			line = line.replace("%num%", "" + count);
 			line = line.replace("%player%", entry.getKey().getPlayerName());
@@ -460,7 +446,8 @@ public class TopVoterHandler implements Listener {
 	 */
 	public String[] topVotersAllTime() {
 		ArrayList<String> msg = new ArrayList<String>();
-		List<Entry<User, Integer>> list = new LinkedList<Entry<User, Integer>>(plugin.topVoterAllTime.entrySet());
+		List<Entry<User, Integer>> list = new LinkedList<Entry<User, Integer>>(
+				plugin.getTopVoter(TopVoter.AllTime).entrySet());
 		int i = 0;
 		for (Entry<User, Integer> entry : list) {
 			String line = "%num%: %player%, %votes%";
@@ -488,7 +475,7 @@ public class TopVoterHandler implements Listener {
 
 	public String[] topVotersDaily() {
 		ArrayList<String> msg = new ArrayList<String>();
-		ArrayList<User> users = plugin.convertSet(plugin.topVoterDaily.keySet());
+		ArrayList<User> users = plugin.convertSet(plugin.getTopVoter(TopVoter.Daily).keySet());
 		for (int i = 0; i < users.size(); i++) {
 			String line = "%num%: %player%, %votes%";
 			line = line.replace("%num%", "" + (i + 1));
@@ -497,7 +484,7 @@ public class TopVoterHandler implements Listener {
 			} catch (Exception ex) {
 				AdvancedCoreHook.getInstance().debug(ex);
 			}
-			line = line.replace("%votes%", "" + plugin.topVoterMonthly.get(users.get(i)));
+			line = line.replace("%votes%", "" + plugin.getTopVoter(TopVoter.Monthly).get(users.get(i)));
 			msg.add(line);
 		}
 
@@ -512,7 +499,8 @@ public class TopVoterHandler implements Listener {
 	 */
 	public String[] topVotersMonthly() {
 		ArrayList<String> msg = new ArrayList<String>();
-		List<Entry<User, Integer>> list = new LinkedList<Entry<User, Integer>>(plugin.topVoterMonthly.entrySet());
+		List<Entry<User, Integer>> list = new LinkedList<Entry<User, Integer>>(
+				plugin.getTopVoter(TopVoter.Monthly).entrySet());
 		int i = 0;
 		for (Entry<User, Integer> entry : list) {
 			String line = "%num%: %player%, %votes%";
@@ -544,7 +532,7 @@ public class TopVoterHandler implements Listener {
 		ArrayList<String> msg = new ArrayList<String>();
 		ArrayList<String> topVoters = new ArrayList<String>();
 		int count = 1;
-		for (Entry<User, Integer> entry : plugin.topVoterWeekly.entrySet()) {
+		for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.Weekly).entrySet()) {
 			String line = Config.getInstance().getFormatCommandVoteTopLine();
 			line = line.replace("%num%", "" + count);
 			line = line.replace("%player%", entry.getKey().getPlayerName());
@@ -583,53 +571,19 @@ public class TopVoterHandler implements Listener {
 				}
 			}
 		}
-		plugin.topVoterAllTime.clear();
-		if (Config.getInstance().getLoadTopVoterAllTime()) {
-			for (User user : users) {
-				int total = user.getAllTimeTotal();
-				if (total > 0) {
-					plugin.topVoterAllTime.put(user, total);
-				}
-			}
-			plugin.topVoterAllTime = sortByValues(plugin.topVoterAllTime, false);
-			plugin.debug("All Time TopVoter loaded");
-		}
 
-		plugin.topVoterMonthly.clear();
-		if (Config.getInstance().getLoadTopVoterMonthly()) {
-			for (User user : users) {
-				int total = user.getMonthTotal();
-				if (total > 0) {
-					plugin.topVoterMonthly.put(user, total);
+		for (TopVoter top : TopVoter.values()) {
+			plugin.getTopVoter(top).clear();
+			if (Config.getInstance().getLoadTopVoter(top)) {
+				for (User user : users) {
+					int total = user.getTotal(top);
+					if (total > 0) {
+						plugin.getTopVoter(top).put(user, total);
+					}
 				}
+				plugin.getTopVoter().put(top, sortByValues(plugin.getTopVoter(top), false));
+				plugin.debug(top.toString() + " TopVoter loaded");
 			}
-			plugin.topVoterMonthly = sortByValues(plugin.topVoterMonthly, false);
-			plugin.debug("Monthly TopVoter loaded");
-		}
-
-		plugin.topVoterWeekly.clear();
-		if (Config.getInstance().getLoadTopVoterWeekly()) {
-			for (User user : users) {
-				int total = user.getWeeklyTotal();
-				if (total > 0) {
-					plugin.topVoterWeekly.put(user, total);
-				}
-			}
-
-			plugin.topVoterWeekly = sortByValues(plugin.topVoterWeekly, false);
-			plugin.debug("Weekly TopVoter loaded");
-		}
-
-		plugin.topVoterDaily.clear();
-		if (Config.getInstance().getLoadTopVoterDaily()) {
-			for (User user : users) {
-				int total = user.getDailyTotal();
-				if (total > 0) {
-					plugin.topVoterDaily.put(user, total);
-				}
-			}
-			plugin.topVoterDaily = sortByValues(plugin.topVoterDaily, false);
-			plugin.debug("Daily TopVoter loaded");
 		}
 
 		plugin.debug("Updated TopVoter");

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Updater/CheckUpdate.java

@@ -1,4 +1,4 @@
-package com.Ben12345rocks.VotingPlugin.Util.Updater;
+package com.Ben12345rocks.VotingPlugin.Updater;
 
 import java.util.Timer;
 import java.util.TimerTask;

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

@@ -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()));
-	}
 }

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

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

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

@@ -1,16 +1,17 @@
 package com.Ben12345rocks.VotingPlugin.Util.PlaceHolders;
 
+import java.util.ArrayList;
 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;
+import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
 
@@ -51,205 +52,348 @@ public class PlaceHolders {
 		PlaceHolders.plugin = plugin;
 	}
 
-	public synchronized String getPlaceHolder(Player p, String identifier) {
+	private ArrayList<PlaceHolder> placeholders = new ArrayList<PlaceHolder>();
+	private ArrayList<PlaceHolder> nonPlayerPlaceholders = new ArrayList<PlaceHolder>();
+
+	/**
+	 * @return the nonPlayerPlaceholders
+	 */
+	public ArrayList<PlaceHolder> getNonPlayerPlaceholders() {
+		return nonPlayerPlaceholders;
+	}
+
+	/**
+	 * @return the placeholders
+	 */
+	public ArrayList<PlaceHolder> getPlaceholders() {
+		return placeholders;
+	}
+
+	public void load() {
+		placeholders.clear();
+		nonPlayerPlaceholders.clear();
+
+		// older placeholders, might be removed in the future
+		placeholders.add(new PlaceHolder("total") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getTotal(TopVoter.Monthly));
+			}
+		});
+
+		placeholders.add(new PlaceHolder("alltimetotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getTotal(TopVoter.AllTime));
+			}
+		});
+
+		placeholders.add(new PlaceHolder("lastmonthtotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getLastMonthTotal());
+			}
+		});
+
+		// end of older placeholders
+
+		for (final TopVoter top : TopVoter.values()) {
+			placeholders.add(new PlaceHolder("total_" + top.toString()) {
+
+				@Override
+				public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+					return Integer.toString(user.getTotal(top));
+				}
+			});
+		}
+
+		placeholders.add(new PlaceHolder("BestDailyTotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getHighestDailyTotal());
+			}
+		});
+
+		placeholders.add(new PlaceHolder("BestWeeklyTotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getHighestWeeklyTotal());
+			}
+		});
+
+		placeholders.add(new PlaceHolder("BestMonthlyTotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getHighestMonthlyTotal());
+			}
+		});
+
+		placeholders.add(new PlaceHolder("DailyVoteStreak") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getDayVoteStreak());
+			}
+		});
+
+		placeholders.add(new PlaceHolder("WeeklyVoteStreak") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getWeekVoteStreak());
+			}
+		});
+
+		placeholders.add(new PlaceHolder("MonthVoteStreak") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getMonthVoteStreak());
+			}
+		});
+
+		placeholders.add(new PlaceHolder("BestDailyVoteStreak") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getBestDayVoteStreak());
+			}
+		});
+
+		placeholders.add(new PlaceHolder("BestWeeklyVoteStreak") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getBestWeekVoteStreak());
+			}
+		});
+
+		placeholders.add(new PlaceHolder("BestMonthVoteStreak") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getBestMonthVoteStreak());
+			}
+		});
+
+		placeholders.add(new PlaceHolder("Points") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getPoints());
+			}
+		});
+
+		placeholders.add(new PlaceHolder("CanVote") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Boolean.toString(user.canVoteAll());
+			}
+		});
+
+		for (final VoteSite voteSite : plugin.getVoteSites()) {
+			placeholders.add(new PlaceHolder("Next_" + voteSite.getKey()) {
+
+				@Override
+				public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+					return Commands.getInstance().voteCommandNextInfo(user, voteSite);
+				}
+			});
+		}
+
+		for (final VoteSite voteSite : plugin.getVoteSites()) {
+			placeholders.add(new PlaceHolder("Last_" + voteSite.getKey()) {
+
+				@Override
+				public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+					return Commands.getInstance().voteCommandLastDuration(user, voteSite);
+				}
+			});
+		}
+
+		placeholders.add(new PlaceHolder("Top_All_Position") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int num = 1;
+				for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.AllTime).entrySet()) {
+					if (entry.getKey().getUUID().equals(p.getUniqueId().toString())) {
+						return "" + num;
+					}
+					num++;
+				}
+				return "";
+			}
+		});
+
+		placeholders.add(new PlaceHolder("Top_All_") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int num = 1;
+				int number = Integer.parseInt(identifier.split("_")[2]);
+				for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.AllTime).entrySet()) {
+					if (num == number) {
+						return entry.getKey().getPlayerName();
+					}
+					num++;
+				}
+				return "";
+			}
+		}.useStartsWith());
+
+		placeholders.add(new PlaceHolder("Top_Month_Position") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int num = 1;
+				for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.Monthly).entrySet()) {
+					if (entry.getKey().getUUID().equals(p.getUniqueId().toString())) {
+						return "" + num;
+					}
+					num++;
+				}
+				return "";
+			}
+		});
+
+		placeholders.add(new PlaceHolder("Top_Month_") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int num = 1;
+				int number = Integer.parseInt(identifier.split("_")[2]);
+				for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.Monthly).entrySet()) {
+					if (num == number) {
+						return entry.getKey().getPlayerName();
+					}
+					num++;
+				}
+				return "";
+			}
+		}.useStartsWith());
+
+		placeholders.add(new PlaceHolder("Top_Week_Position") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int num = 1;
+				for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.Weekly).entrySet()) {
+					if (entry.getKey().getUUID().equals(p.getUniqueId().toString())) {
+						return "" + num;
+					}
+					num++;
+				}
+				return "";
+			}
+		});
+
+		placeholders.add(new PlaceHolder("Top_Week_") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int num = 1;
+				int number = Integer.parseInt(identifier.split("_")[2]);
+				for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.Weekly).entrySet()) {
+					if (num == number) {
+						return entry.getKey().getPlayerName();
+					}
+					num++;
+				}
+				return "";
+			}
+		}.useStartsWith());
+
+		placeholders.add(new PlaceHolder("Top_Daily_Position") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int num = 1;
+				for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.Daily).entrySet()) {
+					if (entry.getKey().getUUID().equals(p.getUniqueId().toString())) {
+						return "" + num;
+					}
+					num++;
+				}
+				return "";
+			}
+		});
+
+		placeholders.add(new PlaceHolder("Top_Daily_") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int num = 1;
+				int number = Integer.parseInt(identifier.split("_")[3]);
+				for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.Daily).entrySet()) {
+					if (num == number) {
+						return entry.getKey().getPlayerName();
+					}
+					num++;
+				}
+				return "";
+			}
+		}.useStartsWith());
+
+		
+		
+		
+		// non players
+		
+		nonPlayerPlaceholders.add(new PlaceHolder("VotePartyVotesCurrent") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(VoteParty.getInstance().getTotalVotes());
+			}
+		});
+
+		nonPlayerPlaceholders.add(new PlaceHolder("VotePartyVotesNeeded") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(VoteParty.getInstance().getNeededVotes());
+			}
+		});
+
+		nonPlayerPlaceholders.add(new PlaceHolder("VotePartyVotesRequired") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(VoteParty.getInstance().getVotesRequired());
+			}
+		});
+	}
+
+	public String getPlaceHolder(OfflinePlayer p, String identifier) {
 		identifier = StringUtils.getInstance().replaceJavascript(p, identifier);
 
+		for (PlaceHolder placeholder : nonPlayerPlaceholders) {
+			if (placeholder.matches(identifier)) {
+				return placeholder.placeholderRequest(p, null, identifier);
+			}
+		}
+
 		User user = UserManager.getInstance().getVotingPluginUser(p);
 
-		// %VotingPlugin_total% - Total votes of all vote sites
-		if (identifier.equalsIgnoreCase("total")) {
-			return Integer.toString(user.getMonthTotal());
-		} else if (identifier.equalsIgnoreCase("alltimetotal")) {
-			return Integer.toString(user.getAllTimeTotal());
-		} else if (identifier.equalsIgnoreCase("lastmonthtotal")) {
-			return Integer.toString(user.getLastMonthTotal());
-		}
-
-		String[] args = identifier.split("_");
-		if (args.length > 1 && args[0].equalsIgnoreCase("total")) {
-			if (args[1].equalsIgnoreCase("all")) {
-				return Integer.toString(user.getAllTimeTotal());
-			} else if (args[1].equalsIgnoreCase("month")) {
-				return Integer.toString(user.getMonthTotal());
-			} else if (args[1].equalsIgnoreCase("week")) {
-				return Integer.toString(user.getWeeklyTotal());
-			} else if (args[1].equalsIgnoreCase("daily")) {
-				return Integer.toString(user.getDailyTotal());
-			}
-		}
-
-		if (identifier.equalsIgnoreCase("BestDailyTotal")) {
-			return "" + user.getHighestDailyTotal();
-		} else if (identifier.equalsIgnoreCase("BestWeeklyTotal")) {
-			return "" + user.getHighestWeeklyTotal();
-		} else if (identifier.equalsIgnoreCase("BestMonthlyTotal")) {
-			return "" + user.getHighestMonthlyTotal();
-		} else if (identifier.equalsIgnoreCase("DailyVoteStreak")) {
-			return "" + user.getDayVoteStreak();
-		} else if (identifier.equalsIgnoreCase("WeeklyVoteStreak")) {
-			return "" + user.getWeekVoteStreak();
-		} else if (identifier.equalsIgnoreCase("MonthlyVoteStreak")) {
-			return "" + user.getMonthVoteStreak();
-		} else if (identifier.equalsIgnoreCase("BestDailyVoteStreak")) {
-			return "" + user.getBestDayVoteStreak();
-		} else if (identifier.equalsIgnoreCase("BestWeeklyVoteStreak")) {
-			return "" + user.getBestWeekVoteStreak();
-		} else if (identifier.equalsIgnoreCase("BestMonthlyVoteStreak")) {
-			return "" + user.getBestMonthVoteStreak();
-		}
-
-		// %VotingPlugin_points% - Total votes of all vote sites
-		if (identifier.equalsIgnoreCase("points")) {
-			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")) {
-			return Boolean.toString(user.canVoteAll());
-		}
-
-		// %VotingPlugin_next_SITENAME% - Next time you can vote for voteSite
-		if (startsWithIgnoreCase(identifier, "next")) {
-			if (args.length > 1) {
-				String str = args[1];
-				for (int i = 2; i < args.length; i++) {
-					str += "_" + args[i];
-				}
-				return playerNextVote(user, str);
-			} else {
-				return "";
-			}
-		}
-
-		// %VotingPlugin_last_SITENAME% - Next time you can vote for voteSite
-		if (startsWithIgnoreCase(identifier, "last")) {
-			if (args.length > 1) {
-				String str = args[1];
-				for (int i = 2; i < args.length; i++) {
-					str += "_" + args[i];
-				}
-				return playerLastVote(user, str);
-			}
-		}
-		if (args.length > 2) {
-			if (args[0].equalsIgnoreCase("top")) {
-				if (StringUtils.getInstance().isInt(args[2])) {
-					int number = Integer.parseInt(args[2]);
-					int num = 1;
-					if (args[1].equalsIgnoreCase("all")) {
-						for (Entry<User, Integer> entry : plugin.topVoterAllTime.entrySet()) {
-							if (num == number) {
-								if (args.length > 3 && args[3].equalsIgnoreCase("votes")) {
-									return "" + entry.getValue().intValue();
-								} else {
-									return entry.getKey().getPlayerName();
-								}
-							}
-							num++;
-						}
-					} else if (args[1].equalsIgnoreCase("month")) {
-						for (Entry<User, Integer> entry : plugin.topVoterMonthly.entrySet()) {
-							if (num == number) {
-								if (args.length > 3 && args[3].equalsIgnoreCase("votes")) {
-									return "" + entry.getValue().intValue();
-								} else {
-									return entry.getKey().getPlayerName();
-								}
-							}
-							num++;
-						}
-					} else if (args[1].equalsIgnoreCase("week")) {
-						for (Entry<User, Integer> entry : plugin.topVoterWeekly.entrySet()) {
-							if (num == number) {
-								if (args.length > 3 && args[3].equalsIgnoreCase("votes")) {
-									return "" + entry.getValue().intValue();
-								} else {
-									return entry.getKey().getPlayerName();
-								}
-							}
-							num++;
-						}
-					} else if (args[1].equalsIgnoreCase("daily")) {
-						for (Entry<User, Integer> entry : plugin.topVoterDaily.entrySet()) {
-							if (num == number) {
-								if (args.length > 3 && args[3].equalsIgnoreCase("votes")) {
-									return "" + entry.getValue().intValue();
-								} else {
-									return entry.getKey().getPlayerName();
-								}
-							}
-							num++;
-						}
-					}
-				} else if (args[2].equalsIgnoreCase("Position")) {
-					int num = 1;
-					if (args[1].equalsIgnoreCase("all")) {
-						for (Entry<User, Integer> entry : plugin.topVoterAllTime.entrySet()) {
-							if (entry.getKey().getUUID().equals(p.getUniqueId().toString())) {
-								return "" + num;
-							}
-							num++;
-						}
-					} else if (args[1].equalsIgnoreCase("month")) {
-						for (Entry<User, Integer> entry : plugin.topVoterMonthly.entrySet()) {
-							if (entry.getKey().getUUID().equals(p.getUniqueId().toString())) {
-								return "" + num;
-							}
-							num++;
-						}
-					} else if (args[1].equalsIgnoreCase("week")) {
-						for (Entry<User, Integer> entry : plugin.topVoterWeekly.entrySet()) {
-							if (entry.getKey().getUUID().equals(p.getUniqueId().toString())) {
-								return "" + num;
-							}
-							num++;
-						}
-					} else if (args[1].equalsIgnoreCase("daily")) {
-						for (Entry<User, Integer> entry : plugin.topVoterDaily.entrySet()) {
-							if (entry.getKey().getUUID().equals(p.getUniqueId().toString())) {
-								return "" + num;
-							}
-							num++;
-						}
-					}
-				}
+		for (PlaceHolder placeholder : placeholders) {
+			if (placeholder.matches(identifier)) {
+				return placeholder.placeholderRequest(p, user, identifier);
 			}
 		}
 
 		return 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);
+	public String getPlaceHolder(Player p, String identifier) {
+		identifier = StringUtils.getInstance().replaceJavascript(p, identifier);
+		return getPlaceHolder((OfflinePlayer) p, identifier);
 	}
-
-	public String playerNextVote(User user, String siteName) {
-		if (!ConfigVoteSites.getInstance().getVoteSitesNames().contains(siteName)) {
-			return "";
-		}
-
-		VoteSite voteSite = plugin.getVoteSite(siteName);
-		return Commands.getInstance().voteCommandNextInfo(user, voteSite);
-	}
-
-	public boolean startsWithIgnoreCase(String str1, String str2) {
-		return str1.toLowerCase().startsWith(str2.toLowerCase());
-	}
-
 }

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

@@ -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,16 @@ public class VoteParty implements Listener {
 		return new ArrayList<String>();
 	}
 
-	/**
-	 * Give reward.
-	 *
-	 * @param user
-	 *            the user
-	 */
-	public void giveReward(User user) {
+	public int getVotesRequired() {
+		int required = Config.getInstance().getVotePartyVotesRequired();
+		int extra = ServerData.getInstance().getVotePartyExtraRequired();
+		if (extra > 0) {
+			return required + extra;
+		}
+		return required;
+	}
+
+	public void giveReward(User user, boolean online) {
 		/*
 		 * if (PlayerUtils.getInstance().isPlayerOnline(user.getPlayerName())) { if
 		 * (user.getVotePartyVotes() >= Config.getInstance().getUserVotesRequired()) {
@@ -173,7 +182,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 +204,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 +235,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) {

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

@@ -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;

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

@@ -1,78 +0,0 @@
-package com.Ben12345rocks.VotingPlugin.VoteShop;
-
-import org.bukkit.entity.Player;
-
-import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
-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.VotingPlugin.Main;
-import com.Ben12345rocks.VotingPlugin.Commands.GUI.PlayerGUIs;
-import com.Ben12345rocks.VotingPlugin.Config.Config;
-import com.Ben12345rocks.VotingPlugin.Objects.User;
-import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
-
-public class VoteShop {
-	static VoteShop instance = new VoteShop();
-
-	static Main plugin = Main.plugin;
-
-	public static VoteShop getInstance() {
-		return instance;
-	}
-
-	private VoteShop() {
-	}
-
-	public VoteShop(Main plugin) {
-		VoteShop.plugin = plugin;
-	}
-
-	public void voteShop(Player player) {
-		BInventory inv = new BInventory(Config.getInstance().getVoteShopName());
-
-		for (String identifier : Config.getInstance().getIdentifiers()) {
-
-			ItemBuilder builder = new ItemBuilder(Config.getInstance().getIdentifierSection(identifier));
-
-			inv.addButton(Config.getInstance().getIdentifierSlot(identifier), new BInventoryButton(builder) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					Player player = event.getWhoClicked();
-
-					User user = UserManager.getInstance().getVotingPluginUser(player);
-					int points = Config.getInstance().getIdentifierCost(identifier);
-					String identifier = Config.getInstance().getIdentifierFromSlot(event.getSlot());
-					if (identifier != null) {
-						if (user.removePoints(points)) {
-							RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-									Config.getInstance().getIdentifierRewardsPath(identifier));
-							user.sendMessage(Config.getInstance().getFormatShopPurchaseMsg()
-									.replace("%Identifier%", identifier).replace("%Points%", "" + points));
-						} else {
-							user.sendMessage(Config.getInstance().getFormatShopFailedMsg()
-									.replace("%Identifier%", identifier).replace("%Points%", "" + points));
-						}
-					}
-				}
-
-			});
-		}
-
-		if (Config.getInstance().getVoteShopBackButton()) {
-			inv.addButton(new BInventoryButton(PlayerGUIs.getInstance().getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					PlayerGUIs.getInstance().openVoteGUI(event.getPlayer(),
-							UserManager.getInstance().getVotingPluginUser(player));
-				}
-			});
-
-		}
-
-		inv.openInventory(player);
-	}
-}