Update version number

VotingPlugin/Resources/Config.yml

@@ -112,6 +112,9 @@ Commands:
   # 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
@@ -169,7 +172,11 @@ Format:
         Title: '&3&l%player% Last Vote Times:'
         # Lines for each vote site
         # %time% = time, using timeformat below
-        Line: '&3%SiteName%: &6%time%'
+        # %timesince% = time since vote
+        Line: '&3%SiteName%: &6%timeSince% ago'
+        # Spelling of TimeType can be changed under Format.Commands.TimeFormats
+        TimeFormat: '%amount% %TimeType%'
+        NeverVoted: 'Never voted'
         
       # Format for /vote total
       Total:
@@ -246,6 +253,16 @@ Format:
   # See https://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html
   TimeFormat: 'EEE, d MMM yyyy HH:mm'
   
+  TimeFomrats:
+    Day: 'Day'
+    Days: 'Days'
+    Hour: 'Hour'
+    Hours: 'Hours'
+    Minute: 'Minute'
+    Minutes: 'Minutes'
+    Second: 'Second'
+    Seconds: 'Seconds'
+  
   # Format for signs
   # SiteName may be all, depending on sign
   # %position% = position of player, set by sign
@@ -623,9 +640,12 @@ VoteParty:
   # Broadcast when vote party reached
   Broadcast: '&cReached the vote party amount!'
   # List of commands to execute, these only execute once.
+  # %player% does not work here
   Commands: []
   # Reward files to give
-  Rewards: []
+  Rewards: 
+    Commands:
+    - say %player%
   
 # Reset milestons at end of the month
 ResetMilestonesMonthly: false

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/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.14</version>
+	<version>5.15</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -165,7 +166,7 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.13-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,13 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandle;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandler;
 import com.Ben12345rocks.AdvancedCore.Commands.GUI.UserGUI;
-import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
-import com.Ben12345rocks.AdvancedCore.Objects.TabCompleteHandle;
-import com.Ben12345rocks.AdvancedCore.Objects.TabCompleteHandler;
-import com.Ben12345rocks.AdvancedCore.Objects.UUID;
-import com.Ben12345rocks.AdvancedCore.Objects.UserStorage;
 import com.Ben12345rocks.AdvancedCore.Report.Report;
+import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
+import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory.ClickEvent;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventoryButton;
@@ -1078,25 +1078,27 @@ public class CommandLoader {
 			}
 		});
 
-		plugin.voteCommand.add(new CommandHandler(new String[] { "Reward" },
-				"VotingPlugin.Commands.Vote.Reward|" + playerPerm, "Open VoteReward GUI", false) {
+		if (!Config.getInstance().commandsDisableVoteRewardGUIs) {
+			plugin.voteCommand.add(new CommandHandler(new String[] { "Reward" },
+					"VotingPlugin.Commands.Vote.Reward|" + playerPerm, "Open VoteReward GUI", false) {
 
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				PlayerGUIs.getInstance().voteReward((Player) sender, "");
+				@Override
+				public void execute(CommandSender sender, String[] args) {
+					PlayerGUIs.getInstance().voteReward((Player) sender, "");
 
-			}
-		});
+				}
+			});
 
-		plugin.voteCommand.add(new CommandHandler(new String[] { "Reward", "(SiteName)" },
-				"VotingPlugin.Commands.Vote.Reward|" + playerPerm, "Open VoteURL GUI for VoteSIte", false) {
+			plugin.voteCommand.add(new CommandHandler(new String[] { "Reward", "(SiteName)" },
+					"VotingPlugin.Commands.Vote.Reward|" + playerPerm, "Open VoteURL GUI for VoteSIte", false) {
 
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				PlayerGUIs.getInstance().voteReward((Player) sender, args[1]);
+				@Override
+				public void execute(CommandSender sender, String[] args) {
+					PlayerGUIs.getInstance().voteReward((Player) sender, args[1]);
 
-			}
-		});
+				}
+			});
+		}
 
 		plugin.voteCommand.add(new CommandHandler(new String[] { "Last", "(player)" },
 				"VotingPlugin.Commands.Vote.Last.Other|" + modPerm, "See other players last votes") {

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;
@@ -590,6 +590,7 @@ public class Commands {
 	 *            the vote site
 	 * @return the string
 	 */
+	@Deprecated
 	public String voteCommandLastDate(User user, VoteSite voteSite) {
 		long time = user.getTime(voteSite);
 		if (time > 0) {
@@ -600,11 +601,91 @@ public class Commands {
 		return "";
 	}
 
+	public String voteCommandLastDuration(User user, VoteSite voteSite) {
+		long time = user.getTime(voteSite);
+		if (time > 0) {
+			LocalDateTime now = LocalDateTime.now();
+			LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault());
+
+			Duration dur = Duration.between(lastVote, now);
+
+			long diffSecond = dur.getSeconds();
+			int diffDays = (int) (diffSecond / 60 / 60 / 24);
+			int diffHours = (int) (diffSecond / 60 / 60 - diffDays * 24);
+			int diffMinutes = (int) (diffSecond / 60 - diffHours * 60 - diffDays * 24 * 60);
+			int diffSeconds = (int) (diffSecond - diffMinutes * 60 - diffHours * 60 * 60 - diffDays * 24 * 60 * 60);
+
+			String info = "";
+			if (diffDays == 1) {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().formatCommandsVoteLastTimeFormat, "TimeType",
+								Config.getInstance().formatTimeFormatsDay), "amount", "" + diffDays);
+				info += " ";
+			} else if (diffDays > 1) {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().formatCommandsVoteLastTimeFormat, "TimeType",
+								Config.getInstance().formatTimeFormatsDays), "amount", "" + diffDays);
+				info += " ";
+			}
+
+			if (diffHours == 1) {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().formatCommandsVoteLastTimeFormat, "TimeType",
+								Config.getInstance().formatTimeFormatsHour), "amount", "" + diffHours);
+				info += " ";
+			} else if (diffHours > 1) {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().formatCommandsVoteLastTimeFormat, "TimeType",
+								Config.getInstance().formatTimeFormatsHours), "amount", "" + diffHours);
+				info += " ";
+			}
+
+			if (diffMinutes == 1) {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().formatCommandsVoteLastTimeFormat, "TimeType",
+								Config.getInstance().formatTimeFormatsMinute), "amount", "" + diffMinutes);
+				info += " ";
+			} else if (diffMinutes > 1) {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().formatCommandsVoteLastTimeFormat, "TimeType",
+								Config.getInstance().formatTimeFormatsMinutes), "amount", "" + diffMinutes);
+				info += " ";
+			}
+
+			if (diffSeconds == 1) {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().formatCommandsVoteLastTimeFormat, "TimeType",
+								Config.getInstance().formatTimeFormatsSecond), "amount", "" + diffSeconds);
+			} else {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().formatCommandsVoteLastTimeFormat, "TimeType",
+								Config.getInstance().formatTimeFormatsSeconds), "amount", "" + diffSeconds);
+			}
+
+			return info;
+		}
+		return Config.getInstance().formatCommandsVoteLastNeverVoted;
+	}
+
 	public String voteCommandLastLine(User user, VoteSite voteSite) {
 		String timeString = voteCommandLastDate(user, voteSite);
+		String timeSince = voteCommandLastDuration(user, voteSite);
 
-		return config.getFormatCommandsVoteLastLine().replace("%Month% %Day%, %Year% %Hour%:%Minute% %ampm%", "%time%")
-				.replace("%time%", timeString).replace("%SiteName%", voteSite.getDisplayName());
+		HashMap<String, String> placeholders = new HashMap<String, String>();
+		placeholders.put("time", timeString);
+		placeholders.put("SiteName", voteSite.getDisplayName());
+		placeholders.put("timesince", timeSince);
+
+		return StringUtils.getInstance().replacePlaceHolder(Config.getInstance().formatCommandsVoteLastLine,
+				placeholders);
 	}
 
 	/**

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;
 

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

@@ -82,7 +82,7 @@ public class AdminGUI {
 
 		lore = new ArrayList<String>();
 		buttons.add(new BInventoryButton("&cReload Plugin", ArrayUtils.getInstance().convert(lore),
-				new ItemStack(Material.STONE, 1, (short) 3)) {
+				new ItemStack(Material.STONE, 1)) {
 
 			@Override
 			public void onClick(ClickEvent event) {

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

@@ -23,9 +23,9 @@ import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Commands.Commands;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
-import com.Ben12345rocks.VotingPlugin.Objects.TopVoter;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
+import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 import com.Ben12345rocks.VotingPlugin.VoteShop.VoteShop;
@@ -331,7 +331,7 @@ public class PlayerGUIs {
 			for (VoteSite voteSite : plugin.voteToday.get(user).keySet()) {
 				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(Config.getInstance().getFormatTimeFormat());
 				String timeString = plugin.voteToday.get(user).get(voteSite).format(formatter);
-				String msg = "&6" + user.getPlayerName() + " : " + voteSite.getDisplayName() + " : " + timeString;
+				String msg = "&6" + voteSite.getDisplayName() + " : " + timeString;
 				inv.addButton(inv.getNextSlot(), new BInventoryButton(user.getPlayerName(), new String[] { msg },
 						MiscUtils.getInstance().setSkullOwner(user.getOfflinePlayer())) {
 

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;

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

@@ -34,17 +34,6 @@ public class Config extends YMLFile {
 		return instance;
 	}
 
-	public void loadValues() {
-		new AnnotationHandler().load(getData(), this);
-	}
-
-	/**
-	 * Instantiates a new config.
-	 */
-	public Config() {
-		super(new File(Main.plugin.getDataFolder(), "Config.yml"));
-	}
-
 	@ConfigDataString(path = "Format.Commands.Vote.ToggleBroadcasts.Enabled", defaultValue = "&cYou will now see vote broadcasts")
 	public String formatCommandsVoteToggleBroadcastEnabled;
 
@@ -54,6 +43,49 @@ public class Config extends YMLFile {
 	@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.
+	 */
+	public Config() {
+		super(new File(Main.plugin.getDataFolder(), "Config.yml"));
+	}
+
 	/**
 	 * Allow un joined.
 	 *
@@ -376,15 +408,6 @@ public class Config extends YMLFile {
 
 	}
 
-	/**
-	 * Gets the commands vote last line.
-	 *
-	 * @return the commands vote last line
-	 */
-	public String getFormatCommandsVoteLastLine() {
-		return getData().getString("Format.Commands.Vote.Last.Line", "&3%SiteName%: &6%time%");
-	}
-
 	/**
 	 * Gets the commands vote last title.
 	 *
@@ -1401,6 +1424,10 @@ public class Config extends YMLFile {
 		}
 	}
 
+	public void loadValues() {
+		new AnnotationHandler().load(getData(), this);
+	}
+
 	@Override
 	public void onFileCreation() {
 		plugin.saveResource("Config.yml", true);

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

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

@@ -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/Events/PlayerInteract.java

@@ -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/Events/PlayerJoinEvent.java

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

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

@@ -8,7 +8,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
-import com.Ben12345rocks.AdvancedCore.Objects.UserStorage;
+import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
 import com.Ben12345rocks.VotingPlugin.Main;

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

@@ -25,10 +25,11 @@ import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
-import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
-import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
-import com.Ben12345rocks.AdvancedCore.Objects.UUID;
-import com.Ben12345rocks.AdvancedCore.Objects.UserStorage;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
+import com.Ben12345rocks.AdvancedCore.NMSManager.NMSManager;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
+import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
 import com.Ben12345rocks.AdvancedCore.Util.Javascript.JavascriptPlaceholderRequest;
 import com.Ben12345rocks.AdvancedCore.Util.Logger.Logger;
 import com.Ben12345rocks.AdvancedCore.Util.Metrics.BStatsMetrics;
@@ -51,9 +52,9 @@ import com.Ben12345rocks.VotingPlugin.Events.PlayerJoinEvent;
 import com.Ben12345rocks.VotingPlugin.Events.SignChange;
 import com.Ben12345rocks.VotingPlugin.Events.VotiferEvent;
 import com.Ben12345rocks.VotingPlugin.Events.VotingPluginUpdateEvent;
-import com.Ben12345rocks.VotingPlugin.Objects.SignHandler;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
+import com.Ben12345rocks.VotingPlugin.Signs.SignHandler;
 import com.Ben12345rocks.VotingPlugin.Signs.Signs;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
@@ -139,13 +140,13 @@ public class Main extends JavaPlugin {
 		while (uuids.size() > 0) {
 			HashMap<User, HashMap<String, String>> data = new HashMap<User, HashMap<String, String>>();
 			AdvancedCoreHook.getInstance().setStorageType(from);
-			//AdvancedCoreHook.getInstance().setStorageType(to);
-			
+			// 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()) {
@@ -721,9 +722,6 @@ public class Main extends JavaPlugin {
 		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();
@@ -837,6 +835,10 @@ public class Main extends JavaPlugin {
 			}, 30l);
 		}
 
+		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");
+		}
 	}
 
 	/**
@@ -898,6 +900,7 @@ public class Main extends JavaPlugin {
 	public void reload() {
 		setUpdate(true);
 		config.reloadData();
+		config.loadValues();
 		configVoteSites.reloadData();
 		updateAdvancedCoreHook();
 		plugin.loadVoteSites();

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

@@ -14,9 +14,10 @@ import java.util.stream.Collectors;
 import org.bukkit.entity.Player;
 
 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
-import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
-import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
-import com.Ben12345rocks.AdvancedCore.Objects.UUID;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
+import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
@@ -30,7 +31,7 @@ import com.Ben12345rocks.VotingPlugin.VoteReminding.VoteReminding;
 /**
  * The Class User.
  */
-public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
+public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 
 	/** The plugin. */
 	static Main plugin = Main.plugin;
@@ -176,14 +177,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return true;
 	}
 
-	public boolean getDisableBroadcast() {
-		return getUserData().getBoolean("DisableBroadcast");
-	}
-
-	public void setDisableBroadcast(boolean value) {
-		getUserData().setBoolean("DisableBroadcast", value);
-	}
-
 	/**
 	 * Can vote site.
 	 *
@@ -295,6 +288,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return getData().getInt("DayVoteStreak");
 	}
 
+	public boolean getDisableBroadcast() {
+		return getUserData().getBoolean("DisableBroadcast");
+	}
+
 	public HashMap<String, Boolean> getHasGottenMilestone() {
 		HashMap<String, Boolean> hasGottenMilestone = new HashMap<String, Boolean>();
 		ArrayList<String> milestoneList = getUserData().getStringList("GottenMileStones");
@@ -437,7 +434,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 			} else if (str.equalsIgnoreCase("AllSites")) {
 				OtherVoteReward.getInstance().giveAllSitesRewards(this, false);
 			} else if (str.equalsIgnoreCase("VoteParty")) {
-				VoteParty.getInstance().giveReward(this);
+				VoteParty.getInstance().giveReward(this, false);
 			} else if (str.contains("Cumulative")) {
 				String st = str.substring("Cumulative".length());
 				if (StringUtils.getInstance().isInt(st)) {
@@ -611,7 +608,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 */
 	public void sendVoteEffects(boolean online) {
 		RewardHandler.getInstance().giveReward(this, Config.getInstance().getData(),
-				Config.getInstance().getAnySiteRewardsPath(), online);
+				Config.getInstance().getAnySiteRewardsPath(), new RewardOptions().setOnline(online));
 	}
 
 	public void setAllTimeTotal(int allTimeTotal) {
@@ -641,6 +638,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		}
 	}
 
+	public void setDisableBroadcast(boolean value) {
+		getUserData().setBoolean("DisableBroadcast", value);
+	}
+
 	public void setHasGotteMilestone(int votesRequired, boolean b) {
 		HashMap<String, Boolean> hasGottenMilestone = getHasGottenMilestone();
 		hasGottenMilestone.put("" + votesRequired, b);

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

@@ -8,8 +8,8 @@ import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 
-import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
-import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Item.ItemBuilder;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;

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

@@ -4,8 +4,9 @@ import java.util.Set;
 
 import org.bukkit.Bukkit;
 
-import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
-import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
@@ -233,7 +234,7 @@ public class OtherVoteReward {
 			return;
 		}
 		RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-				Config.getInstance().getAllSitesRewardPath(), online);
+				Config.getInstance().getAllSitesRewardPath(), new RewardOptions().setOnline(online));
 	}
 
 	/**
@@ -261,7 +262,7 @@ public class OtherVoteReward {
 	 */
 	public void giveFirstVoteRewards(User user, boolean online) {
 		RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-				Config.getInstance().getFirstVoteRewardsPath(), online);
+				Config.getInstance().getFirstVoteRewardsPath(), new RewardOptions().setOnline(online));
 	}
 
 	/**

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

@@ -1,4 +1,4 @@
-package com.Ben12345rocks.VotingPlugin.Objects;
+package com.Ben12345rocks.VotingPlugin.Signs;
 
 import java.util.ArrayList;
 
@@ -16,6 +16,7 @@ import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
+import com.Ben12345rocks.VotingPlugin.Objects.User;
 
 // TODO: Auto-generated Javadoc
 /**

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

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;
 
@@ -64,11 +64,11 @@ public enum TopVoter {
 		if (Config.getInstance().getLoadTopVoterDaily()) {
 			list.add(TopVoter.Daily);
 		}
-		for (int i = list.size()-1; i >= 0; i--) {
+		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;
+					prev = list.size() - 1;
 				}
 				return TopVoter.values()[prev];
 			}

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

@@ -17,12 +17,12 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
-import com.Ben12345rocks.AdvancedCore.Listeners.DateChangedEvent;
-import com.Ben12345rocks.AdvancedCore.Listeners.DayChangeEvent;
-import com.Ben12345rocks.AdvancedCore.Listeners.MonthChangeEvent;
-import com.Ben12345rocks.AdvancedCore.Listeners.PreDateChangedEvent;
-import com.Ben12345rocks.AdvancedCore.Listeners.WeekChangeEvent;
-import com.Ben12345rocks.AdvancedCore.Objects.UUID;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.DateChangedEvent;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.DayChangeEvent;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.MonthChangeEvent;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.PreDateChangedEvent;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.WeekChangeEvent;
+import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.AdvancedCore.YML.YMLFileHandler;

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;
 

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

@@ -241,7 +241,7 @@ public class PlaceHolders {
 		}
 
 		VoteSite voteSite = plugin.getVoteSite(siteName);
-		return Commands.getInstance().voteCommandLastDate(user, voteSite);
+		return Commands.getInstance().voteCommandLastDuration(user, voteSite);
 	}
 
 	public String playerNextVote(User user, String siteName) {

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;
@@ -114,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>();
@@ -178,7 +179,7 @@ public class VoteParty implements Listener {
 	 * @param user
 	 *            the user
 	 */
-	public void giveReward(User user) {
+	public void giveReward(User user, boolean online) {
 		/*
 		 * if (PlayerUtils.getInstance().isPlayerOnline(user.getPlayerName())) { if
 		 * (user.getVotePartyVotes() >= Config.getInstance().getUserVotesRequired()) {
@@ -187,7 +188,7 @@ public class VoteParty implements Listener {
 		 * user.addOfflineOtherReward("VoteParty"); }
 		 */
 		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getVotePartyRewardsPath())
-				.setOnline(user.isOnline())
+				.setOnline(online)
 				.withPlaceHolder("VotesRequired", "" + Config.getInstance().getVotePartyVotesRequired()).send(user);
 	}
 
@@ -209,12 +210,12 @@ public class VoteParty implements Listener {
 		if (Config.getInstance().getVotePartyGiveAllPlayers()) {
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-				giveReward(user);
+				giveReward(user, true);
 			}
 		} else {
 			for (String uuid : getVotedUsers()) {
 				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-				giveReward(user);
+				giveReward(user, true);
 			}
 		}
 		reset();

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

@@ -2,7 +2,8 @@ package com.Ben12345rocks.VotingPlugin.VoteShop;
 
 import org.bukkit.entity.Player;
 
-import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory.ClickEvent;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventoryButton;
@@ -62,7 +63,7 @@ public class VoteShop {
 						if (identifier != null) {
 							if (user.removePoints(points)) {
 								RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-										Config.getInstance().getIdentifierRewardsPath(identifier));
+										Config.getInstance().getIdentifierRewardsPath(identifier), new RewardOptions());
 								user.sendMessage(Config.getInstance().getFormatShopPurchaseMsg()
 										.replace("%Identifier%", identifier).replace("%Points%", "" + points));
 							} else {