Update version number

Little fix
2019-03-18 19:16:47 -04:00 · 2019-03-09 20:50:22 -05:00 · 2019-03-09 20:43:32 -05:00 · 2019-03-09 20:42:21 -05:00 · 2019-03-08 17:09:39 -05:00 · 2019-03-07 20:35:45 -05:00
30 changed files with 994 additions and 528 deletions
@@ -1,13 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
@@ -17,40 +8,14 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=disabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
 org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
@@ -59,65 +24,4 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=info
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
-org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
-org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.8
@@ -42,12 +42,12 @@ AllowUnjoined: false
 VoteReminding:
  # Enable vote reminding
  # This will remind player when he can vote on all sites
-  # Requires VoteDelay's to be setup properly
+  # Requires VoteDelays to be setup properly
  # Use /vote next to see when you can be reminded
  # Players require the perm "VotingPlugin.Login.RemindVotes" or "VotingPlugin.Player"
  Enabled: true

-  # Wether or t to remind only once when the player can vote
+  # Whether or not to remind only once when the player can vote
  # Does not apply to login reminds.
  RemindOnlyOnce: true

@@ -91,7 +91,7 @@ VoteReminding:
 # Set Message to '' (2 ') to disable message

 Commands:
-  # Wether or not the following commands will open GUIs rather than display text
+  # Whether or not the following commands will open GUIs rather than display text
  UseGUI:
    Today: true
    TopVoter: true
@@ -224,6 +224,9 @@ Format:
        - '&3Highest Week Streak: &3&l%BestWeeklyStreak%'
        - '&3Highest Month Streak: &3&l%BestMonthlyStreak%'
        
+      Today:
+        Line: '&6%player% : %VoteSite% : %Time%'
+        
      # PlaceHolders:
      # %VotesRequired% = VotesRequired
      # %NeededVotes% = Number of votes needed to reach VotesRequired
@@ -282,9 +285,16 @@ Format:
  # User not exist message, from commands such as /vote next (player)
  UserNotExist: '&cUser does not exist: %player%'
  
-  # Text for page buttons in inventories
-  PrevPage: '&aPrevious Page'
-  NextPage: '&aNext Page'
+  # Prev/Next page tems in GUIs
+  PrevItem:
+    Material: 'BLACK_STAINED_GLASS_PANE'
+    Amount: 1
+    Name: '&aPrevious Page'
+    
+  NextItem:
+    Material: 'BLACK_STAINED_GLASS_PANE'
+    Amount: 1
+    Name: '&aNext Page'
  
  InvFull: '&cInventory full, dropping items on ground'
  
@@ -390,6 +400,8 @@ GUI:
      Data: 0
      Amount: 1
    URLText: '%VoteUrl%'
+    
+  VoteRewardBackButton: false
  # Customize /vote reward
  # Show players what you get when you vote on each site
  VoteReward:
@@ -440,6 +452,11 @@ GUI:
    # Number of topvoters to display on page +9
    # 9 Slots on the botton are used for page buttons
    Size: 27
+    # If true, /vote top will show player heads
+    UseSkull: true
+    # Item for player in GUI if use skull is false
+    PlayerItem:
+      Material: 'PAPER'
  VoteTotal:
    Name: 'VoteTotal: %player%'
    BackButton: true
@@ -560,7 +577,7 @@ Shop:
    Permission: ''
    # Limit how many times you can buy this
    #Limit: 3
-    # Rewards to run if player buys succesfully
+    # Rewards to run if player buys successfully
    Rewards:
      Items:
        Diamond:
@@ -683,6 +700,14 @@ VoteStreak:
      Rewards:
        Messages:
          Player: "&aYou voted for %Streak% %Type%'s in a row!"
+  Requirement:
+    # Require certain percentage of votes
+    UsePercentage: false
+    # Percentage requirements of votes
+    # 50 = %50
+    Day: 50
+    Week: 50
+    Month: 50
          
  
 # ONLY USE THIS FOR TITLES/SOUNDS AND OTHER EFFECTS
@@ -783,6 +808,13 @@ PointsOnVote: 1
 # Not really recommended
 AddTotals: true

+# Click sound when using gui
+# Set to none for no sound
+ClickSound: 
+  Sound: 'UI_BUTTON_CLICK'
+  Volume: 1.0
+  Pitch: 1.0
+
 # Debug
 Debug: false

@@ -809,7 +841,7 @@ RequestAPI:
  DefaultMethod: 'Anvil'
  DisabledMethods: []
  
-# Wether or not to log every vote to a file
+# Whether or not to log every vote to a file
 # Use this if you wanna track player votes
 # Not recommended though
 LogVotesToFile: false
@@ -862,10 +894,31 @@ AutoCreateVoteSites: true
 # You can also use /av download
 AutoDownload: false

+# Whether or not to disable update checks
+DisableUpdateChecking: false
+
+# Allow transfer of vote points
+AllowVotePointTransfers: false
+
 # Disable this on a hub server for example
 # Still processes rewards for offline rewards (just won't give any)
 ProcessRewards: true

+# Disable checking permissions on tab complete
+DisableAdvancedTab: false
+
+# Load command aliases, such as /avgui
+# Requires restart to take effect
+LoadCommandAliases: true
+
+# Wait until user is logged in with AuthMe
+# Requires AuthMe
+WaitUntilLoggedIn: true
+
+# Preload skulls to improve performance
+# If false, skulls will be cached as they are used
+PreloadSkulls: true
+
 # ---------------------------------------------------------
 # Mysql cache options
 # Clearing cache forces the plugin to pull from database
@@ -899,4 +952,4 @@ ClearCacheOnVote: false

 # Disable checking on world change
 # May improve performance
-#DisableCheckOnWorldChange: false
+#DisableCheckOnWorldChange: false
@@ -4,6 +4,7 @@ main: com.Ben12345rocks.VotingPlugin.Main
 description: Highly Customizable Voting Listener!
 website: https://www.spigotmc.org/resources/votingplugin.15358/
 author: Ben12345rocks
+softdepend: [MVdWPlaceholders]
 api-version: 1.13
 commands:
  vote:
@@ -63,6 +64,9 @@ commands:
  votechoices:
    description: A command
    alaises: vchoices
+  votegivepoints:
+    description: A command
+    alaises: vgivepoints
  adminvotehelp:
    description: Open adminvote help
    aliases: avhelp
@@ -108,18 +112,9 @@ commands:
  adminvotevote:
    description: Command Alias
    aliases: [avvote, fakevote]
-  adminvotesetpoints:
-    description: Command Alias
-    aliases: avsetpoints
-  adminvoteaddpoints:
-    description: Command Alias
-    aliases: avaddpoints
  adminvotegui:
    description: Command Alias
    aliases: avgui
-  votesetrequestmethod:
-    description: Command Alias
-    aliases: [vsetrequestmethod, setrequesetmethod]
  adminvotegivereward:
    description: Command Alias
    aliases: avgivereward
@@ -140,9 +135,6 @@ commands:
  adminvoteConvertFrom:
    description: Command Alias
    aliases: avConvertFrom
-  adminvoteRemovePoints:
-    description: Command Alias
-    aliases: avRemovePoints
  adminvoteServiceSites:
    description: Command Alias
    aliases: avServiceSites
@@ -191,6 +183,18 @@ commands:
  adminvoteDownloadJenkins:
    description: Command Alias
    aliases: avDownloadJenkins
+  adminvoteForceVoteParty:
+    description: Command Alias
+    aliases: avForceVoteParty
+  adminvoteUserEditValue:
+    description: Command Alias
+    aliases: avUserEditValue
+  adminvoteSetRequestMethod:
+    description: Command Alias
+    aliases: avSetRequestMethod
+  adminvoteUser:
+    description: Command Alias
+    aliases: avUser
 permissions:
  VotingPlugin.Player:
    description: Allows basic access player commands
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>5.16.3</version>
+	<version>5.18.2</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -271,5 +271,19 @@
 			<version>1.18.2</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>io.mimimum.minecraft</groupId>
+			<artifactId>SuperbVote</artifactId>
+			<version>0.5.3</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/Jars/SuperbVote-0.5.3.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>be.maximvdw</groupId>
+			<artifactId>MVdWPlaceholderAPI</artifactId>
+			<version>LATEST</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/Jars/MVdWPlaceholderAPI.jar</systemPath>
+		</dependency>
 	</dependencies>
 </project>
@@ -59,6 +59,9 @@ import com.swifteh.GAL.GAL;
 import com.swifteh.GAL.GALVote;
 import com.swifteh.GAL.VoteType;

+import io.minimum.minecraft.superbvote.SuperbVote;
+import io.minimum.minecraft.superbvote.util.PlayerVotes;
+
 // TODO: Auto-generated Javadoc
 /**
 * The Class CommandLoader.
@@ -141,6 +144,71 @@ public class CommandLoader {
 		return playerPerm;
 	}

+	public boolean hasPermission(Player player, String cmd) {
+		if (cmd.startsWith("votingplugin:")) {
+			cmd = cmd.substring("votingplugin:".length());
+		}
+
+		if (commands.containsKey(cmd)) {
+			return commands.get(cmd).hasPerm(player);
+		}
+
+		boolean adminCommand = false;
+
+		if (cmd.startsWith("vote")) {
+			cmd = cmd.substring("vote".length());
+		} else if (cmd.startsWith("v")) {
+			cmd = cmd.substring(1);
+		} else if (cmd.startsWith("av")) {
+			adminCommand = true;
+			cmd = cmd.substring("av".length());
+		} else if (cmd.startsWith("adminvote")) {
+			adminCommand = true;
+			cmd = cmd.substring("adminvote".length());
+		}
+		// plugin.debug(cmd);
+		if (!adminCommand) {
+			for (CommandHandler handle : plugin.getVoteCommand()) {
+				if (handle.isCommand(cmd)) {
+					// plugin.debug("is handle " + ArrayUtils.getInstance()
+					// .makeStringList(ArrayUtils.getInstance().convert(handle.getArgs())));
+					if (handle.hasPerm(player)) {
+						// plugin.debug("has perm");
+						return true;
+					} else {
+						// plugin.debug("no perm " + cmd);
+					}
+				}
+			}
+		} else {
+			for (CommandHandler handle : plugin.getAdminVoteCommand()) {
+				if (handle.isCommand(cmd)) {
+					// plugin.debug("is handle " + ArrayUtils.getInstance()
+					// .makeStringList(ArrayUtils.getInstance().convert(handle.getArgs())));
+					if (handle.hasPerm(player)) {
+						// plugin.debug("has perm");
+						return true;
+					} else {
+						// plugin.debug("no perm " + cmd);
+					}
+				}
+			}
+		}
+		return false;
+	}
+
+	public boolean isVotingPluginCommand(Player player, String cmd) {
+		if (plugin.getCommand(cmd) != null || cmd.startsWith("votingplugin")) {
+			return true;
+		}
+		for (String str : commands.keySet()) {
+			if (str.equalsIgnoreCase(cmd)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * Load admin vote command.
 	 */
@@ -196,7 +264,6 @@ public class CommandLoader {
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ConvertFrom", "VoteRoulette" },
 				"VotingPlugin.Commands.AdminVote.ConvertFrom.GAL|" + adminPerm, "Convert from VoteRoulette") {

-			@SuppressWarnings("static-access")
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				if (Bukkit.getServer().getPluginManager().getPlugin("VoteRoulette") != null) {
@@ -216,17 +283,43 @@ public class CommandLoader {
 			}
 		});

-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "SetPoints", "(player)", "(number)" },
-				"VotingPlugin.Commands.AdminVote.SetPoints|" + adminPerm, "Set players voting points") {
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ConvertFrom", "SuperbVote" },
+				"VotingPlugin.Commands.AdminVote.ConvertFrom.SuperbVote|" + adminPerm, "Convert from SuperbVote") {

 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
-				user.setPoints(Integer.parseInt(args[2]));
-				sender.sendMessage(StringUtils.getInstance().colorize("&cSet " + args[1] + " points to " + args[2]));
+				if (Bukkit.getServer().getPluginManager().getPlugin("SuperbVote") != null) {
+					sender.sendMessage("Starting to convert");
+
+					for (OfflinePlayer p : Bukkit.getOfflinePlayers()) {
+						PlayerVotes votes = SuperbVote.getPlugin().getVoteStorage().getVotes(p.getUniqueId());
+						if (votes != null) {
+							User user = UserManager.getInstance().getVotingPluginUser(p);
+							if (votes.getVotes() > 0) {
+								user.setTotal(TopVoter.AllTime, votes.getVotes());
+							}
+						}
+					}
+
+				} else {
+					sender.sendMessage("SuperbVote not loaded");
+				}
 			}
 		});

+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "User", "(player)", "SetPoints", "(number)" },
+						"VotingPlugin.Commands.AdminVote.SetPoints|" + adminPerm, "Set players voting points") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						user.setPoints(Integer.parseInt(args[3]));
+						sender.sendMessage(
+								StringUtils.getInstance().colorize("&cSet " + args[1] + " points to " + args[3]));
+					}
+				});
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ResyncMilestones" },
 				"VotingPlugin.Commands.AdminVote.SetResyncMilestones|" + adminPerm, "Resync Milestones") {

@@ -242,29 +335,31 @@ public class CommandLoader {
 			}
 		});

-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "AddPoints", "(player)", "(number)" },
-				"VotingPlugin.Commands.AdminVote.AddPoints|" + adminPerm, "Add to players voting points") {
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "User", "(player)", "AddPoints", "(number)" },
+						"VotingPlugin.Commands.AdminVote.AddPoints|" + adminPerm, "Add to players voting points") {

-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
-				user.addPoints(Integer.parseInt(args[2]));
-				sender.sendMessage(StringUtils.getInstance().colorize("&cGave " + args[1] + " " + args[2] + " points"
-						+ ", " + args[1] + " now has " + user.getPoints() + " points"));
-			}
-		});
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						user.addPoints(Integer.parseInt(args[3]));
+						sender.sendMessage(StringUtils.getInstance().colorize("&cGave " + args[1] + " " + args[3]
+								+ " points" + ", " + args[1] + " now has " + user.getPoints() + " points"));
+					}
+				});

-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "RemovePoints", "(player)", "(number)" },
-				"VotingPlugin.Commands.AdminVote.RemovePoints|" + adminPerm, "Remove voting points") {
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "User", "(player)", "RemovePoints", "(number)" },
+						"VotingPlugin.Commands.AdminVote.RemovePoints|" + adminPerm, "Remove voting points") {

-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
-				user.removePoints(Integer.parseInt(args[2]));
-				sender.sendMessage(StringUtils.getInstance().colorize("&cRemoved " + args[2] + " points from " + args[1]
-						+ ", " + args[1] + " now has " + user.getPoints() + " points"));
-			}
-		});
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						user.removePoints(Integer.parseInt(args[3]));
+						sender.sendMessage(StringUtils.getInstance().colorize("&cRemoved " + args[3] + " points from "
+								+ args[1] + ", " + args[1] + " now has " + user.getPoints() + " points"));
+					}
+				});

 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Help&?" },
 				"VotingPlugin.Commands.AdminVote.Help|" + adminPerm, "See this page") {
@@ -519,58 +614,37 @@ public class CommandLoader {
 					}
 				});

-		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "SetTotal", "Month", "(player)", "(number)" },
-						"VotingPlugin.Commands.AdminVote.SetTotal.Month|" + adminPerm, "Set month totals for player") {
+		for (final TopVoter top : TopVoter.values()) {
+			plugin.getAdminVoteCommand()
+					.add(new CommandHandler(new String[] { "User", "(player)", "SetTotal", top.toString(), "(number)" },
+							"VotingPlugin.Commands.AdminVote.SetTotal." + top.toString() + "|" + adminPerm,
+							"Set " + top.toString() + " totals for player") {

-					@Override
-					public void execute(CommandSender sender, String[] args) {
-						UserManager.getInstance().getVotingPluginUser(args[2]).setTotal(TopVoter.Monthly,
-								Integer.parseInt(args[3]));
-						sender.sendMessage(StringUtils.getInstance()
-								.colorize("&cSet month total for '" + args[2] + "' to " + args[3]));
-					}
-				});
+						@Override
+						public void execute(CommandSender sender, String[] args) {
+							UserManager.getInstance().getVotingPluginUser(args[1]).setTotal(top,
+									Integer.parseInt(args[4]));
+							sender.sendMessage(StringUtils.getInstance().colorize(
+									"&cSet " + top.toString() + " total for '" + args[1] + "' to " + args[4]));
+						}
+					});

-		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "SetTotal", "AllTime", "(player)", "(number)" },
-						"VotingPlugin.Commands.AdminVote.SetTotal.AllTime|" + adminPerm,
-						"Set alltime totals for player") {
+			plugin.getAdminVoteCommand()
+					.add(new CommandHandler(new String[] { "User", "(player)", "AddTotal", top.toString(), "(number)" },
+							"VotingPlugin.Commands.AdminVote.AddTotal." + top.toString() + "|" + adminPerm,
+							"Add " + top.toString() + " totals for player") {

-					@Override
-					public void execute(CommandSender sender, String[] args) {
-						UserManager.getInstance().getVotingPluginUser(args[2]).setTotal(TopVoter.AllTime,
-								Integer.parseInt(args[3]));
-						sender.sendMessage(StringUtils.getInstance()
-								.colorize("&cSet alltime total for '" + args[2] + "' to " + args[3]));
-					}
-				});
+						@Override
+						public void execute(CommandSender sender, String[] args) {
+							User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+							user.setTotal(top, user.getTotal(top) + Integer.parseInt(args[4]));
+							sender.sendMessage(StringUtils.getInstance()
+									.colorize("&cAdded " + top.toString() + " total for " + args[1]));
+						}
+					});
+		}

-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "SetTotal", "Week", "(player)", "(number)" },
-				"VotingPlugin.Commands.AdminVote.SetTotal.Week|" + adminPerm, "Set week totals for player") {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				UserManager.getInstance().getVotingPluginUser(args[2]).setTotal(TopVoter.Weekly,
-						Integer.parseInt(args[3]));
-				sender.sendMessage(
-						StringUtils.getInstance().colorize("&cSet week total for '" + args[2] + "' to " + args[3]));
-			}
-		});
-
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "SetTotal", "Day", "(player)", "(number)" },
-				"VotingPlugin.Commands.AdminVote.SetTotal.Day|" + adminPerm, "Set day totals for player") {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				UserManager.getInstance().getVotingPluginUser(args[2]).setTotal(TopVoter.Daily,
-						Integer.parseInt(args[3]));
-				sender.sendMessage(
-						StringUtils.getInstance().colorize("&cSet day total for '" + args[2] + "' to " + args[3]));
-			}
-		});
-
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ClearTotal", "(player)" },
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "User", "(player)", "ClearTotal" },
 				"VotingPlugin.Commands.AdminVote.ClearTotal|" + adminPerm, "Clear Totals for player") {

 			@Override
@@ -582,75 +656,42 @@ public class CommandLoader {
 		});

 		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "AddTotal", "Month", "(player)", "(number)" },
-						"VotingPlugin.Commands.AdminVote.AddTotal.Month|" + adminPerm, "Add month totals for player") {
-
-					@Override
-					public void execute(CommandSender sender, String[] args) {
-						User user = UserManager.getInstance().getVotingPluginUser(args[2]);
-						user.setTotal(TopVoter.Monthly, user.getTotal(TopVoter.Monthly) + Integer.parseInt(args[3]));
-						sender.sendMessage(StringUtils.getInstance().colorize("&cAdded month total for " + args[2]));
-					}
-				});
-
-		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "AddTotal", "AllTime", "(player)", "(number)" },
-						"VotingPlugin.Commands.AdminVote.AddTotal.AllTime|" + adminPerm,
-						"Add alltime totals for player") {
-
-					@Override
-					public void execute(CommandSender sender, String[] args) {
-						User user = UserManager.getInstance().getVotingPluginUser(args[2]);
-						user.setTotal(TopVoter.AllTime, user.getTotal(TopVoter.AllTime) + Integer.parseInt(args[3]));
-						sender.sendMessage(StringUtils.getInstance().colorize("&cAdded alltime total for " + args[2]));
-					}
-				});
-
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "AddTotal", "Week", "(player)", "(number)" },
-				"VotingPlugin.Commands.AdminVote.AddTotal.Week|" + adminPerm, "Add week totals for player") {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				User user = UserManager.getInstance().getVotingPluginUser(args[2]);
-				user.setTotal(TopVoter.Weekly, user.getTotal(TopVoter.Weekly) + Integer.parseInt(args[3]));
-				sender.sendMessage(StringUtils.getInstance().colorize("&cAdded week total for " + args[2]));
-			}
-		});
-
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "AddTotal", "Day", "(player)", "(number)" },
-				"VotingPlugin.Commands.AdminVote.AddTotal.Day|" + adminPerm, "Add day totals for player") {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				User user = UserManager.getInstance().getVotingPluginUser(args[2]);
-				user.setTotal(TopVoter.Daily, user.getTotal(TopVoter.Daily) + Integer.parseInt(args[3]));
-				sender.sendMessage(StringUtils.getInstance().colorize("&cAdded day total for " + args[2]));
-			}
-		});
-
-		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "AddMilestoneCount", "(player)", "(number)" },
+				.add(new CommandHandler(new String[] { "User", "(player)", "AddMilestoneCount", "(number)" },
 						"VotingPlugin.Commands.AdminVote.AddMilestoneCount|" + adminPerm, "Add milestonecount") {

 					@Override
 					public void execute(CommandSender sender, String[] args) {
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
-						user.setMilestoneCount(user.getMilestoneCount() + Integer.parseInt(args[2]));
+						user.setMilestoneCount(user.getMilestoneCount() + Integer.parseInt(args[3]));
 						SpecialRewards.getInstance().checkMilestone(user);
 						sender.sendMessage(StringUtils.getInstance().colorize("&cAdded milestonecount for " + args[1]));
 					}
 				});

 		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "SetMilestoneCount", "(player)", "(number)" },
+				.add(new CommandHandler(new String[] { "User", "(player)", "SetMilestoneCount", "(number)" },
 						"VotingPlugin.Commands.AdminVote.SetMilestoneCount|" + adminPerm, "Set milestonecount") {

 					@Override
 					public void execute(CommandSender sender, String[] args) {
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
-						user.setMilestoneCount(Integer.parseInt(args[2]));
+						user.setMilestoneCount(Integer.parseInt(args[3]));
 						SpecialRewards.getInstance().checkMilestone(user);
-						sender.sendMessage(StringUtils.getInstance().colorize("&cAdded milestonecount for " + args[1]));
+						sender.sendMessage(StringUtils.getInstance()
+								.colorize("&cSet milestonecount for " + args[1] + " to " + args[3]));
+					}
+				});
+
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "User", "(player)", "SetData", "(Text)", "(text)" },
+						"VotingPlugin.Commands.AdminVote.SetData|" + adminPerm, "Set data") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						user.getData().setString(args[3], args[4]);
+						sender.sendMessage(StringUtils.getInstance()
+								.colorize("&cSet " + args[3] + " for " + args[1] + " to " + args[4]));
 					}
 				});

@@ -672,6 +713,39 @@ public class CommandLoader {
 			}
 		});

+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "User", "(Player)", "ViewData" },
+				"VotingPlugin.Commands.AdminVote.ViewData|" + adminPerm, "View playerdata") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+				for (String key : user.getData().getKeys()) {
+					user.sendMessage("&c&l" + key + " &c" + user.getData().getString(key));
+				}
+			}
+		});
+
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "User", "(Player)", "ForceVote", "(Sitename)" },
+						"VotingPlugin.Commands.AdminVote.Vote|" + adminPerm, "Trigger manual vote") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(args[3]), args[1], args[3],
+								false);
+						sendMessage(sender, "&cTriggering vote...");
+						if (voteEvent.getVoteSite() != null) {
+							if (!voteEvent.getVoteSite().isVaidServiceSite()) {
+								sendMessage(sender,
+										"&cPossible issue with service site, has the server gotten the vote from "
+												+ voteEvent.getServiceSite() + "?");
+							}
+						}
+						plugin.getServer().getPluginManager().callEvent(voteEvent);
+
+					}
+				});
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "VoteSite", "(sitename)", "Create" },
 				"VotingPlugin.Commands.AdminVote.VoteSite.Edit|" + adminPerm, "Create VoteSite") {

@@ -935,6 +1009,60 @@ public class CommandLoader {
 					}
 				});

+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "User", "(player)", "ForceMilestone", "(Number)" },
+						"VotingPlugin.Commands.AdminVote.ForceMilestone|" + adminPerm, "Force a milestone") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						SpecialRewards.getInstance().giveMilestoneVoteReward(user, user.isOnline(), parseInt(args[3]));
+					}
+				});
+
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "User", "(player)", "ForceCummulative", "(Number)" },
+						"VotingPlugin.Commands.AdminVote.ForceCummulative|" + adminPerm, "Force a cummulative reward") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						SpecialRewards.getInstance().giveCumulativeVoteReward(user, user.isOnline(), parseInt(args[3]));
+					}
+				});
+
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "User", "(player)", "ForceAllSites" },
+				"VotingPlugin.Commands.AdminVote.ForceAllSites|" + adminPerm, "Force a allsites reward") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+				SpecialRewards.getInstance().giveAllSitesRewards(user, user.isOnline());
+			}
+		});
+
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "User", "(player)", "ForceFirstVote" },
+				"VotingPlugin.Commands.AdminVote.ForceFirstVote|" + adminPerm, "Force a firstvote reward") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+				SpecialRewards.getInstance().giveFirstVoteRewards(user, user.isOnline());
+			}
+		});
+
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "User", "(player)", "ForceVoteStreak", "(Text)", "(Number)" },
+						"VotingPlugin.Commands.AdminVote.ForceVoteStreak|" + adminPerm, "Force a votestreak reward") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						SpecialRewards.getInstance().giveVoteStreakReward(user, user.isOnline(), args[3], args[4],
+								parseInt(args[4]));
+					}
+				});
+
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "Placeholders", "(player)" },
 						"VotingPlugin.Commands.AdminVote.Placeholders.Players|" + adminPerm,
@@ -967,9 +1095,8 @@ public class CommandLoader {
 					}
 				});

-		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "" }, "VotingPlugin.Commands.AdminVote|" + adminPerm,
-						"Base command") {
+		plugin.getAdminVoteCommand().add(
+				new CommandHandler(new String[] {}, "VotingPlugin.Commands.AdminVote|" + adminPerm, "Base command") {

 					@Override
 					public void execute(CommandSender sender, String[] args) {
@@ -991,15 +1118,22 @@ public class CommandLoader {
 	 */
 	public void loadAliases() {
 		commands = new HashMap<String, CommandHandler>();
+		if (!Config.getInstance().isLoadCommandAliases()) {
+			return;
+		}
 		for (CommandHandler cmdHandle : plugin.getVoteCommand()) {
 			if (cmdHandle.getArgs().length > 0) {
 				String[] args = cmdHandle.getArgs()[0].split("&");
 				for (String arg : args) {
+					commands.put("vote" + arg, cmdHandle);
 					try {
 						plugin.getCommand("vote" + arg).setExecutor(new CommandAliases(cmdHandle, false));

 						plugin.getCommand("vote" + arg)
 								.setTabCompleter(new AliasesTabCompleter().setCMDHandle(cmdHandle, false));
+						for (String str : plugin.getCommand("vote" + arg).getAliases()) {
+							commands.put(str, cmdHandle);
+						}
 					} catch (Exception ex) {
 						plugin.debug("Failed to load command and tab completer for /vote" + arg);
 					}
@@ -1012,11 +1146,15 @@ public class CommandLoader {
 			if (cmdHandle.getArgs().length > 0) {
 				String[] args = cmdHandle.getArgs()[0].split("&");
 				for (String arg : args) {
+					commands.put("adminvote" + arg, cmdHandle);
 					try {
 						plugin.getCommand("adminvote" + arg).setExecutor(new CommandAliases(cmdHandle, true));

 						plugin.getCommand("adminvote" + arg)
 								.setTabCompleter(new AliasesTabCompleter().setCMDHandle(cmdHandle, true));
+						for (String str : plugin.getCommand("adminvote" + arg).getAliases()) {
+							commands.put(str, cmdHandle);
+						}
 					} catch (Exception ex) {
 						plugin.debug("Failed to load command and tab completer for /adminvote" + arg + ": "
 								+ ex.getMessage());
@@ -1359,21 +1497,15 @@ public class CommandLoader {
 			}
 		});

-		plugin.getVoteCommand().add(new CommandHandler(new String[] { "Points", },
-				"VotingPlugin.Commands.Vote.Points|" + playerPerm, "View your points") {
+		plugin.getVoteCommand().add(new CommandHandler(new String[] { "Points" },
+				"VotingPlugin.Commands.Vote.Points|" + playerPerm, "View your points", false) {

 			@Override
 			public void execute(CommandSender sender, String[] args) {
-
-				if (sender instanceof Player) {
-					User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-					String msg = Config.getInstance().getFormatCommandVotePoints()
-							.replace("%Player%", user.getPlayerName()).replace("%Points%", "" + user.getPoints());
-					user.sendMessage(msg);
-				} else {
-					sender.sendMessage("Must be a player to use this!");
-				}
-
+				User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
+				String msg = Config.getInstance().getFormatCommandVotePoints().replace("%Player%", user.getPlayerName())
+						.replace("%Points%", "" + user.getPoints());
+				user.sendMessage(msg);
 			}
 		});

@@ -1849,23 +1981,49 @@ public class CommandLoader {
 			}
 		});

-		plugin.getVoteCommand().add(new CommandHandler(new String[] {}, "", "See voting URLs") {
+		if (Config.getInstance().isAllowVotePointTransfers()) {
+			plugin.getVoteCommand().add(new CommandHandler(new String[] { "GivePoints", "(player)", "(number)" },
+					"VotingPlugin.Commands.Vote.GivePoints", "Give someone points from your points", false) {

-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				if (!Config.getInstance().isCommandsUseGUIVote() || !(sender instanceof Player)) {
-					if (isPlayer(sender)) {
-						User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-						user.sendMessage(Commands.getInstance().voteURLs(user));
-					} else {
-						sender.sendMessage(Commands.getInstance().voteURLs(null));
+				@Override
+				public void execute(CommandSender sender, String[] args) {
+					if (Config.getInstance().isAllowVotePointTransfers()) {
+						User cPlayer = UserManager.getInstance().getVotingPluginUser((Player) sender);
+
+						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						int pointsToGive = Integer.parseInt(args[2]);
+						if (cPlayer.getPoints() >= pointsToGive) {
+							user.addPoints(pointsToGive);
+							cPlayer.removePoints(pointsToGive);
+							sendMessage(sender, "&c" + pointsToGive + " points given to " + user.getPlayerName());
+							user.sendMessage(
+									"&cYou received " + pointsToGive + " points from " + cPlayer.getPlayerName());
+						} else {
+							sendMessage(sender, "&cNot enough points");
+						}
 					}
-				} else {
-					PlayerGUIs.getInstance().openVoteURL((Player) sender);
 				}
+			});
+		}

-			}
-		});
+		plugin.getVoteCommand().add(
+				new CommandHandler(new String[] {}, "VotingPlugin.Commands.Vote|" + playerPerm, "See voting URLs") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						if (!Config.getInstance().isCommandsUseGUIVote() || !(sender instanceof Player)) {
+							if (isPlayer(sender)) {
+								User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
+								user.sendMessage(Commands.getInstance().voteURLs(user));
+							} else {
+								sender.sendMessage(Commands.getInstance().voteURLs(null));
+							}
+						} else {
+							PlayerGUIs.getInstance().openVoteURL((Player) sender);
+						}
+
+					}
+				});

 		ArrayList<CommandHandler> avCommands = com.Ben12345rocks.AdvancedCore.Commands.CommandLoader.getInstance()
 				.getBasicCommands("VotingPlugin");
@@ -1884,67 +2042,4 @@ public class CommandLoader {
 	public void setCommands(HashMap<String, CommandHandler> commands) {
 		this.commands = commands;
 	}
-
-	public boolean isVotingPluginCommand(Player player, String cmd) {
-		if (plugin.getCommand(cmd) != null || cmd.startsWith("votingplugin")) {
-			return true;
-		}
-		for (String str : plugin.getDescription().getCommands().keySet()) {
-
-			for (String str1 : plugin.getCommand(str).getAliases()) {
-				if (str1.equalsIgnoreCase(cmd)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public boolean hasPermission(Player player, String cmd) {
-		if (cmd.startsWith("votingplugin:")) {
-			cmd = cmd.substring("votingplugin:".length());
-		}
-		boolean adminCommand = false;
-
-		if (cmd.startsWith("vote")) {
-			cmd = cmd.substring("vote".length());
-		} else if (cmd.startsWith("v")) {
-			cmd = cmd.substring(1);
-		} else if (cmd.startsWith("av")) {
-			adminCommand = true;
-			cmd = cmd.substring("av".length());
-		} else if (cmd.startsWith("adminvote")) {
-			adminCommand = true;
-			cmd = cmd.substring("adminvote".length());
-		}
-		// plugin.debug(cmd);
-		if (!adminCommand) {
-			for (CommandHandler handle : plugin.getVoteCommand()) {
-				if (handle.isCommand(cmd)) {
-					// plugin.debug("is handle " + ArrayUtils.getInstance()
-					// .makeStringList(ArrayUtils.getInstance().convert(handle.getArgs())));
-					if (handle.hasPerm(player)) {
-						// plugin.debug("has perm");
-						return true;
-					} else {
-						// plugin.debug("no perm " + cmd);
-					}
-				}
-			}
-		} else {
-			for (CommandHandler handle : plugin.getAdminVoteCommand()) {
-				if (handle.isCommand(cmd)) {
-					// plugin.debug("is handle " + ArrayUtils.getInstance()
-					// .makeStringList(ArrayUtils.getInstance().convert(handle.getArgs())));
-					if (handle.hasPerm(player)) {
-						// plugin.debug("has perm");
-						return true;
-					} else {
-						// plugin.debug("no perm " + cmd);
-					}
-				}
-			}
-		}
-		return false;
-	}
 }
@@ -888,7 +888,13 @@ public class Commands {
 			for (VoteSite voteSite : plugin.getVoteToday().get(user).keySet()) {
 				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(Config.getInstance().getFormatTimeFormat());
 				String timeString = plugin.getVoteToday().get(user).get(voteSite).format(formatter);
-				msg.add("&6" + user.getPlayerName() + " : " + voteSite.getKey() + " : " + timeString);
+				HashMap<String, String> placeholders = new HashMap<String, String>();
+				placeholders.put("player", user.getPlayerName());
+				placeholders.put("votesite", voteSite.getKey());
+				placeholders.put("time", timeString);
+				msg.add(StringUtils.getInstance()
+						.replacePlaceHolder(Config.getInstance().getFormatCommandsVoteTodayLine(), placeholders));
+			//	msg.add("&6" + user.getPlayerName() + " : " + voteSite.getKey() + " : " + timeString);
 			}
 		}
 		msg = ArrayUtils.getInstance().colorize(msg);
@@ -10,11 +10,12 @@ import org.bukkit.inventory.ItemStack;

 import com.Ben12345rocks.AdvancedCore.Util.EditGUI.EditGUI;
 import com.Ben12345rocks.AdvancedCore.Util.EditGUI.EditGUIButton;
-import com.Ben12345rocks.AdvancedCore.Util.EditGUI.EditGUIValueType;
+import com.Ben12345rocks.AdvancedCore.Util.EditGUI.ValueTypes.EditGUIValueBoolean;
+import com.Ben12345rocks.AdvancedCore.Util.EditGUI.ValueTypes.EditGUIValueNumber;
+import com.Ben12345rocks.AdvancedCore.Util.EditGUI.ValueTypes.EditGUIValueString;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory.ClickEvent;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventoryButton;
-import com.Ben12345rocks.AdvancedCore.Util.Item.ItemBuilder;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
 import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.InputMethod;
@@ -163,99 +164,91 @@ public class AdminGUI {
 			}
 		});

-		inv.addButton(new EditGUIButton(new ItemBuilder(Material.DIAMOND), "Priority", voteSite.getPriority(),
-				EditGUIValueType.NUMBER) {
+		inv.addButton(new EditGUIButton(new EditGUIValueNumber("Priority", voteSite.getPriority()) {

 			@Override
-			public void setValue(Player player, Object value) {
-				VoteSite voteSite = (VoteSite) getMeta(player, "VoteSite");
-				ConfigVoteSites.getInstance().setPriority(voteSite.getKey(), (int) value);
+			public void setValue(Player player, Number num) {
+				VoteSite voteSite = (VoteSite) getInv().getMeta(player, "VoteSite");
+				ConfigVoteSites.getInstance().setPriority(voteSite.getKey(), num.intValue());
 				plugin.reload();
 			}
-		});
+		}));

-		inv.addButton(new EditGUIButton(new ItemBuilder(Material.DIAMOND), "ServiceSite", voteSite.getServiceSite(),
-				EditGUIValueType.STRING) {
+		inv.addButton(new EditGUIButton(new EditGUIValueString("ServiceSite", voteSite.getServiceSite()) {

 			@Override
-			public void setValue(Player player, Object value) {
-				VoteSite voteSite = (VoteSite) getMeta(player, "VoteSite");
+			public void setValue(Player player, String value) {
+				VoteSite voteSite = (VoteSite) getInv().getMeta(player, "VoteSite");
 				String siteName = voteSite.getKey();
-				ConfigVoteSites.getInstance().setServiceSite(siteName, (String) value);
+				ConfigVoteSites.getInstance().setServiceSite(siteName, value);
 				plugin.reload();
 			}
-		});
+		}));

-		inv.addButton(new EditGUIButton(new ItemBuilder(Material.DIAMOND), "Name", voteSite.getDisplayName(),
-				EditGUIValueType.STRING) {
+		inv.addButton(new EditGUIButton(new EditGUIValueString("Name", voteSite.getDisplayName()) {

 			@Override
-			public void setValue(Player player, Object value) {
-				VoteSite voteSite = (VoteSite) getMeta(player, "VoteSite");
-				ConfigVoteSites.getInstance().setDisplayName(voteSite.getKey(), (String) value);
+			public void setValue(Player player, String value) {
+				VoteSite voteSite = (VoteSite) getInv().getMeta(player, "VoteSite");
+				ConfigVoteSites.getInstance().setDisplayName(voteSite.getKey(), value);
 				plugin.reload();
 			}
-		});
+		}));

-		inv.addButton(new EditGUIButton(new ItemBuilder(Material.DIAMOND), "VoteURL", voteSite.getVoteURL(),
-				EditGUIValueType.STRING) {
+		inv.addButton(new EditGUIButton(new EditGUIValueString("VoteURL", voteSite.getVoteURL()) {

 			@Override
-			public void setValue(Player player, Object value) {
-				VoteSite voteSite = (VoteSite) getMeta(player, "VoteSite");
+			public void setValue(Player player, String value) {
+				VoteSite voteSite = (VoteSite) getInv().getMeta(player, "VoteSite");
 				String siteName = voteSite.getKey();
-				ConfigVoteSites.getInstance().setVoteURL(siteName, (String) value);
+				ConfigVoteSites.getInstance().setVoteURL(siteName, value);
 				plugin.reload();
 			}
-		});
+		}));

-		inv.addButton(new EditGUIButton(new ItemBuilder(Material.DIAMOND), "VoteDelay", voteSite.getVoteDelay(),
-				EditGUIValueType.NUMBER) {
+		inv.addButton(new EditGUIButton(new EditGUIValueNumber("VoteDelay", voteSite.getVoteDelay()) {

 			@Override
-			public void setValue(Player player, Object value) {
-				VoteSite voteSite = (VoteSite) getMeta(player, "VoteSite");
+			public void setValue(Player player, Number num) {
+				VoteSite voteSite = (VoteSite) getInv().getMeta(player, "VoteSite");
 				String siteName = voteSite.getKey();
-				ConfigVoteSites.getInstance().setVoteDelay(siteName, (int) value);
+				ConfigVoteSites.getInstance().setVoteDelay(siteName, num.intValue());
 				plugin.reload();
 			}
-		});
+		}));

-		inv.addButton(new EditGUIButton(new ItemBuilder(Material.DIAMOND), "Enabled", voteSite.isEnabled(),
-				EditGUIValueType.BOOLEAN) {
+		inv.addButton(new EditGUIButton(new EditGUIValueBoolean("Enabled", voteSite.isEnabled()) {

 			@Override
-			public void setValue(Player player, Object value) {
-				VoteSite voteSite = (VoteSite) getMeta(player, "VoteSite");
+			public void setValue(Player player, boolean value) {
+				VoteSite voteSite = (VoteSite) getInv().getMeta(player, "VoteSite");
 				String siteName = voteSite.getKey();
-				ConfigVoteSites.getInstance().setEnabled(siteName, (boolean) value);
+				ConfigVoteSites.getInstance().setEnabled(siteName, value);
 				plugin.reload();
 			}
-		});
+		}));

-		inv.addButton(new EditGUIButton(new ItemBuilder(Material.DIAMOND), "ForceOffline", voteSite.isGiveOffline(),
-				EditGUIValueType.BOOLEAN) {
+		inv.addButton(new EditGUIButton(new EditGUIValueBoolean("ForceOffline", voteSite.isGiveOffline()) {

 			@Override
-			public void setValue(Player player, Object value) {
-				VoteSite voteSite = (VoteSite) getMeta(player, "VoteSite");
+			public void setValue(Player player, boolean value) {
+				VoteSite voteSite = (VoteSite) getInv().getMeta(player, "VoteSite");
 				String siteName = voteSite.getKey();
-				ConfigVoteSites.getInstance().setForceOffline(siteName, (boolean) value);
+				ConfigVoteSites.getInstance().setForceOffline(siteName, value);
 				plugin.reload();
 			}
-		});
+		}));

-		inv.addButton(new EditGUIButton(new ItemBuilder(Material.DIAMOND), "VoteDelayDaily",
-				voteSite.isVoteDelayDaily(), EditGUIValueType.BOOLEAN) {
+		inv.addButton(new EditGUIButton(new EditGUIValueBoolean("VoteDelayDaily", voteSite.isVoteDelayDaily()) {

 			@Override
-			public void setValue(Player player, Object value) {
-				VoteSite voteSite = (VoteSite) getMeta(player, "VoteSite");
+			public void setValue(Player player, boolean value) {
+				VoteSite voteSite = (VoteSite) getInv().getMeta(player, "VoteSite");
 				String siteName = voteSite.getKey();
-				ConfigVoteSites.getInstance().setVoteDelayDaily(siteName, (boolean) value);
+				ConfigVoteSites.getInstance().setVoteDelayDaily(siteName, value);
 				plugin.reload();
 			}
-		});
+		}));

 		inv.openInventory(player);
 	}
@@ -1,10 +1,12 @@
 package com.Ben12345rocks.VotingPlugin.Commands.GUI;

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

+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
@@ -161,30 +163,36 @@ public class PlayerGUIs {

 				@Override
 				public void onClick(ClickEvent event) {
-					Player player = event.getWhoClicked();
-					String cmd = Config.getInstance().getVoteGUISlotCommand(slot);
-					User user = getSelectedPlayer(player);
-					if (!cmd.equals("")) {
-						player.performCommand(cmd);
-					} else {
-						if (slot.equalsIgnoreCase("url")) {
-							openVoteURL(player);
-						} else if (slot.equalsIgnoreCase("next")) {
-							openVoteNext(player, user);
-						} else if (slot.equalsIgnoreCase("last")) {
-							openVoteLast(player, user);
-						} else if (slot.equalsIgnoreCase("total")) {
-							openVoteTotal(player, user);
-						} else if (slot.equalsIgnoreCase("top")) {
-							openVoteTop(player, null);
-						} else if (slot.equalsIgnoreCase("today")) {
-							openVoteToday(player);
-						} else if (slot.equalsIgnoreCase("help")) {
-							player.performCommand("vote help");
-						} else if (slot.equalsIgnoreCase("shop")) {
-							openVoteShop(player);
+					Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+						@Override
+						public void run() {
+							Player player = event.getWhoClicked();
+							String cmd = Config.getInstance().getVoteGUISlotCommand(slot);
+							User user = getSelectedPlayer(player);
+							if (!cmd.equals("")) {
+								player.performCommand(cmd);
+							} else {
+								if (slot.equalsIgnoreCase("url")) {
+									openVoteURL(player);
+								} else if (slot.equalsIgnoreCase("next")) {
+									openVoteNext(player, user);
+								} else if (slot.equalsIgnoreCase("last")) {
+									openVoteLast(player, user);
+								} else if (slot.equalsIgnoreCase("total")) {
+									openVoteTotal(player, user);
+								} else if (slot.equalsIgnoreCase("top")) {
+									openVoteTop(player, null);
+								} else if (slot.equalsIgnoreCase("today")) {
+									openVoteToday(player);
+								} else if (slot.equalsIgnoreCase("help")) {
+									player.performCommand("vote help");
+								} else if (slot.equalsIgnoreCase("shop")) {
+									openVoteShop(player);
+								}
+							}
 						}
-					}
+					});

 				}
 			});
@@ -471,25 +479,27 @@ public class PlayerGUIs {

 		int pos = 1;
 		for (Entry<User, Integer> entry : users) {
+			ItemBuilder playerItem;

-			inv.addButton(new BInventoryButton(
-					new ItemBuilder(MiscUtils.getInstance().setSkullOwner(entry.getKey().getOfflinePlayer()))
-							.setName(Config.getInstance().getGUIVoteTopItemName())
-							.addLoreLine(Config.getInstance().getGUIVoteTopItemLore())
-							.addPlaceholder("position", "" + pos)
-							.addPlaceholder("player", entry.getKey().getPlayerName())
-							.addPlaceholder("votes", "" + entry.getValue())) {
+			if (Config.getInstance().isGuiVoteTopUseSkull()) {
+				playerItem = new ItemBuilder(entry.getKey().getPlayerHead());
+			} else {
+				playerItem = new ItemBuilder(Material.valueOf(Config.getInstance().getGuiVoteTopPlayerItemMaterial()));
+			}
+
+			playerItem.setLore(new ArrayList<String>());
+
+			inv.addButton(new BInventoryButton(playerItem.setName(Config.getInstance().getGUIVoteTopItemName())
+					.addLoreLine(Config.getInstance().getGUIVoteTopItemLore()).addPlaceholder("position", "" + pos)
+					.addPlaceholder("player", entry.getKey().getPlayerName())
+					.addPlaceholder("votes", "" + entry.getValue())) {

 				@Override
 				public void onClick(ClickEvent clickEvent) {
-					// ItemBuilder item = new ItemBuilder(clickEvent.getClickedItem());
-					// String name = ChatColor.stripColor(item.getName()).split(":")[1].trim();
-					String name = (String) clickEvent.getButton().getData("player");
-
-					User user = UserManager.getInstance().getVotingPluginUser(name);
+					User user = (User) getData("User");
 					openVoteGUI(player, user);
 				}
-			}.addData("player", entry.getKey().getPlayerName()));
+			}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey()));
 			pos++;
 		}

@@ -584,8 +594,6 @@ public class PlayerGUIs {
 				@Override
 				public void onClick(ClickEvent event) {
 					User user = UserManager.getInstance().getVotingPluginUser(event.getPlayer());
-					Player player = event.getWhoClicked();
-					player.closeInventory();
 					user.sendMessage(Commands.getInstance().voteURLs(user));

 				}
@@ -609,10 +617,8 @@ public class PlayerGUIs {

 				@Override
 				public void onClick(ClickEvent event) {
-					Player player = event.getWhoClicked();
+					Player player = event.getPlayer();
 					if (player != null) {
-						player.closeInventory();
-
 						if (Config.getInstance().isCommandsVoteRewardFromVoteURL()
 								&& event.getClick().equals(ClickType.RIGHT)) {
 							voteReward(player, voteSite.getKey());
@@ -741,6 +747,16 @@ public class PlayerGUIs {
 			}
 		}

+		if (Config.getInstance().isVoteRewardBackButton()) {
+			inv.addButton(new BInventoryButton(getBackButton()) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				}
+			});
+		}
+
 		inv.openInventory(player);
 	}
 }
@@ -9,6 +9,7 @@ import org.bukkit.configuration.ConfigurationSection;

 import com.Ben12345rocks.AdvancedCore.Util.Annotation.AnnotationHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataBoolean;
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataDouble;
 import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataInt;
 import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataString;
 import com.Ben12345rocks.AdvancedCore.YML.YMLFile;
@@ -63,11 +64,10 @@ public class Config extends YMLFile {
 	@Getter
 	private String formatCommandsVoteLastLine;

-	
 	@ConfigDataString(path = "Format.Commands.Vote.Last.NeverVoted", defaultValue = "Never voted")
 	@Getter
 	private String formatCommandsVoteLastNeverVoted;
-	
+
 	@ConfigDataString(path = "Format.Commands.Vote.Last.LastVoted", defaultValue = "%times% ago")
 	@Getter
 	private String formatCommandsVoteLastLastVoted;
@@ -186,6 +186,10 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean countFakeVotes = true;

+	@ConfigDataBoolean(path = "GUI.VoteRewardBackButton")
+	@Getter
+	private boolean voteRewardBackButton = false;
+
 	@ConfigDataInt(path = "ConvertDelay", defaultValue = 30000)
 	@Getter
 	private int convertDelay;
@@ -194,6 +198,10 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean enableDailyRewards = false;

+	@ConfigDataBoolean(path = "DisableUpdateChecking")
+	@Getter
+	private boolean disableUpdateChecking = false;
+
 	@ConfigDataInt(path = "DelayBetweenUpdates")
 	@Getter
 	private int delayBetweenUpdates = 3;
@@ -202,6 +210,10 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean disableNoServiceSiteMessage = false;

+	@ConfigDataBoolean(path = "DisableAdvancedTab")
+	@Getter
+	private boolean disableAdvancedTab = false;
+
 	@Getter
 	private String firstVoteRewardsPath = "FirstVote";

@@ -220,6 +232,45 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean enableWeeklyAwards = false;

+	@ConfigDataDouble(path = "VoteStreak.Requirement.Day")
+	@Getter
+	private double voteStreakRequirementDay = 50;
+
+	@ConfigDataDouble(path = "VoteStreak.Requirement.Week")
+	@Getter
+	private double voteStreakRequirementWeek = 50;
+
+	@ConfigDataDouble(path = "VoteStreak.Requirement.Month")
+	@Getter
+	private double voteStreakRequirementMonth = 50;
+
+	@ConfigDataBoolean(path = "VoteStreak.Requirement.UsePercentage")
+	@Getter
+	private boolean voteStreakRequirementUsePercentage = false;
+
+	@ConfigDataBoolean(path = "LoadCommandAliases")
+	@Getter
+	private boolean loadCommandAliases = true;
+
+	@ConfigDataBoolean(path = "GUI.VoteTop.UseSkull")
+	@Getter
+	private boolean guiVoteTopUseSkull = true;
+
+	@ConfigDataString(path = "GUI.VoteTop.PlayerItem.Material")
+	@Getter
+	private String guiVoteTopPlayerItemMaterial = "PAPER";
+
+	@ConfigDataBoolean(path = "AllowVotePointTransfers")
+	@Getter
+	private boolean allowVotePointTransfers = false;
+
+	@Getter
+	private int formatPageSize = 10;
+
+	@ConfigDataString(path = "Format.Commands.Vote.Today.Line")
+	@Getter
+	private String formatCommandsVoteTodayLine = "&6%player% : %VoteSite% : %Time%";
+
 	/**
 	 * Instantiates a new config.
 	 */
@@ -568,9 +619,6 @@ public class Config extends YMLFile {
 		return getData().getString("Format.NotNumber", "&cError on &6%arg%&c, number expected!");
 	}

-	@Getter
-	private int formatPageSize = 10;
-
 	public String getFormatPrevPage() {
 		return getData().getString("Format.PrevPage", "&aPrevious Page");
 	}
@@ -1034,10 +1082,6 @@ public class Config extends YMLFile {
 		return getData().getBoolean("TopVoterIgnorePermission");
 	}

-	public int getUserVotesRequired() {
-		return getData().getInt("VoteParty.UserVotesRequired");
-	}
-
 	/**
 	 * Gets the vote GUI slot command.
 	 *
@@ -1133,6 +1177,10 @@ public class Config extends YMLFile {
 		return getData().getBoolean("VoteParty.ResetMonthly");
 	}

+	public int getVotePartyUserVotesRequired() {
+		return getData().getInt("VoteParty.UserVotesRequired");
+	}
+
 	/**
 	 * Gets the vote party votes required.
 	 *
@@ -124,10 +124,6 @@ public class ConfigVoteSites extends YMLFile {
 		return getData(siteName).getString("ServiceSite");
 	}

-	public boolean getWaitUntilVoteDelay(String siteName) {
-		return getData(siteName).getBoolean("WaitUntilVoteDelay", false);
-	}
-
 	/**
 	 * Gets the vote delay.
 	 *
@@ -256,6 +252,10 @@ public class ConfigVoteSites extends YMLFile {
 		return getData(siteName).getString("VoteURL");
 	}

+	public boolean getWaitUntilVoteDelay(String siteName) {
+		return getData(siteName).getBoolean("WaitUntilVoteDelay", false);
+	}
+
 	/**
 	 * Checks if is service site good.
 	 *
@@ -0,0 +1,60 @@
+package com.Ben12345rocks.VotingPlugin.Events;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.Ben12345rocks.VotingPlugin.Objects.User;
+
+import lombok.Getter;
+import lombok.Setter;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class PlayerVoteEvent.
+ */
+public class PlayerReceivePointsEvent extends Event {
+
+	/** The Constant handlers. */
+	private static final HandlerList handlers = new HandlerList();
+
+	/**
+	 * Gets the handler list.
+	 *
+	 * @return the handler list
+	 */
+	public static HandlerList getHandlerList() {
+		return handlers;
+	}
+
+	@Getter
+	@Setter
+	private User player;
+
+	@Getter
+	@Setter
+	private int points;
+
+	@Getter
+	@Setter
+	private boolean cancelled;
+
+	@Getter
+	@Setter
+	private String serviceSite = "";
+
+	public PlayerReceivePointsEvent(User user, int points) {
+		super(true);
+		setPlayer(user);
+		setPoints(points);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.bukkit.event.Event#getHandlers()
+	 */
+	@Override
+	public HandlerList getHandlers() {
+		return handlers;
+	}
+
+}
@@ -39,7 +39,7 @@ public class PlayerSpecialRewardEvent extends Event {
 	private boolean cancelled;

 	public PlayerSpecialRewardEvent(User user, SpecialRewardType type) {
-		super();
+		super(true);
 		setType(type);
 		setUser(user);
 	}
@@ -6,10 +6,9 @@ public enum SpecialRewardType {
 	ALLSITE, CUMMULATIVE, MILESTONE, VOTESTREAK, FIRSTVOTE;

 	@Getter
-
 	private int amount = -1;
-	@Getter

+	@Getter
 	private String type = "";

 	public SpecialRewardType setAmount(int num) {
@@ -29,7 +29,7 @@ public class VotePartyEvent extends Event {
 	private boolean cancelled;

 	public VotePartyEvent() {
-		super();
+		super(true);
 	}

 	/*
@@ -9,6 +9,7 @@ import org.bukkit.event.player.PlayerCommandSendEvent;

 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Commands.CommandLoader;
+import com.Ben12345rocks.VotingPlugin.Config.Config;

 // TODO: Auto-generated Javadoc
 /**
@@ -25,6 +26,9 @@ public class PlayerCommandSendListener implements Listener {

 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
 	public void onTab(PlayerCommandSendEvent event) {
+		if (Config.getInstance().isDisableAdvancedTab()) {
+			return;
+		}
 		ArrayList<String> removeCmds = new ArrayList<String>();
 		ArrayList<String> whiteListed = new ArrayList<String>();
 		for (String cmd : event.getCommands()) {
@@ -4,9 +4,9 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerLoginEvent;

 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
+import com.Ben12345rocks.AdvancedCore.Listeners.AdvancedCoreLoginEvent;
 import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
@@ -19,6 +19,7 @@ import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 public class PlayerJoinEvent implements Listener {

 	/** The plugin. */
+	@SuppressWarnings("unused")
 	private static Main plugin;

 	/**
@@ -38,36 +39,22 @@ public class PlayerJoinEvent implements Listener {
 	 *            the event
 	 */
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-	public void onPlayerLogin(PlayerLoginEvent event) {
-		plugin.getServer().getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+	public void onPlayerLogin(AdvancedCoreLoginEvent event) {
+		if (event.getPlayer() == null || (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)
+				&& AdvancedCoreHook.getInstance().getMysql() == null)) {
+			return;
+		}
+		Player player = event.getPlayer();

-			@Override
-			public void run() {
+		User user = UserManager.getInstance().getVotingPluginUser(player);

-				if (event.getPlayer() == null
-						|| (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)
-								&& AdvancedCoreHook.getInstance().getMysql() == null)) {
-					return;
-				}
-				Player player = event.getPlayer();
+		// run remind
+		user.loginMessage();

-				if (player != null) {
-					User user = UserManager.getInstance().getVotingPluginUser(player);
-
-					// run remind
-					user.loginMessage();
-
-					if (user.getData().hasData()) {
-						// give offline vote (if they voted offline)
-
-						user.offVote();
-
-					}
-
-				}
-
-			}
-		}, 20L);
+		if (user.getData().hasData()) {
+			// give offline vote (if they voted offline)
+			user.offVote();
+		}

 	}
 }
@@ -88,7 +88,7 @@ public class PlayerVoteListener implements Listener {
 		if (Config.getInstance().isClearCacheOnVote()) {
 			user.clearCache();
 		}
-		
+
 		if (voteSite.isWaitUntilVoteDelay() && !user.canVoteSite(voteSite)) {
 			plugin.getLogger().info(user.getPlayerName() + " must wait until votedelay is over, ignoring vote");
 			return;
@@ -138,6 +138,8 @@ public class PlayerVoteListener implements Listener {
 				user.addPoints();
 			}

+			user.checkDayVoteStreak();
+
 			// other rewards
 			SpecialRewards.getInstance().checkAllSites(user);
 			SpecialRewards.getInstance().checkCumualativeVotes(user);
@@ -16,6 +16,7 @@ import java.util.Timer;
 import java.util.TimerTask;

 import org.bukkit.Bukkit;
+import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
@@ -27,9 +28,14 @@ import org.bukkit.plugin.java.JavaPlugin;
 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
 import com.Ben12345rocks.AdvancedCore.NMSManager.NMSManager;
+import com.Ben12345rocks.AdvancedCore.Rewards.Reward;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.Injected.RewardInjectInt;
 import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
+import com.Ben12345rocks.AdvancedCore.Util.EditGUI.EditGUIButton;
+import com.Ben12345rocks.AdvancedCore.Util.EditGUI.ValueTypes.EditGUIValueNumber;
+import com.Ben12345rocks.AdvancedCore.Util.Item.ItemBuilder;
 import com.Ben12345rocks.AdvancedCore.Util.Javascript.JavascriptPlaceholderRequest;
 import com.Ben12345rocks.AdvancedCore.Util.Logger.Logger;
 import com.Ben12345rocks.AdvancedCore.Util.Metrics.BStatsMetrics;
@@ -62,6 +68,7 @@ import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
 import com.Ben12345rocks.VotingPlugin.Updater.CheckUpdate;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+import com.Ben12345rocks.VotingPlugin.Util.PlaceHolders.MVdWPlaceholders;
 import com.Ben12345rocks.VotingPlugin.Util.PlaceHolders.PlaceHolders;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
 import com.Ben12345rocks.VotingPlugin.VoteReminding.VoteReminding;
@@ -118,10 +125,14 @@ public class Main extends JavaPlugin {
 	@Getter
 	private boolean updateStarted = false;

+	public AdvancedCoreHook getAdvancedCoreHook() {
+		return AdvancedCoreHook.getInstance();
+	}
+
 	/**
 	 * Check votifier.
 	 */
-	public void checkVotifier() {
+	private void checkVotifier() {
 		try {
 			Class.forName("com.vexsoftware.votifier.model.VotifierEvent");
 		} catch (ClassNotFoundException e) {
@@ -694,6 +705,14 @@ public class Main extends JavaPlugin {
 	public void onEnable() {
 		plugin = this;

+		// disable plugin for older versions below 1.12
+		if (NMSManager.getInstance().isVersion("1.7", "1.8", "1.9", "1.10", "1.11", "1.12")) {
+			plugin.getLogger().severe("Detected running " + NMSManager.getInstance().getVersion()
+					+ ", this version is not supported on this build. Disabling");
+			Bukkit.getPluginManager().disablePlugin(plugin);
+			return;
+		}
+
 		setupFiles();
 		loadVoteSites();
 		AdvancedCoreHook.getInstance().setJenkinsSite("ben12345rocks.com");
@@ -702,9 +721,7 @@ public class Main extends JavaPlugin {
 		registerCommands();
 		registerEvents();
 		checkVotifier();
-
 		CheckUpdate.getInstance().startUp();
-
 		VoteReminding.getInstance().loadRemindChecking();

 		plugin.signs = new ArrayList<SignHandler>();
@@ -722,11 +739,11 @@ public class Main extends JavaPlugin {
 			topVoter.put(top, new LinkedHashMap<User, Integer>());
 		}
 		voteToday = new LinkedHashMap<User, HashMap<VoteSite, LocalDateTime>>();
-
 		voteLog = new Logger(plugin, new File(plugin.getDataFolder() + File.separator + "Log", "votelog.txt"));

 		AdminGUI.getInstance().loadHook();

+		// vote party
 		if (Config.getInstance().getVotePartyEnabled()) {
 			VoteParty.getInstance().check();
 		}
@@ -748,6 +765,10 @@ public class Main extends JavaPlugin {

 		PlaceHolders.getInstance().load();

+		if (Bukkit.getPluginManager().isPluginEnabled("MVdWPlaceholderAPI")) {
+			MVdWPlaceholders.getInstance().loadMVdWPlaceholders();
+		}
+
 		// set columns
 		if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
 			AdvancedCoreHook.getInstance().getMysql().alterColumnType("TopVoterIgnore", "VARCHAR(5)");
@@ -755,7 +776,7 @@ public class Main extends JavaPlugin {
 			AdvancedCoreHook.getInstance().getMysql().alterColumnType("Reminded", "VARCHAR(5)");
 			AdvancedCoreHook.getInstance().getMysql().alterColumnType("DisableBroadcast", "VARCHAR(5)");
 			AdvancedCoreHook.getInstance().getMysql().alterColumnType("LastOnline", "VARCHAR(20)");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("PlayerName", "VARCHAR(20)");
+			AdvancedCoreHook.getInstance().getMysql().alterColumnType("PlayerName", "VARCHAR(30)");
 			AdvancedCoreHook.getInstance().getMysql().alterColumnType("DailyTotal", "INT DEFAULT '0'");
 			AdvancedCoreHook.getInstance().getMysql().alterColumnType("WeeklyTotal", "INT DEFAULT '0'");
 			AdvancedCoreHook.getInstance().getMysql().alterColumnType("DayVoteStreak", "INT DEFAULT '0'");
@@ -773,9 +794,24 @@ public class Main extends JavaPlugin {
 			AdvancedCoreHook.getInstance().getMysql().alterColumnType("MonthTotal", "INT DEFAULT '0'");
 			AdvancedCoreHook.getInstance().getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
 			AdvancedCoreHook.getInstance().getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
-
 		}

+		RewardHandler.getInstance().getInjectedRewards().add(new RewardInjectInt("Points", 0) {
+
+			@Override
+			public void onRewardRequest(Reward reward, com.Ben12345rocks.AdvancedCore.UserManager.User user, int num,
+					HashMap<String, String> placeholders) {
+				UserManager.getInstance().getVotingPluginUser(user).addPoints(num);
+			}
+		}.addEditButton(new EditGUIButton(new ItemBuilder(Material.PAPER), new EditGUIValueNumber("Points", null) {
+
+			@Override
+			public void setValue(Player player, Number value) {
+				Reward reward = (Reward) getInv().getData("Reward");
+				reward.getConfig().set("Points", value.intValue());
+			}
+		})));
+
 		plugin.getLogger().info("Enabled VotingPlugin " + plugin.getDescription().getVersion());

 		boolean hasRewards = RewardHandler.getInstance().hasRewards(ConfigVoteSites.getInstance().getData(),
@@ -813,11 +849,6 @@ public class Main extends JavaPlugin {
 				}
 			}, 30l);
 		}
-
-		if (NMSManager.getInstance().isVersion("1.7", "1.8", "1.9", "1.10", "1.11", "1.12")) {
-			plugin.getLogger().severe("Detected running " + NMSManager.getInstance().getVersion()
-					+ ", this version is not supported on this build");
-		}
 	}

 	/**
@@ -861,15 +892,10 @@ public class Main extends JavaPlugin {
 		pm.registerEvents(new PlayerJoinEvent(this), this);
 		pm.registerEvents(new VotiferEvent(this), this);
 		pm.registerEvents(new PlayerVoteListener(this), this);
-
 		pm.registerEvents(new SignChange(this), this);
-
 		pm.registerEvents(new BlockBreak(this), this);
-
 		pm.registerEvents(new PlayerInteract(this), this);
-
 		pm.registerEvents(new VotingPluginUpdateEvent(this), this);
-
 		pm.registerEvents(new PlayerCommandSendListener(this), this);

 		plugin.debug("Loaded Events");
@@ -889,14 +915,9 @@ public class Main extends JavaPlugin {
 		AdvancedCoreHook.getInstance().setConfigData(Config.getInstance().getData());
 		AdvancedCoreHook.getInstance().reload();
 		PlaceHolders.getInstance().load();
-		// loadTimer();
-
 	}

-	/**
-	 * Setup files.
-	 */
-	public void setupFiles() {
+	private void setupFiles() {
 		try {
 			config = Config.getInstance();
 			config.setup();
@@ -11,6 +11,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;

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

 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
@@ -23,6 +24,7 @@ import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerReceivePointsEvent;
 import com.Ben12345rocks.VotingPlugin.SpecialRewards.SpecialRewards;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
@@ -111,6 +113,47 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		setOfflineVotes(offlineVotes);
 	}

+	public boolean hasPercentageTotal(TopVoter top, double percentage, LocalDateTime time) {
+		int total = getTotal(top);
+		switch (top) {
+			case Daily:
+				return total / plugin.getVoteSites().size() * 100 > percentage;
+			case Monthly:
+				return total / (plugin.getVoteSites().size() * time.getMonth().length(false)) * 100 > percentage;
+			case Weekly:
+				return total / (plugin.getVoteSites().size() * 7) * 100 > percentage;
+			default:
+				return false;
+		}
+	}
+
+	public void checkDayVoteStreak() {
+		if (!voteStreakUpdatedToday(LocalDateTime.now())) {
+			if (!Config.getInstance().isVoteStreakRequirementUsePercentage()
+					|| hasPercentageTotal(TopVoter.Daily, Config.getInstance().getVoteStreakRequirementDay(), null)) {
+				addDayVoteStreak();
+				SpecialRewards.getInstance().checkVoteStreak(this, "Day");
+				setDayVoteStreakLastUpdate(System.currentTimeMillis());
+			}
+		}
+	}
+
+	public boolean voteStreakUpdatedToday(LocalDateTime time) {
+		return MiscUtils.getInstance().getTime(getDayVoteStreakLastUpdate()).getDayOfYear() == time.getDayOfYear();
+	}
+
+	public long getDayVoteStreakLastUpdate() {
+		String str = getData().getString("DayVoteStreakLastUpdate");
+		if (str.isEmpty()) {
+			return 0;
+		}
+		return Long.parseLong(str);
+	}
+
+	public void setDayVoteStreakLastUpdate(long time) {
+		getData().setString("DayVoteStreakLastUpdate", "" + time);
+	}
+
 	/**
 	 * Adds the points.
 	 */
@@ -128,7 +171,14 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	 *            the value
 	 */
 	public void addPoints(int value) {
-		setPoints(getPoints() + value);
+		PlayerReceivePointsEvent event = new PlayerReceivePointsEvent(this, value);
+		Bukkit.getPluginManager().callEvent(event);
+
+		if (event.isCancelled()) {
+			return;
+		}
+
+		setPoints(getPoints() + event.getPoints());
 	}

 	/**
@@ -356,9 +406,9 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		for (VoteSite voteSite : plugin.getVoteSites()) {
 			times.put(voteSite, getTime(voteSite));
 		}
-		LinkedHashMap<VoteSite, Long> sorted = (LinkedHashMap<VoteSite, Long>) times.entrySet().stream()
-				.sorted(Collections.reverseOrder(Map.Entry.comparingByValue()))
-				.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+		LinkedHashMap<VoteSite, Long> sorted = new LinkedHashMap<>(
+				times.entrySet().stream().sorted(Collections.reverseOrder(Map.Entry.comparingByValue()))
+						.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
 		return sorted;
 	}

@@ -417,6 +467,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 				return getData().getInt("MonthTotal");
 			case Weekly:
 				return getUserData().getInt("WeeklyTotal");
+			default:
+				break;
 		}
 		return 0;
 	}
@@ -440,12 +492,14 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {

 	public void giveDailyTopVoterAward(int place, String path) {
 		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getDailyAwardRewardsPath(path))
-				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Daily").send(this);
+				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Daily").setOnline(isOnline())
+				.send(this);
 	}

 	public void giveMonthlyTopVoterAward(int place, String path) {
 		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getMonthlyAwardRewardsPath(path))
-				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Monthly").send(this);
+				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Monthly").setOnline(isOnline())
+				.send(this);
 	}

 	public void giveOfflineOtherRewards() {
@@ -500,7 +554,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {

 	public void giveWeeklyTopVoterAward(int place, String path) {
 		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getWeeklyAwardRewardsPath(path))
-				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Weekly").send(this);
+				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Weekly").setOnline(isOnline())
+				.send(this);
 	}

 	/**
@@ -126,6 +126,8 @@ public class VoteSite {
 			}

 			MiscUtils.getInstance().broadcast(bc, players);
+		} else {
+			plugin.debug(user.getPlayerName() + " is vanished, not broadcasting");
 		}
 	}

@@ -107,11 +107,10 @@ public class TopVoterHandler implements Listener {
 	public void onDayChange(DayChangeEvent event) {
 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getTotal(TopVoter.Daily) == 0 && user.getDayVoteStreak() != 0) {
-				user.setDayVoteStreak(0);
-			} else {
-				user.addDayVoteStreak();
-				SpecialRewards.getInstance().checkVoteStreak(user, "Day");
+			if (!user.voteStreakUpdatedToday(LocalDateTime.now().minusDays(1))) {
+				if (user.getDayVoteStreak() != 0) {
+					user.setDayVoteStreak(0);
+				}
 			}

 			if (user.getHighestDailyTotal() < user.getTotal(TopVoter.Daily)) {
@@ -155,8 +154,12 @@ public class TopVoterHandler implements Listener {
 			if (user.getTotal(TopVoter.Monthly) == 0 && user.getMonthVoteStreak() != 0) {
 				user.setMonthVoteStreak(0);
 			} else {
-				user.addMonthVoteStreak();
-				SpecialRewards.getInstance().checkVoteStreak(user, "Month");
+				if (!Config.getInstance().isVoteStreakRequirementUsePercentage() || user.hasPercentageTotal(
+						TopVoter.Monthly, Config.getInstance().getVoteStreakRequirementMonth(),
+						LocalDateTime.now().minusDays(1))) {
+					user.addMonthVoteStreak();
+					SpecialRewards.getInstance().checkVoteStreak(user, "Month");
+				}
 			}

 			if (user.getHighestMonthlyTotal() < user.getTotal(TopVoter.Monthly)) {
@@ -215,8 +218,11 @@ public class TopVoterHandler implements Listener {
 			if (user.getTotal(TopVoter.Weekly) == 0 && user.getWeekVoteStreak() != 0) {
 				user.setWeekVoteStreak(0);
 			} else {
-				user.addWeekVoteStreak();
-				SpecialRewards.getInstance().checkVoteStreak(user, "Week");
+				if (!Config.getInstance().isVoteStreakRequirementUsePercentage() || user.hasPercentageTotal(
+						TopVoter.Weekly, Config.getInstance().getVoteStreakRequirementWeek(), null)) {
+					user.addWeekVoteStreak();
+					SpecialRewards.getInstance().checkVoteStreak(user, "Week");
+				}
 			}

 			if (user.getHighestWeeklyTotal() < user.getTotal(TopVoter.Weekly)) {
@@ -7,6 +7,7 @@ import org.bukkit.Bukkit;

 import com.Ben12345rocks.AdvancedCore.Util.Updater.Updater;
 import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Config.Config;

 // TODO: Auto-generated Javadoc
 /**
@@ -49,6 +50,9 @@ public class CheckUpdate {
 	 * Check update.
 	 */
 	public void checkUpdate() {
+		if (Config.getInstance().isDisableUpdateChecking()) {
+			return;
+		}
 		plugin.setUpdater(new Updater(plugin, 15358, false));
 		final Updater.UpdateResult result = plugin.getUpdater().getResult();
 		switch (result) {
@@ -75,6 +79,9 @@ public class CheckUpdate {
 	}

 	public void checkUpdateBasic() {
+		if (Config.getInstance().isDisableUpdateChecking()) {
+			return;
+		}
 		plugin.setUpdater(new Updater(plugin, 15358, false));
 		final Updater.UpdateResult result = plugin.getUpdater().getResult();
 		switch (result) {
@@ -95,6 +102,9 @@ public class CheckUpdate {
 	 * Start up.
 	 */
 	public void startUp() {
+		if (Config.getInstance().isDisableUpdateChecking()) {
+			return;
+		}
 		Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {

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

+	public User getVotingPluginUser(com.Ben12345rocks.AdvancedCore.UserManager.User user) {
+		return getVotingPluginUser(java.util.UUID.fromString(user.getUUID()));
+	}
+
 	public User getVotingPluginUser(java.util.UUID uuid) {
 		return getVotingPluginUser(new UUID(uuid.toString()));
 	}
@@ -0,0 +1,86 @@
+package com.Ben12345rocks.VotingPlugin.Util.PlaceHolders;
+
+import org.bukkit.Bukkit;
+
+import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+
+import be.maximvdw.placeholderapi.PlaceholderAPI;
+import be.maximvdw.placeholderapi.PlaceholderReplaceEvent;
+import be.maximvdw.placeholderapi.PlaceholderReplacer;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class PlaceHolders.
+ */
+public class MVdWPlaceholders {
+
+	/** The instance. */
+	static MVdWPlaceholders instance = new MVdWPlaceholders();
+
+	/** The plugin. */
+	static Main plugin = Main.plugin;
+
+	/**
+	 * Gets the single instance of PlaceHolders.
+	 *
+	 * @return single instance of PlaceHolders
+	 */
+	public static MVdWPlaceholders getInstance() {
+		return instance;
+	}
+
+	/**
+	 * Instantiates a new place holders.
+	 */
+	private MVdWPlaceholders() {
+	}
+
+	/**
+	 * Instantiates a new place holders.
+	 *
+	 * @param plugin
+	 *            the plugin
+	 */
+	public MVdWPlaceholders(Main plugin) {
+		MVdWPlaceholders.plugin = plugin;
+	}
+
+	public void loadMVdWPlaceholders() {
+		if (Bukkit.getPluginManager().isPluginEnabled("MVdWPlaceholderAPI")) {
+			// The plugin is enabled
+			for (final PlaceHolder place : PlaceHolders.getInstance().getPlaceholders()) {
+				String str = place.getIdentifier();
+				if (!str.endsWith("_")) {
+					PlaceholderAPI.registerPlaceholder(Main.plugin, "VotingPlugin_" + str, new PlaceholderReplacer() {
+
+						@Override
+						public String onPlaceholderReplace(PlaceholderReplaceEvent event) {
+							return place.placeholderRequest(event.getOfflinePlayer(),
+									UserManager.getInstance().getVotingPluginUser(event.getOfflinePlayer()),
+									event.getPlaceholder().substring("VotingPlugin_".length()));
+						}
+
+					});
+				}
+
+			}
+
+			for (final PlaceHolder place : PlaceHolders.getInstance().getNonPlayerPlaceholders()) {
+				String str = place.getIdentifier();
+				if (!str.endsWith("_")) {
+					PlaceholderAPI.registerPlaceholder(Main.plugin, "VotingPlugin_" + str, new PlaceholderReplacer() {
+
+						@Override
+						public String onPlaceholderReplace(PlaceholderReplaceEvent event) {
+							return place.placeholderRequest(event.getOfflinePlayer(), null,
+									event.getPlaceholder().substring("VotingPlugin_".length()));
+						}
+
+					});
+				}
+
+			}
+		}
+	}
+}
@@ -24,6 +24,10 @@ public abstract class PlaceHolder {
 		this.useStartsWith = useStartsWith;
 	}

+	public boolean hasDescription() {
+		return description != null;
+	}
+
 	public boolean matches(String identifier) {
 		if (isUseStartsWith()) {
 			if (StringUtils.getInstance().startsWithIgnoreCase(identifier, getIdentifier())) {
@@ -49,8 +53,4 @@ public abstract class PlaceHolder {
 		return this;
 	}

-	public boolean hasDescription() {
-		return description != null;
-	}
-
 }
@@ -258,6 +258,13 @@ public class PlaceHolders {
 					return Commands.getInstance().voteCommandLastDuration(user, voteSite);
 				}
 			}.withDescription("How long ago user voted on " + voteSite.getKey()));
+			placeholders.add(new PlaceHolder("CanVote_" + voteSite.getKey()) {
+
+				@Override
+				public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+					return "" + user.canVoteSite(voteSite);
+				}
+			}.withDescription("Whether or not player can vote on " + voteSite.getKey()));
 		}

 		placeholders.add(new PlaceHolder("Top_All_Position") {
@@ -275,6 +282,22 @@ public class PlaceHolders {
 			}
 		}.withDescription("Get user top voter position"));

+		placeholders.add(new PlaceHolder("Top_AllVotes_") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int num = 1;
+				int number = Integer.parseInt(identifier.split("_")[2]);
+				for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.AllTime).entrySet()) {
+					if (num == number) {
+						return "" + entry.getKey().getTotal(TopVoter.AllTime);
+					}
+					num++;
+				}
+				return "";
+			}
+		}.useStartsWith().withDescription("Get user votes at position in top voter"));
+
 		placeholders.add(new PlaceHolder("Top_All_") {

 			@Override
@@ -320,7 +343,23 @@ public class PlaceHolders {
 				}
 				return "";
 			}
-		}.useStartsWith().withDescription("Get user at postion in top voter"));
+		}.useStartsWith().withDescription("Get user at position in top voter"));
+
+		placeholders.add(new PlaceHolder("Top_MonthVotes_") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int num = 1;
+				int number = Integer.parseInt(identifier.split("_")[2]);
+				for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.Monthly).entrySet()) {
+					if (num == number) {
+						return "" + entry.getKey().getTotal(TopVoter.Monthly);
+					}
+					num++;
+				}
+				return "";
+			}
+		}.useStartsWith().withDescription("Get user votes at position in top voter"));

 		placeholders.add(new PlaceHolder("Top_Week_Position") {

@@ -353,6 +392,22 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user at postion in top voter"));

+		placeholders.add(new PlaceHolder("Top_WeekVotes_") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int num = 1;
+				int number = Integer.parseInt(identifier.split("_")[2]);
+				for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.Weekly).entrySet()) {
+					if (num == number) {
+						return "" + entry.getKey().getTotal(TopVoter.Weekly);
+					}
+					num++;
+				}
+				return "";
+			}
+		}.useStartsWith().withDescription("Get user votes at position in top voter"));
+
 		placeholders.add(new PlaceHolder("Top_Daily_Position") {

 			@Override
@@ -384,6 +439,22 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user at postion in top voter"));

+		placeholders.add(new PlaceHolder("Top_DailyVotes_") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int num = 1;
+				int number = Integer.parseInt(identifier.split("_")[2]);
+				for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.Daily).entrySet()) {
+					if (num == number) {
+						return "" + entry.getKey().getTotal(TopVoter.Daily);
+					}
+					num++;
+				}
+				return "";
+			}
+		}.useStartsWith().withDescription("Get user votes at position in top voter"));
+
 		// non players

 		nonPlayerPlaceholders.add(new PlaceHolder("VotePartyVotesCurrent") {
@@ -95,8 +95,8 @@ public class VoteParty implements Listener {
 			if (event.isCancelled()) {
 				return;
 			}
-			giveRewards();
 			MiscUtils.getInstance().broadcast(Config.getInstance().getVotePartyBroadcast());
+			giveRewards();

 			if (Config.getInstance().getVotePartyIncreaseVotesRquired() > 0) {
 				ServerData.getInstance().setVotePartyExtraRequired(ServerData.getInstance().getVotePartyExtraRequired()
@@ -173,23 +173,21 @@ public class VoteParty implements Listener {
 		return required;
 	}

+	public void giveReward(User user) {
+		if (Config.getInstance().getVotePartyUserVotesRequired() > 0) {
+			if (user.getVotePartyVotes() < Config.getInstance().getVotePartyUserVotesRequired()) {
+				return;
+			}
+		}
+		giveReward(user, user.isOnline());
+	}
+
 	public void giveReward(User user, boolean online) {
-		/*
-		 * if (PlayerUtils.getInstance().isPlayerOnline(user.getPlayerName())) { if
-		 * (user.getVotePartyVotes() >= Config.getInstance().getUserVotesRequired()) {
-		 * RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-		 * Config.getInstance().getVotePartyRewardsPath()); } } else {
-		 * user.addOfflineOtherReward("VoteParty"); }
-		 */
 		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getVotePartyRewardsPath())
 				.setOnline(online)
 				.withPlaceHolder("VotesRequired", "" + Config.getInstance().getVotePartyVotesRequired()).send(user);
 	}

-	public void giveReward(User user) {
-		giveReward(user, user.isOnline());
-	}
-
 	/**
 	 * Give rewards.
 	 */
@@ -206,11 +204,13 @@ public class VoteParty implements Listener {
 		}

 		if (Config.getInstance().getVotePartyGiveAllPlayers()) {
+			plugin.debug("Giving all players vote party");
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
 				giveReward(user);
 			}
 		} else {
+			plugin.debug(ArrayUtils.getInstance().makeStringList(getVotedUsers()));
 			for (String uuid : getVotedUsers()) {
 				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
 				giveReward(user);
@@ -0,0 +1,26 @@
+package com.Ben12345rocks.VotingPlugin;
+
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.Injected.RewardInject;
+import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+
+public class VotingPluginHooks {
+	private static VotingPluginHooks instance = new VotingPluginHooks();
+
+	public static VotingPluginHooks getInstance() {
+		return instance;
+	}
+
+	public Main getMainClass() {
+		return Main.plugin;
+	}
+
+	public void addCustomReward(RewardInject inject) {
+		RewardHandler.getInstance().getInjectedRewards().add(inject);
+	}
+
+	public UserManager getUserManager() {
+		return UserManager.getInstance();
+	}
+
+}
Author	SHA1	Message	Date
Ben12345rocks	6e9916fcbd	Update version number	2019-03-18 19:16:47 -04:00
Ben12345rocks	e81c3e27bc	Little fix	2019-03-09 20:50:22 -05:00
Ben12345rocks	f4613cdce4	Update version number	2019-03-09 20:43:32 -05:00
Ben12345rocks	799340ce06	Added config option	2019-03-09 20:42:21 -05:00
Ben12345rocks	ea1a033f2e	Changes	2019-03-08 17:09:39 -05:00
Ben12345rocks	dabdd8ae8f	Add basic preloading	2019-03-07 20:35:45 -05:00
Ben12345rocks	3e2b7eede9	Config update	2019-03-07 18:52:12 -05:00
Ben12345rocks	f941deed79	remove hardcode of vote today, closes #512	2019-03-07 18:40:44 -05:00
Ben12345rocks	f601b4a134	Add debug for when user in vanish	2019-02-27 19:04:37 -05:00
Ben12345rocks	26630725bd	Prevent loading plugin on 1.11 or lower	2019-02-26 18:55:13 -05:00
Ben12345rocks	7faa90ce43	Merge branch 'master' of https://github.com/Ben12345rocks/VotingPlugin	2019-02-23 19:25:15 -05:00
Ben12345rocks	4c99b6b06e	Remove VotingPlugin.Player from /av givepoints	2019-02-18 17:26:25 -05:00
Ben	2f2d8278a4	Merge pull request #506 from kakd/patch-1 Minor spelling fixes in commens	2019-02-18 16:58:06 -05:00
kakd	e8be2974f9	Minor spelling fixes in commens	2019-02-18 16:52:21 -05:00
Ben12345rocks	4930feff94	Add softdepend	2019-02-17 12:17:56 -05:00
Ben12345rocks	132d871039	Update version number	2019-02-16 18:51:38 -05:00
Ben12345rocks	aea6954dbb	Bug fix	2019-02-16 18:47:40 -05:00
Ben12345rocks	1ee8819e4c	Add ability to transfer vote points	2019-02-16 08:12:45 -05:00
Ben12345rocks	41e3b7fbf6	Bug fix	2019-02-12 16:39:46 -05:00
Ben12345rocks	4218d240bc	Bug fix	2019-02-11 17:09:17 -05:00
Ben12345rocks	683d6fcc42	Test commit	2019-02-11 17:07:12 -05:00
Ben12345rocks	c9f6ab2fa6	Add event for when points received	2019-02-09 20:33:42 -05:00
Ben12345rocks	c99d3baa3c	Bug fix	2019-02-09 10:31:59 -05:00
Ben12345rocks	d0ade2feff	Add MVdW placeholders	2019-02-08 20:32:51 -05:00
Ben12345rocks	dcebe5a701	Add authme support	2019-02-08 20:16:21 -05:00
Ben12345rocks	d33791fb28	Update version number	2019-02-03 12:13:26 -05:00
Ben12345rocks	8512b3ab4f	Bug fix	2019-02-01 20:12:06 -05:00
Ben12345rocks	4395d8cc89	Update version number	2019-01-19 19:30:37 -05:00
Ben12345rocks	55f4e6872c	Add option to disable skulls for vote top	2019-01-13 12:19:09 -05:00
Ben12345rocks	6699a9204c	Bug fix	2019-01-12 17:40:49 -05:00
Ben12345rocks	14e1a975c9	Improvements	2019-01-09 17:26:27 -05:00
Ben12345rocks	7ab3c4bcf9	Possible bug fix	2019-01-08 18:25:52 -05:00
Ben12345rocks	1866196571	Improvements	2019-01-07 16:47:25 -05:00
Ben12345rocks	301c21ed20	Preload skull for top voter	2019-01-06 14:01:55 -05:00
Ben12345rocks	2d5208a568	Update version number	2018-12-30 18:34:37 -05:00
Ben12345rocks	44a543e64c	Bug fix	2018-12-30 18:34:09 -05:00
Ben12345rocks	458c66819a	Bug fix	2018-12-30 17:35:27 -05:00
Ben12345rocks	dcf4f3f15d	Update version number	2018-12-30 15:20:25 -05:00
Ben12345rocks	e33ef5420a	Added another command	2018-12-30 13:05:55 -05:00
Ben12345rocks	8d1c3a05ce	Add new command	2018-12-30 12:27:40 -05:00
Ben12345rocks	9a167a46d8	More command work	2018-12-29 20:54:45 -05:00
Ben12345rocks	ffe60808b6	Added sound for inv clicks, command improvements	2018-12-29 20:45:54 -05:00
Ben12345rocks	1affd6c2fa	Increase player name length	2018-12-29 19:27:02 -05:00
Ben12345rocks	17225dca5b	Bug fixes	2018-12-22 19:54:20 -05:00
Ben12345rocks	fc9f55ead8	Bug fix	2018-12-17 16:47:19 -05:00
Ben12345rocks	eec877623e	Add a class to make voting plugin hooks a lot easier	2018-12-16 19:15:48 -05:00
Ben12345rocks	a06b0573c5	Made day vote streak update faster	2018-12-16 19:09:03 -05:00
Ben12345rocks	dfcfee302f	Bug fix	2018-12-16 12:39:21 -05:00
Ben12345rocks	cb1cc27c60	Update version number	2018-12-15 09:18:56 -05:00
Ben12345rocks	aed30a94c0	Bug fixes	2018-12-15 09:17:41 -05:00
Ben12345rocks	8e172e2647	Change default value	2018-12-15 09:01:10 -05:00
Ben12345rocks	ca355e1a01	Add new commands	2018-12-14 20:26:46 -05:00
Ben12345rocks	b0e18d5224	Added ability to disable aliases	2018-12-13 20:34:17 -05:00
Ben12345rocks	f5fc80ef14	Performance improvement	2018-12-13 19:50:10 -05:00
Ben12345rocks	21f846f0bc	Added ability to set percentage for vote streak	2018-12-13 19:43:18 -05:00
Ben12345rocks	a6a742b91e	Performance improvement	2018-12-13 19:23:32 -05:00
Ben12345rocks	4ca6510910	Test commit	2018-12-12 17:02:50 -05:00
Ben12345rocks	e06ea06884	Code cleanup	2018-12-12 16:57:00 -05:00
Ben12345rocks	2c79dff678	Added new option	2018-12-12 16:43:37 -05:00
Ben12345rocks	56c4a094cf	Little fix	2018-12-09 17:01:45 -05:00
Ben12345rocks	1898af9fea	Little fix	2018-12-09 16:39:46 -05:00
Ben12345rocks	885d2bc019	Improvements	2018-12-09 15:39:54 -05:00
Ben12345rocks	12c604d09c	Bug fix	2018-12-08 21:55:49 -05:00
Ben12345rocks	7b48699b39	Another spelling mistake	2018-12-08 19:49:24 -05:00
Ben12345rocks	3b5593882f	Fix spelling mistake	2018-12-08 19:46:28 -05:00
Ben12345rocks	8c72154eed	Update version number	2018-12-08 19:29:48 -05:00
Ben12345rocks	0dc942ecfd	Add option to disable update checks	2018-12-07 17:24:36 -05:00
Ben12345rocks	bc4d051590	Fix description	2018-12-06 18:57:10 -05:00
Ben12345rocks	011a0322ea	Added new canvote placeholder for votesites	2018-12-06 18:56:30 -05:00
Ben12345rocks	ed90db12a4	Add more placeholders	2018-12-05 19:51:29 -05:00
Ben12345rocks	3afea03485	Added ability to convert from superbvote	2018-12-05 19:26:58 -05:00
Ben12345rocks	6da17ee181	Minor fixes	2018-12-05 19:10:49 -05:00
Ben12345rocks	e5d1c255c0	Add debug to vote party	2018-12-05 17:42:15 -05:00
Ben12345rocks	b43754661c	Added vote reward back button	2018-12-04 16:51:55 -05:00
Ben12345rocks	89c419c8df	Bug fix	2018-12-03 21:23:47 -05:00
Ben12345rocks	bd6b2b1edb	Add permission for base /vote	2018-12-03 21:21:08 -05:00
Ben12345rocks	b7c73902f2	Bug fix for vote party	2018-12-02 12:57:28 -05:00
Ben12345rocks	c0995447de	Broadcast before vote party rewards	2018-12-02 12:11:15 -05:00
Ben12345rocks	d970506c76	Little improvements	2018-11-23 20:37:27 -05:00
Ben12345rocks	74fb06302a	Little bits of cleanup	2018-11-23 20:28:03 -05:00