Update version number

.github/stale.yml

@@ -5,6 +5,7 @@ daysUntilClose: 5
 # Issues with these labels will never be considered stale
 exemptLabels:
   - Priority
+  - nonstale
 # Label to use when marking an issue as stale
 staleLabel: stale
 # Comment to post when marking an issue as stale. Set to `false` to disable

VotingPlugin/Resources/Config.yml

@@ -246,6 +246,9 @@ Format:
         - '&3Highest Month Streak: &3&l%BestMonthlyStreak%'
         
       Today:
+        Title:
+        - '&cToday's Votes %page%/%maxpage%'
+        - '&cPlayerName : VoteSite : Time'
         Line: '&6%player% : %VoteSite% : %Time%'
         
       # PlaceHolders:
@@ -376,7 +379,14 @@ StoreTopVoters:
 # ------------------------------------------------
 
 # If true vanished players are treated as if they are offline
-TreatVanishAsOffline: true
+TreatVanishAsOffline: false
+
+# If true, cooldown check is disabled
+DisableCoolDownCheck: false
+
+# Delays login event, delays vote reminding and more
+# In ticks
+DelayLoginEvent: 0
 
 # If false, votestreaks will be disabled
 UseVoteStreaks: true

VotingPlugin/Resources/SpecialRewards.yml

@@ -137,6 +137,7 @@ VoteStreak:
     Month: 50
     
 # Reward given when vote cooldown ended
+# Using this is a little memory intensive
 VoteCoolDownEndedReward: []
 
 # ONLY USE THIS FOR TITLES/SOUNDS AND OTHER EFFECTS
@@ -145,14 +146,14 @@ VoteCoolDownEndedReward: []
 # 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: []
+AnySiteRewards: {}
 
 # Rewards to run when player logs in
-LoginRewards: []
+LoginRewards: {}
 
 # Rewards to run when player logs off
 # Will queue until player logs in unless forceoffline is enabled
-LogoutRewards: []
+LogoutRewards: {}
 
 EnableMonthlyAwards: true
 

VotingPlugin/Resources/VoteSites.yml

@@ -120,4 +120,4 @@ VoteSites:
 # Reward for any site
 # Similar to AnySiteReward
 # This requires the site to be configured in order to get the reward.
-EverySiteReward: []
+EverySiteReward: {}

VotingPlugin/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>6.1.5</version>
+	<version>6.2</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -101,6 +101,7 @@
 				<version>2.4.3</version>
 				<configuration>
 					<shadedArtifactAttached>false</shadedArtifactAttached>
+					<minimizeJar>true</minimizeJar>
 					<relocations>
 						<!-- Lets relocate the shaded API so we dont cause any conflicts with 
 							other plugins -->
@@ -243,11 +244,16 @@
 			<id>bungeecord-repo</id>
 			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
 		</repository>
+		<repository>
+			<id>velocity</id>
+			<url>https://nexus.velocitypowered.com/repository/maven-public/</url>
+		</repository>
 		<repository>
 			<id>bintray-repo</id>
-			<url>https://dl.bintray.com/nuvotifier/maven/</url>
+			<url>https://dl.bintray.com/ichbinjoe/public/</url>
 		</repository>
 	</repositories>
+
 	<dependencies>
 		<!--<dependency> <groupId>com.github.Ben12345rocks</groupId> <artifactId>AdvancedCore</artifactId> 
 			<version>3.0-SNAPSHOT</version> </dependency> -->
@@ -259,13 +265,6 @@
 			<version>1.16.5-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.vexsoftware</groupId>
-			<artifactId>votifier</artifactId>
-			<version>1.9</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/Jars/Votifier.jar</systemPath>
-		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
@@ -281,7 +280,7 @@
 		<dependency>
 			<groupId>com.vexsoftware</groupId>
 			<artifactId>nuvotifier-universal</artifactId>
-			<version>2.3.4</version>
+			<version>2.6.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

VotingPlugin/src/com/bencodez/votingplugin/BungeeHandler.java

@@ -67,7 +67,7 @@ public class BungeeHandler {
 						String uuid = args.get(1);
 						String service = args.get(2);
 						long time = Long.parseLong(args.get(3));
-						plugin.debug("pluginmessaging vote received from " + player + " on " + service);
+						plugin.debug("pluginmessaging vote received from " + player + "/" + uuid + " on " + service);
 						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
 								player);
 
@@ -79,7 +79,7 @@ public class BungeeHandler {
 
 						user.clearCache();
 
-						user.bungeeVotePluginMessaging(service, time, text, !setTotals);
+						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline);
 
 						if (!plugin.getBungeeSettings().isBungeeBroadcast()) {
 							if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
@@ -116,14 +116,17 @@ public class BungeeHandler {
 						String service = args.get(2);
 						long time = Long.parseLong(args.get(3));
 						BungeeMessageData text = new BungeeMessageData(args.get(6));
-						plugin.debug("pluginmessaging voteonline received from " + player + " on " + service);
+						plugin.debug(
+								"pluginmessaging voteonline received from " + player + "/" + uuid + " on " + service);
 						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
 								player);
 						user.clearCache();
 
 						boolean setTotals = Boolean.valueOf(args.get(7));
 
-						user.bungeeVotePluginMessaging(service, time, text, !setTotals);
+						boolean wasOnline = Boolean.valueOf(args.get(4));
+
+						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline);
 
 						if (!plugin.getBungeeSettings().isBungeeBroadcast()) {
 							if (Boolean.valueOf(args.get(4)) || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {

VotingPlugin/src/com/bencodez/votingplugin/VotingPluginMain.java

@@ -40,7 +40,9 @@ import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.javascript.JavascriptPlaceholderRequest;
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
+import com.bencodez.advancedcore.api.rewards.DirectlyDefinedReward;
 import com.bencodez.advancedcore.api.rewards.Reward;
+import com.bencodez.advancedcore.api.rewards.RewardEditData;
 import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardPlaceholderHandle;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInject;
@@ -84,7 +86,6 @@ import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 import com.bencodez.votingplugin.voteparty.VoteParty;
 import com.bencodez.votingplugin.votereminding.VoteReminding;
-import com.vexsoftware.votifier.Votifier;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -223,18 +224,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		}
 	}
 
-	private boolean checkVotifierLoaded() {
-		try {
-			Class.forName("com.vexsoftware.votifier.Votifier");
-			if (Votifier.getInstance().getVoteReceiver() == null) {
-				return false;
-			}
-		} catch (ClassNotFoundException e) {
-			debug("Using NuVotiifer?");
-		}
-		return true;
-	}
-
 	private void checkYMLError() {
 		if (configFile.isFailedToRead() || configVoteSites.isFailedToRead() || specialRewardsConfig.isFailedToRead()
 				|| bungeeSettings.isFailedToRead() || gui.isFailedToRead()) {
@@ -495,17 +484,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					}
 				}, 1000, 1000 * 60 * configFile.getDelayBetweenUpdates());
 
-				getTimer().schedule(new TimerTask() {
-
-					@Override
-					public void run() {
-						if (plugin != null) {
-							coolDownCheck.checkAll();
-						} else {
-							cancel();
-						}
-					}
-				}, 1000 * 60 * 10, 1000 * 60 * 5);
+				coolDownCheck.load();
 
 				getTimer().schedule(new TimerTask() {
 
@@ -588,6 +567,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		registerCommands();
 		checkVotifier();
 		registerEvents();
+		loadDirectlyDefined();
 		checkUpdate = new CheckUpdate(this);
 		checkUpdate.startUp();
 		voteReminding = new VoteReminding(this);
@@ -676,8 +656,10 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
 			getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
 			getMysql().alterColumnType("OfflineRewards", "MEDIUMTEXT");
+			if (getOptions().isPerServerRewards()) {
+				getMysql().alterColumnType("OfflineRewards" + getOptions().getServer(), "MEDIUMTEXT");
+			}
 		}
-
 		// Add rewards
 		RewardHandler.getInstance().addInjectedReward(new RewardInjectInt("Points", 0) {
 
@@ -692,10 +674,10 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 					@Override
 					public void setValue(Player player, Number value) {
-						Reward reward = (Reward) getInv().getData("Reward");
-						reward.getConfig().set("Points", value.intValue());
+						RewardEditData reward = (RewardEditData) getInv().getData("Reward");
+						reward.setValue("Points", value.intValue());
 					}
-				})).validator(new RewardInjectValidator() {
+				}.addLore("Give player voting points"))).validator(new RewardInjectValidator() {
 
 					@Override
 					public void onValidate(Reward reward, RewardInject inject, ConfigurationSection data) {
@@ -774,16 +756,269 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 				}
 			}, 30l);
 		}
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+	}
+
+	public void loadDirectlyDefined() {
+		RewardHandler.getInstance().getDirectlyDefinedRewards().clear();
+		// AllSites reward
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("AllSites") {
 
 			@Override
-			public void run() {
-				if (!checkVotifierLoaded()) {
-					plugin.getLogger().warning("Detected votifier not loaded properly, check startup for details");
-				}
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
 			}
 		});
 
+		// FirstVote
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("FirstVote") {
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+		});
+
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteReminding.Rewards") {
+
+			@Override
+			public void setData(String path, Object value) {
+				getConfigFile().setValue(path, value);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getConfigFile().getData();
+			}
+		});
+
+		// vote cooldown ended
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteCoolDownEndedReward") {
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+		});
+
+		// any site rewards
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("AnySiteRewards") {
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+		});
+
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("EverySiteReward") {
+
+			@Override
+			public void setData(String path, Object value) {
+				getConfigVoteSites().setValue(path, value);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getConfigVoteSites().getData();
+			}
+		});
+
+		// login rewards
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("LoginRewards") {
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+		});
+
+		// logout rewards
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("LogoutRewards") {
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+		});
+
+		// VoteParty
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteParty.Rewards") {
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+		});
+
+		// Cumulative rewards
+		for (String num : getSpecialRewardsConfig().getCumulativeVotes()) {
+			addDirectlyDefinedRewards(new DirectlyDefinedReward("Cumulative." + num + ".Rewards") {
+
+				@Override
+				public void setData(String path, Object value) {
+					getSpecialRewardsConfig().setValue(path, value);
+				}
+
+				@Override
+				public ConfigurationSection getFileData() {
+					return getSpecialRewardsConfig().getData();
+				}
+			});
+		}
+
+		// Milestones rewards
+		for (String num : getSpecialRewardsConfig().getMilestoneVotes()) {
+			addDirectlyDefinedRewards(new DirectlyDefinedReward("MileStones." + num + ".Rewards") {
+
+				@Override
+				public void setData(String path, Object value) {
+					getSpecialRewardsConfig().setValue(path, value);
+				}
+
+				@Override
+				public ConfigurationSection getFileData() {
+					return getSpecialRewardsConfig().getData();
+				}
+			});
+		}
+
+		// VoteSites
+		for (VoteSite site : plugin.getVoteSites()) {
+			addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteSites." + site.getKey() + ".Rewards") {
+
+				@Override
+				public void setData(String path, Object value) {
+					getConfigVoteSites().setValue(path, value);
+				}
+
+				@Override
+				public ConfigurationSection getFileData() {
+					return getConfigVoteSites().getData();
+				}
+			});
+		}
+
+		// vote streaks
+		String[] types = new String[] { "Day", "Week", "Month" };
+		for (String type : types) {
+			for (String str : plugin.getSpecialRewardsConfig().getVoteStreakVotes(type)) {
+				addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteStreak." + type + "." + str + ".Rewards") {
+
+					@Override
+					public void setData(String path, Object value) {
+						getSpecialRewardsConfig().setValue(path, value);
+					}
+
+					@Override
+					public ConfigurationSection getFileData() {
+						return getSpecialRewardsConfig().getData();
+					}
+				});
+			}
+		}
+
+		for (String path : plugin.getSpecialRewardsConfig().getMonthlyPossibleRewardPlaces()) {
+			addDirectlyDefinedRewards(
+					new DirectlyDefinedReward(plugin.getSpecialRewardsConfig().getMonthlyAwardRewardsPath(path)) {
+
+						@Override
+						public void setData(String path, Object value) {
+							getSpecialRewardsConfig().setValue(path, value);
+						}
+
+						@Override
+						public ConfigurationSection getFileData() {
+							return getSpecialRewardsConfig().getData();
+						}
+					});
+		}
+
+		for (String path : plugin.getSpecialRewardsConfig().getWeeklyPossibleRewardPlaces()) {
+			addDirectlyDefinedRewards(
+					new DirectlyDefinedReward(plugin.getSpecialRewardsConfig().getWeeklyAwardRewardsPath(path)) {
+
+						@Override
+						public void setData(String path, Object value) {
+							getSpecialRewardsConfig().setValue(path, value);
+						}
+
+						@Override
+						public ConfigurationSection getFileData() {
+							return getSpecialRewardsConfig().getData();
+						}
+					});
+		}
+
+		for (String path : plugin.getSpecialRewardsConfig().getDailyPossibleRewardPlaces()) {
+			addDirectlyDefinedRewards(
+					new DirectlyDefinedReward(plugin.getSpecialRewardsConfig().getDailyAwardRewardsPath(path)) {
+
+						@Override
+						public void setData(String path, Object value) {
+							getSpecialRewardsConfig().setValue(path, value);
+						}
+
+						@Override
+						public ConfigurationSection getFileData() {
+							return getSpecialRewardsConfig().getData();
+						}
+					});
+		}
+
+		for (String identifier : plugin.getGui().getChestShopIdentifiers()) {
+			addDirectlyDefinedRewards(new DirectlyDefinedReward("CHEST.Shop." + identifier + ".Rewards") {
+
+				@Override
+				public void setData(String path, Object value) {
+					getGui().setValue(path, value);
+				}
+
+				@Override
+				public ConfigurationSection getFileData() {
+					return getGui().getData();
+				}
+			});
+		}
+
+	}
+
+	private void addDirectlyDefinedRewards(DirectlyDefinedReward directlyDefinedReward) {
+		RewardHandler.getInstance().addDirectlyDefined(directlyDefinedReward);
 	}
 
 	/*
@@ -925,10 +1160,11 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		updateAdvancedCoreHook();
 		plugin.loadVoteSites();
+		loadDirectlyDefined();
 		reloadAdvancedCore(userStorage);
 		getOptions().setServer(bungeeSettings.getServer());
 		placeholders.load();
-		coolDownCheck.checkAll();
+
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 			@Override

VotingPlugin/src/com/bencodez/votingplugin/bungee/VotingPluginBungee.java

@@ -233,12 +233,21 @@ public class VotingPluginBungee extends Plugin {
 		}
 	}
 
+	private boolean votifierEnabled = true;
+
 	@Override
 	public void onEnable() {
 		try {
-			getProxy().getPluginManager().registerListener(this, new VoteEventBungee(this));
-		} catch (Exception e) {
-			getLogger().warning("Votifier event failed to enable");
+			Class.forName("com.vexsoftware.votifier.bungee.events.VotifierEvent");
+		} catch (ClassNotFoundException e) {
+			votifierEnabled = false;
+			getLogger().warning("Votifier event not found, not loading votifier event");
+		}
+		if (votifierEnabled) {
+			try {
+				getProxy().getPluginManager().registerListener(this, new VoteEventBungee(this));
+			} catch (Exception e) {
+			}
 		}
 		config = new Config(this);
 		config.load();

VotingPlugin/src/com/bencodez/votingplugin/commands/CommandLoader.java

@@ -45,7 +45,10 @@ import com.bencodez.votingplugin.commands.gui.admin.AdminVoteHelp;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVotePerms;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVotePlaceholders;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVotePlaceholdersPlayer;
-import com.bencodez.votingplugin.commands.gui.admin.AdminVoteVoteShop;
+import com.bencodez.votingplugin.commands.gui.admin.AdminVoteVoteParty;
+import com.bencodez.votingplugin.commands.gui.admin.cumulative.AdminVoteCumulative;
+import com.bencodez.votingplugin.commands.gui.admin.milestones.AdminVoteMilestones;
+import com.bencodez.votingplugin.commands.gui.admin.voteshop.AdminVoteVoteShop;
 import com.bencodez.votingplugin.commands.gui.player.VoteBest;
 import com.bencodez.votingplugin.commands.gui.player.VoteGUI;
 import com.bencodez.votingplugin.commands.gui.player.VoteHelp;
@@ -105,7 +108,7 @@ public class CommandLoader {
 		ItemBuilder item;
 		if (sec != null) {
 			item = new ItemBuilder(sec);
-				a = sec.getBoolean("OpenVoteURL", false);
+			a = sec.getBoolean("OpenVoteURL", false);
 		} else {
 			item = new ItemBuilder(Material.BARRIER, 1).setName("&8Back to VoteGUI");
 		}
@@ -425,14 +428,40 @@ public class CommandLoader {
 			}
 		});
 
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "EditVoteShop" },
-				"VotingPlugin.Commands.AdminVote.EditVoteShop", "Edit VoteShop", false) {
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Edit", "VoteShop" },
+				"VotingPlugin.Commands.AdminVote.Edit.VoteShop", "Edit VoteShop", false) {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				new AdminVoteVoteShop(plugin, sender).open(GUIMethod.CHEST);
 			}
 		});
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Edit", "MileStones" },
+				"VotingPlugin.Commands.AdminVote.Edit.MileStones", "Edit milestones rewards", false) {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				new AdminVoteMilestones(plugin, sender).open(GUIMethod.CHEST);
+			}
+		});
+		
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Edit", "Cumulative" },
+				"VotingPlugin.Commands.AdminVote.Edit.Cumulative", "Edit cumulative rewards", false) {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				new AdminVoteCumulative(plugin, sender).open(GUIMethod.CHEST);
+			}
+		});
+		
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Edit", "VoteParty" },
+				"VotingPlugin.Commands.AdminVote.Edit.VoteParty", "Edit voteparty", false) {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				new AdminVoteVoteParty(plugin, sender).open(GUIMethod.CHEST);
+			}
+		});
 
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Perms" },
 				"VotingPlugin.Commands.AdminVote.Perms|" + adminPerm, "List permissions") {

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/AdminGUI.java

@@ -21,12 +21,17 @@ import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueSt
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.PlayerUtils;
+import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.valuerequest.InputMethod;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
 import com.bencodez.advancedcore.api.valuerequest.listeners.StringListener;
+import com.bencodez.advancedcore.command.gui.RewardEditGUI;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.commands.gui.admin.AdminVoteVoteShop;
+import com.bencodez.votingplugin.commands.gui.admin.AdminVoteVoteParty;
+import com.bencodez.votingplugin.commands.gui.admin.cumulative.AdminVoteCumulative;
+import com.bencodez.votingplugin.commands.gui.admin.milestones.AdminVoteMilestones;
+import com.bencodez.votingplugin.commands.gui.admin.voteshop.AdminVoteVoteShop;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
 import com.bencodez.votingplugin.objects.VoteSite;
 
@@ -68,7 +73,7 @@ public class AdminGUI {
 			}
 		});
 
-		buttons.add(new BInventoryButton(new ItemBuilder(Material.DIAMOND, 1).setName("&cEdit VoteShop")) {
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.CHEST, 1).setName("&cEdit VoteShop")) {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
@@ -76,7 +81,66 @@ public class AdminGUI {
 			}
 		});
 
-		buttons.add(new BInventoryButton("&cReload Plugin", new String[] {}, new ItemStack(Material.STONE, 1)) {
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.DIAMOND_BLOCK, 1).setName("&cEdit Milestones")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteMilestones(plugin, clickEvent.getPlayer()).open(GUIMethod.CHEST);
+			}
+		});
+
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.COBBLESTONE, 1).setName("&cEdit Cumulative")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteCumulative(plugin, clickEvent.getPlayer()).open(GUIMethod.CHEST);
+			}
+		});
+
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.STONE, 1).setName("&cEdit VoteParty")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteVoteParty(plugin, clickEvent.getPlayer()).open(GUIMethod.CHEST);
+			}
+		});
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.STONE, 1).setName("&cEdit FirstVote reward")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+						RewardHandler.getInstance().getDirectlyDefined("FirstVote"));
+			}
+		});
+
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.STONE, 1).setName("&cEdit AllSites reward")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+						RewardHandler.getInstance().getDirectlyDefined("AllSites"));
+			}
+		});
+		
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.STONE, 1).setName("&cEdit AnySiteRewards")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+						RewardHandler.getInstance().getDirectlyDefined("AnySiteRewards"));
+			}
+		});
+		
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.STONE, 1).setName("&cEdit EverySiteReward")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+						RewardHandler.getInstance().getDirectlyDefined("EverySiteReward"));
+			}
+		});
+
+		buttons.add(new BInventoryButton("&cReload Plugin", new String[] {}, new ItemStack(Material.BUCKET, 1)) {
 
 			@Override
 			public void onClick(ClickEvent event) {
@@ -108,6 +172,7 @@ public class AdminGUI {
 			lore.add("ServiceSite: " + voteSite.getServiceSite());
 			lore.add("VoteURL: " + voteSite.getVoteURL());
 			lore.add("VoteDelay: " + voteSite.getVoteDelay());
+			lore.add("VoteDelayMin: " + voteSite.getVoteDelayMin());
 
 			inv.addButton(count, new BInventoryButton(voteSite.getKey(), ArrayUtils.getInstance().convert(lore),
 					new ItemStack(Material.STONE)) {
@@ -211,6 +276,17 @@ public class AdminGUI {
 				plugin.reload();
 			}
 		}));
+		
+		inv.addButton(new EditGUIButton(new EditGUIValueNumber("VoteDelayMin", voteSite.getVoteDelay()) {
+
+			@Override
+			public void setValue(Player player, Number num) {
+				VoteSite voteSite = (VoteSite) getInv().getMeta(player, "VoteSite");
+				String siteName = voteSite.getKey();
+				plugin.getConfigVoteSites().setVoteDelay(siteName, num.intValue());
+				plugin.reload();
+			}
+		}));
 
 		inv.addButton(new EditGUIButton(new EditGUIValueBoolean("Enabled", voteSite.isEnabled()) {
 
@@ -257,6 +333,15 @@ public class AdminGUI {
 							plugin.reload();
 						}
 					}));
+		} else {
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.DISPENSER, 1).setName("&cRewards")) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(), RewardHandler.getInstance()
+							.getDirectlyDefined("VoteSites." + voteSite.getKey() + ".Rewards"));
+				}
+			});
 		}
 
 		inv.openInventory(player);

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/AdminVoteConfirmation.java

@@ -0,0 +1,72 @@
+package com.bencodez.votingplugin.commands.gui.admin;
+
+import java.util.ArrayList;
+
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.gui.GUIHandler;
+import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.votingplugin.VotingPluginMain;
+
+public abstract class AdminVoteConfirmation extends GUIHandler {
+
+	@SuppressWarnings("unused")
+	private VotingPluginMain plugin;
+	private String title;
+
+	public AdminVoteConfirmation(VotingPluginMain plugin, CommandSender player, String title) {
+		super(player);
+		this.plugin = plugin;
+		this.title = title;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender sender) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+
+	}
+
+	public abstract void onConfirm(Player p);
+
+	public abstract void onDeny(Player p);
+
+	@Override
+	public void onChest(Player player) {
+		BInventory inv = new BInventory(title);
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.EMERALD_BLOCK).setName("&aConfirm")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				onConfirm(clickEvent.getPlayer());
+			}
+		});
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.REDSTONE_BLOCK).setName("&aCancel")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				onDeny(clickEvent.getPlayer());
+			}
+		});
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/AdminVoteVoteParty.java

@@ -0,0 +1,226 @@
+package com.bencodez.votingplugin.commands.gui.admin;
+
+import java.util.ArrayList;
+
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.gui.GUIHandler;
+import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.inventory.editgui.EditGUI;
+import com.bencodez.advancedcore.api.inventory.editgui.EditGUIButton;
+import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueBoolean;
+import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueList;
+import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueNumber;
+import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueString;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.advancedcore.api.rewards.RewardHandler;
+import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
+import com.bencodez.advancedcore.api.valuerequest.listeners.NumberListener;
+import com.bencodez.advancedcore.command.gui.RewardEditGUI;
+import com.bencodez.votingplugin.VotingPluginMain;
+
+public class AdminVoteVoteParty extends GUIHandler {
+
+	private VotingPluginMain plugin;
+
+	public AdminVoteVoteParty(VotingPluginMain plugin, CommandSender player) {
+		super(player);
+		this.plugin = plugin;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender sender) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+
+	}
+
+	private void setPathData(String path, Object value) {
+		plugin.getSpecialRewardsConfig().getData().set("VoteParty." + path, value);
+		plugin.getSpecialRewardsConfig().saveData();
+		plugin.reload();
+	}
+
+	@Override
+	public void onChest(Player player) {
+		EditGUI inv = new EditGUI("Edit VoteParty");
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteParty");
+
+		// to add
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
+				new EditGUIValueBoolean("Enabled", plugin.getSpecialRewardsConfig().getVotePartyEnabled()) {
+
+					@Override
+					public void setValue(Player player, boolean name) {
+						setPathData(getKey(), name);
+					}
+				}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.EMERALD, 1),
+				new EditGUIValueNumber("VotesRequired", plugin.getSpecialRewardsConfig().getVotePartyVotesRequired()) {
+
+					@Override
+					public void setValue(Player player, Number num) {
+						setPathData(getKey(), num.intValue());
+					}
+				}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.LADDER, 1), new EditGUIValueNumber(
+				"IncreaseVotesRquired", plugin.getSpecialRewardsConfig().getVotePartyIncreaseVotesRquired()) {
+
+			@Override
+			public void setValue(Player player, Number num) {
+				setPathData(getKey(), num.intValue());
+			}
+		}));
+
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.LADDER).setName("&cCurrent increase amount")
+				.addLoreLine("&cCurrent value: " + plugin.getServerData().getVotePartyExtraRequired())) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new ValueRequestBuilder(new NumberListener() {
+
+					@Override
+					public void onInput(Player player, Number value) {
+						plugin.getServerData().setVotePartyExtraRequired(value.intValue());
+					}
+				}, new Number[] { 0, 10, 50, 100 })
+						.currentValue("" + plugin.getServerData().getVotePartyExtraRequired()).allowCustomOption(true)
+						.request(clickEvent.getPlayer());
+				;
+			}
+		});
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.EMERALD, 1), new EditGUIValueNumber(
+				"UserVotesRequired", plugin.getSpecialRewardsConfig().getVotePartyUserVotesRequired()) {
+
+			@Override
+			public void setValue(Player player, Number num) {
+				setPathData(getKey(), num.intValue());
+			}
+		}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean("GiveAllPlayers",
+				plugin.getSpecialRewardsConfig().getVotePartyGiveAllPlayers()) {
+
+			@Override
+			public void setValue(Player player, boolean name) {
+				setPathData(getKey(), name);
+			}
+		}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
+				new EditGUIValueBoolean("ResetEachDay", plugin.getSpecialRewardsConfig().getVotePartyResetEachDay()) {
+
+					@Override
+					public void setValue(Player player, boolean name) {
+						setPathData(getKey(), name);
+					}
+				}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
+				new EditGUIValueBoolean("ResetWeekly", plugin.getSpecialRewardsConfig().getVotePartyResetWeekly()) {
+
+					@Override
+					public void setValue(Player player, boolean name) {
+						setPathData(getKey(), name);
+					}
+				}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
+				new EditGUIValueBoolean("ResetMonthly", plugin.getSpecialRewardsConfig().getVotePartyResetMontly()) {
+
+					@Override
+					public void setValue(Player player, boolean name) {
+						setPathData(getKey(), name);
+					}
+				}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean("OnlyOncePerDay",
+				plugin.getSpecialRewardsConfig().getVotePartyOnlyOncePerDay()) {
+
+			@Override
+			public void setValue(Player player, boolean name) {
+				setPathData(getKey(), name);
+			}
+		}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean(
+				"ResetExtraVotesMonthly", plugin.getSpecialRewardsConfig().isVotePartyResetExtraVotesMonthly()) {
+
+			@Override
+			public void setValue(Player player, boolean name) {
+				setPathData(getKey(), name);
+			}
+		}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean("CountFakeVotes",
+				plugin.getSpecialRewardsConfig().getVotePartyCountFakeVotes()) {
+
+			@Override
+			public void setValue(Player player, boolean name) {
+				setPathData(getKey(), name);
+			}
+		}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean("CountOfflineVotes",
+				plugin.getSpecialRewardsConfig().getVotePartyCountOfflineVotes()) {
+
+			@Override
+			public void setValue(Player player, boolean name) {
+				setPathData(getKey(), name);
+			}
+		}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
+				new EditGUIValueString("Broadcast", plugin.getSpecialRewardsConfig().getVotePartyBroadcast()) {
+
+					@Override
+					public void setValue(Player player, String name) {
+						setPathData(getKey(), name);
+					}
+				}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
+				new EditGUIValueList("Commands", plugin.getSpecialRewardsConfig().getVotePartyCommands()) {
+
+					@Override
+					public void setValue(Player player, ArrayList<String> value) {
+						setPathData(getKey(), value);
+					}
+				}));
+
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.DISPENSER, 1).setName("&cRewards")
+				.addLoreLine("&aUse this for per player rewards, also set online only rewards here as well")
+				.addLoreLine("&cTo set rewards to be given to players online only, set RewardType to ONLINE")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+						RewardHandler.getInstance().getDirectlyDefined("VoteParty.Rewards"));
+			}
+		});
+
+		// implement item reward?
+
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/cumulative/AdminVoteCumulative.java

@@ -0,0 +1,106 @@
+package com.bencodez.votingplugin.commands.gui.admin.cumulative;
+
+import java.util.ArrayList;
+
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.gui.GUIHandler;
+import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.rewards.RewardHandler;
+import com.bencodez.advancedcore.api.valuerequest.InputMethod;
+import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
+import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
+import com.bencodez.advancedcore.api.valuerequest.listeners.NumberListener;
+import com.bencodez.advancedcore.command.gui.RewardEditGUI;
+import com.bencodez.votingplugin.VotingPluginMain;
+
+public class AdminVoteCumulative extends GUIHandler {
+
+	private VotingPluginMain plugin;
+
+	public AdminVoteCumulative(VotingPluginMain plugin, CommandSender player) {
+		super(player);
+		this.plugin = plugin;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender sender) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+
+	}
+
+	@Override
+	public void onChest(Player player) {
+		BInventory inv = new BInventory("Edit Cumulative");
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.Cumulative");
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&cEdit existing cumulative rewards")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				ArrayList<Integer> nums = new ArrayList<Integer>();
+				for (String num : plugin.getSpecialRewardsConfig().getCumulativeVotes()) {
+					if (StringParser.getInstance().isInt(num)) {
+						nums.add(Integer.parseInt(num));
+					}
+				}
+				Number[] options = new Number[nums.size()];
+				for (int i = 0; i < nums.size(); i++) {
+					options[i] = nums.get(i);
+				}
+				new ValueRequestBuilder(new NumberListener() {
+
+					@Override
+					public void onInput(Player player, Number value) {
+						RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+								RewardHandler.getInstance().getDirectlyDefined("Cumulative." + value.intValue() + ".Rewards"));
+					}
+				}, options).allowCustomOption(false).usingMethod(InputMethod.INVENTORY).request(clickEvent.getPlayer());;
+			}
+		});
+
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.EMERALD_BLOCK).setName("&aAdd cumulative reward")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new ValueRequest().requestNumber(player, new NumberListener() {
+
+					@Override
+					public void onInput(Player player, Number value) {
+						plugin.getSpecialRewardsConfig().setCumulative(value.intValue());
+						plugin.reload();
+					}
+				});
+			}
+		});
+
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.REDSTONE_BLOCK).setName("&cRemove cumulative")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteCumulativeRemove(plugin, clickEvent.getPlayer()).open();
+			}
+		});
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/cumulative/AdminVoteCumulativeRemove.java

@@ -0,0 +1,77 @@
+package com.bencodez.votingplugin.commands.gui.admin.cumulative;
+
+import java.util.ArrayList;
+
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.gui.GUIHandler;
+import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.commands.gui.admin.AdminVoteConfirmation;
+
+public class AdminVoteCumulativeRemove extends GUIHandler {
+
+	private VotingPluginMain plugin;
+
+	public AdminVoteCumulativeRemove(VotingPluginMain plugin, CommandSender player) {
+		super(player);
+		this.plugin = plugin;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender sender) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+
+	}
+
+	@Override
+	public void onChest(Player player) {
+		BInventory inv = new BInventory("Remove cumulative");
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.Cumulative");
+		for (final String votes : plugin.getSpecialRewardsConfig().getCumulativeVotes()) {
+			inv.addButton(new BInventoryButton(
+					new ItemBuilder(Material.PAPER, 1).setName(votes).addLoreLine("&c&lClick to remove")) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					new AdminVoteConfirmation(plugin, clickEvent.getPlayer(), "Remove cumulative " + votes + "?") {
+
+						@Override
+						public void onDeny(Player p) {
+							new AdminVoteCumulative(plugin, p);
+						}
+
+						@Override
+						public void onConfirm(Player p) {
+							plugin.getSpecialRewardsConfig().removeCumulative(votes);
+							p.sendMessage("Removed cumulative " + votes);
+							plugin.reload();
+						}
+					}.open();;
+
+				}
+			});
+		}
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/milestones/AdminVoteMilestoneRemove.java

@@ -0,0 +1,77 @@
+package com.bencodez.votingplugin.commands.gui.admin.milestones;
+
+import java.util.ArrayList;
+
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.gui.GUIHandler;
+import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.commands.gui.admin.AdminVoteConfirmation;
+
+public class AdminVoteMilestoneRemove extends GUIHandler {
+
+	private VotingPluginMain plugin;
+
+	public AdminVoteMilestoneRemove(VotingPluginMain plugin, CommandSender player) {
+		super(player);
+		this.plugin = plugin;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender sender) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+
+	}
+
+	@Override
+	public void onChest(Player player) {
+		BInventory inv = new BInventory("Remove milestones");
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.MileStones");
+		for (final String votes : plugin.getSpecialRewardsConfig().getMilestoneVotes()) {
+			inv.addButton(new BInventoryButton(
+					new ItemBuilder(Material.PAPER, 1).setName(votes).addLoreLine("&c&lClick to remove")) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					new AdminVoteConfirmation(plugin, clickEvent.getPlayer(), "Remove milestone " + votes + "?") {
+
+						@Override
+						public void onDeny(Player p) {
+							new AdminVoteMilestones(plugin, p);
+						}
+
+						@Override
+						public void onConfirm(Player p) {
+							plugin.getSpecialRewardsConfig().removeMilestone(votes);
+							p.sendMessage("Removed milestone " + votes);
+							plugin.reload();
+						}
+					}.open();;
+
+				}
+			});
+		}
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/milestones/AdminVoteMilestones.java

@@ -0,0 +1,108 @@
+package com.bencodez.votingplugin.commands.gui.admin.milestones;
+
+import java.util.ArrayList;
+
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.gui.GUIHandler;
+import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.rewards.RewardHandler;
+import com.bencodez.advancedcore.api.valuerequest.InputMethod;
+import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
+import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
+import com.bencodez.advancedcore.api.valuerequest.listeners.NumberListener;
+import com.bencodez.advancedcore.command.gui.RewardEditGUI;
+import com.bencodez.votingplugin.VotingPluginMain;
+
+public class AdminVoteMilestones extends GUIHandler {
+
+	private VotingPluginMain plugin;
+
+	public AdminVoteMilestones(VotingPluginMain plugin, CommandSender player) {
+		super(player);
+		this.plugin = plugin;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender sender) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+
+	}
+
+	@Override
+	public void onChest(Player player) {
+		BInventory inv = new BInventory("Edit MileStones");
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.MileStones");
+		inv.addButton(
+				new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&cEdit existing milestone rewards")) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						ArrayList<Integer> nums = new ArrayList<Integer>();
+						for (String num : plugin.getSpecialRewardsConfig().getMilestoneVotes()) {
+							if (StringParser.getInstance().isInt(num)) {
+								nums.add(Integer.parseInt(num));
+							}
+						}
+						Number[] options = new Number[nums.size()];
+						for (int i = 0; i < nums.size(); i++) {
+							options[i] = nums.get(i);
+						}
+						new ValueRequestBuilder(new NumberListener() {
+
+							@Override
+							public void onInput(Player player, Number value) {
+								RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+										RewardHandler.getInstance()
+												.getDirectlyDefined("MileStones." + value.intValue() + ".Rewards"));
+							}
+						}, options).allowCustomOption(false).usingMethod(InputMethod.INVENTORY).request(clickEvent.getPlayer());;
+					}
+				});
+
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.EMERALD_BLOCK).setName("&aAdd milestone")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new ValueRequest().requestNumber(player, new NumberListener() {
+
+					@Override
+					public void onInput(Player player, Number value) {
+						plugin.getSpecialRewardsConfig().setMilestone(value.intValue());
+						plugin.reload();
+					}
+				});
+			}
+		});
+
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.REDSTONE_BLOCK).setName("&cRemove milestone")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteMilestoneRemove(plugin, clickEvent.getPlayer()).open();
+			}
+		});
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/voteshop/AdminVoteVoteShop.java

@@ -1,4 +1,4 @@
-package com.bencodez.votingplugin.commands.gui.admin;
+package com.bencodez.votingplugin.commands.gui.admin.voteshop;
 
 import java.util.ArrayList;
 
@@ -42,6 +42,7 @@ public class AdminVoteVoteShop extends GUIHandler {
 	@Override
 	public void onChest(Player player) {
 		BInventory inv = new BInventory("Edit VoteShop");
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteShop");
 		inv.addButton(new BInventoryButton(new ItemBuilder(Material.DIAMOND).setName("&cEdit existing item")) {
 
 			@Override
@@ -69,15 +70,7 @@ public class AdminVoteVoteShop extends GUIHandler {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				
-				new ValueRequest().requestString(player, new StringListener() {
-
-					@Override
-					public void onInput(Player player, String value) {
-						plugin.getGui().removeShop(value);
-						plugin.reload();
-					}
-				});
+				new AdminVoteVoteShopItemRemove(plugin, clickEvent.getPlayer()).open();
 			}
 		});
 		inv.openInventory(player);

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/voteshop/AdminVoteVoteShopItem.java

@@ -1,4 +1,4 @@
-package com.bencodez.votingplugin.commands.gui.admin;
+package com.bencodez.votingplugin.commands.gui.admin.voteshop;
 
 import java.util.ArrayList;
 
@@ -9,12 +9,16 @@ import org.bukkit.entity.Player;
 
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.editgui.EditGUI;
 import com.bencodez.advancedcore.api.inventory.editgui.EditGUIButton;
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueList;
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueNumber;
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueString;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.advancedcore.api.rewards.RewardHandler;
+import com.bencodez.advancedcore.command.gui.RewardEditGUI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 public class AdminVoteVoteShopItem extends GUIHandler {
@@ -51,7 +55,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 	@Override
 	public void onChest(Player player) {
 		EditGUI inv = new EditGUI("Edit VoteShop Item: " + identifier);
-
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteShop");
 		// to add
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueString("Identifier_Name",
 				plugin.getGui().getChestShopIdentifierIdentifierName(identifier)) {
@@ -112,6 +116,14 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 						setPathData(getKey(), value);
 					}
 				}));
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.DISPENSER, 1).setName("&cRewards")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+						RewardHandler.getInstance().getDirectlyDefined("CHEST.Shop." + identifier + ".Rewards"));
+			}
+		});
 
 		// implement item reward?
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/voteshop/AdminVoteVoteShopItemRemove.java

@@ -1,4 +1,4 @@
-package com.bencodez.votingplugin.commands.gui.admin;
+package com.bencodez.votingplugin.commands.gui.admin.voteshop;
 
 import java.util.ArrayList;
 
@@ -12,6 +12,7 @@ import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.commands.gui.admin.AdminVoteConfirmation;
 
 public class AdminVoteVoteShopItemRemove extends GUIHandler {
 
@@ -39,16 +40,31 @@ public class AdminVoteVoteShopItemRemove extends GUIHandler {
 	@Override
 	public void onChest(Player player) {
 		BInventory inv = new BInventory("Edit VoteShop Remove Item");
-
-		for (String identifier : plugin.getGui().getChestShopIdentifiers()) {
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteShop");
+		
+		for (final String identifier : plugin.getGui().getChestShopIdentifiers()) {
 			inv.addButton(
 					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier))
 							.addLoreLine("&c&lClick to remove")) {
 
 						@Override
 						public void onClick(ClickEvent clickEvent) {
-							plugin.getGui().removeShop((String) getData("ident"));
-							sendMessage(clickEvent.getPlayer(), "&cRemoved " + (String) (getData("ident")));
+							new AdminVoteConfirmation(plugin, clickEvent.getPlayer(),
+									"Remove shop item " + identifier + "?") {
+
+								@Override
+								public void onDeny(Player p) {
+									new AdminVoteVoteShop(plugin, p).open();
+								}
+
+								@Override
+								public void onConfirm(Player p) {
+									plugin.getGui().removeShop(identifier);
+									p.sendMessage("Removed " + identifier);
+									plugin.reload();
+								}
+							}.open();;
+
 						}
 					}.addData("ident", identifier));
 		}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/voteshop/AdminVoteVoteShopItems.java

@@ -1,4 +1,4 @@
-package com.bencodez.votingplugin.commands.gui.admin;
+package com.bencodez.votingplugin.commands.gui.admin.voteshop;
 
 import java.util.ArrayList;
 
@@ -39,7 +39,8 @@ public class AdminVoteVoteShopItems extends GUIHandler {
 	@Override
 	public void onChest(Player player) {
 		BInventory inv = new BInventory("Edit VoteShop Items");
-
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteShop");
+		
 		for (String identifier : plugin.getGui().getChestShopIdentifiers()) {
 			inv.addButton(
 					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier))) {

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteToday.java

@@ -51,15 +51,21 @@ public class VoteToday extends GUIHandler {
 			maxPage++;
 		}
 
-		msg.add("&cToday's Votes " + page + "/" + maxPage);
-		msg.add("&cPlayerName : VoteSite : Time");
+		HashMap<String, String> placeholders = new HashMap<String, String>();
+		placeholders.put("page", "" + page);
+		placeholders.put("maxpage", "" + maxPage);
+		
+		for (String m : plugin.getConfigFile().getFormatCommandsVoteTodayTitle()) {
+			msg.add(m);
+		}
+		
 		page--;
 
 		for (int i = pagesize * page; (i < voteToday.length) && (i < ((page + 1) * pagesize)); i++) {
 			msg.add(voteToday[i]);
 		}
 
-		return ArrayUtils.getInstance().colorize(msg);
+		return ArrayUtils.getInstance().colorize(ArrayUtils.getInstance().replacePlaceHolder(msg, placeholders));
 	}
 
 	@Override

VotingPlugin/src/com/bencodez/votingplugin/config/Config.java

@@ -7,6 +7,7 @@ import java.util.Set;
 
 import org.bukkit.configuration.ConfigurationSection;
 
+import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.yml.YMLFile;
 import com.bencodez.advancedcore.api.yml.annotation.AnnotationHandler;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataBoolean;
@@ -152,6 +153,11 @@ public class Config extends YMLFile {
 	@Getter
 	private String formatCommandsVoteTodayLine = "&6%player% : %VoteSite% : %Time%";
 
+	@ConfigDataListString(path = "Format.Commands.Vote.Today.Title")
+	@Getter
+	private ArrayList<String> formatCommandsVoteTodayTitle = ArrayUtils.getInstance()
+			.convert(new String[] { "&cToday's Votes %page%/%maxpage%", "&cPlayerName : VoteSite : Time" });
+
 	@ConfigDataString(path = "Format.Commands.Vote.ToggleBroadcasts.Disabled")
 	@Getter
 	private String formatCommandsVoteToggleBroadcastDisabled = "&cYou will no longer see vote broadcasts";
@@ -211,6 +217,10 @@ public class Config extends YMLFile {
 	@Getter
 	private int MaxiumNumberOfTopVotersToLoad = -1;
 
+	@ConfigDataInt(path = "DelayLoginEvent")
+	@Getter
+	private int delayLoginEvent = 0;
+
 	@ConfigDataBoolean(path = "OverrideVersionDisable")
 	@Getter
 	private boolean overrideVersionDisable = false;
@@ -231,6 +241,10 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean usePrimaryAccountForPlaceholders = false;
 
+	@ConfigDataBoolean(path = "DisableCoolDownCheck")
+	@Getter
+	private boolean disableCoolDownCheck = false;
+
 	@ConfigDataListString(path = "VotingBroadcastBlacklist")
 	@Getter
 	private ArrayList<String> votingBroadcastBlacklist = new ArrayList<String>();

VotingPlugin/src/com/bencodez/votingplugin/config/SpecialRewardsConfig.java

@@ -240,7 +240,7 @@ public class SpecialRewardsConfig extends YMLFile {
 	public boolean getVotePartyResetMontly() {
 		return getData().getBoolean("VoteParty.ResetMonthly");
 	}
-	
+
 	public boolean getVotePartyResetWeekly() {
 		return getData().getBoolean("VoteParty.ResetWeekly");
 	}
@@ -304,4 +304,26 @@ public class SpecialRewardsConfig extends YMLFile {
 	public void onFileCreation() {
 		plugin.saveResource("SpecialRewards.yml", true);
 	}
+
+	public void setMilestone(int intValue) {
+		getData().set("Milestones." + intValue + ".Enabled", true);
+		getData().set("Milestones." + intValue + ".Rewards.Messages.Player", "&aYou got %milestone% milestone votes!");
+		saveData();
+	}
+
+	public void removeMilestone(String votes) {
+		getData().set("MileStones." + votes, null);
+		saveData();
+	}
+
+	public void removeCumulative(String votes) {
+		getData().set("Cumulative." + votes, null);
+		saveData();
+	}
+
+	public void setCumulative(int intValue) {
+		getData().set("Cumulative." + intValue + ".Enabled", true);
+		getData().set("Cumulative." + intValue + ".Rewards.Messages.Player", "&aYou got %cumulative% cumulative votes!");
+		saveData();
+	}
 }

VotingPlugin/src/com/bencodez/votingplugin/cooldown/CoolDownCheck.java

@@ -32,27 +32,43 @@ public class CoolDownCheck implements Listener {
 		this.plugin = plugin;
 	}
 
-	public void checkAll() {
-		plugin.getTimer().schedule(new TimerTask() {
+	public void load() {
+		checkAll();
+	}
 
-			@Override
-			public void run() {
-				if (VotingPluginMain.plugin != null) {
-					for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-						if (VotingPluginMain.plugin != null) {
-							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-							if (user.getUserData().hasData() && user.hasLoggedOnBefore()) {
-								user.checkCoolDownEvents();
+	public void checkAll() {
+		if (!plugin.getConfigFile().isDisableCoolDownCheck() && RewardHandler.getInstance()
+				.hasRewards(plugin.getSpecialRewardsConfig().getData(), "VoteCoolDownEndedReward")) {
+			plugin.getTimer().schedule(new TimerTask() {
+
+				@Override
+				public void run() {
+					if (VotingPluginMain.plugin != null) {
+						if (!plugin.getConfigFile().isDisableCoolDownCheck() && RewardHandler.getInstance()
+								.hasRewards(plugin.getSpecialRewardsConfig().getData(), "VoteCoolDownEndedReward")) {
+							for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+								if (VotingPluginMain.plugin != null) {
+									VotingPluginUser user = UserManager.getInstance()
+											.getVotingPluginUser(new UUID(uuid));
+									if (user.getUserData().hasData() && user.hasLoggedOnBefore()) {
+										user.checkCoolDownEvents();
+									}
+								} else {
+									cancel();
+								}
 							}
 						} else {
+							plugin.debug("Not enabling cooldown check reward");
 							cancel();
 						}
+					} else {
+						cancel();
 					}
-				} else {
-					cancel();
 				}
-			}
-		}, 1000 * 60 * 3);
+			}, 1000 * 60 * 5, 1000 * 60 * 30);
+		} else {
+			plugin.debug("Not enabling cooldown check reward");
+		}
 
 	}
 

VotingPlugin/src/com/bencodez/votingplugin/events/PlayerVoteEvent.java

@@ -71,6 +71,10 @@ public class PlayerVoteEvent extends Event {
 	@Getter
 	@Setter
 	private VotingPluginUser votingPluginUser;
+	
+	@Getter
+	@Setter
+	private boolean wasOnline;
 
 	public PlayerVoteEvent(VoteSite voteSite, String voteUsername, String serviceSite, boolean realVote) {
 		super(true);

VotingPlugin/src/com/bencodez/votingplugin/listeners/PlayerJoinEvent.java

@@ -42,15 +42,29 @@ public class PlayerJoinEvent implements Listener {
 				&& VotingPluginMain.plugin.getMysql() == null)) {
 			return;
 		}
-		Player player = event.getPlayer();
 
+		int delay = plugin.getConfigFile().getDelayLoginEvent();
+		if (delay <= 0) {
+			login(event.getPlayer());
+		} else {
+			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					login(event.getPlayer());
+				}
+			}, delay);
+		}
+
+	}
+
+	private void login(Player player) {
 		VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
 		if (player.isOp() && plugin.isYmlError()) {
 			user.sendMessage("&cVotingPlugin: Detected yml error, please check console for details");
 		}
 
 		boolean data = user.getData().hasData();
-
 		// run remind
 		user.loginMessage();
 

VotingPlugin/src/com/bencodez/votingplugin/listeners/PlayerVoteListener.java

@@ -143,8 +143,12 @@ public class PlayerVoteListener implements Listener {
 
 			if (((user.isOnline() || voteSite.isGiveOffline())
 					&& VotingPluginMain.plugin.getOptions().isProcessRewards()) || event.isBungee()) {
-				user.playerVote(voteSite, true, false, event.isForceBungee());
-				user.sendVoteEffects(true);
+				boolean online = true;
+				if (event.isBungee()) {
+					online = event.isWasOnline();
+				}
+				user.playerVote(voteSite, online, false, event.isForceBungee());
+				user.sendVoteEffects(online);
 				user.closeInv();
 			} else {
 				user.addOfflineVote(voteSite.getKey());

VotingPlugin/src/com/bencodez/votingplugin/specialrewards/SpecialRewards.java

@@ -97,8 +97,8 @@ public class SpecialRewards {
 
 						if (gotCumulative) {
 							gotCumulativeAny = true;
+							plugin.debug(user.getPlayerName() + " got cumulative " + votesRequired + ", current total: " + total);
 							giveCumulativeVoteReward(user, user.isOnline(), votesRequired, forceBungee);
-							plugin.debug(user.getPlayerName() + " got cumulative " + votesRequired);
 						} else {
 							plugin.devDebug(user.getPlayerName() + " not able to get cumulative " + votesRequired);
 						}

VotingPlugin/src/com/bencodez/votingplugin/user/VotingPluginUser.java

@@ -193,7 +193,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		}
 	}
 
-	public void bungeeVotePluginMessaging(String service, long time, BungeeMessageData text, boolean setTotals) {
+	public void bungeeVotePluginMessaging(String service, long time, BungeeMessageData text, boolean setTotals, boolean wasOnline) {
 		if (plugin.getBungeeSettings().isUseBungeecoord()) {
 			VotingPluginMain.plugin.debug("Pluginmessaging vote for " + getPlayerName() + " on " + service);
 
@@ -205,6 +205,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 			voteEvent.setTime(time);
 			voteEvent.setAddTotals(setTotals);
 			voteEvent.setBungeeTextTotals(text);
+			voteEvent.setWasOnline(wasOnline);
 			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 				@Override