Update version number

Minor spelling fixes in commens

README.md

@@ -2,6 +2,12 @@
 Plugin on SpigotMC
 https://www.spigotmc.org/resources/votingplugin.15358/
 
+![img](http://badge.henrya.org/spigot/downloads?id=15358&color=green)
+
+![img2](http://badge.henrya.org/spigot/version?id=15358&color=red)
+
+
+
 ## License
 ### Creative Commons Arttribution 3.0 Unported
 https://github.com/Ben12345rocks/VotingPlugin/blob/master/VotingPlugin/LICENSE.txt

VotingPlugin/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding/<project>=Cp1252
+encoding/Resources=Cp1252
+encoding/src=Cp1252

VotingPlugin/.settings/org.eclipse.jdt.core.prefs

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

VotingPlugin/Resources/Config.yml

@@ -4,12 +4,13 @@
 # https://github.com/Ben12345rocks/VotingPlugin/wiki
 
 # Valid Options:
-# - SQLITE
+# - SQLITE 
 # - FLAT
 # - MYSQL
 DataStorage: SQLITE
 
 # Information for mysql
+# See the end of the config for cache options
 MySQL:
   Host: ''
   # Default port is 3306
@@ -23,23 +24,14 @@ MySQL:
   # -1 for no limit
   # Affecting this value may affect performance
   MaxSize: -1
+  # Table name prefix, for use with mutliple servers
+  Prefix: ''
+  #UseSSL: true
 
 # Let players who never joined before vote
-# Recommend: False (Will prevent creating random user data files)
+# Recommend: False (Will prevent creating random user data)
 AllowUnjoined: false
 
-# If true, plugin will send scoreboards on some commands
-SendScoreboards: true
-
-# If true, plugin will automaticly generate votesites
-# Disable this if you experience issues with sites being created randomly
-AutoCreateVoteSites: true
-
-# Automaticly download the latest version
-# Will require a restart to actually update
-# Note that updates take 30-40 minutes to load before they can be downloaded
-AutoDownload: false
-
 # ------------------------------------------------
 # VoteReminding
 # ------------------------------------------------
@@ -50,12 +42,12 @@ AutoDownload: 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
 
@@ -82,18 +74,9 @@ VoteReminding:
       FadeIn: 10
       ShowTime: 50
       FadeOut: 10
-  
-Commands:
-  # Wether or not the following commands will open GUIs rather than display text
-  UseGUI:
-    Today: true
-    TopVoter: true
-    Last: true
-    Next: true
-    Total: true
-    Vote: true
-    Best: true
-    Streak: true
+    ActionBar:
+      Message: '&cRemember to vote'
+      Delay: 30
     
 # ------------------------------------------------
 # Format
@@ -107,11 +90,30 @@ Commands:
 #
 # Set Message to '' (2 ') to disable message
 
+Commands:
+  # Whether or not the following commands will open GUIs rather than display text
+  UseGUI:
+    Today: true
+    TopVoter: true
+    Last: true
+    Next: true
+    Total: true
+    Vote: true
+    Best: true
+    Streak: true
+  # If true, you can right click a votesite from /vote (gui version) and open the vote reward gui for that site
+  # Can be used to display rewards for that site
+  VoteRewardFromVoteURL: false
+  # disable /vote reward commands
+  # Effective after restart
+  DisableVoteRewardGUIs: false
+
 Format:
   # CommandHandler help message
   HelpLine: '&3&l%Command% - &3%HelpMessage%'
 
   # Broadcast vote message
+  # Set to an empty message to disable
   BroadcastMsg: '&6[&4Broadcast&6] &2Thanks &c%player% &2for voting on %SiteName%'
   
   # Broadcast only when player is online
@@ -162,7 +164,12 @@ Format:
         Title: '&3&l%player% Last Vote Times:'
         # Lines for each vote site
         # %time% = time, using timeformat below
-        Line: '&3%SiteName%: &6%time%'
+        # %timesince% = time since vote
+        Line: '&3%SiteName%: &6%timeSince%'
+        # Spelling of TimeType can be changed under Format.Commands.TimeFormats
+        TimeFormat: '%amount% %TimeType%'
+        LastVoted: '%times% ago'
+        NeverVoted: 'Never voted'
         
       # Format for /vote total
       Total:
@@ -217,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
@@ -227,9 +237,9 @@ Format:
       # %Points% = player points
       Points: '&a%Player% currently has &a&l%Points%&a Points!'
       
-  # Login message if player can vote on all sites
-  # Must be enabled in config.yml  
-  LoginMsg: '&cRemember to vote!'
+      ToggleBroadcast:
+        Enabled: '&cYou will now see vote broadcasts'
+        Disabled: '&cYou will no longer see vote broadcasts'
   
   # Msg on top voter award, will only send message if that place has a reward set
   # %place% = place - 1,2,3,etc
@@ -239,6 +249,16 @@ Format:
   # See https://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html
   TimeFormat: 'EEE, d MMM yyyy HH:mm'
   
+  TimeFormats:
+    Day: 'Day'
+    Days: 'Days'
+    Hour: 'Hour'
+    Hours: 'Hours'
+    Minute: 'Minute'
+    Minutes: 'Minutes'
+    Second: 'Second'
+    Seconds: 'Seconds'
+  
   # Format for signs
   # SiteName may be all, depending on sign
   # %position% = position of player, set by sign
@@ -260,14 +280,23 @@ Format:
   
   # Shop messages when using the /vote shop
   ShopPurchase: '&aYou bought the %Identifier% for %Points% Points!'
-  ShopFailed: '&cYou do not have %Points% points to purhcase this!'
+  ShopFailed: '&cYou do not have %Points% points to purchase this!'
   
   # 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'
   
   # Display text
   # Used in /vote top (GUI)
@@ -281,6 +310,10 @@ Format:
 # GUI Options
 # ------------------------------------------------
   
+# Enable command for last month gui
+# Requires restart to take effect
+LastMonthGUI: false
+  
 # Configure GUI's here
 # Note: Slots start at 0 instead of 1, max slot is 53 (don't go over) (E.g: last slot in first row of inventory is 8)
 # Item Material's can be found here: https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Material.html
@@ -298,58 +331,44 @@ GUI:
         # You can set skulls of the player using the following
         # Remove the # to enable
         #Skull: '%Player%'
-      Slot: 0
     Next:
       Item:
         Material: 'COMPASS'
         Data: 0
         Amount: 1
         Name: '&4Next'
-      Slot: 1
     Last:
       Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
         Data: 0
         Amount: 1
         Name: '&4Last'
-      Slot: 2
     Total:
       Item:
         Material: 'CHEST'
         Data: 0
         Amount: 1
         Name: '&4Total'
-      Slot: 3
     Top:
       Item:
         Material: 'SIGN'
         Data: 0
         Amount: 1
         Name: '&4Top'
-      Slot: 4
     Today:
       Item:
         Material: 'BOOK'
         Data: 0
         Amount: 1
         Name: '&4Today'
-      Slot: 5
     Shop:
       Item:
         Material: 'DIAMOND'
         Data: 0
         Amount: 1
         Name: '&4Vote Shop'
-      Slot: 6
-    # /vote Reward gui item
-    # Uncomment to use, most likely will be unused
-    #Rewards:
-    #  Item:
-    #    Material: 'DIAMOND'
-    #    Data: 0
-    #    Amount: 1
-    #    Name: '&4Voting Rewards'
-    #  Slot: 7
+        Lore:
+        - '&aYou currently have %points% points'
       
   # GUI for /vote url
   # And /vote if enabled in Config.yml
@@ -384,6 +403,9 @@ GUI:
       Material: 'EMERALD_BLOCK'
       Data: 0
       Amount: 1
+    URLText: '%VoteUrl%'
+    
+  VoteRewardBackButton: false
   # Customize /vote reward
   # Show players what you get when you vote on each site
   VoteReward:
@@ -409,7 +431,6 @@ GUI:
           # Remove this line for no lore
           Lore:
           - '&4Line 1'
-          Slot: 0
   VoteLast:
     Name: 'VoteLast: %player%'
     BackButton: true
@@ -435,30 +456,35 @@ 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
     DayTotal:
       Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
         Name: '&cDaily Total'
         Lore: '&c&lTotal: &c%Total%'
         Amount: 1
     WeekTotal:
       Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
         Name: '&cWeekly Total'
         Lore: '&c&lTotal: &c%Total%'
         Amount: 1
     MonthTotal:
       Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
         Name: '&cMonthly Total'
         Lore: '&c&lTotal: &c%Total%'
         Amount: 1
     AllTimeTotal:
       Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
         Name: '&cAllTime Total'
         Lore: '&c&lTotal: &c%Total%'
         Amount: 1
@@ -466,19 +492,19 @@ GUI:
     Name: 'VoteBest: %player%'
     DayBest:
       Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
         Name: '&cDaily Best'
         Lore: '&c&lBest: &c%Best%'
         Amount: 1
     WeekBest:
       Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
         Name: '&cWeekly Best'
         Lore: '&c&lBest: &c%Best%'
         Amount: 1
     MonthBest:
       Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
         Name: '&cMonthly Best'
         Lore: '&c&lBest: &c%Best%'
         Amount: 1
@@ -487,37 +513,37 @@ GUI:
     BackButton: false
     CurrentDayStreak:
       Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
         Name: '&cCurrent Daily Streak'
         Lore: '&c&lStreak: &c%Streak%'
         Amount: 1
     CurrentWeekStreak:
       Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
         Name: '&cCurrent Weekly Streak'
         Lore: '&c&lStreak: &c%Streak%'
         Amount: 1
     CurrentMonthStreak:
       Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
         Name: '&cCurrent Monthly Streak'
         Lore: '&c&lStreak: &c%Streak%'
         Amount: 1
     HighestDayStreak:
       Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
         Name: '&cHighest Daily Streak'
         Lore: '&c&lStreak: &c%Streak%'
         Amount: 1
     HighestWeekStreak:
       Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
         Name: '&cHighest Weekly Streak'
         Lore: '&c&lStreak: &c%Streak%'
         Amount: 1
     HighestMonthStreak:
       Item:
-        Material: 'WATCH'
+        Material: 'CLOCK'
         Name: '&cHighest Monthly Streak'
         Lore: '&c&lStreak: &c%Streak%'
         Amount: 1
@@ -534,6 +560,11 @@ BackButton:
   Name: '&8Back to VoteGUI'
 
 VoteShopBackButton: true
+VoteShopEnabled: true
+# Hide items in vote shop which user can not buy
+VoteShopHideLimitedReached: true
+# Requires above to be false
+VoteShopLimitReached: '&aYou reached your limit'
 Shop:
   # Identifier
   # Used in placeholders for formats
@@ -550,14 +581,18 @@ Shop:
     - '&c&lCost: &c3 Voting Points'
     # Number of voting points this cost
     Cost: 3
-    # Rewards to run if player buys succesfully
+    # Permission required, leave blank for no permission
+    Permission: ''
+    # Limit how many times you can buy this
+    #Limit: 3
+    # If true, item is not buyable
+    #NotBuyable: false
+    # Rewards to run if player buys successfully
     Rewards:
       Items:
         Diamond:
           Material: 'DIAMOND'
-          Amount: 1
-    # Slot
-    Slot: 0          
+          Amount: 1     
      
 # ------------------------------------------------
 # Extra Rewards
@@ -601,40 +636,53 @@ VoteParty:
   Enabled: false
   # Number of votes required to give rewards
   VotesRequired: 20
+  # Increase the amount of votes required on each vote party reached
+  #IncreaseVotesRquired: 10
   # If true, players who did not vote to reach the votes required will 
   # recieve the reward
   GiveAllPlayers: false
   # If true, the vote count will reset each day
   ResetEachDay: false
+  # Reset at the end of the month
+  ResetMonthly: false
   # Count votes from /av vote?
   CountFakeVotes: true
   # Number of user votes that apply to vote party total the user needs to get rewards
   UserVotesRequired: 0
   # Broadcast when vote party reached
   Broadcast: '&cReached the vote party amount!'
-  # Reward files to give
-  Rewards: []
+  # List of commands to execute, these only execute once.
+  # %player% does not work here
+  Commands: []
+  # Rewards to give per player
+  Rewards: 
+    Commands:
+    - say %player%
+    Items:
+      DIAMOND:
+        Material: 'DIAMOND'
+        Amount: 1
   
-# Reset milestons at end of the month
+# Reset milestones at end of the month
 ResetMilestonesMonthly: false
   
 MileStones:
   # Number of votes required
   # Allows multiple milestones
-  # Number be be around ' (E.g. '1')
+  # Number be around ' (E.g. '1')
   # Can have multiple listed here
   '20':
     Enabled: false
     Rewards: 
       Messages:
         Player: '&aYou got %milestone% milestone votes!'
-    
+   
 VoteStreak:
   # Valid options: Day, Week, Month
   Day:
     # Number of days in a row
     # Each day requires one vote
-    # Add a - to give a reward for every multiple (e.g. 2-)
+    # Add a - to give a reward for every multiple (e.g. 2- = 2,4,6,8, and so on)
     '2':
       # Enabled or not
       Enabled: false
@@ -662,12 +710,25 @@ 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
+    
+# Reward given when vote cooldown ended
+VoteCoolDownEndedReward: []
           
   
 # ONLY USE THIS FOR TITLES/SOUNDS AND OTHER EFFECTS
-# IT WILL ONLY RUN ONE TIME FOR ANY NUMBER OF OFFLINE VOTES
+# IT WILL ONLY RUN ONE TIME FOR ANY NUMBER OF OFFLINE VOTES (3 offline votes = 1 AnySiteReward)
 # Any reward files listed here are ran on vote of any site
 # It is recommended to add rewards to each site instead of here
+# Using forceoffline won't work here
+# Use EverySiteReward in VoteSites.yml for a global reward for each site
 AnySiteRewards: []
 
 
@@ -676,18 +737,22 @@ AnySiteRewards: []
 # ------------------------------------------------
 
 # Top voter blacklist
+# Hide these names from top voter lists
 BlackList:
 - 'Notch'
 
 # If true players with the permission 'VotingPlugin.TopVoter.Ignore' will act 
 # as if there name was added on the the blacklist above
-# This also applies for ops
+# This also applies for players with op
 TopVoterIgnorePermission: false
 
 # /vote top default data displayed
 # Valid Options: AllTime, Monthly, Weekly, Daily
 VoteTopDefault: Monthly
 
+# Whether or not to have ties on top voter rewards
+TopVoterAwardsTies: true
+
 # These are required to be enabled in order for top voter awards to work
 LoadTopVoter:
   AllTime: true
@@ -706,6 +771,7 @@ EnableMonthlyAwards: true
 # Rewards to give
 MonthlyAwards:
   # Position. 1 is first in top voter, 2 is second, etc...
+  # Using 1-10 will reward players in first to tenth place with the same reward
   1:
     Rewards:
       Messages:
@@ -744,16 +810,28 @@ DailyAwards:
     
 # ------------------------------------------------
 # Advanced
-# Most of these values can be left untouched
+# Most of these values can be left untouched for most setups
 # ------------------------------------------------
 
 # Number of points to give on vote
 # Set to 0 to give no points
 PointsOnVote: 1
 
-# Wether or not to check on world change
-# Should only be used if you do per world rewards
-CheckOnWorldChange: false
+AlwaysCloseInventory: false
+
+# Set this to false to disable the plugin adding totals
+# 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
+  
+# Limit monthly votes to number of days of a month multipled by the number of sites
+LimitMonthlyVotes: false
 
 # Debug
 Debug: false
@@ -769,7 +847,8 @@ DebugInGame: false
 
 # Will log debug messages to VotingPlugin/Log/log.txt
 # Requires Debug to be on
-LogDebugToFile: false
+# Only needed for extra cases
+#LogDebugToFile: false
 
 # Options for request api
 # Current methods
@@ -781,31 +860,27 @@ 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
 
+# Only update in the background when needed when set to false
+AlwaysUpdate: false
+
+# Update in the background only if players are online
+UpdateWithPlayersOnlineOnly: false
+
 # Delay between background updates like signs and more
 # Default: 3 Minutes
 # Longer times result in longer wait in stuff updating after a vote, like topvoter
 DelayBetweenUpdates: 3
 
-# Clear cache on update, setting to true reduces performance
-ClearCacheOnUpdate: false
-
 # Set to true to disable no service site message on voting
 # You should never have to touch this if everything is setup properly
 # Will also disable a few other warnings about vote sites
 DisableNoServiceSiteMessage: false
 
-# Used in special cases
-# Much slower, but may work better
-AlternateUUIDLookup: false
-
-# Shouldn't need to change this
-AutoKillInvs: true
-
 # Count fake votes
 # If true fake votes will give points and totals
 CountFakeVotes: true
@@ -813,3 +888,90 @@ CountFakeVotes: true
 # Give VotingPlugin.Player by default
 # Requires restart to take affect
 GiveDefaultPermission: true
+
+# Remove old player files
+# Happens on startup or /av purge
+PurgeOldData: false
+
+# Minimum number of days offline in order to purge
+PurgeMin: 90
+
+# Whether or not to create daily backups. (Only the most recent ones get kept)
+CreateBackups: true
+
+# If true, plugin will send scoreboards on some commands
+SendScoreboards: true
+
+# If true, plugin will automaticly generate votesites
+# Disable this if you experience issues with sites being created randomly
+# Most cases this will work all the time
+AutoCreateVoteSites: true
+
+# Automaticly download the latest version
+# Will require a restart to actually update
+# Note: It takes 30-40 minutes before being able to download the latest build
+# 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: false
+
+# ---------------------------------------------------------
+# Mysql cache options
+# Clearing cache forces the plugin to pull from database
+# ---------------------------------------------------------
+
+# Clear cache on update, setting to true reduces update speed
+ClearCacheOnUpdate: false
+
+# Clear mysql on player join always
+ClearCacheOnJoin: false
+
+# Clears cache for the player who voted only
+# Only effects if using mysql
+# Would recommend for some bungee setups
+ClearCacheOnVote: false
+
+# Disable using vault for permission checks
+DisableVaultPermissions: false
+
+# ###############################################################
+# Deprecated options, don't recommend using any of these
+
+# Whether or not to disable checking names on mojang, disable if you hit the rate limit
+# Shouldn't make a noticeable impact if set to false
+#CheckNameMojang: false
+
+# Shouldn't need to change this
+#AutoKillInvs: true
+
+# Used in special cases
+# Much slower, but may work better
+# Not recommended in newer versions
+#AlternateUUIDLookup: false
+
+# Disable checking on world change
+# May improve performance
+#DisableCheckOnWorldChange: false

VotingPlugin/Resources/VoteSites.yml

@@ -1,5 +1,7 @@
 VoteSites:
-  # VoteSite name
+  # VoteSite key
+  # Used for saving data for votesites
+  # Use a short name if you can
   ExampleVoteSite:
     # Enable voteSite
     # If false, votesite will not be loaded by plugin
@@ -16,7 +18,8 @@ VoteSites:
           
     # The serviceName from the vote, has to be correct to work correctly
     # Gotten from voting on the site (will be in console/log)
-    # Usually is the main part of the url(e.g. PlanetMinecraft.com)
+    # Usually is the main part of the url(e.g. PlanetMinecraft.com), but not always
+    # See console when you vote (it will notify you if the plugin didn't find a votingsite matching the service site
     ServiceSite: 'PlanetMinecraft.com'
 
     # vote url for /vote
@@ -28,21 +31,73 @@ VoteSites:
     # Most sites are 24 hours
     VoteDelay: 24
     
+    # Require waiting until votedelay time has pasted in order to accept vote
+    # Recommend: false
+    WaitUntilVoteDelay: false
+    
     # Reset vote delay each day (for certain sites that do this)
+    # Recommend: false
     VoteDelayDaily: false
     
-    # If true, rewards can be executed offline (required ForceOffline to be true in the reward)
-    GiveOffline: false
+    # If true, rewards can be executed offline (requires ForceOffline to be true in the reward)
+    # Setting this to true will execute the reward offline while the player is offline
+    # This basiclly disables offline voting if set to true, don't misinterpret this option
+    ForceOffline: false
     
     # VoteSite Material for GUI's
+    # Removing this may result in an error, required on each site
     Item:
       Material: 'DIAMOND'
       Amount: 1
 
-    # List of reward files to give to voter
+    # Rewards to give
+    # https://github.com/Ben12345rocks/AdvancedCore/wiki/Rewards
     Rewards:
-    - 'ExampleReward'
+      # Execute console commands
+      Commands:
+      - 'say hello'
+      # Send player a message
+      Messages:
+        Player: 'You voted'
+  # Site 2 example
+  Site2:
+    Enabled: false
+    Name: 'Site2'
+    ServiceSite: 'PlanetMinecraft.com'
+    VoteURL: 'link to vote URL here, used in /vote'
+    VoteDelay: 24
+    Item:
+      Material: 'DIAMOND'
+      Amount: 1
+    Rewards:
+      Commands:
+      - 'say hello'
+      # Advanced example
+      # 50% chance for reward1, if reward1 not given then 20% chance to get reward2, if reward2 not given then fallback
+      AdvancedPriority:
+        # Similar to priority, but no need to have to use reward files
+        # Add requirements under each reward
+        # Will go in order from list here and try to run each of the following rewards...
+        # This name can be anything, but they need to be different
+        Reward1:
+          Chance: 50
+          # Any other requirement here
+          # If any requirement fails, the next will be attempted
+          Messages:
+            Player: 'You got first reward'
+        Reward2:
+          Chance: 20
+          Messages:
+            Player: 'You got second reward'
+        # Fallback, 100% chance, after other rewards fail chances
+        Fallback:
+          Messages:
+            Player: 'You got unlucky'
+
+      Messages:
+        Player: 'You voted'
     
 # Reward for any site
 # Similar to AnySiteReward
+# This requires the site to be configured in order to get the reward.
 EverySiteReward: []

VotingPlugin/Resources/plugin.yml

@@ -4,7 +4,8 @@ main: com.Ben12345rocks.VotingPlugin.Main
 description: Highly Customizable Voting Listener!
 website: https://www.spigotmc.org/resources/votingplugin.15358/
 author: Ben12345rocks
-softdepend: [AdvancedCore]
+softdepend: [MVdWPlaceholders, Votifier]
+api-version: 1.13
 commands:
   vote:
     description: Vote command
@@ -27,9 +28,6 @@ commands:
   votetop:
     description: See top voters
     aliases: vtop
-  voteinfo:
-    description: See player info
-    aliases: vinfo
   votetoday:
     description: See who voted today
     aliases: vtoday
@@ -57,21 +55,24 @@ commands:
   votestreak:
     description: A command
     aliases: vstreak
+  votetogglebroadcast:
+    description: A command
+    aliases: vtogglebroadcast
   votepoints:
     description: A command
     aliases: vpoints
-  votegivereward:
+  votechoices:
     description: A command
-  voteselectChoiceReward:
+    alaises: vchoices
+  votegivepoints:
     description: A command
+    alaises: vgivepoints
   adminvotehelp:
     description: Open adminvote help
     aliases: avhelp
   adminvote?:
     description: Open adminvote help
     aliases: av?
-  adminvoteconvert:
-    description: A command
   adminvotereport:
     description: Command Alias
     aliases: avreport
@@ -93,24 +94,15 @@ commands:
   adminvoterewards:
     description: Command Alias
     aliases: avrewards
-  adminvotereward:
-    description: Command Alias
-    aliases: avreward
   adminvoteuuid:
     description: Command Alias
     aliases: avuuid
-  adminvotereset:
-    description: Command Alias
-    aliases: avreset
   adminvotevotesite:
     description: Command Alias
     aliases: avvotesite
   adminvoteconfig:
     description: Command Alias
     aliases: avconfig
-  adminvoteserverdata:
-    description: Command Alias
-    aliases: avserverdata
   adminvotesettotal:
     description: Command Alias
     aliases: avsettotal
@@ -120,36 +112,20 @@ commands:
   adminvotevote:
     description: Command Alias
     aliases: [avvote, fakevote]
-  adminvoteTriggerPlayerVoteEvent:
-    description: Command Alias
-    aliases: avTriggerPlayerVoteEvent
-  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
   adminvoteusers:
     description: Command Alias
     aliases: avusers
-  adminvoteClearTotal:
-    description: Command Alias
-    aliases: avClearTotal
   adminvoteConvertFromData:
     description: Command Alias
     aliases: avConvertFromData
   adminvoteClearTotal:
     description: Command Alias
-    aliases: avClearTotal
   adminvoteBackgroundUpdate:
     description: Command Alias
     aliases: avBackgroundUpdate
@@ -159,9 +135,6 @@ commands:
   adminvoteConvertFrom:
     description: Command Alias
     aliases: avConvertFrom
-  adminvoteRemovePoints:
-    description: Command Alias
-    aliases: avRemovePoints
   adminvoteServiceSites:
     description: Command Alias
     aliases: avServiceSites
@@ -180,6 +153,48 @@ commands:
   adminvoteForceTimeChanged:
     description: Command Alias
     aliases: avForceTimeChanged
+  adminvoteplayername:
+    description: Command Alias
+    aliases: avplayername
+  adminvoteResyncMilestones:
+    description: Command Alias
+    aliases: avResyncMilestones
+  adminvoteClearOfflineRewards:
+    description: Command Alias
+    aliases: avClearOfflineRewards
+  adminvoteUserRemove:
+    description: Command Alias
+    aliases: avUserRemove
+  adminvotePurge:
+    description: Command Alias
+    aliases: avPurge
+  adminvoteJavascript:
+    description: Command Alias
+    aliases: avJavascript
+  adminvoteStatus:
+    description: Command Alias
+    aliases: avStatus
+  adminvoteTest:
+    description: Command Alias
+    aliases: avTest
+  adminvotePlaceholders:
+    description: Command Alias
+    aliases: avPlaceholders
+  adminvoteDownloadJenkins:
+    description: Command Alias
+    aliases: avDownloadJenkins
+  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
@@ -196,4 +211,9 @@ permissions:
     description: Allows access to create signs
   VotingPlugin.TopVoter.Ignore:
     description: Allows you to be exempt from top voter
+  VotingPlugin.NoRemind:
+    description: Ignore vote reminding
+    default: false
+  VotingPlugin.Sign.Create:
+    description: Permission to create sign
   

VotingPlugin/pom.xml

@@ -1,15 +1,17 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>5.10.3</version>
+	<version>5.19.2</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<github.global.server>github</github.global.server>
+		<project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
 	</properties>
 	<distributionManagement>
 		<repository>
@@ -33,6 +35,34 @@
 			</resource>
 		</resources>
 		<sourceDirectory>src</sourceDirectory>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>org.projectlombok</groupId>
+										<artifactId>lombok-maven-plugin</artifactId>
+										<versionRange>[1,)</versionRange>
+										<goals>
+											<goal>delombok</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore />
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -44,6 +74,25 @@
 					<finalName>${project.name}</finalName>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.projectlombok</groupId>
+				<artifactId>lombok-maven-plugin</artifactId>
+				<version>1.18.2.0</version>
+				<executions>
+					<execution>
+						<id>delombok</id>
+						<phase>deploy</phase>
+						<goals>
+							<goal>delombok</goal>
+						</goals>
+						<configuration>
+							<addOutputDirectory>false</addOutputDirectory>
+							<outputDirectory>${project.basedir}/target/delombok</outputDirectory>
+							<sourceDirectory>${project.basedir}/src</sourceDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
@@ -71,6 +120,10 @@
 							<pattern>com.zaxxer.HikariCP</pattern>
 							<shadedPattern>${project.groupId}.${project.artifactId}.HikariCP</shadedPattern>
 						</relocation>
+						<relocation>
+							<pattern>com.zaxxer.hikari</pattern>
+							<shadedPattern>${project.groupId}.${project.artifactId}.hikari</shadedPattern>
+						</relocation>
 						<relocation>
 							<pattern>org.slf4j.slf4j-simple</pattern>
 							<shadedPattern>${project.groupId}.${project.artifactId}.slf4j-simple</shadedPattern>
@@ -92,7 +145,6 @@
 								</excludes>
 							</artifactSet>
 							<createDependencyReducedPom>false</createDependencyReducedPom>
-
 						</configuration>
 					</execution>
 				</executions>
@@ -108,6 +160,9 @@
 							<goal>jar</goal>
 						</goals>
 						<phase>deploy</phase>
+						<configuration>
+							<sourcepath>${project.basedir}/target/delombok</sourcepath>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
@@ -138,6 +193,31 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>3.1.0</version>
+				<executions>
+					<execution>
+						<id>copy-resources</id>
+						<phase>install</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${user.home}/Documents/Test Server/plugins</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${basedir}/target</directory>
+									<includes>
+										<include>${project.artifactId}.jar</include>
+									</includes>
+								</resource>
+							</resources>
+							<overwrite>true</overwrite>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 	<repositories>
@@ -148,6 +228,10 @@
 		<repository>
 			<id>jitpack.io</id>
 			<url>https://jitpack.io</url>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots>
 		</repository>
 	</repositories>
 	<dependencies>
@@ -161,7 +245,7 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.12.2-R0.1-SNAPSHOT</version>
+			<version>1.14.4-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -185,5 +269,25 @@
 			<scope>system</scope>
 			<systemPath>${project.basedir}/Jars/VoteRoulette.jar</systemPath>
 		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<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>

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

@@ -17,19 +17,19 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permission;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
-import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
-import com.Ben12345rocks.AdvancedCore.Objects.UUID;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.TimeChecker;
+import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Scoreboards.SimpleScoreboard;
 import com.Ben12345rocks.VotingPlugin.Main;
-import com.Ben12345rocks.VotingPlugin.Commands.Executers.CommandVote;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
+import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 
 import net.md_5.bungee.api.chat.TextComponent;
@@ -100,7 +100,7 @@ public class Commands {
 		msg.add(StringUtils.getInstance().stringToComp("&3&l() = Needed"));
 		msg.add(StringUtils.getInstance().stringToComp("&3&lAliases: adminvote, av"));
 
-		for (int i = pagesize * page; (i < text.size()) && (i < ((page + 1) * pagesize) - 1); i++) {
+		for (int i = pagesize * page; (i < text.size()) && (i < ((page + 1) * pagesize)); i++) {
 			msg.add(text.get(i));
 		}
 
@@ -120,7 +120,7 @@ public class Commands {
 
 		boolean requirePerms = Config.getInstance().getFormatCommandsVoteHelpRequirePermission();
 
-		for (CommandHandler cmdHandle : plugin.adminVoteCommand) {
+		for (CommandHandler cmdHandle : plugin.getAdminVoteCommand()) {
 			if (sender.hasPermission(cmdHandle.getPerm()) && requirePerms) {
 				unsorted.put(cmdHandle.getHelpLineCommand("/adminvote"), cmdHandle.getHelpLine("/adminvote"));
 			} else {
@@ -188,32 +188,105 @@ public class Commands {
 		return ArrayUtils.getInstance().convert(msg);
 	}
 
-	/**
-	 * List perms.
-	 *
-	 * @return the string[]
-	 */
-	public String[] listPerms() {
+	public String[] listPerms(CommandSender sender) {
 		ArrayList<String> msg = new ArrayList<String>();
+		msg.add("&c&lCommand : Permissions (seperated by |)");
+
+		for (CommandHandler handle : plugin.getVoteCommand()) {
+			if (sender instanceof Player) {
+				if (handle.hasPerm(sender)) {
+					msg.add("&a" + handle.getHelpLineCommand("/vote") + " : " + handle.getPerm() + " : true");
+				} else {
+					msg.add("&c" + handle.getHelpLineCommand("/vote") + " : " + handle.getPerm() + " : false");
+				}
+			} else {
+				msg.add(handle.getHelpLineCommand("/vote") + " : " + handle.getPerm());
+			}
 
-		for (CommandHandler handle : plugin.voteCommand) {
-			msg.add(handle.getHelpLineCommand("/vote") + " : " + handle.getPerm());
 		}
 
-		for (CommandHandler handle : plugin.adminVoteCommand) {
-			msg.add(handle.getHelpLineCommand("/av") + " : " + handle.getPerm());
+		for (CommandHandler handle : plugin.getAdminVoteCommand()) {
+			if (sender instanceof Player) {
+				if (handle.hasPerm(sender)) {
+					msg.add("&a" + handle.getHelpLineCommand("/av") + " : " + handle.getPerm() + " : true");
+				} else {
+					msg.add("&c" + handle.getHelpLineCommand("/av") + " : " + handle.getPerm() + " : false");
+				}
+			} else {
+				msg.add(handle.getHelpLineCommand("/av") + " : " + handle.getPerm());
+			}
 		}
 
 		for (Permission perm : plugin.getDescription().getPermissions()) {
-			msg.add(perm.getName());
+			if (sender instanceof Player) {
+				if (sender.hasPermission(perm)) {
+					msg.add("&a" + perm.getName() + " : true");
+				} else {
+					msg.add("&c" + perm.getName() + " : false");
+				}
+			} else {
+				msg.add(perm.getName());
+			}
 		}
 
 		msg = ArrayUtils.getInstance().colorize(msg);
-		Collections.sort(msg, String.CASE_INSENSITIVE_ORDER);
 
 		return ArrayUtils.getInstance().convert(msg);
 	}
 
+	public void listPerms(CommandSender sender, String player, int page) {
+		Player p = Bukkit.getPlayer(player);
+		if (p != null) {
+
+			ArrayList<String> msg = new ArrayList<String>();
+			ArrayList<String> text = new ArrayList<String>();
+
+			for (CommandHandler handle : plugin.getVoteCommand()) {
+				if (handle.hasPerm(p)) {
+					msg.add("&a" + handle.getHelpLineCommand("/vote") + " : " + handle.getPerm() + " : true");
+				} else {
+					msg.add("&c" + handle.getHelpLineCommand("/vote") + " : " + handle.getPerm() + " : false");
+				}
+
+			}
+
+			for (CommandHandler handle : plugin.getAdminVoteCommand()) {
+				if (handle.hasPerm(p)) {
+					msg.add("&a" + handle.getHelpLineCommand("/av") + " : " + handle.getPerm() + " : true");
+				} else {
+					msg.add("&c" + handle.getHelpLineCommand("/av") + " : " + handle.getPerm() + " : false");
+				}
+			}
+
+			for (Permission perm : plugin.getDescription().getPermissions()) {
+				if (p.hasPermission(perm)) {
+					msg.add("&a" + perm.getName() + " : true");
+				} else {
+					msg.add("&c" + perm.getName() + " : false");
+				}
+			}
+
+			msg = ArrayUtils.getInstance().colorize(msg);
+
+			int pagesize = Config.getInstance().getFormatPageSize();
+
+			int maxPage = msg.size() / pagesize;
+			if ((msg.size() % pagesize) != 0) {
+				maxPage++;
+			}
+
+			text.add("&c&lCommand : Permissions (seperated by |) " + page + "/" + maxPage);
+
+			for (int i = pagesize * page - pagesize; i < msg.size() && i < pagesize * page; i++) {
+				text.add(msg.get(i));
+			}
+			sender.sendMessage(ArrayUtils.getInstance().convert(ArrayUtils.getInstance().colorize(text)));
+		} else {
+			sender.sendMessage(StringUtils.getInstance().colorize("&cPlayer not online: " + player));
+		}
+
+	}
+
 	/**
 	 * Player info.
 	 *
@@ -248,10 +321,10 @@ public class Commands {
 	 * @param page
 	 *            the page
 	 */
-	public void sendTopVoterAllTimeScoreBoard(Player player, int page) {
-		if (AdvancedCoreHook.getInstance().isSendScoreboards()) {
+	public void sendTopVoterAllTimeScoreBoard(final Player player, int page) {
+		if (Main.plugin.getOptions().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
-			ArrayList<User> users = plugin.convertSet(plugin.topVoterAllTime.keySet());
+			ArrayList<User> users = plugin.convertSet(plugin.getTopVoter(TopVoter.AllTime).keySet());
 
 			int pageSize = (users.size() / pagesize);
 			if ((users.size() % pagesize) != 0) {
@@ -265,7 +338,7 @@ public class Commands {
 
 			for (int i = (page - 1) * pagesize; (i < users.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 				scoreboard.add("" + (i + 1) + ": " + users.get(i).getPlayerName(),
-						plugin.topVoterAllTime.get(users.get(i)));
+						plugin.getTopVoter(TopVoter.AllTime).get(users.get(i)));
 			}
 			scoreboard.build();
 			scoreboard.send(player);
@@ -274,8 +347,7 @@ public class Commands {
 
 				@Override
 				public void run() {
-					SimpleScoreboard clear = new SimpleScoreboard("Empty");
-					clear.send(player);
+					player.setScoreboard(Bukkit.getScoreboardManager().getNewScoreboard());
 				}
 			}, 90);
 		}
@@ -289,10 +361,10 @@ public class Commands {
 	 * @param page
 	 *            the page
 	 */
-	public void sendTopVoterDailyScoreBoard(Player player, int page) {
-		if (AdvancedCoreHook.getInstance().isSendScoreboards()) {
+	public void sendTopVoterDailyScoreBoard(final Player player, int page) {
+		if (Main.plugin.getOptions().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
-			ArrayList<User> users = plugin.convertSet(plugin.topVoterDaily.keySet());
+			ArrayList<User> users = plugin.convertSet(plugin.getTopVoter(TopVoter.Daily).keySet());
 
 			int pageSize = (users.size() / pagesize);
 			if ((users.size() % pagesize) != 0) {
@@ -306,7 +378,7 @@ public class Commands {
 
 			for (int i = (page - 1) * pagesize; (i < users.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 				scoreboard.add("" + (i + 1) + ": " + users.get(i).getPlayerName(),
-						plugin.topVoterDaily.get(users.get(i)));
+						plugin.getTopVoter(TopVoter.Daily).get(users.get(i)));
 			}
 			scoreboard.build();
 			scoreboard.send(player);
@@ -315,8 +387,7 @@ public class Commands {
 
 				@Override
 				public void run() {
-					SimpleScoreboard clear = new SimpleScoreboard("Empty");
-					clear.send(player);
+					player.setScoreboard(Bukkit.getScoreboardManager().getNewScoreboard());
 				}
 			}, 90);
 		}
@@ -330,10 +401,10 @@ public class Commands {
 	 * @param page
 	 *            the page
 	 */
-	public void sendTopVoterMonthlyScoreBoard(Player player, int page) {
-		if (AdvancedCoreHook.getInstance().isSendScoreboards()) {
+	public void sendTopVoterMonthlyScoreBoard(final Player player, int page) {
+		if (Main.plugin.getOptions().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
-			ArrayList<User> users = plugin.convertSet(plugin.topVoterMonthly.keySet());
+			ArrayList<User> users = plugin.convertSet(plugin.getTopVoter(TopVoter.Monthly).keySet());
 
 			int pageSize = (users.size() / pagesize);
 			if ((users.size() % pagesize) != 0) {
@@ -347,7 +418,7 @@ public class Commands {
 
 			for (int i = (page - 1) * pagesize; (i < users.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 				scoreboard.add("" + (i + 1) + ": " + users.get(i).getPlayerName(),
-						plugin.topVoterMonthly.get(users.get(i)));
+						plugin.getTopVoter(TopVoter.Monthly).get(users.get(i)));
 			}
 			scoreboard.build();
 			scoreboard.send(player);
@@ -356,8 +427,7 @@ public class Commands {
 
 				@Override
 				public void run() {
-					SimpleScoreboard clear = new SimpleScoreboard("Empty");
-					clear.send(player);
+					player.setScoreboard(Bukkit.getScoreboardManager().getNewScoreboard());
 				}
 			}, 90);
 		}
@@ -371,10 +441,10 @@ public class Commands {
 	 * @param page
 	 *            the page
 	 */
-	public void sendTopVoterWeeklyScoreBoard(Player player, int page) {
-		if (AdvancedCoreHook.getInstance().isSendScoreboards()) {
+	public void sendTopVoterWeeklyScoreBoard(final Player player, int page) {
+		if (Main.plugin.getOptions().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
-			ArrayList<User> users = plugin.convertSet(plugin.topVoterWeekly.keySet());
+			ArrayList<User> users = plugin.convertSet(plugin.getTopVoter(TopVoter.Weekly).keySet());
 
 			int pageSize = (users.size() / pagesize);
 			if ((users.size() % pagesize) != 0) {
@@ -388,7 +458,7 @@ public class Commands {
 
 			for (int i = (page - 1) * pagesize; (i < users.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 				scoreboard.add("" + (i + 1) + ": " + users.get(i).getPlayerName(),
-						plugin.topVoterWeekly.get(users.get(i)));
+						plugin.getTopVoter(TopVoter.Weekly).get(users.get(i)));
 			}
 			scoreboard.build();
 			scoreboard.send(player);
@@ -397,8 +467,7 @@ public class Commands {
 
 				@Override
 				public void run() {
-					SimpleScoreboard clear = new SimpleScoreboard("Empty");
-					clear.send(player);
+					player.setScoreboard(Bukkit.getScoreboardManager().getNewScoreboard());
 				}
 			}, 90);
 
@@ -413,8 +482,8 @@ public class Commands {
 	 * @param page
 	 *            the page
 	 */
-	public void sendVoteTodayScoreBoard(Player player, int page) {
-		if (AdvancedCoreHook.getInstance().isSendScoreboards()) {
+	public void sendVoteTodayScoreBoard(final Player player, int page) {
+		if (Main.plugin.getOptions().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
 
 			String[] voteToday = voteToday();
@@ -436,8 +505,7 @@ public class Commands {
 
 				@Override
 				public void run() {
-					SimpleScoreboard clear = new SimpleScoreboard("Empty");
-					clear.send(player);
+					player.setScoreboard(Bukkit.getScoreboardManager().getNewScoreboard());
 				}
 			}, 90);
 
@@ -468,7 +536,7 @@ public class Commands {
 	}
 
 	public void updateVoteToday(ArrayList<User> users) {
-		plugin.voteToday.clear();
+		plugin.getVoteToday().clear();
 
 		for (User user : users) {
 			HashMap<VoteSite, LocalDateTime> times = new HashMap<VoteSite, LocalDateTime>();
@@ -483,7 +551,7 @@ public class Commands {
 				}
 			}
 			if (times.keySet().size() > 0) {
-				plugin.voteToday.put(user, times);
+				plugin.getVoteToday().put(user, times);
 			}
 
 		}
@@ -523,6 +591,7 @@ public class Commands {
 	 *            the vote site
 	 * @return the string
 	 */
+	@Deprecated
 	public String voteCommandLastDate(User user, VoteSite voteSite) {
 		long time = user.getTime(voteSite);
 		if (time > 0) {
@@ -533,11 +602,92 @@ public class Commands {
 		return "";
 	}
 
+	public String voteCommandLastDuration(User user, VoteSite voteSite) {
+		long time = user.getTime(voteSite);
+		if (time > 0) {
+			LocalDateTime now = LocalDateTime.now();
+			LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault());
+
+			Duration dur = Duration.between(lastVote, now);
+
+			long diffSecond = dur.getSeconds();
+			int diffDays = (int) (diffSecond / 60 / 60 / 24);
+			int diffHours = (int) (diffSecond / 60 / 60 - diffDays * 24);
+			int diffMinutes = (int) (diffSecond / 60 - diffHours * 60 - diffDays * 24 * 60);
+			int diffSeconds = (int) (diffSecond - diffMinutes * 60 - diffHours * 60 * 60 - diffDays * 24 * 60 * 60);
+
+			String info = "";
+			if (diffDays == 1) {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
+								Config.getInstance().getFormatTimeFormatsDay()), "amount", "" + diffDays);
+				info += " ";
+			} else if (diffDays > 1) {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
+								Config.getInstance().getFormatTimeFormatsDays()), "amount", "" + diffDays);
+				info += " ";
+			}
+
+			if (diffHours == 1) {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
+								Config.getInstance().getFormatTimeFormatsHour()), "amount", "" + diffHours);
+				info += " ";
+			} else if (diffHours > 1) {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
+								Config.getInstance().getFormatTimeFormatsHours()), "amount", "" + diffHours);
+				info += " ";
+			}
+
+			if (diffMinutes == 1) {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
+								Config.getInstance().getFormatTimeFormatsMinute()), "amount", "" + diffMinutes);
+				info += " ";
+			} else if (diffMinutes > 1) {
+				info += StringUtils.getInstance().replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+						Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
+						Config.getInstance().getFormatTimeFormatsMinutes()), "amount", "" + diffMinutes);
+				info += " ";
+			}
+
+			if (diffSeconds == 1) {
+				info += StringUtils.getInstance()
+						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+								Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
+								Config.getInstance().getFormatTimeFormatsSecond()), "amount", "" + diffSeconds);
+			} else {
+				info += StringUtils.getInstance().replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+						Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
+						Config.getInstance().getFormatTimeFormatsSeconds()), "amount", "" + diffSeconds);
+			}
+
+			info = StringUtils.getInstance()
+					.replacePlaceHolder(Config.getInstance().getFormatCommandsVoteLastLastVoted(), "times", info);
+
+			return info;
+		}
+		return Config.getInstance().getFormatCommandsVoteLastNeverVoted();
+	}
+
 	public String voteCommandLastLine(User user, VoteSite voteSite) {
 		String timeString = voteCommandLastDate(user, voteSite);
+		String timeSince = voteCommandLastDuration(user, voteSite);
 
-		return config.getFormatCommandsVoteLastLine().replace("%Month% %Day%, %Year% %Hour%:%Minute% %ampm%", "%time%")
-				.replace("%time%", timeString).replace("%SiteName%", voteSite.getDisplayName());
+		HashMap<String, String> placeholders = new HashMap<String, String>();
+		placeholders.put("time", timeString);
+		placeholders.put("SiteName", voteSite.getDisplayName());
+		placeholders.put("timesince", timeSince);
+
+		return StringUtils.getInstance().replacePlaceHolder(Config.getInstance().getFormatCommandsVoteLastLine(),
+				placeholders);
 	}
 
 	/**
@@ -582,17 +732,18 @@ public class Commands {
 		String info = new String();
 
 		long time = user.getTime(voteSite);
-		LocalDateTime now = LocalDateTime.now();
-		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault());
+		LocalDateTime now = TimeChecker.getInstance().getTime();
+		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault())
+				.plusHours(Main.plugin.getOptions().getTimeHourOffSet());
 
 		if (!voteSite.isVoteDelayDaily()) {
-			int votedelay = voteSite.getVoteDelay();
+			double votedelay = voteSite.getVoteDelay();
 			if (votedelay == 0) {
 				String errorMsg = config.getFormatCommandsVoteNextInfoError();
 				info = errorMsg;
 			} else {
 
-				LocalDateTime nextvote = lastVote.plusHours(votedelay);
+				LocalDateTime nextvote = lastVote.plusHours((long) votedelay);
 
 				if (time == 0 || now.isAfter(nextvote)) {
 					info = config.getFormatCommandsVoteNextInfoCanVote();
@@ -612,7 +763,7 @@ public class Commands {
 			}
 		} else {
 			if (lastVote.getDayOfYear() == now.getDayOfYear() && lastVote.getYear() == now.getYear()) {
-				LocalDateTime midnight = LocalDateTime.now().plusDays(1).withHour(0).withMinute(0);
+				LocalDateTime midnight = TimeChecker.getInstance().getTime().plusDays(1).withHour(0).withMinute(0);
 				Duration dur = Duration.between(now, midnight);
 
 				int diffHours = (int) (dur.getSeconds() / (60 * 60));
@@ -641,10 +792,10 @@ public class Commands {
 	public String[] voteCommandTotal(User user) {
 		ArrayList<String> msg = new ArrayList<String>();
 
-		int daily = user.getDailyTotal();
-		int weekly = user.getWeeklyTotal();
-		int month = user.getMonthTotal();
-		int all = user.getAllTimeTotal();
+		int daily = user.getTotal(TopVoter.Daily);
+		int weekly = user.getTotal(TopVoter.Weekly);
+		int month = user.getTotal(TopVoter.Monthly);
+		int all = user.getTotal(TopVoter.AllTime);
 
 		for (String s : config.getFormatCommandsVoteTotal()) {
 			String str = StringUtils.getInstance().replaceIgnoreCase(s, "%DailyTotal%", "" + daily);
@@ -677,10 +828,10 @@ public class Commands {
 
 		for (String uuid : uuids) {
 			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			daily += user.getDailyTotal();
-			weekly += user.getWeeklyTotal();
-			month += user.getMonthTotal();
-			all += user.getAllTimeTotal();
+			daily += user.getTotal(TopVoter.Daily);
+			weekly += user.getTotal(TopVoter.Weekly);
+			month += user.getTotal(TopVoter.Monthly);
+			all += user.getTotal(TopVoter.AllTime);
 		}
 
 		for (String s : config.getFormatCommandsVoteTotalAll()) {
@@ -709,7 +860,7 @@ public class Commands {
 
 		boolean requirePerms = config.getFormatCommandsVoteHelpRequirePermission();
 
-		for (CommandHandler cmdHandle : plugin.voteCommand) {
+		for (CommandHandler cmdHandle : plugin.getVoteCommand()) {
 			if (cmdHandle.hasPerm(sender)) {
 				unsorted.put(cmdHandle.getHelpLineCommand("/vote"), cmdHandle.getHelpLine("/vote"));
 			} else if (!requirePerms) {
@@ -733,31 +884,25 @@ public class Commands {
 	 */
 	public String[] voteToday() {
 		ArrayList<String> msg = new ArrayList<String>();
-		for (User user : plugin.voteToday.keySet()) {
+		for (User user : plugin.getVoteToday().keySet()) {
 
-			for (VoteSite voteSite : plugin.voteToday.get(user).keySet()) {
+			for (VoteSite voteSite : plugin.getVoteToday().get(user).keySet()) {
 				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(Config.getInstance().getFormatTimeFormat());
-				String timeString = plugin.voteToday.get(user).get(voteSite).format(formatter);
-				msg.add("&6" + user.getPlayerName() + " : " + voteSite.getKey() + " : " + timeString);
+				String timeString = plugin.getVoteToday().get(user).get(voteSite).format(formatter);
+				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);
 		return ArrayUtils.getInstance().convert(msg);
 	}
 
-	public void voteTop(CommandSender sender, int page) {
-		String str = Config.getInstance().getVoteTopDefault();
-		if (str.equalsIgnoreCase("monthly")) {
-			CommandVote.getInstance().topVoterMonthly(sender, page);
-		} else if (str.equalsIgnoreCase("weekly")) {
-			CommandVote.getInstance().topVoterWeekly(sender, page);
-		} else if (str.equalsIgnoreCase("daily")) {
-			CommandVote.getInstance().topVoterDaily(sender, page);
-		} else {
-
-		}
-	}
-
 	public String[] voteURLs(User user) {
 		ArrayList<String> sites = new ArrayList<String>();
 
@@ -775,19 +920,23 @@ public class Commands {
 				msg = StringUtils.getInstance().replaceIgnoreCase(msg, "%num%", Integer.toString(counter));
 				msg = StringUtils.getInstance().replaceIgnoreCase(msg, "%url%", voteURL);
 				msg = StringUtils.getInstance().replaceIgnoreCase(msg, "%SiteName%", voteSite.getDisplayName());
+				msg = StringUtils.getInstance().replaceIgnoreCase(msg, "%player%", user.getPlayerName());
+				msg = StringUtils.getInstance().replacePlaceHolder(msg, "Next",
+						"" + voteCommandNextInfo(user, voteSite));
 				sites.add(msg);
 			}
 		}
 		if (user != null) {
 			HashMap<String, String> phs = new HashMap<String, String>();
-			phs.put("DailyTotal", "" + user.getDailyTotal());
-			phs.put("WeekTotal", "" + user.getWeeklyTotal());
-			phs.put("MonthTotal", "" + user.getMonthTotal());
-			phs.put("Total", "" + user.getAllTimeTotal());
+			phs.put("DailyTotal", "" + user.getTotal(TopVoter.Daily));
+			phs.put("WeekTotal", "" + user.getTotal(TopVoter.Weekly));
+			phs.put("MonthTotal", "" + user.getTotal(TopVoter.Monthly));
+			phs.put("Total", "" + user.getTotal(TopVoter.AllTime));
 
 			sites = ArrayUtils.getInstance().replacePlaceHolder(sites, phs);
 		}
 		sites = ArrayUtils.getInstance().colorize(sites);
 		return ArrayUtils.getInstance().convert(sites);
 	}
+
 }

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

@@ -1,24 +1,14 @@
 package com.Ben12345rocks.VotingPlugin.Commands.Executers;
 
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
-import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Updater.Updater;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
 import com.Ben12345rocks.VotingPlugin.Main;
-import com.Ben12345rocks.VotingPlugin.Commands.Commands;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
-import com.Ben12345rocks.VotingPlugin.Objects.User;
-import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
-import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -63,112 +53,15 @@ public class CommandAdminVote implements CommandExecutor {
 		this.plugin = plugin;
 	}
 
-	/**
-	 * Check update.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void checkUpdate(CommandSender sender) {
-		plugin.updater = new Updater(plugin, 15358, false);
-		final Updater.UpdateResult result = plugin.updater.getResult();
-		switch (result) {
-		case FAIL_SPIGOT: {
-			sender.sendMessage(StringUtils.getInstance()
-					.colorize("&cFailed to check for update for &c&l" + plugin.getName() + "&c!"));
-			break;
-		}
-		case NO_UPDATE: {
-			sender.sendMessage(StringUtils.getInstance().colorize(
-					"&c&l" + plugin.getName() + " &cis up to date! Version: &c&l" + plugin.updater.getVersion()));
-			break;
-		}
-		case UPDATE_AVAILABLE: {
-			sender.sendMessage(StringUtils.getInstance()
-					.colorize("&c&l" + plugin.getName() + " &chas an update available! Your Version: &c&l"
-							+ plugin.getDescription().getVersion() + " &cNew Version: &c&l"
-							+ plugin.updater.getVersion()));
-			break;
-		}
-		default: {
-			break;
-		}
-		}
-	}
-
-	/**
-	 * Check vote site.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param siteName
-	 *            the site name
-	 */
-	public void checkVoteSite(CommandSender sender, String siteName) {
-		if (!ConfigVoteSites.getInstance().isServiceSiteGood(siteName)) {
-			sender.sendMessage(
-					StringUtils.getInstance().colorize("&cServiceSite is invalid, votes may not work properly"));
-		} else {
-			sender.sendMessage(StringUtils.getInstance().colorize("&aServiceSite is properly setup"));
-		}
-		if (!ConfigVoteSites.getInstance().isVoteURLGood(siteName)) {
-			sender.sendMessage(StringUtils.getInstance().colorize("&cVoteURL is invalid"));
-		} else {
-			sender.sendMessage(StringUtils.getInstance().colorize("&aVoteURL is properly setup"));
-		}
-	}
-
-	/**
-	 * Creates the vote site.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param voteSite
-	 *            the vote site
-	 */
-	public void createVoteSite(CommandSender sender, String voteSite) {
-
-		sender.sendMessage(StringUtils.getInstance().colorize("&cCreating VoteSite..."));
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				ConfigVoteSites.getInstance().generateVoteSite(voteSite);
-				sender.sendMessage(StringUtils.getInstance().colorize("&cCreated VoteSite: &c&l" + voteSite));
-			}
-		});
-
-	}
-
-	/**
-	 * Help.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param page
-	 *            the page
-	 */
-	public void help(CommandSender sender, int page) {
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendJson(Commands.getInstance().adminHelp(sender, page - 1));
-		} else {
-			sender.sendMessage(ArrayUtils.getInstance().convert(
-					ArrayUtils.getInstance().comptoString(Commands.getInstance().adminHelp(sender, page - 1))));
-		}
-
-	}
-
 	/*
 	 * (non-Javadoc)
-	 *
 	 * @see org.bukkit.command.CommandExecutor#onCommand(org.bukkit.command.
 	 * CommandSender , org.bukkit.command.Command, java.lang.String,
 	 * java.lang.String[])
 	 */
 	@Override
 	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
-		for (CommandHandler commandHandler : plugin.adminVoteCommand) {
+		for (CommandHandler commandHandler : plugin.getAdminVoteCommand()) {
 			if (commandHandler.runCommand(sender, args)) {
 				return true;
 			}
@@ -180,263 +73,4 @@ public class CommandAdminVote implements CommandExecutor {
 		return true;
 	}
 
-	/**
-	 * Perm list.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void permList(CommandSender sender) {
-
-		sender.sendMessage(Commands.getInstance().listPerms());
-
-	}
-
-	/**
-	 * Reload.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void reload(CommandSender sender) {
-
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				sender.sendMessage(ChatColor.RED + "Reloading " + plugin.getName() + "...");
-				plugin.reload();
-				sender.sendMessage(
-						ChatColor.RED + plugin.getName() + " v" + plugin.getDescription().getVersion() + " reloaded!");
-			}
-		});
-
-	}
-
-	/**
-	 * Reset player totals.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param playerName
-	 *            the player name
-	 */
-	public void resetPlayerTotals(CommandSender sender, String playerName) {
-		sender.sendMessage(StringUtils.getInstance().colorize("&cResseting totals for player &c&l" + playerName));
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				User user = UserManager.getInstance().getVotingPluginUser(playerName);
-				user.resetDailyTotalVotes();
-				user.resetMonthlyTotalVotes();
-				user.resetWeeklyTotalVotes();
-				sender.sendMessage(StringUtils.getInstance().colorize("&cDone resseting totals for &c&l" + playerName));
-				plugin.update();
-			}
-		});
-	}
-
-	/**
-	 * Reset totals.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void resetTotals(CommandSender sender) {
-
-		sender.sendMessage(StringUtils.getInstance().colorize("&cResseting totals for all players..."));
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				TopVoterHandler.getInstance().resetDailyTotals();
-				TopVoterHandler.getInstance().resetMonthlyTotals();
-				TopVoterHandler.getInstance().resetWeeklyTotals();
-				sender.sendMessage(StringUtils.getInstance().colorize("&cDone resseting totals"));
-				plugin.update();
-			}
-		});
-
-	}
-
-	/**
-	 * Sets the config allow unjoined.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param value
-	 *            the value
-	 */
-	public void setConfigAllowUnjoined(CommandSender sender, boolean value) {
-
-		Config.getInstance().setAllowUnJoined(value);
-		sender.sendMessage(StringUtils.getInstance().colorize("&cSet AllowUnjoined to &c&l" + value));
-
-	}
-
-	/**
-	 * Sets the config broadcast vote.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param value
-	 *            the value
-	 */
-	public void setConfigBroadcastVote(CommandSender sender, boolean value) {
-
-		Config.getInstance().setDebugEnabled(value);
-		sender.sendMessage(StringUtils.getInstance().colorize("&cSet BroadcastVote to &c&l" + value));
-
-	}
-
-	/**
-	 * Sets the config debug.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param value
-	 *            the value
-	 */
-	public void setConfigDebug(CommandSender sender, boolean value) {
-
-		Config.getInstance().setDebugEnabled(value);
-		sender.sendMessage(StringUtils.getInstance().colorize("&cSet Debug to &c&l" + value));
-
-	}
-
-	/**
-	 * Sets the config enable top voter awards.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param value
-	 *            the value
-	 */
-	public void setConfigEnableTopVoterAwards(CommandSender sender, boolean value) {
-
-		Config.getInstance().setTopVoterAwardsEnabled(value);
-		sender.sendMessage(StringUtils.getInstance().colorize("&cSet DisableTopVoterAwards to &c&l" + value));
-
-	}
-
-	/**
-	 * Sets the total.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param playerName
-	 *            the player name
-	 * @param amount
-	 *            the amount
-	 */
-	public void setTotal(CommandSender sender, String playerName, int amount) {
-
-		UserManager.getInstance().getVotingPluginUser(playerName).setMonthTotal(amount);
-		sender.sendMessage(ChatColor.GREEN + playerName + " total votes has been set to " + amount);
-		plugin.update();
-
-	}
-
-	/**
-	 * Sets the vote site enabled.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param voteSite
-	 *            the vote site
-	 * @param value
-	 *            the value
-	 */
-	public void setVoteSiteEnabled(CommandSender sender, String voteSite, boolean value) {
-		ConfigVoteSites.getInstance().setEnabled(voteSite, value);
-		sender.sendMessage(StringUtils.getInstance().colorize("&cSet votesite " + voteSite + " enabled to " + value));
-	}
-
-	/**
-	 * Sets the vote site priority.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param voteSite
-	 *            the vote site
-	 * @param value
-	 *            the value
-	 */
-	public void setVoteSitePriority(CommandSender sender, String voteSite, int value) {
-
-		ConfigVoteSites.getInstance().setPriority(voteSite, value);
-		sender.sendMessage(
-				StringUtils.getInstance().colorize("&cSet priortiy to &c&l" + value + "&c on &c&l" + voteSite));
-
-	}
-
-	/**
-	 * Sets the vote site service site.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param voteSite
-	 *            the vote site
-	 * @param serviceSite
-	 *            the service site
-	 */
-	public void setVoteSiteServiceSite(CommandSender sender, String voteSite, String serviceSite) {
-
-		ConfigVoteSites.getInstance().setServiceSite(voteSite, serviceSite);
-		sender.sendMessage(StringUtils.getInstance()
-				.colorize("&cSet ServiceSite to &c&l" + serviceSite + "&c on &c&l" + voteSite));
-
-	}
-
-	/**
-	 * Sets the vote site vote delay.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param voteSite
-	 *            the vote site
-	 * @param delay
-	 *            the delay
-	 */
-	public void setVoteSiteVoteDelay(CommandSender sender, String voteSite, int delay) {
-
-		ConfigVoteSites.getInstance().setVoteDelay(voteSite, delay);
-		sender.sendMessage(
-				StringUtils.getInstance().colorize("&cSet VoteDelay to &c&l" + delay + "&c on &c&l" + voteSite));
-
-	}
-
-	/**
-	 * Sets the vote site vote URL.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param voteSite
-	 *            the vote site
-	 * @param url
-	 *            the url
-	 */
-	public void setVoteSiteVoteURL(CommandSender sender, String voteSite, String url) {
-
-		ConfigVoteSites.getInstance().setVoteURL(voteSite, url);
-		sender.sendMessage(StringUtils.getInstance().colorize("&cSet VoteURL to &c&l" + url + "&c on &c&l" + voteSite));
-
-	}
-
-	/**
-	 * Uuid.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param playerName
-	 *            the player name
-	 */
-	public void uuid(CommandSender sender, String playerName) {
-
-		sender.sendMessage(ChatColor.GREEN + "UUID of player " + ChatColor.DARK_GREEN + playerName + ChatColor.GREEN
-				+ " is: " + PlayerUtils.getInstance().getUUID(playerName));
-
-	}
-
 }

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

@@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
-import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 
@@ -32,7 +32,6 @@ public class CommandAliases implements CommandExecutor {
 
 	/*
 	 * (non-Javadoc)
-	 *
 	 * @see org.bukkit.command.CommandExecutor#onCommand(org.bukkit.command.
 	 * CommandSender , org.bukkit.command.Command, java.lang.String,
 	 * java.lang.String[])
@@ -50,9 +49,9 @@ public class CommandAliases implements CommandExecutor {
 
 		ArrayList<CommandHandler> handles = new ArrayList<CommandHandler>();
 		if (adminCommand) {
-			handles.addAll(plugin.adminVoteCommand);
+			handles.addAll(plugin.getAdminVoteCommand());
 		} else {
-			handles.addAll(plugin.voteCommand);
+			handles.addAll(plugin.getVoteCommand());
 		}
 
 		for (CommandHandler cmdHandle : handles) {
@@ -82,7 +81,7 @@ public class CommandAliases implements CommandExecutor {
 				}
 			}
 		}
-		
+
 		/*
 		 * for (String arg : cmdHandle.getArgs()[0].split("&")) { argsNew.set(0, arg);
 		 * if (cmdHandle.runCommand(sender, Utils.getInstance().convertArray(argsNew)))

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

@@ -1,21 +1,12 @@
 package com.Ben12345rocks.VotingPlugin.Commands.Executers;
 
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
-import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
 import com.Ben12345rocks.VotingPlugin.Main;
-import com.Ben12345rocks.VotingPlugin.Commands.Commands;
-import com.Ben12345rocks.VotingPlugin.Config.Config;
-import com.Ben12345rocks.VotingPlugin.Objects.User;
-import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
-import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -54,149 +45,8 @@ public class CommandVote implements CommandExecutor {
 		CommandVote.plugin = plugin;
 	}
 
-	/**
-	 * Help.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void help(CommandSender sender) {
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendJson(Commands.getInstance().voteHelpText(sender));
-		} else {
-			sender.sendMessage(ArrayUtils.getInstance()
-					.convert(ArrayUtils.getInstance().comptoString(Commands.getInstance().voteHelpText(sender))));
-		}
-
-	}
-
-	/**
-	 * Info other.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param playerName
-	 *            the player name
-	 */
-	public void infoOther(CommandSender sender, String playerName) {
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				if (sender instanceof Player) {
-					User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-					user.sendMessage(StringUtils.getInstance().colorize("&cGetting player info..."));
-					user.sendMessage(Commands.getInstance()
-							.playerInfo(UserManager.getInstance().getVotingPluginUser(playerName)));
-				} else {
-					sender.sendMessage(ArrayUtils.getInstance().colorize(Commands.getInstance()
-							.playerInfo(UserManager.getInstance().getVotingPluginUser(playerName))));
-				}
-			}
-		});
-
-	}
-
-	/**
-	 * Info self.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void infoSelf(CommandSender sender) {
-		if (sender instanceof Player) {
-			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-				@Override
-				public void run() {
-					User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-					user.sendMessage(StringUtils.getInstance().colorize("&cGetting info..."));
-					user.sendMessage(Commands.getInstance().playerInfo(user));
-				}
-			});
-
-		} else {
-			sender.sendMessage("You must be a player to do this!");
-		}
-	}
-
-	/**
-	 * Last other.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param playerName
-	 *            the player name
-	 */
-	public void lastOther(CommandSender sender, String playerName) {
-
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendMessage(
-					Commands.getInstance().voteCommandLast(UserManager.getInstance().getVotingPluginUser(playerName)));
-		} else {
-			sender.sendMessage(ArrayUtils.getInstance().colorize(
-					Commands.getInstance().voteCommandLast(UserManager.getInstance().getVotingPluginUser(playerName))));
-		}
-
-	}
-
-	/**
-	 * Last self.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void lastSelf(CommandSender sender) {
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendMessage(Commands.getInstance().voteCommandLast(user));
-		} else {
-			sender.sendMessage("You must be a player to do this!");
-		}
-	}
-
-	/**
-	 * Next other.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param playerName
-	 *            the player name
-	 */
-	public void nextOther(CommandSender sender, String playerName) {
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendMessage(
-					Commands.getInstance().voteCommandNext(UserManager.getInstance().getVotingPluginUser(playerName)));
-
-		} else {
-			sender.sendMessage(ArrayUtils.getInstance().colorize(
-					Commands.getInstance().voteCommandNext(UserManager.getInstance().getVotingPluginUser(playerName))));
-		}
-
-	}
-
-	/**
-	 * Next self.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void nextSelf(CommandSender sender) {
-		if (sender instanceof Player) {
-			String playerName = sender.getName();
-			User user = UserManager.getInstance().getVotingPluginUser(playerName);
-			user.sendMessage(Commands.getInstance().voteCommandNext(user));
-		} else {
-			sender.sendMessage("You must be a player to do this!");
-		}
-	}
-
 	/*
 	 * (non-Javadoc)
-	 *
 	 * @see org.bukkit.command.CommandExecutor#onCommand(org.bukkit.command.
 	 * CommandSender , org.bukkit.command.Command, java.lang.String,
 	 * java.lang.String[])
@@ -204,7 +54,7 @@ public class CommandVote implements CommandExecutor {
 	@Override
 	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
 
-		for (CommandHandler commandHandler : plugin.voteCommand) {
+		for (CommandHandler commandHandler : plugin.getVoteCommand()) {
 			if (commandHandler.runCommand(sender, args)) {
 				return true;
 			}
@@ -215,220 +65,4 @@ public class CommandVote implements CommandExecutor {
 		return true;
 	}
 
-	/**
-	 * Points other.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param user
-	 *            the user
-	 */
-	public void pointsOther(CommandSender sender, User user) {
-		String msg = Config.getInstance().getFormatCommandVotePoints().replace("%Player%", user.getPlayerName())
-				.replace("%Points%", "" + user.getPoints());
-		if (sender instanceof Player) {
-			UserManager.getInstance().getVotingPluginUser((Player) sender).sendMessage(msg);
-		} else {
-			sender.sendMessage(StringUtils.getInstance().colorize(msg));
-		}
-
-	}
-
-	/**
-	 * Points self.
-	 *
-	 * @param user
-	 *            the user
-	 */
-	public void pointsSelf(User user) {
-		String msg = Config.getInstance().getFormatCommandVotePoints().replace("%Player%", user.getPlayerName())
-				.replace("%Points%", "" + user.getPoints());
-		user.sendMessage(msg);
-	}
-
-	/**
-	 * Today.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param page
-	 *            the page
-	 */
-	public void today(CommandSender sender, int page) {
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendMessage(Commands.getInstance().commandVoteToday(page));
-			Bukkit.getScheduler().runTask(plugin, new Runnable() {
-
-				@Override
-				public void run() {
-					Commands.getInstance().sendVoteTodayScoreBoard((Player) sender, page);
-				}
-			});
-		} else {
-			sender.sendMessage(Commands.getInstance().commandVoteToday(page));
-		}
-	}
-
-	public void topVoterAll(CommandSender sender, int page) {
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendMessage(TopVoterHandler.getInstance().topVoterAllTime(page));
-			Bukkit.getScheduler().runTask(plugin, new Runnable() {
-
-				@Override
-				public void run() {
-					Commands.getInstance().sendTopVoterAllTimeScoreBoard((Player) sender, page);
-				}
-			});
-		} else {
-			sender.sendMessage(TopVoterHandler.getInstance().topVoterAllTime(page));
-		}
-	}
-
-	/**
-	 * Top voter daily.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param page
-	 *            the page
-	 */
-	public void topVoterDaily(CommandSender sender, int page) {
-
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendMessage(TopVoterHandler.getInstance().topVoterDaily(page));
-			Bukkit.getScheduler().runTask(plugin, new Runnable() {
-
-				@Override
-				public void run() {
-					Commands.getInstance().sendTopVoterDailyScoreBoard((Player) sender, page);
-				}
-			});
-		} else {
-			sender.sendMessage(TopVoterHandler.getInstance().topVoterDaily(page));
-		}
-
-	}
-
-	/**
-	 * Top voter monthly.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param page
-	 *            the page
-	 */
-	public void topVoterMonthly(CommandSender sender, int page) {
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendMessage(TopVoterHandler.getInstance().topVoterMonthly(page));
-			Bukkit.getScheduler().runTask(plugin, new Runnable() {
-
-				@Override
-				public void run() {
-					Commands.getInstance().sendTopVoterMonthlyScoreBoard((Player) sender, page);
-				}
-			});
-		} else {
-			sender.sendMessage(TopVoterHandler.getInstance().topVoterMonthly(page));
-		}
-
-	}
-
-	/**
-	 * Top voter weekly.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param page
-	 *            the page
-	 */
-	public void topVoterWeekly(CommandSender sender, int page) {
-
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				if (sender instanceof Player) {
-					User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-					user.sendMessage(TopVoterHandler.getInstance().topVoterWeekly(page));
-					Bukkit.getScheduler().runTask(plugin, new Runnable() {
-
-						@Override
-						public void run() {
-							Commands.getInstance().sendTopVoterWeeklyScoreBoard((Player) sender, page);
-						}
-					});
-				} else {
-					sender.sendMessage(TopVoterHandler.getInstance().topVoterWeekly(page));
-				}
-
-			}
-		});
-
-	}
-
-	/**
-	 * Total all.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void totalAll(CommandSender sender) {
-
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				if (sender instanceof Player) {
-					User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-					user.sendMessage(Commands.getInstance().voteCommandTotalAll());
-
-				} else {
-					sender.sendMessage(Commands.getInstance().voteCommandTotalAll());
-				}
-
-			}
-		});
-
-	}
-
-	/**
-	 * Total other.
-	 *
-	 * @param sender
-	 *            the sender
-	 * @param playerName
-	 *            the player name
-	 */
-	public void totalOther(CommandSender sender, String playerName) {
-		if (sender instanceof Player) {
-			User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
-			user.sendMessage(
-					Commands.getInstance().voteCommandTotal(UserManager.getInstance().getVotingPluginUser(playerName)));
-		} else {
-			sender.sendMessage(ArrayUtils.getInstance().colorize(Commands.getInstance()
-					.voteCommandTotal(UserManager.getInstance().getVotingPluginUser(playerName))));
-		}
-
-	}
-
-	/**
-	 * Total self.
-	 *
-	 * @param sender
-	 *            the sender
-	 */
-	public void totalSelf(CommandSender sender) {
-		if (sender instanceof Player) {
-			String playerName = sender.getName();
-			User user = UserManager.getInstance().getVotingPluginUser(playerName);
-			user.sendMessage(Commands.getInstance().voteCommandTotal(user));
-		} else {
-			sender.sendMessage("You must be a player to do this!");
-		}
-	}
-
 }

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

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

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

@@ -1,16 +1,19 @@
 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.ChatColor;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory.ClickEvent;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventoryButton;
@@ -22,12 +25,11 @@ import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Commands.Commands;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
-import com.Ben12345rocks.VotingPlugin.Objects.TopVoter;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
+import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
-import com.Ben12345rocks.VotingPlugin.VoteShop.VoteShop;
 
 public class PlayerGUIs {
 	static PlayerGUIs instance = new PlayerGUIs();
@@ -50,12 +52,28 @@ public class PlayerGUIs {
 	private PlayerGUIs() {
 	}
 
-	public ItemBuilder getBackButton() {
+	public BInventoryButton getBackButton() {
 		ConfigurationSection sec = Config.getInstance().getBackButton();
+		ItemBuilder item;
 		if (sec != null) {
-			return new ItemBuilder(sec);
+			item = new ItemBuilder(sec);
+		} else {
+			item = new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI");
 		}
-		return new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI");
+
+		BInventoryButton b = new BInventoryButton(item) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				openVoteGUI(event.getWhoClicked(), getSelectedPlayer(event.getWhoClicked()));
+			}
+		};
+
+		if (!Config.getInstance().isAlwaysCloseInventory()) {
+			b.dontClose();
+		}
+
+		return b;
 	}
 
 	public User getSelectedPlayer(Player player) {
@@ -108,12 +126,15 @@ public class PlayerGUIs {
 				&& !player.hasPermission("VotingPlugin.Mod"))
 				|| (!player.hasPermission("VotingPlugin.Commands.Vote.GUI")
 						&& !player.hasPermission("VotingPlugin.Player"))) {
-			player.sendMessage(StringUtils.getInstance().colorize(AdvancedCoreHook.getInstance().getFormatNoPerms()));
+			player.sendMessage(StringUtils.getInstance().colorize(Main.plugin.getOptions().getFormatNoPerms()));
 			return;
 		}
 		setSelectedPlayer(player, user);
 		BInventory inv = new BInventory(StringUtils.getInstance()
 				.replacePlaceHolder(Config.getInstance().getGUIVoteGUIName(), "player", user.getPlayerName()));
+		if (!Config.getInstance().isAlwaysCloseInventory()) {
+			inv.dontClose();
+		}
 
 		for (String slot : Config.getInstance().getVoteGUISlots()) {
 			ItemBuilder builder = new ItemBuilder(Config.getInstance().getVoteGUISlotSection(slot));
@@ -121,6 +142,7 @@ public class PlayerGUIs {
 			String[] lore = new String[1];
 
 			lore = ArrayUtils.getInstance().convert(Config.getInstance().getVoteGUISlotLore(slot));
+
 			if (lore.length == 0) {
 				if (slot.equalsIgnoreCase("url")) {
 					lore = Commands.getInstance().voteURLs(user);
@@ -148,36 +170,56 @@ public class PlayerGUIs {
 				}
 			}
 
-			builder.setLore(lore);
+			HashMap<String, String> placeholders = new HashMap<String, String>();
+			placeholders.put("points", "" + user.getPoints());
 
-			inv.addButton(Config.getInstance().getVoteGUISlotSlot(slot), new BInventoryButton(builder) {
+			builder.setPlaceholders(placeholders);
+			builder.setLore(ArrayUtils.getInstance().convert(lore));
+
+			inv.addButton(new BInventoryButton(builder) {
 
 				@Override
 				public void onClick(ClickEvent event) {
-					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")) {
-							VoteShop.getInstance().voteShop(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.equalsIgnoreCase("none")) {
+								return;
+							} else if (!cmd.equals("")) {
+								Bukkit.getScheduler().runTask(plugin, new Runnable() {
+
+									@Override
+									public void run() {
+										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);
+								} else if (slot.equalsIgnoreCase("lastmonth")) {
+									openVoteTopLastMonth(player);
+								}
+							}
 						}
-					}
+					});
 
 				}
 			});
@@ -202,14 +244,7 @@ public class PlayerGUIs {
 		}
 
 		if (Config.getInstance().getGUIVoteLastBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-
-			});
+			inv.addButton(getBackButton());
 		}
 
 		inv.openInventory(player);
@@ -231,18 +266,115 @@ public class PlayerGUIs {
 		}
 
 		if (Config.getInstance().getGUIVoteNextBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-
-			});
+			inv.addButton(getBackButton());
 		}
 		inv.openInventory(player);
 	}
 
+	public void openVoteShop(Player player) {
+		if (!Config.getInstance().getVoteShopEnabled()) {
+			player.sendMessage(StringUtils.getInstance().colorize("&cVote shop disabled"));
+			return;
+		}
+
+		BInventory inv = new BInventory(Config.getInstance().getVoteShopName());
+
+		for (final String identifier : Config.getInstance().getIdentifiers()) {
+
+			String perm = Config.getInstance().getVoteShopPermission(identifier);
+			boolean hasPerm = false;
+			if (perm.isEmpty()) {
+				hasPerm = true;
+			} else {
+				hasPerm = player.hasPermission(perm);
+			}
+
+			int limit = Config.getInstance().getIdentifierLimit(identifier);
+
+			boolean limitPass = true;
+			if (limit > 0) {
+				User user = UserManager.getInstance().getVotingPluginUser(player);
+				if (user.getVoteShopIdentifierLimit(identifier) >= limit) {
+					limitPass = false;
+				}
+			}
+
+			if (!Config.getInstance().getVoteShopNotBuyable(identifier)) {
+				if (hasPerm && (limitPass || !Config.getInstance().isVoteShopHideLimitedReached())) {
+					ItemBuilder builder = new ItemBuilder(Config.getInstance().getIdentifierSection(identifier));
+
+					inv.addButton(new BInventoryButton(builder) {
+
+						@Override
+						public void onClick(ClickEvent event) {
+							Player player = event.getWhoClicked();
+
+							User user = UserManager.getInstance().getVotingPluginUser(player);
+							user.clearCache();
+							String identifier = (String) getData("identifier");
+							int limit = (int) getData("Limit");
+							int points = Config.getInstance().getIdentifierCost(identifier);
+							if (identifier != null) {
+
+								// limit fail-safe, should never be needed, except in rare cases
+								boolean limitPass = true;
+								if (limit > 0) {
+									if (user.getVoteShopIdentifierLimit(identifier) >= limit) {
+										limitPass = false;
+									}
+								}
+
+								if (limitPass) {
+									HashMap<String, String> placeholders = new HashMap<String, String>();
+									placeholders.put("identifier", identifier);
+									placeholders.put("points", "" + points);
+									placeholders.put("limit", "" + limit);
+									if (user.removePoints(points)) {
+
+										RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
+												Config.getInstance().getIdentifierRewardsPath(identifier),
+												new RewardOptions().setPlaceholders(placeholders));
+
+										user.sendMessage(StringUtils.getInstance().replacePlaceHolder(
+												Config.getInstance().getFormatShopPurchaseMsg(), placeholders));
+										if (limit > 0) {
+											user.setVoteShopIdentifierLimit(identifier,
+													user.getVoteShopIdentifierLimit(identifier) + 1);
+										}
+									} else {
+										user.sendMessage(StringUtils.getInstance().replacePlaceHolder(
+												Config.getInstance().getFormatShopFailedMsg(), placeholders));
+									}
+								} else {
+									user.sendMessage(Config.getInstance().getVoteShopLimitReached());
+								}
+							}
+						}
+
+					}.addData("identifier", identifier).addData("Limit", limit));
+				}
+			} else {
+				if (hasPerm) {
+					ItemBuilder builder = new ItemBuilder(Config.getInstance().getIdentifierSection(identifier));
+					inv.addButton(new BInventoryButton(builder) {
+
+						@Override
+						public void onClick(ClickEvent event) {
+
+						}
+
+					}.dontClose().addData("identifier", identifier).addData("Limit", limit));
+				}
+			}
+		}
+
+		if (Config.getInstance().getVoteShopBackButton()) {
+			inv.addButton(getBackButton());
+		}
+
+		inv.openInventory(player);
+	}
+
 	public void openVoteStreak(Player player, User user) {
 		setSelectedPlayer(player, user);
 		BInventory inv = new BInventory(StringUtils.getInstance()
@@ -305,13 +437,7 @@ public class PlayerGUIs {
 				});
 
 		if (Config.getInstance().getGUIVoteStreakBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-			});
+			inv.addButton(getBackButton());
 		}
 
 		inv.openInventory(player);
@@ -320,12 +446,15 @@ public class PlayerGUIs {
 	public void openVoteToday(Player player) {
 		setSelectedPlayer(player, null);
 		BInventory inv = new BInventory(Config.getInstance().getGUIVoteTodayName());
-		for (User user : plugin.voteToday.keySet()) {
+		if (!Config.getInstance().isAlwaysCloseInventory()) {
+			inv.dontClose();
+		}
+		for (User user : plugin.getVoteToday().keySet()) {
 
-			for (VoteSite voteSite : plugin.voteToday.get(user).keySet()) {
+			for (VoteSite voteSite : plugin.getVoteToday().get(user).keySet()) {
 				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(Config.getInstance().getFormatTimeFormat());
-				String timeString = plugin.voteToday.get(user).get(voteSite).format(formatter);
-				String msg = "&6" + user.getPlayerName() + " : " + voteSite.getDisplayName() + " : " + timeString;
+				String timeString = plugin.getVoteToday().get(user).get(voteSite).format(formatter);
+				String msg = "&6" + voteSite.getDisplayName() + " : " + timeString;
 				inv.addButton(inv.getNextSlot(), new BInventoryButton(user.getPlayerName(), new String[] { msg },
 						MiscUtils.getInstance().setSkullOwner(user.getOfflinePlayer())) {
 
@@ -334,68 +463,105 @@ public class PlayerGUIs {
 						User user = UserManager.getInstance()
 								.getVotingPluginUser(clickEvent.getClickedItem().getItemMeta().getDisplayName());
 						openVoteGUI(player, user);
-
 					}
 				});
 			}
 		}
 
 		if (Config.getInstance().getGUIVoteTodayBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-
-			});
+			inv.addButton(getBackButton());
 		}
 		inv.openInventory(player);
 	}
 
+	public void openVoteTopLastMonth(Player player) {
+		Set<Entry<User, Integer>> users = null;
+
+		users = plugin.getLastMonthTopVoter().entrySet();
+
+		BInventory inv = new BInventory(StringUtils.getInstance()
+				.replacePlaceHolder(Config.getInstance().getGUIVoteTopName(), "topvoter", "Last Month"));
+		if (!Config.getInstance().isAlwaysCloseInventory()) {
+			inv.dontClose();
+		}
+
+		int pos = 1;
+		for (Entry<User, Integer> entry : users) {
+			ItemBuilder playerItem;
+
+			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) {
+					User user = (User) getData("User");
+					openVoteGUI(player, user);
+				}
+			}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey()));
+			pos++;
+		}
+
+		if (Config.getInstance().getGUIVoteTopBackButton()) {
+			inv.getPageButtons().add(getBackButton().setSlot(1));
+		}
+
+		inv.setPages(true);
+		inv.setMaxInvSize(Config.getInstance().getGUIVoteTopSize());
+		inv.openInventory(player);
+
+	}
+
 	public void openVoteTop(Player player, TopVoter top) {
 		if (top == null) {
 			top = TopVoter.getDefault();
 		}
-		BInventory inv = null;
 		Set<Entry<User, Integer>> users = null;
-		String topVoter = "";
-		if (top.equals(TopVoter.Monthly)) {
-			topVoter = Config.getInstance().getFormatTopVoterMonthly();
-			users = plugin.topVoterMonthly.entrySet();
-		} else if (top.equals(TopVoter.Weekly)) {
-			topVoter = Config.getInstance().getFormatTopVoterWeekly();
-			users = plugin.topVoterWeekly.entrySet();
-		} else if (top.equals(TopVoter.Daily)) {
-			topVoter = Config.getInstance().getFormatTopVoterDaily();
-			users = plugin.topVoterDaily.entrySet();
-		} else {
-			topVoter = Config.getInstance().getFormatTopVoterAllTime();
-			users = plugin.topVoterAllTime.entrySet();
+
+		String topVoter = top.getName();
+		users = plugin.getTopVoter(top).entrySet();
+
+		BInventory inv = new BInventory(StringUtils.getInstance()
+				.replacePlaceHolder(Config.getInstance().getGUIVoteTopName(), "topvoter", topVoter));
+		if (!Config.getInstance().isAlwaysCloseInventory()) {
+			inv.dontClose();
 		}
-		inv = new BInventory(StringUtils.getInstance().replacePlaceHolder(Config.getInstance().getGUIVoteTopName(),
-				"topvoter", topVoter));
+
 		int pos = 1;
 		for (Entry<User, Integer> entry : users) {
-			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())) {
+			ItemBuilder playerItem;
+
+			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();
-
-					User user = UserManager.getInstance().getVotingPluginUser(name);
+					User user = (User) getData("User");
 					openVoteGUI(player, user);
 				}
-			});
+			}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey()));
 			pos++;
 		}
+
 		final TopVoter cur = top;
 		inv.getPageButtons().add(new BInventoryButton(
 				new ItemBuilder(Config.getInstance().getGUIVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
@@ -411,14 +577,9 @@ public class PlayerGUIs {
 		});
 
 		if (Config.getInstance().getGUIVoteTopBackButton()) {
-			inv.getPageButtons().add(new BInventoryButton(getBackButton().setSlot(1)) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-			});
+			inv.getPageButtons().add(getBackButton().setSlot(1));
 		}
+
 		inv.setPages(true);
 		inv.setMaxInvSize(Config.getInstance().getGUIVoteTopSize());
 		inv.openInventory(player);
@@ -429,47 +590,21 @@ public class PlayerGUIs {
 		setSelectedPlayer(player, user);
 		BInventory inv = new BInventory(StringUtils.getInstance()
 				.replacePlaceHolder(Config.getInstance().getGUIVoteTotalName(), "player", user.getPlayerName()));
-		inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteTotalDayTotalItem())
-				.addPlaceholder("Total", "" + user.getDailyTotal())) {
 
-			@Override
-			public void onClick(ClickEvent clickEvent) {
-
-			}
-		});
-		inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteTotalWeekTotalItem())
-				.addPlaceholder("Total", "" + user.getWeeklyTotal())) {
-
-			@Override
-			public void onClick(ClickEvent clickEvent) {
-
-			}
-		});
-		inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteTotalMonthTotalItem())
-				.addPlaceholder("Total", "" + user.getMonthTotal())) {
-
-			@Override
-			public void onClick(ClickEvent clickEvent) {
-
-			}
-		});
-		inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteTotalAllTimeTotalItem())
-				.addPlaceholder("Total", "" + user.getAllTimeTotal())) {
-
-			@Override
-			public void onClick(ClickEvent clickEvent) {
-			}
-		});
-
-		if (Config.getInstance().getGUIVoteTotalBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
+		for (TopVoter top : TopVoter.values()) {
+			inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteTotalItem(top))
+					.addPlaceholder("Total", "" + user.getTotal(top)).addPlaceholder("topvoter", top.getName())) {
 
 				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				public void onClick(ClickEvent clickEvent) {
+
 				}
 			});
 		}
+
+		if (Config.getInstance().getGUIVoteTotalBackButton()) {
+			inv.addButton(getBackButton());
+		}
 		inv.openInventory(player);
 	}
 
@@ -505,8 +640,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));
 
 				}
@@ -515,9 +648,8 @@ public class PlayerGUIs {
 			count++;
 		}
 
-		for (VoteSite voteSite : plugin.getVoteSites()) {
+		for (final VoteSite voteSite : plugin.getVoteSites()) {
 			ItemBuilder builder = new ItemBuilder(Config.getInstance().getVoteURLAlreadyVotedItemSection());
-
 			if (user.canVoteSite(voteSite)) {
 				builder = new ItemBuilder(Config.getInstance().getVoteURLCanVoteItemSection());
 			} else {
@@ -531,12 +663,19 @@ public class PlayerGUIs {
 
 				@Override
 				public void onClick(ClickEvent event) {
-					Player player = event.getWhoClicked();
+					Player player = event.getPlayer();
 					if (player != null) {
-						player.closeInventory();
-						User user = UserManager.getInstance().getVotingPluginUser(player);
-						user.sendMessage(voteSite.getVoteURL());
-
+						if (Config.getInstance().isCommandsVoteRewardFromVoteURL()
+								&& event.getClick().equals(ClickType.RIGHT)) {
+							voteReward(player, voteSite.getKey());
+						} else {
+							User user = UserManager.getInstance().getVotingPluginUser(player);
+							user.sendMessage(StringUtils.getInstance().replacePlaceHolder(StringUtils.getInstance()
+									.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+											Config.getInstance().getGUIVoteURLURLText(), "voteurl",
+											voteSite.getVoteURL()), "sitename", voteSite.getDisplayName()),
+									"player", player.getName()));
+						}
 					}
 
 				}
@@ -545,13 +684,7 @@ public class PlayerGUIs {
 		}
 
 		if (Config.getInstance().getGUIVoteURLBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-			});
+			inv.addButton(getBackButton());
 		}
 
 		inv.openInventory(player);
@@ -564,6 +697,9 @@ public class PlayerGUIs {
 		BInventory inv = new BInventory(StringUtils.getInstance()
 				.replacePlaceHolder(Config.getInstance().getGUIVoteURLSiteName(), "site", site.getDisplayName()));
 		inv.setMeta(player, "VoteSite", site);
+		if (!Config.getInstance().isAlwaysCloseInventory()) {
+			inv.dontClose();
+		}
 
 		inv.addButton(
 				new BInventoryButton(new ItemBuilder(Material.BOW).setName("&4URL").addLoreLine("Click to see URL")) {
@@ -584,7 +720,7 @@ public class PlayerGUIs {
 			}
 		});
 
-		inv.addButton(new BInventoryButton(new ItemBuilder(Material.WATCH).setName("&4Last Vote")
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.CLOCK).setName("&4Last Vote")
 				.addLoreLine(Commands.getInstance().voteCommandLastLine(user, site))) {
 
 			@Override
@@ -594,13 +730,7 @@ public class PlayerGUIs {
 		});
 
 		if (Config.getInstance().getGUIVoteURLBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-			});
+			inv.addButton(getBackButton());
 		}
 		inv.openInventory(player);
 	}
@@ -621,26 +751,19 @@ public class PlayerGUIs {
 		BInventory inv = new BInventory(Config.getInstance().getGUIVoteRewardName());
 
 		if ((siteName == null) || (siteName == "")) {
-			int count = 0;
 			for (VoteSite voteSite : plugin.getVoteSites()) {
 				try {
 					ItemBuilder builder = voteSite.getItem();
-					final VoteSite site = voteSite;
 
-					inv.addButton(count, new BInventoryButton(builder) {
+					inv.addButton(new BInventoryButton(builder) {
 
 						@Override
 						public void onClick(ClickEvent event) {
 							Player player = event.getWhoClicked();
-							if (player != null) {
-								player.closeInventory();
-								player.performCommand("vote reward " + site.getKey());
-
-							}
 
+							voteReward(player, (String) getData("site"));
 						}
-					});
-					count++;
+					}.addData("site", voteSite.getKey()));
 				} catch (Exception ex) {
 
 				}
@@ -654,10 +777,6 @@ public class PlayerGUIs {
 
 							@Override
 							public void onClick(ClickEvent event) {
-								Player player = event.getWhoClicked();
-								if (player != null) {
-									player.closeInventory();
-								}
 
 							}
 
@@ -665,6 +784,10 @@ public class PlayerGUIs {
 			}
 		}
 
+		if (Config.getInstance().isVoteRewardBackButton()) {
+			inv.addButton(getBackButton());
+		}
+
 		inv.openInventory(player);
 	}
 }

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

@@ -10,7 +10,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 
-import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 
@@ -24,7 +24,6 @@ public class AdminVoteTabCompleter implements TabCompleter {
 
 	/*
 	 * (non-Javadoc)
-	 *
 	 * @see org.bukkit.command.TabCompleter#onTabComplete(org.bukkit.command.
 	 * CommandSender, org.bukkit.command.Command, java.lang.String,
 	 * java.lang.String[])
@@ -36,9 +35,8 @@ public class AdminVoteTabCompleter implements TabCompleter {
 
 		Set<String> cmds = new HashSet<String>();
 
-		for (CommandHandler cmdHandle : plugin.adminVoteCommand) {
-			cmds.addAll(cmdHandle.getTabCompleteOptions(sender, args, args.length - 1));
-		}
+		cmds.addAll(TabCompleteHandler.getInstance().getTabCompleteOptions(plugin.getAdminVoteCommand(), sender, args,
+				args.length - 1));
 
 		for (String str : cmds) {
 			if (StringUtils.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {

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

@@ -5,12 +5,14 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 
-import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
@@ -26,9 +28,10 @@ public class AliasesTabCompleter implements TabCompleter {
 	/** The cmd handle. */
 	public CommandHandler cmdHandle;
 
+	private boolean adminCommand;
+
 	/*
 	 * (non-Javadoc)
-	 *
 	 * @see org.bukkit.command.TabCompleter#onTabComplete(org.bukkit.command.
 	 * CommandSender, org.bukkit.command.Command, java.lang.String,
 	 * java.lang.String[])
@@ -48,8 +51,14 @@ public class AliasesTabCompleter implements TabCompleter {
 		Set<String> cmds = new HashSet<String>();
 
 		ArrayList<CommandHandler> cmdHandlers = new ArrayList<CommandHandler>();
-		cmdHandlers.addAll(plugin.voteCommand);
-		cmdHandlers.addAll(plugin.adminVoteCommand);
+
+		if (adminCommand) {
+			cmdHandlers.addAll(plugin.getAdminVoteCommand());
+		} else {
+			cmdHandlers.addAll(plugin.getVoteCommand());
+		}
+		ConcurrentHashMap<String, ArrayList<String>> tabCompletes = TabCompleteHandler.getInstance()
+				.getTabCompleteOptions();
 		for (CommandHandler cmdHandle : cmdHandlers) {
 			if (cmdHandle.getArgs().length >= argsIn.length) {
 				for (String arg : cmdHandle.getArgs()[0].split("&")) {
@@ -69,7 +78,7 @@ public class AliasesTabCompleter implements TabCompleter {
 
 						if (argsMatch) {
 
-							cmds.addAll(cmdHandle.getTabCompleteOptions(sender, args, argsIn.length));
+							cmds.addAll(cmdHandle.getTabCompleteOptions(sender, args, argsIn.length, tabCompletes));
 						}
 
 					}
@@ -88,15 +97,9 @@ public class AliasesTabCompleter implements TabCompleter {
 		return tab;
 	}
 
-	/**
-	 * Sets the CMD handle.
-	 *
-	 * @param cmd
-	 *            the cmd
-	 * @return the aliases tab completer
-	 */
-	public AliasesTabCompleter setCMDHandle(CommandHandler cmd) {
+	public AliasesTabCompleter setCMDHandle(CommandHandler cmd, boolean adminCommand) {
 		cmdHandle = cmd;
+		this.adminCommand = adminCommand;
 		return this;
 	}
 

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

@@ -10,7 +10,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 
-import com.Ben12345rocks.AdvancedCore.Objects.CommandHandler;
+import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 
@@ -25,7 +25,6 @@ public class VoteTabCompleter implements TabCompleter {
 
 	/*
 	 * (non-Javadoc)
-	 *
 	 * @see org.bukkit.command.TabCompleter#onTabComplete(org.bukkit.command.
 	 * CommandSender, org.bukkit.command.Command, java.lang.String,
 	 * java.lang.String[])
@@ -33,29 +32,22 @@ public class VoteTabCompleter implements TabCompleter {
 	@Override
 	public List<String> onTabComplete(CommandSender sender, Command cmd, String alias, String[] args) {
 
-		if (cmd.getName().equalsIgnoreCase("vote") || cmd.getName().equalsIgnoreCase("v")) {
+		ArrayList<String> tab = new ArrayList<String>();
 
-			ArrayList<String> tab = new ArrayList<String>();
+		Set<String> cmds = new HashSet<String>();
 
-			Set<String> cmds = new HashSet<String>();
+		cmds.addAll(TabCompleteHandler.getInstance().getTabCompleteOptions(plugin.getVoteCommand(), sender, args,
+				args.length - 1));
 
-			for (CommandHandler cmdHandle : plugin.voteCommand) {
-				cmds.addAll(cmdHandle.getTabCompleteOptions(sender, args, args.length - 1));
+		for (String str : cmds) {
+			if (StringUtils.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
+				tab.add(str);
 			}
-
-			for (String str : cmds) {
-				if (StringUtils.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
-					tab.add(str);
-				}
-			}
-
-			Collections.sort(tab, String.CASE_INSENSITIVE_ORDER);
-
-			return tab;
-
 		}
-		return null;
 
+		Collections.sort(tab, String.CASE_INSENSITIVE_ORDER);
+
+		return tab;
 	}
 
 }

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

@@ -7,8 +7,16 @@ import java.util.Set;
 
 import org.bukkit.configuration.ConfigurationSection;
 
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.AnnotationHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataBoolean;
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataDouble;
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataInt;
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataString;
 import com.Ben12345rocks.AdvancedCore.YML.YMLFile;
 import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
+
+import lombok.Getter;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -31,6 +39,254 @@ public class Config extends YMLFile {
 		return instance;
 	}
 
+	@ConfigDataString(
+			path = "Format.Commands.Vote.ToggleBroadcasts.Enabled", defaultValue = "&cYou will now see vote broadcasts"
+	)
+	@Getter
+	private String formatCommandsVoteToggleBroadcastEnabled;
+
+	@ConfigDataString(
+			path = "Format.Commands.Vote.ToggleBroadcasts.Disabled",
+			defaultValue = "&cYou will no longer see vote broadcasts"
+	)
+	@Getter
+	private String formatCommandsVoteToggleBroadcastDisabled;
+
+	@ConfigDataBoolean(path = "Commands.VoteRewardFromVoteURL")
+	@Getter
+	private boolean commandsVoteRewardFromVoteURL = false;
+
+	@ConfigDataString(path = "Format.Commands.Vote.Last.TimeFormat", defaultValue = "%amount% %TimeType%")
+	@Getter
+	private String formatCommandsVoteLastTimeFormat;
+
+	@ConfigDataString(path = "Format.Commands.Vote.Last.Line", defaultValue = "&3%SiteName%: &6%timeSince% ago")
+	@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;
+
+	@ConfigDataString(path = "Format.TimeFormats.Days", defaultValue = "Days")
+	@Getter
+	private String formatTimeFormatsDays;
+
+	@ConfigDataString(path = "Format.TimeFormats.Day", defaultValue = "Day")
+	@Getter
+	private String formatTimeFormatsDay;
+
+	@ConfigDataString(path = "Format.TimeFormats.Hours", defaultValue = "Hours")
+	@Getter
+	private String formatTimeFormatsHours;
+
+	@ConfigDataString(path = "Format.TimeFormats.Hour", defaultValue = "Hour")
+	@Getter
+	private String formatTimeFormatsHour;
+
+	@ConfigDataString(path = "Format.TimeFormats.Minutes", defaultValue = "Minutes")
+	@Getter
+	private String formatTimeFormatsMinutes;
+
+	@ConfigDataString(path = "Format.TimeFormats.Minute", defaultValue = "Minute")
+	@Getter
+	private String formatTimeFormatsMinute;
+
+	@ConfigDataString(path = "Format.TimeFormats.Seconds", defaultValue = "Seconds")
+	@Getter
+	private String formatTimeFormatsSeconds;
+
+	@ConfigDataString(path = "Format.TimeFormats.Second", defaultValue = "Second")
+	@Getter
+	private String formatTimeFormatsSecond;
+
+	@ConfigDataBoolean(path = "Commands.DisableVoteRewardGUIs")
+	@Getter
+	private boolean commandsDisableVoteRewardGUIs;
+
+	@ConfigDataBoolean(path = "AlwaysUpdate")
+	@Getter
+	private boolean alwaysUpdate = false;
+
+	@ConfigDataBoolean(path = "UpdateWithPlayersOnlineOnly")
+	@Getter
+	private boolean updateWithPlayersOnlineOnly = false;
+
+	@ConfigDataBoolean(path = "AllowUnjoined")
+	@Getter
+	private boolean allowUnjoined = false;
+
+	@ConfigDataBoolean(path = "AddTotals")
+	@Getter
+	private boolean addTotals = true;
+
+	@Getter
+	private String allSitesRewardPath = "AllSites";
+
+	@ConfigDataBoolean(path = "AlternateUUIDLookup")
+	@Getter
+	private boolean alternateUUIDLookup = false;
+
+	@Getter
+	private String anySiteRewardsPath = "AnySiteRewards";
+
+	@ConfigDataBoolean(path = "AutoCreateVoteSites")
+	@Getter
+	private boolean autoCreateVoteSites = true;
+
+	@ConfigDataBoolean(path = "Format.BroadcastVote")
+	@Getter
+	private boolean broadcastVotesEnabled = true;
+
+	@ConfigDataBoolean(path = "clearCacheOnUpdate")
+	@Getter
+	private boolean clearCacheOnUpdate = false;
+
+	@ConfigDataBoolean(path = "ClearCacheOnVote")
+	@Getter
+	private boolean clearCacheOnVote = false;
+
+	@ConfigDataBoolean(path = "Commands.UseGUI.Best")
+	@Getter
+	private boolean commandsUseGUIBest = true;
+
+	@ConfigDataBoolean(path = "Commands.UseGUI.Last")
+	@Getter
+	private boolean commandsUseGUILast = true;
+
+	@ConfigDataBoolean(path = "Commands.UseGUI.Next")
+	@Getter
+	private boolean commandsUseGUINext = true;
+
+	@ConfigDataBoolean(path = "Commands.UseGUI.Streak")
+	@Getter
+	private boolean commandsUseGUIStreak = true;
+
+	@ConfigDataBoolean(path = "Commands.UseGUI.Today")
+	@Getter
+	private boolean commandsUseGUIToday = true;
+
+	@ConfigDataBoolean(path = "Commands.UseGUI.TopVoter")
+	@Getter
+	private boolean commandsUseGUITopVoter = true;
+
+	@ConfigDataBoolean(path = "Commands.UseGUI.Total")
+	@Getter
+	private boolean commandsUseGUITotal = true;
+
+	@ConfigDataBoolean(path = "Commands.UseGUI.Vote")
+	@Getter
+	private boolean commandsUseGUIVote = true;
+
+	@ConfigDataBoolean(path = "CountFakeVotes")
+	@Getter
+	private boolean countFakeVotes = true;
+
+	@ConfigDataBoolean(path = "GUI.VoteRewardBackButton")
+	@Getter
+	private boolean voteRewardBackButton = false;
+
+	@ConfigDataInt(path = "ConvertDelay", defaultValue = 30000)
+	@Getter
+	private int convertDelay;
+
+	@ConfigDataBoolean(path = "EnableDailyRewards")
+	@Getter
+	private boolean enableDailyRewards = false;
+
+	@ConfigDataBoolean(path = "DisableUpdateChecking")
+	@Getter
+	private boolean disableUpdateChecking = false;
+
+	@ConfigDataInt(path = "DelayBetweenUpdates")
+	@Getter
+	private int delayBetweenUpdates = 3;
+
+	@ConfigDataBoolean(path = "DisableNoServiceSiteMessage")
+	@Getter
+	private boolean disableNoServiceSiteMessage = false;
+
+	@ConfigDataBoolean(path = "DisableAdvancedTab")
+	@Getter
+	private boolean disableAdvancedTab = false;
+
+	@Getter
+	private String firstVoteRewardsPath = "FirstVote";
+
+	@ConfigDataBoolean(path = "LogVotesToFile")
+	@Getter
+	private boolean logVotesToFile = false;
+
+	@ConfigDataBoolean(path = "EnableMonthlyAwards")
+	@Getter
+	private boolean enableMonthlyAwards = false;
+
+	@Getter
+	private String votePartyRewardsPath = "VoteParty.Rewards";
+
+	@ConfigDataBoolean(path = "EnableWeeklyAwards")
+	@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;
+
+	@ConfigDataBoolean(path = "LimitMonthlyVotes")
+	@Getter
+	private boolean limitMonthlyVotes = false;
+
+	@ConfigDataBoolean(path = "AlwaysCloseInventory")
+	@Getter
+	private boolean alwaysCloseInventory = false;
+
+	@ConfigDataBoolean(path = "VoteShopHideLimitedReached")
+	@Getter
+	private boolean voteShopHideLimitedReached = true;
+
+	@ConfigDataString(path = "VoteShopLimitReached")
+	@Getter
+	private String voteShopLimitReached = "&aYou reached your limit";
+
+	@Getter
+	private int formatPageSize = 10;
+
+	@ConfigDataString(path = "Format.Commands.Vote.Today.Line")
+	@Getter
+	private String formatCommandsVoteTodayLine = "&6%player% : %VoteSite% : %Time%";
+
 	/**
 	 * Instantiates a new config.
 	 */
@@ -38,55 +294,6 @@ public class Config extends YMLFile {
 		super(new File(Main.plugin.getDataFolder(), "Config.yml"));
 	}
 
-	/**
-	 * Allow un joined.
-	 *
-	 * @return true, if successful
-	 */
-	public boolean allowUnJoined() {
-		return getData().getBoolean("AllowUnjoined");
-	}
-
-	/**
-	 * Gets the all sites reward.
-	 *
-	 * @return the all sites reward
-	 */
-	public String getAllSitesRewardPath() {
-		return "AllSites";
-	}
-
-	public boolean getAlternateUUIDLookup() {
-		return getData().getBoolean("AlternateUUIDLookup");
-	}
-
-	/**
-	 * Gets the rewards.
-	 *
-	 * @return the rewards
-	 */
-	public String getAnySiteRewardsPath() {
-		return "AnySiteRewards";
-
-	}
-
-	/**
-	 * Gets the auto create vote sites.
-	 *
-	 * @return the auto create vote sites
-	 */
-	public boolean getAutoCreateVoteSites() {
-		return getData().getBoolean("AutoCreateVoteSites");
-	}
-
-	public boolean getAutoDownload() {
-		return getData().getBoolean("AutoDownload");
-	}
-
-	public boolean getAutoKillInvs() {
-		return getData().getBoolean("AutoKillInvs", true);
-	}
-
 	public ConfigurationSection getBackButton() {
 		return getData().getConfigurationSection("BackButton");
 	}
@@ -101,59 +308,6 @@ public class Config extends YMLFile {
 		return (ArrayList<String>) getData().getList("BlackList", new ArrayList<String>());
 	}
 
-	/**
-	 * Gets the broad cast votes enabled.
-	 *
-	 * @return the broad cast votes enabled
-	 */
-	public boolean getBroadCastVotesEnabled() {
-		return getData().getBoolean("BroadcastVote", true);
-	}
-
-	public boolean getCheckOnWorldChange() {
-		return getData().getBoolean("CheckOnWorldChange");
-	}
-
-	public boolean getClearCacheOnUpdate() {
-		return getData().getBoolean("ClearCacheOnUpdate");
-	}
-
-	public boolean getCommandsUseGUIBest() {
-		return getData().getBoolean("Commands.UseGUI.Best");
-	}
-
-	public boolean getCommandsUseGUILast() {
-		return getData().getBoolean("Commands.UseGUI.Last", true);
-	}
-
-	public boolean getCommandsUseGUINext() {
-		return getData().getBoolean("Commands.UseGUI.Next", true);
-	}
-
-	public boolean getCommandsUseGUIStreak() {
-		return getData().getBoolean("Commands.UseGUI.Streak");
-	}
-
-	public boolean getCommandsUseGUIToday() {
-		return getData().getBoolean("Commands.UseGUI.Today", true);
-	}
-
-	public boolean getCommandsUseGUITopVoter() {
-		return getData().getBoolean("Commands.UseGUI.TopVoter", true);
-	}
-
-	public boolean getCommandsUseGUITotal() {
-		return getData().getBoolean("Commands.UseGUI.Total", true);
-	}
-
-	public boolean getCommandsUseGUIVote() {
-		return getData().getBoolean("Commands.UseGUI.Vote", true);
-	}
-
-	public boolean getCountFakeVotes() {
-		return getData().getBoolean("CountFakeVotes", true);
-	}
-
 	/**
 	 * Gets the cumulative reward enabled.
 	 *
@@ -208,24 +362,8 @@ public class Config extends YMLFile {
 		return getData().getBoolean("Cumulative." + cumulative + ".VotesInSameWeek");
 	}
 
-	/**
-	 * Gets the daily award rewards path
-	 *
-	 * @param pos
-	 *            the pos
-	 * @return the daily award rewards
-	 */
-	public String getDailyAwardRewardsPath(int pos) {
-		return "DailyAwards." + pos + ".Rewards";
-	}
-
-	/**
-	 * Gets the daily awards enabled.
-	 *
-	 * @return the daily awards enabled
-	 */
-	public boolean getDailyAwardsEnabled() {
-		return getData().getBoolean("EnableDailyAwards");
+	public String getDailyAwardRewardsPath(String path) {
+		return "DailyAwards." + path + ".Rewards";
 	}
 
 	/**
@@ -242,49 +380,6 @@ public class Config extends YMLFile {
 		}
 	}
 
-	public String getDataStorage() {
-		return getData().getString("DataStorage", "FLAT");
-	}
-
-	/**
-	 * Gets the debug enabled.
-	 *
-	 * @return the debug enabled
-	 */
-	public boolean getDebugEnabled() {
-		return getData().getBoolean("Debug");
-	}
-
-	/**
-	 * Gets the debug info ingame.
-	 *
-	 * @return the debug info ingame
-	 */
-	public boolean getDebugInfoIngame() {
-		return getData().getBoolean("DebugInfoIngame");
-	}
-
-	public int getDelayBetweenUpdates() {
-		return getData().getInt("DelayBetweenUpdates", 3);
-	}
-
-	public boolean getDisableNoServiceSiteMessage() {
-		return getData().getBoolean("DisableNoServiceSiteMessage");
-	}
-
-	public boolean getExtraDebug() {
-		return getData().getBoolean("ExtraDebug");
-	}
-
-	/**
-	 * Gets the first vote rewards.
-	 *
-	 * @return the first vote rewards
-	 */
-	public String getFirstVoteRewardsPath() {
-		return "FirstVote";
-	}
-
 	/**
 	 * Gets the broad cast msg.
 	 *
@@ -351,15 +446,6 @@ public class Config extends YMLFile {
 
 	}
 
-	/**
-	 * Gets the commands vote last line.
-	 *
-	 * @return the commands vote last line
-	 */
-	public String getFormatCommandsVoteLastLine() {
-		return getData().getString("Format.Commands.Vote.Last.Line", "&3%SiteName%: &6%time%");
-	}
-
 	/**
 	 * Gets the commands vote last title.
 	 *
@@ -549,15 +635,6 @@ public class Config extends YMLFile {
 		return getData().getString("Format.NotNumber", "&cError on &6%arg%&c, number expected!");
 	}
 
-	/**
-	 * Gets the page size.
-	 *
-	 * @return the page size
-	 */
-	public int getFormatPageSize() {
-		return 10;
-	}
-
 	public String getFormatPrevPage() {
 		return getData().getString("Format.PrevPage", "&aPrevious Page");
 	}
@@ -661,6 +738,10 @@ public class Config extends YMLFile {
 		return getData().getString("Format.TopVoter.Weekly", "Weekly");
 	}
 
+	public String getFormatUserNotExist() {
+		return getData().getString("Format.UserNotExist", "&cUser does not exist: %player%");
+	}
+
 	/**
 	 * Gets the vote help.
 	 *
@@ -671,6 +752,10 @@ public class Config extends YMLFile {
 		return (ArrayList<String>) getData().getList("Format.Commands.Vote.Help.Lines", new ArrayList<String>());
 	}
 
+	public boolean getGiveDefaultPermission() {
+		return getData().getBoolean("GiveDefaultPermission", true);
+	}
+
 	public ConfigurationSection getGUIVoteBestDayBestItem() {
 		return getData().getConfigurationSection("GUI.VoteBest.DayBest.Item");
 	}
@@ -787,6 +872,22 @@ public class Config extends YMLFile {
 		return getData().getConfigurationSection("GUI.VoteTotal.DayTotal.Item");
 	}
 
+	public ConfigurationSection getGUIVoteTotalItem(TopVoter top) {
+		switch (top) {
+			case AllTime:
+				return getGUIVoteTotalAllTimeTotalItem();
+			case Daily:
+				return getGUIVoteTotalDayTotalItem();
+			case Monthly:
+				return getGUIVoteTotalMonthTotalItem();
+			case Weekly:
+				return getGUIVoteTotalWeekTotalItem();
+			default:
+				return getGUIVoteTotalAllTimeTotalItem();
+
+		}
+	}
+
 	public ConfigurationSection getGUIVoteTotalMonthTotalItem() {
 		return getData().getConfigurationSection("GUI.VoteTotal.MonthTotal.Item");
 	}
@@ -811,21 +912,16 @@ public class Config extends YMLFile {
 		return getData().getString("GUI.VoteURLSite.Name", "VoteSite %site%");
 	}
 
+	public String getGUIVoteURLURLText() {
+		return getData().getString("GUI.VoteURL.URLText", "%VoteUrl%");
+	}
+
 	public int getIdentifierCost(String identifier) {
 		return getData().getInt("Shop." + identifier + ".Cost");
 	}
 
-	public String getIdentifierFromSlot(int slot) {
-		for (String identifier : getIdentifiers()) {
-			if (getIdentifierSlot(identifier) == slot) {
-				return identifier;
-			}
-		}
-		return null;
-	}
-
-	public int getIdentifierItemAmount(String identifier) {
-		return getData().getInt("Shop." + identifier + ".Item.Amount");
+	public int getIdentifierLimit(String identifier) {
+		return getData().getInt("Shop." + identifier + ".Limit", -1);
 	}
 
 	public String getIdentifierRewardsPath(String identifier) {
@@ -834,15 +930,30 @@ public class Config extends YMLFile {
 	}
 
 	public Set<String> getIdentifiers() {
-		return getData().getConfigurationSection("Shop").getKeys(false);
+		ConfigurationSection shop = getData().getConfigurationSection("Shop");
+		if (shop != null) {
+			return shop.getKeys(false);
+		}
+		return new HashSet<String>();
 	}
 
 	public ConfigurationSection getIdentifierSection(String identifier) {
 		return getData().getConfigurationSection("Shop." + identifier);
 	}
 
-	public int getIdentifierSlot(String identifier) {
-		return getData().getInt("Shop." + identifier + ".Slot");
+	public boolean getLoadTopVoter(TopVoter top) {
+		switch (top) {
+			case AllTime:
+				return getLoadTopVoterAllTime();
+			case Daily:
+				return getLoadTopVoterDaily();
+			case Monthly:
+				return getLoadTopVoterMonthly();
+			case Weekly:
+				return getLoadTopVoterWeekly();
+			default:
+				return false;
+		}
 	}
 
 	public boolean getLoadTopVoterAllTime() {
@@ -861,24 +972,6 @@ public class Config extends YMLFile {
 		return getData().getBoolean("LoadTopVoter.Weekly");
 	}
 
-	/**
-	 * Gets the log debug to file.
-	 *
-	 * @return the log debug to file
-	 */
-	public boolean getLogDebugToFile() {
-		return getData().getBoolean("LogDebugToFile", true);
-	}
-
-	/**
-	 * Gets the log votes to file.
-	 *
-	 * @return the log votes to file
-	 */
-	public boolean getLogVotesToFile() {
-		return getData().getBoolean("LogVotesToFile");
-	}
-
 	/**
 	 * Gets the milestone reward enabled.
 	 *
@@ -918,24 +1011,8 @@ public class Config extends YMLFile {
 		}
 	}
 
-	/**
-	 * Gets the monthly award rewards.
-	 *
-	 * @param pos
-	 *            the pos
-	 * @return the monthly award rewards
-	 */
-	public String getMonthlyAwardRewardsPath(int pos) {
-		return "MonthlyAwards." + pos + ".Rewards";
-	}
-
-	/**
-	 * Gets the monthly awards enabled.
-	 *
-	 * @return the monthly awards enabled
-	 */
-	public boolean getMonthlyAwardsEnabled() {
-		return getData().getBoolean("EnableMonthlyAwards");
+	public String getMonthlyAwardRewardsPath(String path) {
+		return "MonthlyAwards." + path + ".Rewards";
 	}
 
 	/**
@@ -951,42 +1028,18 @@ public class Config extends YMLFile {
 		}
 	}
 
-	public String getMySqlDatabase() {
-		return getData().getString("MySQL.Database", "");
-	}
-
-	public String getMySqlHost() {
-		return getData().getString("MySQL.Host", "");
-	}
-
-	public int getMySqlMaxConnections() {
-		return getData().getInt("MySQL.MaxConnections", 1);
-	}
-
-	public int getMysqlMaxSize() {
-		return getData().getInt("MySQL.MaxSize", -1);
-	}
-
-	public String getMySqlPassword() {
-		return getData().getString("MySQL.Password", "");
-	}
-
-	public int getMySqlPort() {
-		return getData().getInt("MySQL.Port");
-	}
-
-	public boolean getMySqlPreloadTable() {
-		return getData().getBoolean("MySQL.PreLoadTable");
-	}
-
-	public String getMySqlUsername() {
-		return getData().getString("MySQL.Username", "");
-	}
-
 	public int getPointsOnVote() {
 		return getData().getInt("PointsOnVote", 1);
 	}
 
+	public int getPurgeMin() {
+		return getData().getInt("PurgeMin", 90);
+	}
+
+	public boolean getPurgeOldData() {
+		return getData().getBoolean("PurgeOldData");
+	}
+
 	/**
 	 * Gets the request API default method.
 	 *
@@ -1010,15 +1063,6 @@ public class Config extends YMLFile {
 		return getData().getBoolean("ResetMilestonesMonthly");
 	}
 
-	/**
-	 * Gets the send scoreboards.
-	 *
-	 * @return the send scoreboards
-	 */
-	public boolean getSendScoreboards() {
-		return getData().getBoolean("SendScoreboards");
-	}
-
 	/**
 	 * Gets the store top voters daily.
 	 *
@@ -1046,12 +1090,12 @@ public class Config extends YMLFile {
 		return getData().getBoolean("StoreTopVoters.Weekly");
 	}
 
-	public boolean getTopVoterIgnorePermission() {
-		return getData().getBoolean("TopVoterIgnorePermission");
+	public boolean getTopVoterAwardsTies() {
+		return getData().getBoolean("TopVoterAwardsTies", true);
 	}
 
-	public int getUserVotesRequired() {
-		return getData().getInt("VoteParty.UserVotesRequired");
+	public boolean getTopVoterIgnorePermission() {
+		return getData().getBoolean("TopVoterIgnorePermission");
 	}
 
 	/**
@@ -1075,7 +1119,7 @@ public class Config extends YMLFile {
 	 */
 	@SuppressWarnings("unchecked")
 	public ArrayList<String> getVoteGUISlotLore(String slot) {
-		return (ArrayList<String>) getData().getList("GUI.VoteGUI." + slot + ".Lore", new ArrayList<String>());
+		return (ArrayList<String>) getData().getList("GUI.VoteGUI." + slot + ".Item.Lore", new ArrayList<String>());
 	}
 
 	/**
@@ -1103,13 +1147,18 @@ public class Config extends YMLFile {
 	 * @return the vote GUI slot slot
 	 */
 	public int getVoteGUISlotSlot(String slot) {
-		return getData().getInt("GUI.VoteGUI." + slot + ".Slot");
+		return getData().getInt("GUI.VoteGUI." + slot + ".Slot", -1);
 	}
 
 	public String getVotePartyBroadcast() {
 		return getData().getString("VoteParty.Broadcast", "");
 	}
 
+	@SuppressWarnings("unchecked")
+	public ArrayList<String> getVotePartyCommands() {
+		return (ArrayList<String>) getData().getList("VoteParty.Commands", new ArrayList<String>());
+	}
+
 	public boolean getVotePartyCountFakeVotes() {
 		return getData().getBoolean("VoteParty.CountFakeVotes", true);
 	}
@@ -1132,17 +1181,20 @@ public class Config extends YMLFile {
 		return getData().getBoolean("VoteParty.GiveAllPlayers");
 	}
 
+	public int getVotePartyIncreaseVotesRquired() {
+		return getData().getInt("VoteParty.IncreaseVotesRquired", 0);
+	}
+
 	public boolean getVotePartyResetEachDay() {
 		return getData().getBoolean("VoteParty.ResetEachDay");
 	}
 
-	/**
-	 * Gets the vote party rewards.
-	 *
-	 * @return the vote party rewards
-	 */
-	public String getVotePartyRewardsPath() {
-		return "VoteParty.Rewards";
+	public boolean getVotePartyResetMontly() {
+		return getData().getBoolean("VoteParty.ResetMonthly");
+	}
+
+	public int getVotePartyUserVotesRequired() {
+		return getData().getInt("VoteParty.UserVotesRequired");
 	}
 
 	/**
@@ -1203,18 +1255,26 @@ public class Config extends YMLFile {
 		return getData().getBoolean("VoteShopBackButton", true);
 	}
 
-	public boolean getGiveDefaultPermission() {
-		return getData().getBoolean("GiveDefaultPermission", true);
+	public boolean getVoteShopEnabled() {
+		return getData().getBoolean("VoteShopEnabled", true);
 	}
 
 	public String getVoteShopName() {
 		return getData().getString("GUI.VoteShopName", "VoteShop");
 	}
 
-	public String getFormatUserNotExist() {
-		return getData().getString("Format.UserNotExist", "&cUser does not exist: %player%");
+	public String getVoteShopPermission(String ident) {
+		return getData().getString("Shop." + ident + ".Permission", "");
 	}
 
+	@ConfigDataBoolean(path = "OverrideVersionDisable")
+	@Getter
+	private boolean overrideVersionDisable = false;
+
+	@ConfigDataBoolean(path = "LastMonthGUI")
+	@Getter
+	private boolean lastMonthGUI = false;
+
 	/**
 	 * Gets the vote site items.
 	 *
@@ -1250,6 +1310,10 @@ public class Config extends YMLFile {
 		return getData().getInt("GUI.VoteReward." + siteName + ".Items." + item + ".Slot");
 	}
 
+	public boolean getVoteShopNotBuyable(String shop) {
+		return getData().getBoolean("Shop." + shop + ".NotBuyable", false);
+	}
+
 	/**
 	 * Gets the votes required.
 	 *
@@ -1344,24 +1408,8 @@ public class Config extends YMLFile {
 		return getData().getBoolean("GUI.VoteURL.ViewAllUrlsButtonEnabled");
 	}
 
-	/**
-	 * Gets the weekly award rewards.
-	 *
-	 * @param pos
-	 *            the pos
-	 * @return the weekly award rewards
-	 */
-	public String getWeeklyAwardRewardsPath(int pos) {
-		return "WeeklyAwards." + pos + ".Rewards";
-	}
-
-	/**
-	 * Gets the weekly awards enabled.
-	 *
-	 * @return the weekly awards enabled
-	 */
-	public boolean getWeeklyAwardsEnabled() {
-		return getData().getBoolean("EnableWeeklyAwards");
+	public String getWeeklyAwardRewardsPath(String path) {
+		return "WeeklyAwards." + path + ".Rewards";
 	}
 
 	/**
@@ -1377,100 +1425,13 @@ public class Config extends YMLFile {
 		}
 	}
 
+	public void loadValues() {
+		new AnnotationHandler().load(getData(), this);
+	}
+
 	@Override
 	public void onFileCreation() {
 		plugin.saveResource("Config.yml", true);
 	}
 
-	/**
-	 * Sets the allow un joined.
-	 *
-	 * @param value
-	 *            the new allow un joined
-	 */
-	public void setAllowUnJoined(boolean value) {
-		getData().set("AllowUnjoined", value);
-		saveData();
-	}
-
-	/**
-	 * Sets the rewards.
-	 *
-	 * @param rewards
-	 *            the new rewards
-	 */
-	public void setAnySiteRewards(ArrayList<String> rewards) {
-		getData().set("AnySiteRewards", rewards);
-		saveData();
-	}
-
-	/**
-	 * Sets the broadcast vote enabled.
-	 *
-	 * @param value
-	 *            the new broadcast vote enabled
-	 */
-	public void setBroadcastVoteEnabled(boolean value) {
-		getData().set("BroadcastVote", value);
-		saveData();
-	}
-
-	/**
-	 * Sets the debug enabled.
-	 *
-	 * @param value
-	 *            the new debug enabled
-	 */
-	public void setDebugEnabled(boolean value) {
-		getData().set("Debug", value);
-		saveData();
-	}
-
-	/**
-	 * Sets the debug info ingame.
-	 *
-	 * @param value
-	 *            the new debug info ingame
-	 */
-	public void setDebugInfoIngame(boolean value) {
-		getData().set("DebugInfoIngame", value);
-		saveData();
-	}
-
-	/**
-	 * Sets the top voter awards enabled.
-	 *
-	 * @param value
-	 *            the new top voter awards enabled
-	 */
-	public void setTopVoterAwardsEnabled(boolean value) {
-		getData().set("TopVoterAwards", value);
-		saveData();
-	}
-
-	public void setVoteRemindingEnabled(boolean value) {
-		getData().set("VoteReminding.Enabled", value);
-		saveData();
-	}
-
-	public void setVoteRemindingRemindDelay(int value) {
-		getData().set("VoteReminding.RemindDelay", value);
-		saveData();
-	}
-
-	public void setVoteRemindingRemindOnLogin(boolean value) {
-		getData().set("VoteReminding.RemindOnLogin", value);
-		saveData();
-	}
-
-	public void setVoteRemindingRemindOnlyOnce(boolean value) {
-		getData().set("VoteReminding.RemindOnlyOnce", value);
-		saveData();
-	}
-
-	public void setVoteRemindingRewards(ArrayList<String> value) {
-		getData().set("VoteReminding.Rewards", value);
-		saveData();
-	}
-
 }

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

@@ -51,7 +51,7 @@ public class ConfigVoteSites extends YMLFile {
 	 *            the site name
 	 */
 	public void generateVoteSite(String siteName) {
-		if (Config.getInstance().getAutoCreateVoteSites()) {
+		if (Config.getInstance().isAutoCreateVoteSites()) {
 			String org = siteName;
 			siteName = siteName.replace(".", "_");
 			plugin.getLogger().warning("VoteSite " + siteName
@@ -60,6 +60,8 @@ public class ConfigVoteSites extends YMLFile {
 			setServiceSite(siteName, org);
 			setVoteURL(siteName, "VoteURL");
 			setVoteDelay(siteName, 24);
+			set(siteName, "Item.Material", "GRASS");
+			set(siteName, "Item.Amount", 1);
 			set(siteName, "Rewards.Messages.Player", "&aThanks for voting on %ServiceSite%!");
 
 			plugin.loadVoteSites();
@@ -167,7 +169,7 @@ public class ConfigVoteSites extends YMLFile {
 	}
 
 	public boolean getVoteSiteGiveOffline(String site) {
-		return getData(site).getBoolean("GiveOffline");
+		return getData(site).getBoolean("ForceOffline", getData(site).getBoolean("GiveOffline"));
 	}
 
 	public boolean getVoteSiteResetVoteDelayDaily(String siteName) {
@@ -250,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.
 	 *
@@ -351,6 +357,11 @@ public class ConfigVoteSites extends YMLFile {
 		set(siteName, "Enabled", disabled);
 	}
 
+	public void setForceOffline(String siteName, boolean value) {
+		set(siteName, "ForceOffline", value);
+
+	}
+
 	/**
 	 * Sets the priority.
 	 *
@@ -399,6 +410,10 @@ public class ConfigVoteSites extends YMLFile {
 		set(siteName, "VoteDelay", voteDelay);
 	}
 
+	public void setVoteDelayDaily(String siteName, boolean value) {
+		set(siteName, "VoteDelayDaily", value);
+	}
+
 	/**
 	 * Sets the vote URL.
 	 *

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/CoolDown/CoolDownCheck.java

@@ -0,0 +1,84 @@
+package com.Ben12345rocks.VotingPlugin.CoolDown;
+
+import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.DateChangedEvent;
+import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
+import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Config.Config;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteCoolDownEndEvent;
+import com.Ben12345rocks.VotingPlugin.Objects.User;
+import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class VoteReminding.
+ */
+public class CoolDownCheck implements Listener {
+
+	/** The instance. */
+	static CoolDownCheck instance = new CoolDownCheck();
+
+	/** The plugin. */
+	static Main plugin = Main.plugin;
+
+	/**
+	 * Gets the single instance of VoteReminding.
+	 *
+	 * @return single instance of VoteReminding
+	 */
+	public static CoolDownCheck getInstance() {
+		return instance;
+	}
+
+	/**
+	 * Instantiates a new vote reminding.
+	 */
+	private CoolDownCheck() {
+	}
+
+	/**
+	 * Instantiates a new vote reminding.
+	 *
+	 * @param plugin
+	 *            the plugin
+	 */
+	public CoolDownCheck(Main plugin) {
+		CoolDownCheck.plugin = plugin;
+	}
+
+	public void checkAll() {
+		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+					if (Main.plugin != null) {
+						User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+						if (user.getUserData().hasData() && user.hasLoggedOnBefore()) {
+							user.checkCoolDownEvents();
+						}
+					}
+				}
+			}
+		});
+
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void onCoolDownEnd(PlayerVoteCoolDownEndEvent event) {
+		RewardHandler.getInstance().giveReward(event.getPlayer(), Config.getInstance().getData(),
+				"VoteCoolDownEndedReward",
+				new RewardOptions().addPlaceholder("Votesite", event.getVoteSite().getDisplayName()));
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void onDayChangeEnd(DateChangedEvent event) {
+		checkAll();
+	}
+}

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

@@ -8,8 +8,9 @@ import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.configuration.ConfigurationSection;
 
+import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
-import com.Ben12345rocks.VotingPlugin.Objects.SignHandler;
+import com.Ben12345rocks.VotingPlugin.Signs.SignHandler;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -48,10 +49,12 @@ public class ServerData {
 		ServerData.plugin = plugin;
 	}
 
-	public void addServiceSite(String site) {
+	public synchronized void addServiceSite(String site) {
 		ArrayList<String> l = getServiceSites();
-		l.add(site);
-		setServiceSites(l);
+		if (!getServiceSites().contains(site)) {
+			l.add(site);
+		}
+		setServiceSites(ArrayUtils.getInstance().removeDuplicates(l));
 	}
 
 	/**
@@ -75,7 +78,7 @@ public class ServerData {
 		getData().set("Signs." + count + ".Data", data);
 		getData().set("Signs." + count + ".Position", position);
 		saveData();
-		plugin.signs.add(new SignHandler("" + count, getSignLocation("" + count), getSignData("" + count),
+		plugin.getSigns().add(new SignHandler("" + count, getSignLocation("" + count), getSignData("" + count),
 				getSignPosition("" + count)));
 	}
 
@@ -148,6 +151,10 @@ public class ServerData {
 		}
 	}
 
+	public int getVotePartyExtraRequired() {
+		return getData().getInt("VotePartyExtraRequired", 0);
+	}
+
 	/**
 	 * Next sign number.
 	 *
@@ -235,6 +242,11 @@ public class ServerData {
 		saveData();
 	}
 
+	public void setVotePartyExtraRequired(int value) {
+		getData().set("VotePartyExtraRequired", value);
+		saveData();
+	}
+
 	/**
 	 * Update values.
 	 */

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

@@ -1,70 +0,0 @@
-package com.Ben12345rocks.VotingPlugin.Events;
-
-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.Objects.UserStorage;
-import com.Ben12345rocks.VotingPlugin.Main;
-import com.Ben12345rocks.VotingPlugin.Objects.User;
-import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class PlayerJoinEvent.
- */
-public class PlayerJoinEvent implements Listener {
-
-	/** The plugin. */
-	private static Main plugin;
-
-	/**
-	 * Instantiates a new player join event.
-	 *
-	 * @param plugin
-	 *            the plugin
-	 */
-	public PlayerJoinEvent(Main plugin) {
-		PlayerJoinEvent.plugin = plugin;
-	}
-
-	/**
-	 * On player login.
-	 *
-	 * @param event
-	 *            the event
-	 */
-	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-	public void onPlayerLogin(PlayerLoginEvent event) {
-		plugin.getServer().getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-
-				if (event.getPlayer() == null
-						|| (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)
-								&& AdvancedCoreHook.getInstance().getMysql() == null)) {
-					return;
-				}
-				Player player = event.getPlayer();
-
-				if (player != null) {
-					User user = UserManager.getInstance().getVotingPluginUser(player);
-					if (UserManager.getInstance().getAllUUIDs().contains(player.getUniqueId().toString())) {
-						// give offline vote (if they voted
-						// offline)
-						user.offVote();
-					}
-
-					// run remind
-					user.loginMessage();
-				}
-
-			}
-		}, 20L);
-
-	}
-}

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

@@ -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);
+		this.player = user;
+		this.points = points;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.bukkit.event.Event#getHandlers()
+	 */
+	@Override
+	public HandlerList getHandlers() {
+		return handlers;
+	}
+
+}

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

@@ -0,0 +1,56 @@
+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 PlayerSpecialRewardEvent 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 user;
+
+	@Getter
+	@Setter
+	private SpecialRewardType type;
+
+	@Getter
+	@Setter
+	private boolean cancelled;
+
+	public PlayerSpecialRewardEvent(User user, SpecialRewardType type) {
+		super(true);
+		this.type = type;
+		this.user = user;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.bukkit.event.Event#getHandlers()
+	 */
+	@Override
+	public HandlerList getHandlers() {
+		return handlers;
+	}
+
+}

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

@@ -0,0 +1,57 @@
+package com.Ben12345rocks.VotingPlugin.Events;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.Ben12345rocks.VotingPlugin.Objects.User;
+import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
+
+import lombok.Getter;
+import lombok.Setter;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class PlayerVoteEvent.
+ */
+public class PlayerVoteCoolDownEndEvent 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 VoteSite voteSite;
+
+	@Getter
+	@Setter
+	private boolean cancelled;
+
+	public PlayerVoteCoolDownEndEvent(User user, VoteSite site) {
+		super(true);
+		player = user;
+		voteSite = site;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.bukkit.event.Event#getHandlers()
+	 */
+	@Override
+	public HandlerList getHandlers() {
+		return handlers;
+	}
+
+}

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

@@ -5,6 +5,9 @@ import org.bukkit.event.HandlerList;
 
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
 
+import lombok.Getter;
+import lombok.Setter;
+
 // TODO: Auto-generated Javadoc
 /**
  * The Class PlayerVoteEvent.
@@ -23,24 +26,36 @@ public class PlayerVoteEvent extends Event {
 		return handlers;
 	}
 
-	/** The player. */
+	@Getter
+	@Setter
 	private String player;
 
-	/** The vote site. */
+	@Getter
+	@Setter
 	private VoteSite voteSite;
 
-	/** The cancelled. */
+	@Getter
+	@Setter
 	private boolean cancelled;
 
-	public PlayerVoteEvent(VoteSite voteSite, String voteUsername) {
-		super();
-		setPlayer(voteUsername);
-		setVoteSite(voteSite);
+	@Getter
+	@Setter
+	private boolean realVote = true;
+
+	@Getter
+	@Setter
+	private String serviceSite = "";
+
+	public PlayerVoteEvent(VoteSite voteSite, String voteUsername, String serviceSite, boolean realVote) {
+		super(true);
+		this.player = voteUsername;
+		this.voteSite = voteSite;
+		this.realVote = realVote;
+		this.serviceSite = serviceSite;
 	}
 
 	/*
 	 * (non-Javadoc)
-	 *
 	 * @see org.bukkit.event.Event#getHandlers()
 	 */
 	@Override
@@ -48,55 +63,4 @@ public class PlayerVoteEvent extends Event {
 		return handlers;
 	}
 
-	/**
-	 * Gets the player.
-	 *
-	 * @return the player
-	 */
-	public String getPlayer() {
-		return player;
-	}
-
-	/**
-	 * Gets the vote site.
-	 *
-	 * @return the vote site
-	 */
-	public VoteSite getVoteSite() {
-		return voteSite;
-	}
-
-	/**
-	 * Checks if is cancelled.
-	 *
-	 * @return true, if is cancelled
-	 */
-	public boolean isCancelled() {
-		return cancelled;
-	}
-
-	/**
-	 * Sets the cancelled.
-	 *
-	 * @param bln
-	 *            the new cancelled
-	 */
-	public void setCancelled(boolean bln) {
-		cancelled = bln;
-	}
-
-	public void setPlayer(String voteUsername) {
-		this.player = voteUsername;
-	}
-
-	/**
-	 * Sets the vote site.
-	 *
-	 * @param voteSite
-	 *            the new vote site
-	 */
-	public void setVoteSite(VoteSite voteSite) {
-		this.voteSite = voteSite;
-	}
-
 }

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

@@ -0,0 +1,24 @@
+package com.Ben12345rocks.VotingPlugin.Events;
+
+import lombok.Getter;
+
+public enum SpecialRewardType {
+	ALLSITE, CUMMULATIVE, MILESTONE, VOTESTREAK, FIRSTVOTE;
+
+	@Getter
+	private int amount = -1;
+
+	@Getter
+	private String type = "";
+
+	public SpecialRewardType setAmount(int num) {
+		amount = num;
+		return this;
+	}
+
+	public SpecialRewardType setType(String type) {
+		this.type = type;
+		return this;
+	}
+
+}

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

@@ -0,0 +1,44 @@
+package com.Ben12345rocks.VotingPlugin.Events;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import lombok.Getter;
+import lombok.Setter;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class PlayerVoteEvent.
+ */
+public class VotePartyEvent 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 boolean cancelled;
+
+	public VotePartyEvent() {
+		super(true);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.bukkit.event.Event#getHandlers()
+	 */
+	@Override
+	public HandlerList getHandlers() {
+		return handlers;
+	}
+
+}

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

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

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

@@ -1,4 +1,4 @@
-package com.Ben12345rocks.VotingPlugin.Events;
+package com.Ben12345rocks.VotingPlugin.Listeners;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -9,7 +9,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
 
 import com.Ben12345rocks.VotingPlugin.Main;
-import com.Ben12345rocks.VotingPlugin.Objects.SignHandler;
+import com.Ben12345rocks.VotingPlugin.Signs.SignHandler;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -45,7 +45,7 @@ public class BlockBreak implements Listener {
 
 				@Override
 				public void run() {
-					for (SignHandler sign : plugin.signs) {
+					for (SignHandler sign : plugin.getSigns()) {
 						if (sign.getLocation().equals(loc)) {
 							sign.removeSign();
 							sign.setValid(false);

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

@@ -0,0 +1,48 @@
+package com.Ben12345rocks.VotingPlugin.Listeners;
+
+import java.util.ArrayList;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import 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
+/**
+ * The Class PlayerJoinEvent.
+ */
+public class PlayerCommandSendListener implements Listener {
+
+	@SuppressWarnings("unused")
+	private static Main plugin;
+
+	public PlayerCommandSendListener(Main plugin) {
+		PlayerCommandSendListener.plugin = plugin;
+	}
+
+	@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()) {
+			if (CommandLoader.getInstance().isVotingPluginCommand(event.getPlayer(), cmd)) {
+				if (!CommandLoader.getInstance().hasPermission(event.getPlayer(), cmd) && !whiteListed.contains(cmd)) {
+					removeCmds.add(cmd);
+					// plugin.debug("removed " + cmd);
+				} else {
+					removeCmds.remove(cmd);
+					whiteListed.add(cmd);
+					// plugin.debug("has " + cmd);
+				}
+			}
+		}
+		event.getCommands().removeAll(removeCmds);
+	}
+}

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

@@ -1,4 +1,4 @@
-package com.Ben12345rocks.VotingPlugin.Events;
+package com.Ben12345rocks.VotingPlugin.Listeners;
 
 import org.bukkit.block.Sign;
 import org.bukkit.entity.Player;
@@ -9,7 +9,7 @@ import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 
 import com.Ben12345rocks.VotingPlugin.Main;
-import com.Ben12345rocks.VotingPlugin.Objects.SignHandler;
+import com.Ben12345rocks.VotingPlugin.Signs.SignHandler;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 
 // TODO: Auto-generated Javadoc
@@ -44,7 +44,7 @@ public class PlayerInteract implements Listener {
 			// plugin.debug("Checking for sign click");
 			if (event.getClickedBlock().getState() instanceof Sign) {
 				// plugin.debug(player.getName() + " right clicked a sign");
-				for (SignHandler sign : plugin.signs) {
+				for (SignHandler sign : plugin.getSigns()) {
 					if (sign.isLocationSame(event.getClickedBlock().getLocation())) {
 						// plugin.debug(player.getName() +
 						// " right clicked a top voter sign, sending message");

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

@@ -0,0 +1,62 @@
+package com.Ben12345rocks.VotingPlugin.Listeners;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+import com.Ben12345rocks.AdvancedCore.Listeners.AdvancedCoreLoginEvent;
+import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
+import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Objects.User;
+import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class PlayerJoinEvent.
+ */
+public class PlayerJoinEvent implements Listener {
+
+	/** The plugin. */
+	@SuppressWarnings("unused")
+	private static Main plugin;
+
+	/**
+	 * Instantiates a new player join event.
+	 *
+	 * @param plugin
+	 *            the plugin
+	 */
+	public PlayerJoinEvent(Main plugin) {
+		PlayerJoinEvent.plugin = plugin;
+	}
+
+	/**
+	 * On player login.
+	 *
+	 * @param event
+	 *            the event
+	 */
+	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+	public void onPlayerLogin(AdvancedCoreLoginEvent event) {
+		if (event.getPlayer() == null
+				|| (Main.plugin.getStorageType().equals(UserStorage.MYSQL) && Main.plugin.getMysql() == null)) {
+			return;
+		}
+		Player player = event.getPlayer();
+
+		User user = UserManager.getInstance().getVotingPluginUser(player);
+		if (player.isOp() && plugin.isYmlError()) {
+			user.sendMessage("&cVotingPlugin: Detected yml error, please chceck console for details");
+		}
+
+		// run remind
+		user.loginMessage();
+
+		if (user.getData().hasData()) {
+			// give offline vote (if they voted offline)
+			user.offVote();
+		}
+
+	}
+}

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

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

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

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

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

@@ -0,0 +1,122 @@
+package com.Ben12345rocks.VotingPlugin.Listeners;
+
+import java.util.ArrayList;
+
+import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
+import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Config.Config;
+import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.Data.ServerData;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteEvent;
+import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
+import com.vexsoftware.votifier.model.Vote;
+import com.vexsoftware.votifier.model.VotifierEvent;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class VotiferEvent.
+ */
+public class VotiferEvent implements Listener {
+
+	/** The config. */
+	static Config config = Config.getInstance();
+
+	/** The config vote sites. */
+	static ConfigVoteSites configVoteSites = ConfigVoteSites.getInstance();
+
+	/** The plugin. */
+	static Main plugin = Main.plugin;
+
+	/**
+	 * Instantiates a new votifer event.
+	 *
+	 * @param plugin
+	 *            the plugin
+	 */
+	public VotiferEvent(Main plugin) {
+		VotiferEvent.plugin = plugin;
+	}
+
+	/**
+	 * On votifer event.
+	 *
+	 * @param event
+	 *            the event
+	 */
+	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
+	public void onVotiferEvent(VotifierEvent event) {
+
+		Vote vote = event.getVote();
+		final String voteSite = vote.getServiceName();
+		final String IP = vote.getAddress();
+		final String voteUsername = vote.getUsername().trim();
+		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				ServerData.getInstance().addServiceSite(voteSite);
+			}
+		});
+
+		if (voteUsername.length() == 0) {
+			plugin.getLogger().warning("No name from vote on " + voteSite);
+			return;
+		}
+
+		plugin.getLogger()
+				.info("Recieved a vote from service site '" + voteSite + "' by player '" + voteUsername + "'!");
+
+		plugin.debug("PlayerUsername: " + voteUsername);
+		plugin.debug("VoteSite: " + voteSite);
+		plugin.debug("IP: " + IP);
+
+		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				String voteSiteName = plugin.getVoteSiteName(voteSite);
+
+				ArrayList<String> sites = configVoteSites.getVoteSitesNames();
+				boolean createSite = false;
+				if (sites != null) {
+					if (!sites.contains(voteSiteName)) {
+						createSite = true;
+					}
+				} else {
+					createSite = true;
+				}
+
+				if (Config.getInstance().isAutoCreateVoteSites() && createSite) {
+					plugin.getLogger().warning("VoteSite with service site '" + voteSiteName
+							+ "' does not exist, attempting to generaterate...");
+					ConfigVoteSites.getInstance().generateVoteSite(voteSiteName);
+
+					ArrayList<String> services = new ArrayList<String>();
+					for (VoteSite site : plugin.getVoteSites()) {
+						services.add(site.getServiceSite());
+					}
+					plugin.getLogger()
+							.info("Current known service sites: " + ArrayUtils.getInstance().makeStringList(services));
+
+				}
+
+				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName), voteUsername,
+						voteSite, true);
+				plugin.getServer().getPluginManager().callEvent(voteEvent);
+
+				if (voteEvent.isCancelled()) {
+					plugin.debug("Vote cancelled");
+					return;
+				}
+
+			}
+		});
+
+	}
+
+}

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

@@ -1,4 +1,4 @@
-package com.Ben12345rocks.VotingPlugin.Events;
+package com.Ben12345rocks.VotingPlugin.Listeners;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -36,7 +36,8 @@ public class VotingPluginUpdateEvent implements Listener {
 	public void onPluginUpdate(PluginUpdateVersionEvent event) {
 		if (event.getPlugin().getName().equals(plugin.getDescription().getName())) {
 			if (!event.getOldVersion().equals("")) {
-				plugin.getLogger().info("Updated VotingPlugin");
+				plugin.getLogger().info("VotingPlugin Updated to " + plugin.getDescription().getVersion() + " from "
+						+ event.getOldVersion());
 			}
 		}
 	}

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

@@ -11,17 +11,23 @@ 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.Objects.RewardBuilder;
-import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
-import com.Ben12345rocks.AdvancedCore.Objects.UUID;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.TimeChecker;
+import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
-import com.Ben12345rocks.VotingPlugin.OtherRewards.OtherVoteReward;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerReceivePointsEvent;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteCoolDownEndEvent;
+import com.Ben12345rocks.VotingPlugin.SpecialRewards.SpecialRewards;
+import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
 import com.Ben12345rocks.VotingPlugin.VoteReminding.VoteReminding;
 
@@ -29,7 +35,7 @@ import com.Ben12345rocks.VotingPlugin.VoteReminding.VoteReminding;
 /**
  * The Class User.
  */
-public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
+public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 
 	/** The plugin. */
 	static Main plugin = Main.plugin;
@@ -125,7 +131,13 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.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());
 	}
 
 	/**
@@ -189,8 +201,9 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		if (time == 0) {
 			return true;
 		}
-		LocalDateTime now = LocalDateTime.now();
-		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault());
+		LocalDateTime now = TimeChecker.getInstance().getTime();
+		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault())
+				.plusHours(Main.plugin.getOptions().getTimeHourOffSet());
 
 		if (!voteSite.isVoteDelayDaily()) {
 			int votedelay = ConfigVoteSites.getInstance().getVoteDelay(siteName);
@@ -203,7 +216,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 
 			return now.isAfter(nextvote);
 		} else {
-			if (now.getDayOfYear() != lastVote.getDayOfYear() && now.getYear() != lastVote.getYear()) {
+			if (now.getDayOfYear() != lastVote.getDayOfYear() || now.getYear() != lastVote.getYear()) {
 				return true;
 			}
 			return false;
@@ -249,13 +262,41 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return true;
 	}
 
-	public void clearTotals() {
-		setAllTimeTotal(0);
-		resetDailyTotalVotes();
-		resetMonthlyTotalVotes();
-		setWeeklyTotal(0);
+	public void checkCoolDownEvents() {
+		for (VoteSite site : plugin.getVoteSites()) {
+			if (canVoteSite(site) != getLastCoolDownCheck(site)) {
+				plugin.debug(getPlayerName() + " vote cooldown ended: " + site.getKey());
+				PlayerVoteCoolDownEndEvent event = new PlayerVoteCoolDownEndEvent(this, site);
+				plugin.getServer().getPluginManager().callEvent(event);
+				setLastVoteCoolDownCheck(true, site);
+			}
+		}
 	}
 
+	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 void clearOfflineRewards() {
+		setOfflineVotes(new ArrayList<String>());
+		setOfflineRewards(new ArrayList<String>());
+		setOfflineOtherRewards(new ArrayList<String>());
+	}
+
+	public void clearTotals() {
+		for (TopVoter top : TopVoter.values()) {
+			resetTotals(top);
+		}
+	}
+
+	@Deprecated
 	public int getAllTimeTotal() {
 		return getUserData().getInt("AllTimeTotal");
 	}
@@ -272,6 +313,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return getData().getInt("BestWeekVoteStreak");
 	}
 
+	@Deprecated
 	public int getDailyTotal() {
 		return getUserData().getInt("DailyTotal");
 	}
@@ -280,6 +322,18 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return getData().getInt("DayVoteStreak");
 	}
 
+	public long getDayVoteStreakLastUpdate() {
+		String str = getData().getString("DayVoteStreakLastUpdate");
+		if (str.isEmpty()) {
+			return 0;
+		}
+		return Long.parseLong(str);
+	}
+
+	public boolean getDisableBroadcast() {
+		return getUserData().getBoolean("DisableBroadcast");
+	}
+
 	public HashMap<String, Boolean> getHasGottenMilestone() {
 		HashMap<String, Boolean> hasGottenMilestone = new HashMap<String, Boolean>();
 		ArrayList<String> milestoneList = getUserData().getStringList("GottenMileStones");
@@ -305,6 +359,39 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return getData().getInt("HighestWeeklyTotal");
 	}
 
+	public boolean getLastCoolDownCheck(VoteSite site) {
+		HashMap<VoteSite, Boolean> array = getLastCoolDownCheckArray();
+		if (array.containsKey(site)) {
+			return array.get(site).booleanValue();
+		}
+		return true;
+	}
+
+	public HashMap<VoteSite, Boolean> getLastCoolDownCheckArray() {
+		HashMap<VoteSite, Boolean> lastVotesCheck = new HashMap<VoteSite, Boolean>();
+		ArrayList<String> LastVotesCheckList = getUserData().getStringList("LastVoteCoolDownCheck");
+		for (String str : LastVotesCheckList) {
+			String[] data = str.split("//");
+			if (data.length > 1 && plugin.hasVoteSite(data[0])) {
+				VoteSite site = plugin.getVoteSite(data[0]);
+				if (site != null) {
+					Boolean value = Boolean.FALSE;
+					try {
+						value = Boolean.valueOf(data[1]);
+					} catch (NumberFormatException e) {
+						plugin.debug("Not value: " + data[1]);
+					}
+					lastVotesCheck.put(site, value);
+				}
+			}
+		}
+		return lastVotesCheck;
+	}
+
+	public int getLastMonthTotal() {
+		return getData().getInt("LastMonthTotal");
+	}
+
 	public HashMap<VoteSite, Long> getLastVotes() {
 		HashMap<VoteSite, Long> lastVotes = new HashMap<VoteSite, Long>();
 		ArrayList<String> LastVotesList = getUserData().getStringList("LastVotes");
@@ -333,14 +420,14 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 * @return the last vote times sorted
 	 */
 	public HashMap<VoteSite, Long> getLastVoteTimesSorted() {
-		HashMap<VoteSite, Long> times = new LinkedHashMap<VoteSite, Long>();
+		LinkedHashMap<VoteSite, Long> times = new LinkedHashMap<VoteSite, Long>();
 
 		for (VoteSite voteSite : plugin.getVoteSites()) {
 			times.put(voteSite, getTime(voteSite));
 		}
-		HashMap<VoteSite, Long> sorted = (HashMap<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;
 	}
 
@@ -348,6 +435,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return getData().getInt("MilestoneCount", getAllTimeTotal());
 	}
 
+	@Deprecated
 	public int getMonthTotal() {
 		return getData().getInt("MonthTotal");
 	}
@@ -388,10 +476,31 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return 0;
 	}
 
+	public int getTotal(TopVoter top) {
+		switch (top) {
+			case AllTime:
+				return getUserData().getInt("AllTimeTotal");
+			case Daily:
+				return getUserData().getInt("DailyTotal");
+			case Monthly:
+				return getData().getInt("MonthTotal");
+			case Weekly:
+				return getUserData().getInt("WeeklyTotal");
+			default:
+				break;
+		}
+		return 0;
+	}
+
 	public int getVotePartyVotes() {
 		return getUserData().getInt("VotePartyVotes");
 	}
 
+	public int getVoteShopIdentifierLimit(String identifier) {
+		return getData().getInt("VoteShopLimit" + identifier);
+	}
+
+	@Deprecated
 	public int getWeeklyTotal() {
 		return getUserData().getInt("WeeklyTotal");
 	}
@@ -400,43 +509,34 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return getData().getInt("WeekVoteStreak");
 	}
 
-	/**
-	 * Give daily top voter award.
-	 *
-	 * @param place
-	 *            the place
-	 */
-	public void giveDailyTopVoterAward(int place) {
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getDailyAwardRewardsPath(place))
-				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Daily").send(this);
+	public void giveDailyTopVoterAward(int place, String path) {
+		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getDailyAwardRewardsPath(path))
+				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Daily").setOnline(isOnline())
+				.send(this);
 	}
 
-	/**
-	 * Give monthly top voter award.
-	 *
-	 * @param place
-	 *            the place
-	 */
-	public void giveMonthlyTopVoterAward(int place) {
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getMonthlyAwardRewardsPath(place))
-				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Monthly").send(this);
+	public void giveMonthlyTopVoterAward(int place, String path) {
+		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getMonthlyAwardRewardsPath(path))
+				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Monthly").setOnline(isOnline())
+				.send(this);
 	}
 
 	public void giveOfflineOtherRewards() {
-		for (String str : getOfflineOtherRewards()) {
+		ArrayList<String> offlineRewards = getOfflineOtherRewards();
+		for (String str : offlineRewards) {
 			if (str.equalsIgnoreCase("FirstVote")) {
-				OtherVoteReward.getInstance().giveFirstVoteRewards(this, false);
+				SpecialRewards.getInstance().giveFirstVoteRewards(this, false);
 			} else if (str.equalsIgnoreCase("AllSites")) {
-				OtherVoteReward.getInstance().giveAllSitesRewards(this, false);
+				SpecialRewards.getInstance().giveAllSitesRewards(this, false);
 			} else if (str.equalsIgnoreCase("VoteParty")) {
-				VoteParty.getInstance().giveReward(this);
+				VoteParty.getInstance().giveReward(this, false);
 			} else if (str.contains("Cumulative")) {
 				String st = str.substring("Cumulative".length());
 				if (StringUtils.getInstance().isInt(st)) {
 					int votesRequired = Integer.parseInt(st);
 					if (votesRequired != 0) {
 						if (Config.getInstance().getCumulativeRewardEnabled(votesRequired)) {
-							OtherVoteReward.getInstance().giveCumulativeVoteReward(this, false, votesRequired);
+							SpecialRewards.getInstance().giveCumulativeVoteReward(this, false, votesRequired);
 						}
 					}
 				}
@@ -446,37 +546,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 					int votesRequired = Integer.parseInt(st);
 					if (votesRequired > 0) {
 						if (Config.getInstance().getMilestoneRewardEnabled(votesRequired)) {
-							OtherVoteReward.getInstance().giveMilestoneVoteReward(this, true, votesRequired);
-						}
-					}
-				}
-			} else if (str.contains("MonthlyTopVoter")) {
-				String st = str.substring("MontlyTopVoter".length());
-				if (StringUtils.getInstance().isInt(st)) {
-					int place = Integer.parseInt(st);
-					if (place > 0) {
-						if (Config.getInstance().getMonthlyAwardsEnabled()) {
-							giveMonthlyTopVoterAward(place);
-						}
-					}
-				}
-			} else if (str.contains("WeeklyTopVoter")) {
-				String st = str.substring("WeeklyTopVoter".length());
-				if (StringUtils.getInstance().isInt(st)) {
-					int place = Integer.parseInt(st);
-					if (place > 0) {
-						if (Config.getInstance().getWeeklyAwardsEnabled()) {
-							giveWeeklyTopVoterAward(place);
-						}
-					}
-				}
-			} else if (str.contains("DailyTopVoter")) {
-				String st = str.substring("DailyTopVoter".length());
-				if (StringUtils.getInstance().isInt(st)) {
-					int place = Integer.parseInt(st);
-					if (place > 0) {
-						if (Config.getInstance().getDailyAwardsEnabled()) {
-							giveDailyTopVoterAward(place);
+							SpecialRewards.getInstance().giveMilestoneVoteReward(this, true, votesRequired);
 						}
 					}
 				}
@@ -487,7 +557,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 					String st = args[2];
 
 					if (Config.getInstance().getVoteStreakRewardEnabled(type, st)) {
-						OtherVoteReward.getInstance().giveVoteStreakReward(this, false, type, "" + st, -1);
+						SpecialRewards.getInstance().giveVoteStreakReward(this, false, type, "" + st, -1);
 					}
 
 				}
@@ -496,18 +566,15 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 			}
 
 		}
-		setOfflineOtherRewards(new ArrayList<String>());
+		if (!offlineRewards.isEmpty()) {
+			setOfflineOtherRewards(new ArrayList<String>());
+		}
 	}
 
-	/**
-	 * Give weekly top voter award.
-	 *
-	 * @param place
-	 *            the place
-	 */
-	public void giveWeeklyTopVoterAward(int place) {
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getWeeklyAwardRewardsPath(place))
-				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Weekly").send(this);
+	public void giveWeeklyTopVoterAward(int place, String path) {
+		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getWeeklyAwardRewardsPath(path))
+				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Weekly").setOnline(isOnline())
+				.send(this);
 	}
 
 	/**
@@ -516,7 +583,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 * @return true if user got the first vote reward
 	 */
 	public boolean hasGottenFirstVote() {
-		return getAllTimeTotal() != 0;
+		return getTotal(TopVoter.AllTime) != 0;
 	}
 
 	/**
@@ -534,12 +601,26 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return false;
 	}
 
+	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 boolean isReminded() {
-		return Boolean.valueOf(getUserData().getString("Reminded"));
+		return getUserData().getBoolean("Reminded");
 	}
 
 	public boolean isTopVoterIgnore() {
-		return Boolean.valueOf(getUserData().getString("TopVoterIgnore"));
+		return getUserData().getBoolean("TopVoterIgnore");
 	}
 
 	/**
@@ -555,9 +636,17 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 * Off vote.
 	 */
 	public void offVote() {
+		if (!Main.plugin.getOptions().isProcessRewards()) {
+			Main.plugin.debug("Processing rewards is disabled");
+			return;
+		}
+		Main.plugin.extraDebug("Checking offline vote site votes");
 		Player player = getPlayer();
 		if (player != null) {
-			setTopVoterIgnore(player.hasPermission("VotingPlugin.TopVoter.Ignore"));
+			boolean topVoterIngorePerm = player.hasPermission("VotingPlugin.TopVoter.Ignore");
+			if (isTopVoterIgnore() != topVoterIngorePerm) {
+				setTopVoterIgnore(topVoterIngorePerm);
+			}
 			ArrayList<String> offlineVotes = getOfflineVotes();
 			// plugin.debug(ArrayUtils.getInstance().makeStringList(offlineVotes));
 			if (offlineVotes.size() > 0) {
@@ -572,9 +661,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 					plugin.debug("Site doesn't exist: " + offlineVotes.get(i));
 				}
 			}
-			if (!offlineVotes.isEmpty()) {
-				setOfflineVotes(new ArrayList<String>());
-			}
+
+			setOfflineVotes(new ArrayList<String>());
 
 			giveOfflineOtherRewards();
 		}
@@ -591,11 +679,11 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 *            the broadcast
 	 */
 	public void playerVote(VoteSite voteSite, boolean online, boolean broadcast) {
-		if (Config.getInstance().getBroadCastVotesEnabled() && Config.getInstance().getFormatBroadcastWhenOnline()
+		if (Config.getInstance().getFormatBroadcastWhenOnline() && Config.getInstance().isBroadcastVotesEnabled()
 				&& broadcast) {
 			voteSite.broadcastVote(this);
 		}
-		voteSite.giveSiteReward(this, online);
+		voteSite.giveRewards(this, online);
 	}
 
 	/**
@@ -613,16 +701,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		return false;
 	}
 
-	public void resetDailyTotalVotes() {
-		setDailyTotal(0);
-	}
-
-	public void resetMonthlyTotalVotes() {
-		setMonthTotal(0);
-	}
-
-	public void resetWeeklyTotalVotes() {
-		setWeeklyTotal(0);
+	public void resetTotals(TopVoter topVoter) {
+		setTotal(topVoter, 0);
 	}
 
 	/**
@@ -633,11 +713,12 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 	 */
 	public void sendVoteEffects(boolean online) {
 		RewardHandler.getInstance().giveReward(this, Config.getInstance().getData(),
-				Config.getInstance().getAnySiteRewardsPath(), online);
+				Config.getInstance().getAnySiteRewardsPath(), new RewardOptions().setOnline(online));
 	}
 
+	@Deprecated
 	public void setAllTimeTotal(int allTimeTotal) {
-		getUserData().setInt("AllTimeTotal", allTimeTotal);
+		setTotal(TopVoter.AllTime, allTimeTotal);
 	}
 
 	public void setBestDayVoteStreak(int streak) {
@@ -652,8 +733,9 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		getData().setInt("BestWeekVoteStreak", streak);
 	}
 
+	@Deprecated
 	public void setDailyTotal(int total) {
-		getUserData().setInt("DailyTotal", total);
+		setTotal(TopVoter.Daily, total);
 	}
 
 	public void setDayVoteStreak(int streak) {
@@ -663,6 +745,14 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		}
 	}
 
+	public void setDayVoteStreakLastUpdate(long time) {
+		getData().setString("DayVoteStreakLastUpdate", "" + time);
+	}
+
+	public void setDisableBroadcast(boolean value) {
+		getUserData().setBoolean("DisableBroadcast", value);
+	}
+
 	public void setHasGotteMilestone(int votesRequired, boolean b) {
 		HashMap<String, Boolean> hasGottenMilestone = getHasGottenMilestone();
 		hasGottenMilestone.put("" + votesRequired, b);
@@ -690,6 +780,25 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		getData().setInt("HighestWeeklyTotal", total);
 	}
 
+	public void setLastCoolDownCheckArray(HashMap<VoteSite, Boolean> lastVotesCheck) {
+		ArrayList<String> data = new ArrayList<String>();
+		for (Entry<VoteSite, Boolean> entry : lastVotesCheck.entrySet()) {
+			String str = entry.getKey().getKey() + "//" + entry.getValue().booleanValue();
+			data.add(str);
+		}
+		getUserData().setStringList("LastVoteCoolDownCheck", data);
+	}
+
+	public void setLastMonthTotal(int total) {
+		getData().setInt("LastMonthTotal", total);
+	}
+
+	public void setLastVoteCoolDownCheck(boolean lastDelay, VoteSite voteSite) {
+		HashMap<VoteSite, Boolean> array = getLastCoolDownCheckArray();
+		array.put(voteSite, Boolean.valueOf(lastDelay));
+		setLastCoolDownCheckArray(array);
+	}
+
 	public void setLastVotes(HashMap<VoteSite, Long> lastVotes) {
 		ArrayList<String> data = new ArrayList<String>();
 		for (Entry<VoteSite, Long> entry : lastVotes.entrySet()) {
@@ -703,8 +812,9 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		getData().setInt("MilestoneCount", value);
 	}
 
+	@Deprecated
 	public void setMonthTotal(int total) {
-		getData().setInt("MonthTotal", total);
+		setTotal(TopVoter.Monthly, total);
 	}
 
 	public void setMonthVoteStreak(int streak) {
@@ -750,12 +860,43 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		getUserData().setString("TopVoterIgnore", "" + topVoterIgnore);
 	}
 
+	public void setTotal(TopVoter top, int value) {
+		switch (top) {
+			case AllTime:
+				getUserData().setInt("AllTimeTotal", value);
+				break;
+			case Daily:
+				getUserData().setInt("DailyTotal", value);
+				break;
+			case Monthly:
+				if (Config.getInstance().isLimitMonthlyVotes()) {
+					int days = TimeChecker.getInstance().getTime().getMonth().maxLength();
+					if (value > days) {
+						value = days * plugin.getVoteSites().size();
+					}
+				}
+				getData().setInt("MonthTotal", value);
+				break;
+			case Weekly:
+				getUserData().setInt("WeeklyTotal", value);
+				break;
+			default:
+				break;
+
+		}
+	}
+
 	public void setVotePartyVotes(int value) {
 		getUserData().setInt("VotePartyVotes", value);
 	}
 
+	public void setVoteShopIdentifierLimit(String identifier, int value) {
+		getData().setInt("VoteShopLimit" + identifier, value);
+	}
+
+	@Deprecated
 	public void setWeeklyTotal(int total) {
-		getUserData().setInt("WeeklyTotal", total);
+		setTotal(TopVoter.Weekly, total);
 	}
 
 	public void setWeekVoteStreak(int streak) {
@@ -765,4 +906,18 @@ public class User extends com.Ben12345rocks.AdvancedCore.Objects.User {
 		}
 	}
 
+	public boolean shouldBeReminded() {
+		Player player = getPlayer();
+		if (player != null) {
+			if (player.hasPermission("VotingPlugin.NoRemind")) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	public boolean voteStreakUpdatedToday(LocalDateTime time) {
+		return MiscUtils.getInstance().getTime(getDayVoteStreakLastUpdate()).getDayOfYear() == time.getDayOfYear();
+	}
+
 }

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

@@ -1,18 +1,28 @@
 package com.Ben12345rocks.VotingPlugin.Objects;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Player;
 
-import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
-import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Item.ItemBuilder;
+import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.Data.ServerData;
+import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+
+import lombok.Getter;
+import lombok.Setter;
 
-// TODO: Auto-generated Javadoc
 /**
  * The Class VoteSite.
  */
@@ -27,32 +37,49 @@ public class VoteSite {
 	/** The plugin. */
 	static Main plugin = Main.plugin;
 
-	/** The vote URL. */
+	@Getter
+	@Setter
 	private String voteURL;
 
-	/** The service site. */
+	@Getter
+	@Setter
 	private String serviceSite;
 
-	/** The site name. */
+	@Getter
+	@Setter
 	private String key;
 
+	@Getter
+	@Setter
 	private String displayName;
 
-	/** The vote delay. */
-	private int voteDelay;
+	@Getter
+	@Setter
+	private double voteDelay;
 
-	/** The enabled. */
+	@Getter
+	@Setter
 	private boolean enabled;
 
+	@Getter
+	@Setter
 	private boolean voteDelayDaily;
 
-	/** The priority. */
+	@Getter
+	@Setter
 	private int priority;
 
+	@Setter
 	private ConfigurationSection item;
 
+	@Getter
+	@Setter
 	private boolean giveOffline;
 
+	@Getter
+	@Setter
+	private boolean waitUntilVoteDelay;
+
 	/**
 	 * Instantiates a new vote site.
 	 *
@@ -84,16 +111,24 @@ public class VoteSite {
 		if (!user.isVanished()) {
 			String playerName = user.getPlayerName();
 			String bc = StringUtils.getInstance().colorize(config.getFormatBroadCastMsg());
-			bc = bc.replace("%player%", playerName).replace("%SiteName%", getDisplayName());
-			MiscUtils.getInstance().broadcast(bc);
-		}
-	}
+			HashMap<String, String> placeholders = new HashMap<String, String>();
+			placeholders.put("player", playerName);
+			placeholders.put("nickname",
+					(user.getPlayer() != null) ? user.getPlayer().getDisplayName() : user.getPlayerName());
+			placeholders.put("sitename", getDisplayName());
+			placeholders.put("servicesite", getServiceSite());
+			bc = StringUtils.getInstance().replacePlaceHolder(bc, placeholders);
+			ArrayList<Player> players = new ArrayList<Player>();
+			for (Player p : Bukkit.getOnlinePlayers()) {
+				if (!UserManager.getInstance().getVotingPluginUser(p).getDisableBroadcast()) {
+					players.add(p);
+				}
+			}
 
-	/**
-	 * @return the displayName
-	 */
-	public String getDisplayName() {
-		return displayName;
+			MiscUtils.getInstance().broadcast(bc, players);
+		} else {
+			plugin.debug(user.getPlayerName() + " is vanished, not broadcasting");
+		}
 	}
 
 	/**
@@ -109,49 +144,6 @@ public class VoteSite {
 		}
 	}
 
-	/**
-	 * @return the key
-	 */
-	public String getKey() {
-		return key;
-	}
-
-	/**
-	 * Gets the priority.
-	 *
-	 * @return the priority
-	 */
-	public int getPriority() {
-		return priority;
-	}
-
-	/**
-	 * Gets the service site.
-	 *
-	 * @return the service site
-	 */
-	public String getServiceSite() {
-		return serviceSite;
-	}
-
-	/**
-	 * Gets the vote delay.
-	 *
-	 * @return the vote delay
-	 */
-	public int getVoteDelay() {
-		return voteDelay;
-	}
-
-	/**
-	 * Gets the vote URL.
-	 *
-	 * @return the vote URL
-	 */
-	public String getVoteURL() {
-		return voteURL;
-	}
-
 	/**
 	 * Give rewards.
 	 *
@@ -174,18 +166,6 @@ public class VoteSite {
 		return RewardHandler.getInstance().hasRewards(configVoteSites.getData(), configVoteSites.getRewardsPath(key));
 	}
 
-	/**
-	 * Give site reward.
-	 *
-	 * @param user
-	 *            the user
-	 * @param online
-	 *            the online
-	 */
-	public void giveSiteReward(User user, boolean online) {
-		giveRewards(user, online);
-	}
-
 	/**
 	 * Inits the.
 	 */
@@ -202,119 +182,12 @@ public class VoteSite {
 		item = configVoteSites.getItem(key);
 		voteDelayDaily = configVoteSites.getVoteSiteResetVoteDelayDaily(key);
 		giveOffline = configVoteSites.getVoteSiteGiveOffline(key);
+		waitUntilVoteDelay = configVoteSites.getWaitUntilVoteDelay(key);
 	}
 
-	/**
-	 * Checks if is enabled.
-	 *
-	 * @return true, if is enabled
-	 */
-	public boolean isEnabled() {
-		return enabled;
-	}
-
-	/**
-	 * @return the giveOffline
-	 */
-	public boolean isGiveOffline() {
-		return giveOffline;
-	}
-
-	/**
-	 * @return the voteDelayDaily
-	 */
-	public boolean isVoteDelayDaily() {
-		return voteDelayDaily;
-	}
-
-	/**
-	 * @param displayName
-	 *            the displayName to set
-	 */
-	public void setDisplayName(String displayName) {
-		this.displayName = displayName;
-	}
-
-	/**
-	 * Sets the enabled.
-	 *
-	 * @param enabled
-	 *            the new enabled
-	 */
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
-	/**
-	 * @param giveOffline
-	 *            the giveOffline to set
-	 */
-	public void setGiveOffline(boolean giveOffline) {
-		this.giveOffline = giveOffline;
-	}
-
-	/**
-	 * @param item
-	 *            the item to set
-	 */
-	public void setItem(ConfigurationSection item) {
-		this.item = item;
-	}
-
-	/**
-	 * @param key
-	 *            the key to set
-	 */
-	public void setKey(String key) {
-		this.key = key;
-	}
-
-	/**
-	 * Sets the priority.
-	 *
-	 * @param priority
-	 *            the new priority
-	 */
-	public void setPriority(int priority) {
-		this.priority = priority;
-	}
-
-	/**
-	 * Sets the service site.
-	 *
-	 * @param serviceSite
-	 *            the new service site
-	 */
-	public void setServiceSite(String serviceSite) {
-		this.serviceSite = serviceSite;
-	}
-
-	/**
-	 * Sets the vote delay.
-	 *
-	 * @param voteDelay
-	 *            the new vote delay
-	 */
-	public void setVoteDelay(int voteDelay) {
-		this.voteDelay = voteDelay;
-	}
-
-	/**
-	 * @param voteDelayDaily
-	 *            the voteDelayDaily to set
-	 */
-	public void setVoteDelayDaily(boolean voteDelayDaily) {
-		this.voteDelayDaily = voteDelayDaily;
-	}
-
-	/**
-	 * Sets the vote URL.
-	 *
-	 * @param voteURL
-	 *            the new vote URL
-	 */
-	public void setVoteURL(String voteURL) {
-		this.voteURL = voteURL;
+	public boolean isVaidServiceSite() {
+		return ArrayUtils.getInstance().containsIgnoreCase(ServerData.getInstance().getServiceSites(),
+				getServiceSite());
 	}
 
 }

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

@@ -1,20 +1,26 @@
-package com.Ben12345rocks.VotingPlugin.Objects;
+package com.Ben12345rocks.VotingPlugin.Signs;
 
 import java.util.ArrayList;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.Sign;
 import org.bukkit.block.Skull;
+import org.bukkit.block.data.Directional;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
+import com.Ben12345rocks.VotingPlugin.Objects.User;
+import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
+
+import lombok.Getter;
+import lombok.Setter;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -22,13 +28,16 @@ import com.Ben12345rocks.VotingPlugin.Data.ServerData;
  */
 public class SignHandler {
 
-	/** The sign. */
+	@Getter
+	@Setter
 	private String sign;
 
-	/** The location. */
+	@Getter
+	@Setter
 	private Location location;
 
-	/** The data. */
+	@Getter
+	@Setter
 	private String data;
 
 	/** The lines. */
@@ -46,8 +55,9 @@ public class SignHandler {
 	/** The votes. */
 	private int votes;
 
-	/** The is valid. */
-	private boolean isValid;
+	@Getter
+	@Setter
+	private boolean valid;
 
 	/**
 	 * Instantiates a new sign handler.
@@ -72,6 +82,17 @@ public class SignHandler {
 		playerName = "";
 	}
 
+	@SuppressWarnings("deprecation")
+	private boolean checkSkull(Block block) {
+		if (block.getState() instanceof Skull) {
+			Skull skull = (Skull) block.getState();
+			skull.setOwner(playerName);
+			skull.update();
+			return true;
+		}
+		return false;
+	}
+
 	/**
 	 * Check skulls.
 	 */
@@ -103,24 +124,6 @@ public class SignHandler {
 
 	}
 
-	/**
-	 * Gets the data.
-	 *
-	 * @return the data
-	 */
-	public String getData() {
-		return data;
-	}
-
-	/**
-	 * Gets the location.
-	 *
-	 * @return the location
-	 */
-	public Location getLocation() {
-		return location;
-	}
-
 	/**
 	 * Gets the right click message.
 	 *
@@ -135,15 +138,6 @@ public class SignHandler {
 		return msg;
 	}
 
-	/**
-	 * Gets the sign.
-	 *
-	 * @return the sign
-	 */
-	public String getSign() {
-		return sign;
-	}
-
 	/**
 	 * Checks if is location same.
 	 *
@@ -155,15 +149,6 @@ public class SignHandler {
 		return loc.equals(getLocation());
 	}
 
-	/**
-	 * Checks if is valid.
-	 *
-	 * @return true, if is valid
-	 */
-	public boolean isValid() {
-		return isValid;
-	}
-
 	/**
 	 * Removes the sign.
 	 */
@@ -171,46 +156,6 @@ public class SignHandler {
 		ServerData.getInstance().removeSign(sign);
 	}
 
-	/**
-	 * Sets the data.
-	 *
-	 * @param data
-	 *            the new data
-	 */
-	public void setData(String data) {
-		this.data = data;
-	}
-
-	/**
-	 * Sets the location.
-	 *
-	 * @param location
-	 *            the new location
-	 */
-	public void setLocation(Location location) {
-		this.location = location;
-	}
-
-	/**
-	 * Sets the sign.
-	 *
-	 * @param sign
-	 *            the new sign
-	 */
-	public void setSign(String sign) {
-		this.sign = sign;
-	}
-
-	/**
-	 * Sets the valid.
-	 *
-	 * @param isValid
-	 *            the new valid
-	 */
-	public void setValid(boolean isValid) {
-		this.isValid = isValid;
-	}
-
 	/**
 	 * Store sign.
 	 */
@@ -236,13 +181,13 @@ public class SignHandler {
 
 			ArrayList<User> users = null;
 			if (data.equalsIgnoreCase("all")) {
-				users = plugin.convertSet(plugin.topVoterAllTime.keySet());
+				users = plugin.convertSet(plugin.getTopVoter(TopVoter.AllTime).keySet());
 			} else if (data.equalsIgnoreCase("monthly")) {
-				users = plugin.convertSet(plugin.topVoterMonthly.keySet());
+				users = plugin.convertSet(plugin.getTopVoter(TopVoter.Monthly).keySet());
 			} else if (data.equalsIgnoreCase("weekly")) {
-				users = plugin.convertSet(plugin.topVoterWeekly.keySet());
+				users = plugin.convertSet(plugin.getTopVoter(TopVoter.Weekly).keySet());
 			} else if (data.equalsIgnoreCase("daily")) {
-				users = plugin.convertSet(plugin.topVoterDaily.keySet());
+				users = plugin.convertSet(plugin.getTopVoter(TopVoter.Daily).keySet());
 			}
 
 			if (users != null && users.size() >= position) {
@@ -251,13 +196,13 @@ public class SignHandler {
 
 				votes = 0;
 				if (data.equalsIgnoreCase("all")) {
-					votes = plugin.topVoterAllTime.get(user);
+					votes = plugin.getTopVoter(TopVoter.AllTime).get(user);
 				} else if (data.equalsIgnoreCase("monthly")) {
-					votes = plugin.topVoterMonthly.get(user);
+					votes = plugin.getTopVoter(TopVoter.Monthly).get(user);
 				} else if (data.equalsIgnoreCase("weekly")) {
-					votes = plugin.topVoterWeekly.get(user);
+					votes = plugin.getTopVoter(TopVoter.Weekly).get(user);
 				} else if (data.equalsIgnoreCase("daily")) {
-					votes = plugin.topVoterDaily.get(user);
+					votes = plugin.getTopVoter(TopVoter.Daily).get(user);
 				}
 
 				for (int j = 0; j < lines.size(); j++) {
@@ -305,20 +250,26 @@ public class SignHandler {
 					}
 
 				} catch (Exception ex) {
-					AdvancedCoreHook.getInstance().debug(ex);
+					Main.plugin.debug(ex);
 				}
 			}
 		}, delay);
 	}
 
-	@SuppressWarnings("deprecation")
 	public void updateSkulls(Location loc1, Location loc2) {
-		for (Block block : MiscUtils.getInstance().getRegionBlocks(location.getWorld(), loc1, loc2)) {
-			if (block.getState() instanceof Skull) {
-				Skull skull = (Skull) block.getState();
-				skull.setOwner(playerName);
-				skull.update();
+		BlockState state = getLocation().getBlock().getState();
+		if (state instanceof Sign && state.getBlockData() instanceof Directional) {
+			Directional s = (Directional) state.getBlockData();
+			Block b = location.getBlock().getRelative(s.getFacing());
+			Block above = b.getRelative(BlockFace.UP);
+			if (checkSkull(above)) {
+				return;
 			}
+
+		}
+
+		for (Block block : MiscUtils.getInstance().getRegionBlocks(location.getWorld(), loc1, loc2)) {
+			checkSkull(block);
 		}
 	}
 }

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

@@ -6,7 +6,6 @@ import org.bukkit.Location;
 
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
-import com.Ben12345rocks.VotingPlugin.Objects.SignHandler;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -66,10 +65,10 @@ public class Signs {
 	 * Load signs.
 	 */
 	public void loadSigns() {
-		plugin.signs = new ArrayList<SignHandler>();
+		plugin.setSigns(new ArrayList<SignHandler>());
 		for (String sign : ServerData.getInstance().getSigns()) {
 			// plugin.getLogger().info("Loading sign " + sign);
-			plugin.signs.add(new SignHandler(sign, ServerData.getInstance().getSignLocation(sign),
+			plugin.getSigns().add(new SignHandler(sign, ServerData.getInstance().getSignLocation(sign),
 					ServerData.getInstance().getSignData(sign), ServerData.getInstance().getSignPosition(sign)));
 		}
 	}
@@ -78,7 +77,7 @@ public class Signs {
 	 * Store signs.
 	 */
 	public void storeSigns() {
-		for (SignHandler sign : plugin.signs) {
+		for (SignHandler sign : plugin.getSigns()) {
 			sign.storeSign();
 		}
 	}
@@ -87,14 +86,16 @@ public class Signs {
 	 * Update signs.
 	 */
 	public void updateSigns() {
-		for (int i = plugin.signs.size() - 1; i >= 0; i--) {
-			if (!plugin.signs.get(i).isValid()) {
+		int time = 0;
+		for (int i = plugin.getSigns().size() - 1; i >= 0; i--) {
+			if (!plugin.getSigns().get(i).isValid()) {
 				plugin.debug("Sign " + i + " invalid, removing from data.");
-				plugin.signs.get(i).removeSign();
-				plugin.signs.remove(i);
+				plugin.getSigns().get(i).removeSign();
+				plugin.getSigns().remove(i);
 			} else {
-				plugin.signs.get(i).updateLines();
-				plugin.signs.get(i).updateSign(i * 3);
+				plugin.getSigns().get(i).updateLines();
+				plugin.getSigns().get(i).updateSign(time);
+				time += 5;
 			}
 		}
 

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

@@ -1,20 +1,26 @@
-package com.Ben12345rocks.VotingPlugin.OtherRewards;
+package com.Ben12345rocks.VotingPlugin.SpecialRewards;
 
 import java.util.Set;
 
-import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
-import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
+import org.bukkit.Bukkit;
+
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerSpecialRewardEvent;
+import com.Ben12345rocks.VotingPlugin.Events.SpecialRewardType;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
+import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 
 // TODO: Auto-generated Javadoc
 /**
  * The Class OtherVoteReward.
  */
-public class OtherVoteReward {
+public class SpecialRewards {
 
 	/** The config. */
 	static Config config = Config.getInstance();
@@ -23,7 +29,7 @@ public class OtherVoteReward {
 	static ConfigVoteSites configVoteSites = ConfigVoteSites.getInstance();
 
 	/** The instance. */
-	static OtherVoteReward instance = new OtherVoteReward();
+	static SpecialRewards instance = new SpecialRewards();
 
 	/** The plugin. */
 	static Main plugin = Main.plugin;
@@ -33,14 +39,14 @@ public class OtherVoteReward {
 	 *
 	 * @return single instance of OtherVoteReward
 	 */
-	public static OtherVoteReward getInstance() {
+	public static SpecialRewards getInstance() {
 		return instance;
 	}
 
 	/**
 	 * Instantiates a new other vote reward.
 	 */
-	private OtherVoteReward() {
+	private SpecialRewards() {
 	}
 
 	/**
@@ -49,8 +55,8 @@ public class OtherVoteReward {
 	 * @param plugin
 	 *            the plugin
 	 */
-	public OtherVoteReward(Main plugin) {
-		OtherVoteReward.plugin = plugin;
+	public SpecialRewards(Main plugin) {
+		SpecialRewards.plugin = plugin;
 	}
 
 	/**
@@ -66,7 +72,6 @@ public class OtherVoteReward {
 			giveAllSitesRewards(user, user.isOnline());
 		}
 		return checkAllVotes;
-
 	}
 
 	/**
@@ -88,11 +93,11 @@ public class OtherVoteReward {
 									Config.getInstance().getCumulativeRewardsPath(votesRequired))) {
 						int total = 0;
 						if (Config.getInstance().getCumulativeVotesInSameDay(votesRequired)) {
-							total = user.getDailyTotal();
+							total = user.getTotal(TopVoter.Daily);
 						} else if (Config.getInstance().getCumulativeVotesInSameWeek(votesRequired)) {
-							total = user.getWeeklyTotal();
+							total = user.getTotal(TopVoter.Weekly);
 						} else {
-							total = user.getAllTimeTotal();
+							total = user.getTotal(TopVoter.AllTime);
 						}
 
 						if ((total % votesRequired) == 0 && total != 0) {
@@ -224,8 +229,14 @@ public class OtherVoteReward {
 	 *            the online
 	 */
 	public void giveAllSitesRewards(User user, boolean online) {
+		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user, SpecialRewardType.ALLSITE);
+		Bukkit.getPluginManager().callEvent(event);
+
+		if (event.isCancelled()) {
+			return;
+		}
 		RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-				Config.getInstance().getAllSitesRewardPath(), online);
+				Config.getInstance().getAllSitesRewardPath(), new RewardOptions().setOnline(online));
 	}
 
 	/**
@@ -239,6 +250,14 @@ public class OtherVoteReward {
 	 *            the cumulative
 	 */
 	public void giveCumulativeVoteReward(User user, boolean online, int cumulative) {
+		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user,
+				SpecialRewardType.CUMMULATIVE.setAmount(cumulative));
+		Bukkit.getPluginManager().callEvent(event);
+
+		if (event.isCancelled()) {
+			return;
+		}
+
 		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getCumulativeRewardsPath(cumulative))
 				.setOnline(online).withPlaceHolder("Cumulative", "" + cumulative).send(user);
 	}
@@ -252,8 +271,14 @@ public class OtherVoteReward {
 	 *            the online
 	 */
 	public void giveFirstVoteRewards(User user, boolean online) {
+		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user, SpecialRewardType.FIRSTVOTE);
+		Bukkit.getPluginManager().callEvent(event);
+
+		if (event.isCancelled()) {
+			return;
+		}
 		RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-				Config.getInstance().getFirstVoteRewardsPath(), online);
+				Config.getInstance().getFirstVoteRewardsPath(), new RewardOptions().setOnline(online));
 	}
 
 	/**
@@ -267,12 +292,27 @@ public class OtherVoteReward {
 	 *            the milestone
 	 */
 	public void giveMilestoneVoteReward(User user, boolean online, int milestone) {
+		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user,
+				SpecialRewardType.MILESTONE.setAmount(milestone));
+		Bukkit.getPluginManager().callEvent(event);
+
+		if (event.isCancelled()) {
+			return;
+		}
 		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getMilestoneRewardsPath(milestone))
 				.setOnline(online).withPlaceHolder("Milestone", "" + milestone).send(user);
 	}
 
 	public void giveVoteStreakReward(User user, boolean online, String type, String string, int votes) {
+		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user,
+				SpecialRewardType.VOTESTREAK.setType(type).setAmount(votes));
+		Bukkit.getPluginManager().callEvent(event);
+
+		if (event.isCancelled()) {
+			return;
+		}
 		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getVoteStreakRewardsPath(type, string))
 				.setOnline(online).withPlaceHolder("Type", type).withPlaceHolder("Streak", "" + votes).send(user);
 	}
+
 }

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

@@ -0,0 +1,74 @@
+package com.Ben12345rocks.VotingPlugin.Test;
+
+import java.util.ArrayList;
+
+import com.Ben12345rocks.AdvancedCore.Rewards.Reward;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
+import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteEvent;
+import com.Ben12345rocks.VotingPlugin.Objects.User;
+import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+
+public class VoteTester {
+
+	private static VoteTester instance = new VoteTester();
+
+	public static VoteTester getInstance() {
+		return instance;
+	}
+
+	private Main plugin = Main.plugin;
+
+	public void testRewards(int amount, String name, String rewardName) {
+		long time1 = System.currentTimeMillis();
+		ArrayList<Long> timesPerReward = new ArrayList<Long>();
+		User user = UserManager.getInstance().getVotingPluginUser(name);
+		Reward reward = RewardHandler.getInstance().getReward(rewardName);
+		int rewardsGiven = 0;
+		for (int i = 0; i < amount; i++) {
+			long start1 = System.currentTimeMillis();
+			if (reward.canGiveReward(user, new RewardOptions())) {
+				rewardsGiven++;
+				RewardHandler.getInstance().giveReward(user, reward, new RewardOptions().setIgnoreRequirements(true));
+			}
+			long start2 = System.currentTimeMillis();
+			timesPerReward.add(start2 - start1);
+		}
+		long time2 = System.currentTimeMillis();
+		long time = time2 - time1;
+		long timeTotal = 0;
+		for (Long t : timesPerReward) {
+			timeTotal += t.longValue();
+		}
+		long timePerRewardAvg = timeTotal / timesPerReward.size();
+		Main.plugin.getLogger().info("Time to process rewards (" + amount + "): " + time + " ms, average per reward "
+				+ timePerRewardAvg + " ms. " + Main.plugin.getStorageType() + ", "
+				+ UserManager.getInstance().getAllUUIDs().size() + " users. " + rewardsGiven + " rewards given");
+	}
+
+	public void testVotes(int amount, String name, String site) {
+		long time1 = System.currentTimeMillis();
+		ArrayList<Long> timesPerVote = new ArrayList<Long>();
+		for (int i = 0; i < amount; i++) {
+			long start1 = System.currentTimeMillis();
+			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(site), name,
+					plugin.getVoteSiteServiceSite(site), false);
+			plugin.getServer().getPluginManager().callEvent(voteEvent);
+			long start2 = System.currentTimeMillis();
+			timesPerVote.add(start2 - start1);
+		}
+		long time2 = System.currentTimeMillis();
+		long time = time2 - time1;
+		long timeTotal = 0;
+		for (Long t : timesPerVote) {
+			timeTotal += t.longValue();
+		}
+		long timePerVoteAvg = timeTotal / timesPerVote.size();
+		Main.plugin.getLogger()
+				.info("Time to process votes (" + amount + "): " + time + " ms, average per vote " + timePerVoteAvg
+						+ " ms. " + Main.plugin.getStorageType() + ", " + UserManager.getInstance().getAllUUIDs().size()
+						+ " users. " + Main.plugin.getVoteSites().size() + " votesites");
+	}
+
+}

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

@@ -1,4 +1,4 @@
-package com.Ben12345rocks.VotingPlugin.Objects;
+package com.Ben12345rocks.VotingPlugin.TopVoter;
 
 import java.util.ArrayList;
 
@@ -24,6 +24,18 @@ public enum TopVoter {
 		return AllTime;
 	}
 
+	public String getName() {
+		if (this.equals(TopVoter.Monthly)) {
+			return Config.getInstance().getFormatTopVoterMonthly();
+		} else if (this.equals(TopVoter.Weekly)) {
+			return Config.getInstance().getFormatTopVoterWeekly();
+		} else if (this.equals(TopVoter.Daily)) {
+			return Config.getInstance().getFormatTopVoterDaily();
+		} else {
+			return Config.getInstance().getFormatTopVoterAllTime();
+		}
+	}
+
 	public TopVoter next() {
 		ArrayList<TopVoter> list = new ArrayList<TopVoter>();
 		if (Config.getInstance().getLoadTopVoterAllTime()) {
@@ -51,19 +63,28 @@ public enum TopVoter {
 	}
 
 	public TopVoter prev() {
-		switch (this) {
-		case AllTime:
-			return Daily;
-		case Daily:
-			return Weekly;
-		case Monthly:
-			return AllTime;
-		case Weekly:
-			return Monthly;
-		default:
-			return AllTime;
-
+		ArrayList<TopVoter> list = new ArrayList<TopVoter>();
+		if (Config.getInstance().getLoadTopVoterAllTime()) {
+			list.add(TopVoter.AllTime);
 		}
-
+		if (Config.getInstance().getLoadTopVoterMonthly()) {
+			list.add(TopVoter.Monthly);
+		}
+		if (Config.getInstance().getLoadTopVoterWeekly()) {
+			list.add(TopVoter.Weekly);
+		}
+		if (Config.getInstance().getLoadTopVoterDaily()) {
+			list.add(TopVoter.Daily);
+		}
+		for (int i = list.size() - 1; i >= 0; i--) {
+			if (list.get(i).equals(this)) {
+				int prev = i - 1;
+				if (prev < 0) {
+					prev = list.size() - 1;
+				}
+				return TopVoter.values()[prev];
+			}
+		}
+		return TopVoter.AllTime;
 	}
 }

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

@@ -16,19 +16,19 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
-import com.Ben12345rocks.AdvancedCore.Listeners.DateChangedEvent;
-import com.Ben12345rocks.AdvancedCore.Listeners.DayChangeEvent;
-import com.Ben12345rocks.AdvancedCore.Listeners.MonthChangeEvent;
-import com.Ben12345rocks.AdvancedCore.Listeners.WeekChangeEvent;
-import com.Ben12345rocks.AdvancedCore.Objects.UUID;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.DateChangedEvent;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.DayChangeEvent;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.MonthChangeEvent;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.PreDateChangedEvent;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.WeekChangeEvent;
+import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.AdvancedCore.YML.YMLFileHandler;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
-import com.Ben12345rocks.VotingPlugin.OtherRewards.OtherVoteReward;
+import com.Ben12345rocks.VotingPlugin.SpecialRewards.SpecialRewards;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 
 public class TopVoterHandler implements Listener {
@@ -65,57 +65,85 @@ public class TopVoterHandler implements Listener {
 
 	public String[] getTopVotersWeekly() {
 		ArrayList<String> msg = new ArrayList<String>();
-		ArrayList<User> users = plugin.convertSet(plugin.topVoterWeekly.keySet());
+		ArrayList<User> users = plugin.convertSet(plugin.getTopVoter(TopVoter.Weekly).keySet());
 		for (int i = 0; i < users.size(); i++) {
 			String line = Config.getInstance().getFormatCommandVoteTopLine().replace("%num%", "" + (i + 1))
 					.replace("%player%", users.get(i).getPlayerName())
-					.replace("%votes%", "" + plugin.topVoterWeekly.get(users.get(i)));
+					.replace("%votes%", "" + plugin.getTopVoter(TopVoter.Weekly).get(users.get(i)));
 			msg.add(line);
 		}
 		msg = ArrayUtils.getInstance().colorize(msg);
 		return ArrayUtils.getInstance().convert(msg);
 	}
 
+	private HashMap<Integer, String> handlePlaces(Set<String> places) {
+		HashMap<Integer, String> place = new HashMap<Integer, String>();
+		for (String p : places) {
+			String[] data = p.split("-");
+			try {
+				if (data.length > 1) {
+					for (int i = Integer.parseInt(data[0]); i < Integer.parseInt(data[1]); i++) {
+						place.put(i, p);
+					}
+				} else {
+					place.put(Integer.parseInt(data[0]), p);
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+
+		return place;
+	}
+
 	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
 	public void onDateChanged(DateChangedEvent event) {
 		plugin.setUpdate(true);
+		plugin.update();
+		loadLastMonth();
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onDayChange(DayChangeEvent event) {
-
 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getDailyTotal() == 0 && user.getDayVoteStreak() != 0) {
-				user.setDayVoteStreak(0);
-			} else {
-				user.addDayVoteStreak();
+			if (!user.voteStreakUpdatedToday(LocalDateTime.now().minusDays(1))) {
+				if (user.getDayVoteStreak() != 0) {
+					user.setDayVoteStreak(0);
+				}
 			}
-			OtherVoteReward.getInstance().checkVoteStreak(user, "Day");
 
-			if (user.getHighestDailyTotal() < user.getDailyTotal()) {
-				user.setHighestDailyTotal(user.getDailyTotal());
+			if (user.getHighestDailyTotal() < user.getTotal(TopVoter.Daily)) {
+				user.setHighestDailyTotal(user.getTotal(TopVoter.Daily));
 			}
 		}
 
 		if (Config.getInstance().getStoreTopVotersDaily()) {
-			plugin.debug("Storing TopVoters Daily");
-			storeDailyTopVoters();
+			plugin.getLogger().info("Saving TopVoters Daily");
+			storeTopVoters(TopVoter.Daily);
 		}
 
-		if (Config.getInstance().getDailyAwardsEnabled()) {
-			Set<String> places = Config.getInstance().getDailyPossibleRewardPlaces();
+		if (Config.getInstance().isEnableDailyRewards()) {
+			HashMap<Integer, String> places = handlePlaces(Config.getInstance().getDailyPossibleRewardPlaces());
 			int i = 0;
-			for (User user : plugin.topVoterDaily.keySet()) {
+			int lastTotal = -1;
+			for (User user : plugin.getTopVoter(TopVoter.Daily).keySet()) {
 				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-					i++;
-					if (places.contains(Integer.toString(i))) {
-						user.giveDailyTopVoterAward(i);
+					if (Config.getInstance().getTopVoterAwardsTies()) {
+						if (user.getTotal(TopVoter.Daily) != lastTotal) {
+							i++;
+						}
+					} else {
+						i++;
+					}
+					if (places.containsKey(i)) {
+						user.giveDailyTopVoterAward(i, places.get(i));
 					}
 				}
+				lastTotal = user.getTotal(TopVoter.Daily);
 			}
 		}
-		resetDailyTotals();
+		resetTotals(TopVoter.Daily);
 
 	}
 
@@ -123,36 +151,52 @@ public class TopVoterHandler implements Listener {
 	public void onMonthChange(MonthChangeEvent event) {
 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getMonthTotal() == 0 && user.getMonthVoteStreak() != 0) {
+			if (user.getTotal(TopVoter.Monthly) == 0 && user.getMonthVoteStreak() != 0) {
 				user.setMonthVoteStreak(0);
 			} else {
-				user.addMonthVoteStreak();
-				OtherVoteReward.getInstance().checkVoteStreak(user, "Month");
+				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.getMonthTotal()) {
-				user.setHighestMonthlyTotal(user.getMonthTotal());
+			user.setLastMonthTotal(user.getTotal(TopVoter.Monthly));
+
+			if (user.getHighestMonthlyTotal() < user.getTotal(TopVoter.Monthly)) {
+				user.setHighestMonthlyTotal(user.getTotal(TopVoter.Monthly));
 			}
 		}
 
 		if (Config.getInstance().getStoreTopVotersMonthly()) {
-			plugin.debug("Storing TopVoters Monthly");
-			storeMonthlyTopVoters();
+			plugin.getLogger().info("Saving TopVoters Monthly");
+			storeTopVoters(TopVoter.Monthly);
 		}
 
-		if (Config.getInstance().getMonthlyAwardsEnabled()) {
-			Set<String> places = Config.getInstance().getMonthlyPossibleRewardPlaces();
+		if (Config.getInstance().isEnableMonthlyAwards()) {
+			HashMap<Integer, String> places = handlePlaces(Config.getInstance().getMonthlyPossibleRewardPlaces());
 			int i = 0;
-			for (User user : plugin.topVoterMonthly.keySet()) {
+			int lastTotal = -1;
+			for (User user : plugin.getTopVoter(TopVoter.Monthly).keySet()) {
+
 				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-					i++;
-					if (places.contains(Integer.toString(i))) {
-						user.giveMonthlyTopVoterAward(i);
+					if (Config.getInstance().getTopVoterAwardsTies()) {
+						if (user.getTotal(TopVoter.Monthly) != lastTotal) {
+							i++;
+						}
+					} else {
+						i++;
+					}
+					if (places.containsKey(i)) {
+						user.giveMonthlyTopVoterAward(i, places.get(i));
 					}
 				}
+				lastTotal = user.getTotal(TopVoter.Monthly);
 			}
 		}
-		resetMonthlyTotals();
+
+		resetTotals(TopVoter.Monthly);
 
 		if (Config.getInstance().getResetMilestonesMonthly()) {
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
@@ -162,43 +206,59 @@ public class TopVoterHandler implements Listener {
 			}
 
 		}
+	}
 
+	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
+	public void onPreDateChanged(PreDateChangedEvent event) {
+		plugin.setUpdate(true);
+		plugin.update();
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onWeekChange(WeekChangeEvent event) {
 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getWeeklyTotal() == 0 && user.getWeekVoteStreak() != 0) {
+			if (user.getTotal(TopVoter.Weekly) == 0 && user.getWeekVoteStreak() != 0) {
 				user.setWeekVoteStreak(0);
 			} else {
-				user.addWeekVoteStreak();
-				OtherVoteReward.getInstance().checkVoteStreak(user, "Week");
+				if (!Config.getInstance().isVoteStreakRequirementUsePercentage() || user.hasPercentageTotal(
+						TopVoter.Weekly, Config.getInstance().getVoteStreakRequirementWeek(), null)) {
+					user.addWeekVoteStreak();
+					SpecialRewards.getInstance().checkVoteStreak(user, "Week");
+				}
 			}
 
-			if (user.getHighestWeeklyTotal() < user.getWeeklyTotal()) {
-				user.setHighestWeeklyTotal(user.getWeeklyTotal());
+			if (user.getHighestWeeklyTotal() < user.getTotal(TopVoter.Weekly)) {
+				user.setHighestWeeklyTotal(user.getTotal(TopVoter.Weekly));
 			}
 		}
 
 		if (Config.getInstance().getStoreTopVotersWeekly()) {
-			plugin.debug("Storing TopVoters Weekly");
-			storeWeeklyTopVoters();
+			plugin.getLogger().info("Saving TopVoters Weekly");
+			storeTopVoters(TopVoter.Weekly);
 		}
 
-		if (Config.getInstance().getWeeklyAwardsEnabled()) {
-			Set<String> places = Config.getInstance().getWeeklyPossibleRewardPlaces();
+		if (Config.getInstance().isEnableWeeklyAwards()) {
+			HashMap<Integer, String> places = handlePlaces(Config.getInstance().getWeeklyPossibleRewardPlaces());
 			int i = 0;
-			for (User user : plugin.topVoterWeekly.keySet()) {
+			int lastTotal = -1;
+			for (User user : plugin.getTopVoter(TopVoter.Weekly).keySet()) {
 				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-					i++;
-					if (places.contains(Integer.toString(i))) {
-						user.giveWeeklyTopVoterAward(i);
+					if (Config.getInstance().getTopVoterAwardsTies()) {
+						if (user.getTotal(TopVoter.Weekly) != lastTotal) {
+							i++;
+						}
+					} else {
+						i++;
+					}
+					if (places.containsKey(i)) {
+						user.giveWeeklyTopVoterAward(i, places.get(i));
 					}
 				}
+				lastTotal = user.getTotal(TopVoter.Weekly);
 			}
 		}
-		resetWeeklyTotals();
+		resetTotals(TopVoter.Weekly);
 
 	}
 
@@ -206,29 +266,11 @@ public class TopVoterHandler implements Listener {
 		plugin.getServer().getPluginManager().registerEvents(this, plugin);
 	}
 
-	public void resetDailyTotals() {
+	public void resetTotals(TopVoter topVoter) {
 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getDailyTotal() != 0) {
-				user.resetDailyTotalVotes();
-			}
-		}
-	}
-
-	public void resetMonthlyTotals() {
-		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getMonthTotal() != 0) {
-				user.resetMonthlyTotalVotes();
-			}
-		}
-	}
-
-	public void resetWeeklyTotals() {
-		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getWeeklyTotal() != 0) {
-				user.resetWeeklyTotalVotes();
+			if (user.getTotal(topVoter) != 0) {
+				user.resetTotals(topVoter);
 			}
 		}
 	}
@@ -260,53 +302,30 @@ public class TopVoterHandler implements Listener {
 		return sortedMap;
 	}
 
-	public void storeDailyTopVoters() {
-		String month = LocalDateTime.now().getMonth().toString();
-		int year = LocalDateTime.now().getYear();
-		int day = LocalDateTime.now().getDayOfMonth();
-		YMLFileHandler file = new YMLFileHandler(new File(plugin.getDataFolder(),
-				"TopVoter" + File.separator + "Daily" + File.separator + year + "_" + month + "_" + day + ".yml"));
-		file.setup();
-		ArrayList<String> topVoters = new ArrayList<String>();
-		int count = 1;
-		for (Entry<User, Integer> entry : plugin.topVoterDaily.entrySet()) {
-			topVoters.add(count + ": " + entry.getKey().getPlayerName() + ": " + entry.getValue());
-			count++;
-		}
-		file.getData().set("Day", topVoters);
-		file.saveData();
-	}
+	public void storeTopVoters(TopVoter top) {
+		LocalDateTime time = LocalDateTime.now().minusDays(1);
+		String month = time.getMonth().toString();
+		int year = time.getYear();
+		int week = time.getDayOfYear();
+		int day = time.getDayOfMonth();
+		String fileName = "TopVoter" + File.separator + top.toString() + File.separator + year + "_" + month;
 
-	public void storeMonthlyTopVoters() {
-		String month = LocalDateTime.now().getMonth().toString();
-		int year = LocalDateTime.now().getYear();
-		YMLFileHandler file = new YMLFileHandler(new File(plugin.getDataFolder(),
-				"TopVoter" + File.separator + "Monthly" + File.separator + year + "_" + month + ".yml"));
-		file.setup();
-		ArrayList<String> topVoters = new ArrayList<String>();
-		int count = 1;
-		for (Entry<User, Integer> entry : plugin.topVoterMonthly.entrySet()) {
-			topVoters.add(count + ": " + entry.getKey().getPlayerName() + ": " + entry.getValue());
-			count++;
+		if (top.equals(TopVoter.Daily)) {
+			fileName += "_" + day;
+		} else if (top.equals(TopVoter.Weekly)) {
+			fileName += "_" + week;
 		}
-		file.getData().set("Month", topVoters);
-		file.saveData();
-	}
+		fileName += ".yml";
 
-	public void storeWeeklyTopVoters() {
-		String month = LocalDateTime.now().getMonth().toString();
-		int year = LocalDateTime.now().getYear();
-		int week = LocalDateTime.now().getDayOfMonth();
-		YMLFileHandler file = new YMLFileHandler(new File(plugin.getDataFolder(),
-				"TopVoter" + File.separator + "Weekly" + File.separator + year + "_" + month + "_" + week + ".yml"));
+		YMLFileHandler file = new YMLFileHandler(new File(plugin.getDataFolder(), fileName));
 		file.setup();
 		ArrayList<String> topVoters = new ArrayList<String>();
 		int count = 1;
-		for (Entry<User, Integer> entry : plugin.topVoterWeekly.entrySet()) {
+		for (Entry<User, Integer> entry : plugin.getTopVoter(top).entrySet()) {
 			topVoters.add(count + ": " + entry.getKey().getPlayerName() + ": " + entry.getValue());
 			count++;
 		}
-		file.getData().set("Week", topVoters);
+		file.getData().set(top.toString(), topVoters);
 		file.saveData();
 	}
 
@@ -322,7 +341,7 @@ public class TopVoterHandler implements Listener {
 		ArrayList<String> msg = new ArrayList<String>();
 		ArrayList<String> topVoters = new ArrayList<String>();
 		int count = 1;
-		for (Entry<User, Integer> entry : plugin.topVoterAllTime.entrySet()) {
+		for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.AllTime).entrySet()) {
 			String line = Config.getInstance().getFormatCommandVoteTopLine();
 			line = line.replace("%num%", "" + count);
 			line = line.replace("%player%", entry.getKey().getPlayerName());
@@ -362,7 +381,7 @@ public class TopVoterHandler implements Listener {
 		ArrayList<String> msg = new ArrayList<String>();
 		ArrayList<String> topVoters = new ArrayList<String>();
 		int count = 1;
-		for (Entry<User, Integer> entry : plugin.topVoterDaily.entrySet()) {
+		for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.Daily).entrySet()) {
 			String line = Config.getInstance().getFormatCommandVoteTopLine();
 			line = line.replace("%num%", "" + count);
 			line = line.replace("%player%", entry.getKey().getPlayerName());
@@ -402,7 +421,7 @@ public class TopVoterHandler implements Listener {
 		ArrayList<String> msg = new ArrayList<String>();
 		ArrayList<String> topVoters = new ArrayList<String>();
 		int count = 1;
-		for (Entry<User, Integer> entry : plugin.topVoterMonthly.entrySet()) {
+		for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.Monthly).entrySet()) {
 			String line = Config.getInstance().getFormatCommandVoteTopLine();
 			line = line.replace("%num%", "" + count);
 			line = line.replace("%player%", entry.getKey().getPlayerName());
@@ -437,7 +456,8 @@ public class TopVoterHandler implements Listener {
 	 */
 	public String[] topVotersAllTime() {
 		ArrayList<String> msg = new ArrayList<String>();
-		List<Entry<User, Integer>> list = new LinkedList<Entry<User, Integer>>(plugin.topVoterAllTime.entrySet());
+		List<Entry<User, Integer>> list = new LinkedList<Entry<User, Integer>>(
+				plugin.getTopVoter(TopVoter.AllTime).entrySet());
 		int i = 0;
 		for (Entry<User, Integer> entry : list) {
 			String line = "%num%: %player%, %votes%";
@@ -445,7 +465,7 @@ public class TopVoterHandler implements Listener {
 			try {
 				line = line.replace("%player%", entry.getKey().getPlayerName());
 			} catch (Exception ex) {
-				AdvancedCoreHook.getInstance().debug(ex);
+				Main.plugin.debug(ex);
 			}
 			line = line.replace("%votes%", "" + entry.getValue());
 
@@ -465,16 +485,16 @@ public class TopVoterHandler implements Listener {
 
 	public String[] topVotersDaily() {
 		ArrayList<String> msg = new ArrayList<String>();
-		ArrayList<User> users = plugin.convertSet(plugin.topVoterDaily.keySet());
+		ArrayList<User> users = plugin.convertSet(plugin.getTopVoter(TopVoter.Daily).keySet());
 		for (int i = 0; i < users.size(); i++) {
 			String line = "%num%: %player%, %votes%";
 			line = line.replace("%num%", "" + (i + 1));
 			try {
 				line = line.replace("%player%", users.get(i).getPlayerName());
 			} catch (Exception ex) {
-				AdvancedCoreHook.getInstance().debug(ex);
+				Main.plugin.debug(ex);
 			}
-			line = line.replace("%votes%", "" + plugin.topVoterMonthly.get(users.get(i)));
+			line = line.replace("%votes%", "" + plugin.getTopVoter(TopVoter.Monthly).get(users.get(i)));
 			msg.add(line);
 		}
 
@@ -489,7 +509,8 @@ public class TopVoterHandler implements Listener {
 	 */
 	public String[] topVotersMonthly() {
 		ArrayList<String> msg = new ArrayList<String>();
-		List<Entry<User, Integer>> list = new LinkedList<Entry<User, Integer>>(plugin.topVoterMonthly.entrySet());
+		List<Entry<User, Integer>> list = new LinkedList<Entry<User, Integer>>(
+				plugin.getTopVoter(TopVoter.Monthly).entrySet());
 		int i = 0;
 		for (Entry<User, Integer> entry : list) {
 			String line = "%num%: %player%, %votes%";
@@ -497,7 +518,7 @@ public class TopVoterHandler implements Listener {
 			try {
 				line = line.replace("%player%", entry.getKey().getPlayerName());
 			} catch (Exception ex) {
-				AdvancedCoreHook.getInstance().debug(ex);
+				Main.plugin.debug(ex);
 			}
 			line = line.replace("%votes%", "" + entry.getValue());
 
@@ -521,7 +542,7 @@ public class TopVoterHandler implements Listener {
 		ArrayList<String> msg = new ArrayList<String>();
 		ArrayList<String> topVoters = new ArrayList<String>();
 		int count = 1;
-		for (Entry<User, Integer> entry : plugin.topVoterWeekly.entrySet()) {
+		for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.Weekly).entrySet()) {
 			String line = Config.getInstance().getFormatCommandVoteTopLine();
 			line = line.replace("%num%", "" + count);
 			line = line.replace("%player%", entry.getKey().getPlayerName());
@@ -549,6 +570,26 @@ public class TopVoterHandler implements Listener {
 		return ArrayUtils.getInstance().convert(msg);
 	}
 
+	public void loadLastMonth() {
+		if (Config.getInstance().isLastMonthGUI()) {
+			plugin.getLastMonthTopVoter().clear();
+
+			LinkedHashMap<User, Integer> totals = new LinkedHashMap<User, Integer>();
+			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+				int total = user.getLastMonthTotal();
+				if (total > 0) {
+					totals.put(user, total);
+				}
+			}
+
+			plugin.getLastMonthTopVoter().putAll(sortByValues(totals, false));
+
+			plugin.debug("Loaded last month top voters");
+		}
+
+	}
+
 	public synchronized void updateTopVoters(ArrayList<User> users1) {
 		ArrayList<User> users = new ArrayList<User>();
 		ArrayList<String> blackList = getTopVoterBlackList();
@@ -560,53 +601,19 @@ public class TopVoterHandler implements Listener {
 				}
 			}
 		}
-		plugin.topVoterAllTime.clear();
-		if (Config.getInstance().getLoadTopVoterAllTime()) {
-			for (User user : users) {
-				int total = user.getAllTimeTotal();
-				if (total > 0) {
-					plugin.topVoterAllTime.put(user, total);
-				}
-			}
-			plugin.topVoterAllTime = sortByValues(plugin.topVoterAllTime, false);
-			plugin.debug("All Time TopVoter loaded");
-		}
 
-		plugin.topVoterMonthly.clear();
-		if (Config.getInstance().getLoadTopVoterMonthly()) {
-			for (User user : users) {
-				int total = user.getMonthTotal();
-				if (total > 0) {
-					plugin.topVoterMonthly.put(user, total);
+		for (TopVoter top : TopVoter.values()) {
+			plugin.getTopVoter(top).clear();
+			if (Config.getInstance().getLoadTopVoter(top)) {
+				for (User user : users) {
+					int total = user.getTotal(top);
+					if (total > 0) {
+						plugin.getTopVoter(top).put(user, total);
+					}
 				}
+				plugin.getTopVoter().put(top, sortByValues(plugin.getTopVoter(top), false));
+				plugin.debug(top.toString() + " TopVoter loaded");
 			}
-			plugin.topVoterMonthly = sortByValues(plugin.topVoterMonthly, false);
-			plugin.debug("Monthly TopVoter loaded");
-		}
-
-		plugin.topVoterWeekly.clear();
-		if (Config.getInstance().getLoadTopVoterWeekly()) {
-			for (User user : users) {
-				int total = user.getWeeklyTotal();
-				if (total > 0) {
-					plugin.topVoterWeekly.put(user, total);
-				}
-			}
-
-			plugin.topVoterWeekly = sortByValues(plugin.topVoterWeekly, false);
-			plugin.debug("Weekly TopVoter loaded");
-		}
-
-		plugin.topVoterDaily.clear();
-		if (Config.getInstance().getLoadTopVoterDaily()) {
-			for (User user : users) {
-				int total = user.getDailyTotal();
-				if (total > 0) {
-					plugin.topVoterDaily.put(user, total);
-				}
-			}
-			plugin.topVoterDaily = sortByValues(plugin.topVoterDaily, false);
-			plugin.debug("Daily TopVoter loaded");
 		}
 
 		plugin.debug("Updated TopVoter");

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

@@ -0,0 +1,125 @@
+package com.Ben12345rocks.VotingPlugin.Updater;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+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
+/**
+ * The Class CheckUpdate.
+ */
+public class CheckUpdate {
+
+	/** The instance. */
+	static CheckUpdate instance = new CheckUpdate();
+
+	/** The plugin. */
+	static Main plugin = Main.plugin;
+
+	/**
+	 * Gets the single instance of CheckUpdate.
+	 *
+	 * @return single instance of CheckUpdate
+	 */
+	public static CheckUpdate getInstance() {
+		return instance;
+	}
+
+	/**
+	 * Instantiates a new check update.
+	 */
+	private CheckUpdate() {
+	}
+
+	/**
+	 * Instantiates a new check update.
+	 *
+	 * @param plugin
+	 *            the plugin
+	 */
+	public CheckUpdate(Main plugin) {
+		CheckUpdate.plugin = plugin;
+	}
+
+	/**
+	 * 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) {
+			case FAIL_SPIGOT: {
+				plugin.getLogger().info("Failed to check for update for " + plugin.getName() + "!");
+				break;
+			}
+			case NO_UPDATE: {
+				plugin.getLogger()
+						.info(plugin.getName() + " is up to date! Version: " + plugin.getUpdater().getVersion());
+				break;
+			}
+			case UPDATE_AVAILABLE: {
+				plugin.getLogger()
+						.info(plugin.getName() + " has an update available! Your Version: "
+								+ plugin.getDescription().getVersion() + " New Version: "
+								+ plugin.getUpdater().getVersion() + " Use /av download to get the latest update!");
+				break;
+			}
+			default: {
+				break;
+			}
+		}
+	}
+
+	public void checkUpdateBasic() {
+		if (Config.getInstance().isDisableUpdateChecking()) {
+			return;
+		}
+		plugin.setUpdater(new Updater(plugin, 15358, false));
+		final Updater.UpdateResult result = plugin.getUpdater().getResult();
+		switch (result) {
+			case UPDATE_AVAILABLE: {
+				plugin.getLogger()
+						.info(plugin.getName() + " has an update available! Your Version: "
+								+ plugin.getDescription().getVersion() + " New Version: "
+								+ plugin.getUpdater().getVersion() + " Use /av download to get the latest update!");
+				break;
+			}
+			default: {
+				break;
+			}
+		}
+	}
+
+	/**
+	 * Start up.
+	 */
+	public void startUp() {
+		if (Config.getInstance().isDisableUpdateChecking()) {
+			return;
+		}
+		Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				checkUpdate();
+				new Timer().schedule(new TimerTask() {
+
+					@Override
+					public void run() {
+						checkUpdateBasic();
+					}
+				}, 1000 * 60 * 1200, 1000 * 60 * 1200);
+
+			}
+		}, 10l);
+	}
+
+}

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

@@ -5,7 +5,7 @@ import java.util.ArrayList;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.Ben12345rocks.AdvancedCore.Objects.UUID;
+import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 
@@ -32,6 +32,14 @@ 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()));
+	}
+
 	public User getVotingPluginUser(OfflinePlayer player) {
 		return getVotingPluginUser(player.getName());
 	}

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

@@ -0,0 +1,88 @@
+package com.Ben12345rocks.VotingPlugin.Util.PlaceHolders;
+
+import org.bukkit.Bukkit;
+
+import com.Ben12345rocks.AdvancedCore.Util.Placeholder.PlaceHolder;
+import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Objects.User;
+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<User> 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<User> 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()));
+						}
+
+					});
+				}
+
+			}
+		}
+	}
+}

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

@@ -1,19 +1,24 @@
 package com.Ben12345rocks.VotingPlugin.Util.PlaceHolders;
 
+import java.util.ArrayList;
 import java.util.Map.Entry;
 
+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
+import com.Ben12345rocks.AdvancedCore.Util.Placeholder.PlaceHolder;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Commands.Commands;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
-import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
+import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
 
+import lombok.Getter;
+
 // TODO: Auto-generated Javadoc
 /**
  * The Class PlaceHolders.
@@ -35,6 +40,12 @@ public class PlaceHolders {
 		return instance;
 	}
 
+	@Getter
+	private ArrayList<PlaceHolder<User>> placeholders = new ArrayList<PlaceHolder<User>>();
+
+	@Getter
+	private ArrayList<PlaceHolder<User>> nonPlayerPlaceholders = new ArrayList<PlaceHolder<User>>();
+
 	/**
 	 * Instantiates a new place holders.
 	 */
@@ -51,203 +62,472 @@ public class PlaceHolders {
 		PlaceHolders.plugin = plugin;
 	}
 
-	public synchronized String getPlaceHolder(Player p, String identifier) {
+	public String getPlaceHolder(OfflinePlayer p, String identifier) {
 		identifier = StringUtils.getInstance().replaceJavascript(p, identifier);
 
+		for (PlaceHolder<User> placeholder : nonPlayerPlaceholders) {
+			if (placeholder.matches(identifier)) {
+				return placeholder.placeholderRequest(p, null, identifier);
+			}
+		}
+
 		User user = UserManager.getInstance().getVotingPluginUser(p);
 
-		// %VotingPlugin_total% - Total votes of all vote sites
-		if (identifier.equalsIgnoreCase("total")) {
-			return Integer.toString(user.getMonthTotal());
-		} else if (identifier.equalsIgnoreCase("alltimetotal")) {
-			return Integer.toString(user.getAllTimeTotal());
-		}
-
-		String[] args = identifier.split("_");
-		if (args.length > 1 && args[0].equalsIgnoreCase("total")) {
-			if (args[1].equalsIgnoreCase("all")) {
-				return Integer.toString(user.getAllTimeTotal());
-			} else if (args[1].equalsIgnoreCase("month")) {
-				return Integer.toString(user.getMonthTotal());
-			} else if (args[1].equalsIgnoreCase("week")) {
-				return Integer.toString(user.getWeeklyTotal());
-			} else if (args[1].equalsIgnoreCase("daily")) {
-				return Integer.toString(user.getDailyTotal());
+		for (PlaceHolder<User> placeholder : placeholders) {
+			if (placeholder.matches(identifier)) {
+				return placeholder.placeholderRequest(p, user, identifier);
 			}
 		}
 
-		if (identifier.equalsIgnoreCase("BestDailyTotal")) {
-			return "" + user.getHighestDailyTotal();
-		} else if (identifier.equalsIgnoreCase("BestWeeklyTotal")) {
-			return "" + user.getHighestWeeklyTotal();
-		} else if (identifier.equalsIgnoreCase("BestMonthlyTotal")) {
-			return "" + user.getHighestMonthlyTotal();
-		} else if (identifier.equalsIgnoreCase("DailyVoteStreak")) {
-			return "" + user.getDayVoteStreak();
-		} else if (identifier.equalsIgnoreCase("WeeklyVoteStreak")) {
-			return "" + user.getWeekVoteStreak();
-		} else if (identifier.equalsIgnoreCase("MonthlyVoteStreak")) {
-			return "" + user.getMonthVoteStreak();
-		} else if (identifier.equalsIgnoreCase("BestDailyVoteStreak")) {
-			return "" + user.getBestDayVoteStreak();
-		} else if (identifier.equalsIgnoreCase("BestWeeklyVoteStreak")) {
-			return "" + user.getBestWeekVoteStreak();
-		} else if (identifier.equalsIgnoreCase("BestMonthlyVoteStreak")) {
-			return "" + user.getBestMonthVoteStreak();
+		return "Not a valid placeholder";
+	}
+
+	public String getPlaceHolder(Player p, String identifier) {
+		identifier = StringUtils.getInstance().replaceJavascript(p, identifier);
+		return getPlaceHolder((OfflinePlayer) p, identifier);
+	}
+
+	public void load() {
+		placeholders.clear();
+		nonPlayerPlaceholders.clear();
+
+		// older placeholders, might be removed in the future
+		placeholders.add(new PlaceHolder<User>("total") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getTotal(TopVoter.Monthly));
+			}
+		}.withDescription("Month total"));
+
+		placeholders.add(new PlaceHolder<User>("alltimetotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getTotal(TopVoter.AllTime));
+			}
+		}.withDescription("Alltime total"));
+
+		placeholders.add(new PlaceHolder<User>("lastmonthtotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getLastMonthTotal());
+			}
+		}.withDescription("Last month total"));
+
+		// end of older placeholders
+
+		placeholders.add(new PlaceHolder<User>("DisableBroadcast") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return "" + user.getDisableBroadcast();
+			}
+		}.withDescription("Returns true/false if user has broadcast disabled"));
+
+		placeholders.add(new PlaceHolder<User>("MilestoneCount") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return "" + user.getMilestoneCount();
+			}
+		}.withDescription("User milestonecount"));
+
+		for (final String identifier : Config.getInstance().getIdentifiers()) {
+			if (Config.getInstance().getIdentifierLimit(identifier) > 0) {
+				placeholders.add(new PlaceHolder<User>("VoteShopLimit_" + identifier) {
+
+					@Override
+					public String placeholderRequest(OfflinePlayer p, User user, String ident) {
+						return "" + user.getVoteShopIdentifierLimit(identifier);
+					}
+				}.withDescription("User voteshop limit for " + identifier));
+			}
 		}
 
-		// %VotingPlugin_points% - Total votes of all vote sites
-		if (identifier.equalsIgnoreCase("points")) {
-			return Integer.toString(user.getPoints());
-		}
+		for (final TopVoter top : TopVoter.values()) {
+			placeholders.add(new PlaceHolder<User>("Total_" + top.toString()) {
 
-		// %VotingPlugin_VotePartyVotesNeeded - Number of votes needed until
-		// vote party rewards
-		if (identifier.equalsIgnoreCase("VotePartyVotesNeeded")) {
-			return Integer.toString(VoteParty.getInstance().getNeededVotes());
-		} else if (identifier.equalsIgnoreCase("VotePartyVotesCurrent")) {
-			return Integer.toString(VoteParty.getInstance().getTotalVotes());
-		} else if (identifier.equalsIgnoreCase("VotePartyVotesRequired")) {
-			return Integer.toString(Config.getInstance().getVotePartyVotesRequired());
-		}
-
-		// %VotingPlugin_canvote% - Whether or not a player can vote on all
-		// sites
-		if (identifier.equalsIgnoreCase("canvote")) {
-			return Boolean.toString(user.canVoteAll());
-		}
-
-		// %VotingPlugin_next_SITENAME% - Next time you can vote for voteSite
-		if (startsWithIgnoreCase(identifier, "next")) {
-			if (args.length > 1) {
-				String str = args[1];
-				for (int i = 2; i < args.length; i++) {
-					str += "_" + args[i];
+				@Override
+				public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+					return Integer.toString(user.getTotal(top));
+				}
+			}.withDescription("User total for " + top.getName()));
+		}
+
+		placeholders.add(new PlaceHolder<User>("BestDailyTotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getHighestDailyTotal());
+			}
+		}.withDescription("Best daily total"));
+
+		placeholders.add(new PlaceHolder<User>("BestWeeklyTotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getHighestWeeklyTotal());
+			}
+		}.withDescription("Best weekly total"));
+
+		placeholders.add(new PlaceHolder<User>("BestMonthlyTotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getHighestMonthlyTotal());
+			}
+		}.withDescription("Best monthly total"));
+
+		placeholders.add(new PlaceHolder<User>("DailyVoteStreak") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getDayVoteStreak());
+			}
+		}.withDescription("Current daily votestreak"));
+
+		placeholders.add(new PlaceHolder<User>("WeeklyVoteStreak") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getWeekVoteStreak());
+			}
+		}.withDescription("Current weekly votestreak"));
+
+		placeholders.add(new PlaceHolder<User>("MonthVoteStreak") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getMonthVoteStreak());
+			}
+		}.withDescription("Current month votestreak"));
+
+		placeholders.add(new PlaceHolder<User>("BestDailyVoteStreak") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getBestDayVoteStreak());
+			}
+		}.withDescription("Best daily votestreak"));
+
+		placeholders.add(new PlaceHolder<User>("BestWeeklyVoteStreak") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getBestWeekVoteStreak());
+			}
+		}.withDescription("Best weekly votestreak"));
+
+		placeholders.add(new PlaceHolder<User>("BestMonthVoteStreak") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getBestMonthVoteStreak());
+			}
+		}.withDescription("Best month votestreak"));
+
+		placeholders.add(new PlaceHolder<User>("Points") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(user.getPoints());
+			}
+		}.withDescription("User points"));
+
+		placeholders.add(new PlaceHolder<User>("CanVote") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Boolean.toString(user.canVoteAll());
+			}
+		}.withDescription("Return true/false if player can vote on all sites"));
+
+		for (final VoteSite voteSite : plugin.getVoteSites()) {
+			placeholders.add(new PlaceHolder<User>("Next_" + voteSite.getKey()) {
+
+				@Override
+				public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+					return Commands.getInstance().voteCommandNextInfo(user, voteSite);
+				}
+			}.withDescription("How long until user can vote on " + voteSite.getKey()));
+			placeholders.add(new PlaceHolder<User>("Last_" + voteSite.getKey()) {
+
+				@Override
+				public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+					return Commands.getInstance().voteCommandLastDuration(user, voteSite);
+				}
+			}.withDescription("How long ago user voted on " + voteSite.getKey()));
+			placeholders.add(new PlaceHolder<User>("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<User>("Top_All_Position") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int num = 1;
+				for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.AllTime).entrySet()) {
+					if (entry.getKey().getUUID().equals(p.getUniqueId().toString())) {
+						return "" + num;
+					}
+					num++;
 				}
-				return playerNextVote(user, str);
-			} else {
 				return "";
 			}
-		}
+		}.withDescription("Get user top voter position"));
 
-		// %VotingPlugin_last_SITENAME% - Next time you can vote for voteSite
-		if (startsWithIgnoreCase(identifier, "last")) {
-			if (args.length > 1) {
-				String str = args[1];
-				for (int i = 2; i < args.length; i++) {
-					str += "_" + args[i];
-				}
-				return playerLastVote(user, str);
-			}
-		}
-		if (args.length > 2) {
-			if (args[0].equalsIgnoreCase("top")) {
-				if (StringUtils.getInstance().isInt(args[2])) {
-					int number = Integer.parseInt(args[2]);
-					int num = 1;
-					if (args[1].equalsIgnoreCase("all")) {
-						for (Entry<User, Integer> entry : plugin.topVoterAllTime.entrySet()) {
-							if (num == number) {
-								if (args.length > 3 && args[3].equalsIgnoreCase("votes")) {
-									return "" + entry.getValue().intValue();
-								} else {
-									return entry.getKey().getPlayerName();
-								}
-							}
-							num++;
-						}
-					} else if (args[1].equalsIgnoreCase("month")) {
-						for (Entry<User, Integer> entry : plugin.topVoterMonthly.entrySet()) {
-							if (num == number) {
-								if (args.length > 3 && args[3].equalsIgnoreCase("votes")) {
-									return "" + entry.getValue().intValue();
-								} else {
-									return entry.getKey().getPlayerName();
-								}
-							}
-							num++;
-						}
-					} else if (args[1].equalsIgnoreCase("week")) {
-						for (Entry<User, Integer> entry : plugin.topVoterWeekly.entrySet()) {
-							if (num == number) {
-								if (args.length > 3 && args[3].equalsIgnoreCase("votes")) {
-									return "" + entry.getValue().intValue();
-								} else {
-									return entry.getKey().getPlayerName();
-								}
-							}
-							num++;
-						}
-					} else if (args[1].equalsIgnoreCase("daily")) {
-						for (Entry<User, Integer> entry : plugin.topVoterDaily.entrySet()) {
-							if (num == number) {
-								if (args.length > 3 && args[3].equalsIgnoreCase("votes")) {
-									return "" + entry.getValue().intValue();
-								} else {
-									return entry.getKey().getPlayerName();
-								}
-							}
-							num++;
-						}
-					}
-				} else if (args[2].equalsIgnoreCase("Position")) {
-					int num = 1;
-					if (args[1].equalsIgnoreCase("all")) {
-						for (Entry<User, Integer> entry : plugin.topVoterAllTime.entrySet()) {
-							if (entry.getKey().getUUID().equals(p.getUniqueId().toString())) {
-								return "" + num;
-							}
-							num++;
-						}
-					} else if (args[1].equalsIgnoreCase("month")) {
-						for (Entry<User, Integer> entry : plugin.topVoterMonthly.entrySet()) {
-							if (entry.getKey().getUUID().equals(p.getUniqueId().toString())) {
-								return "" + num;
-							}
-							num++;
-						}
-					} else if (args[1].equalsIgnoreCase("week")) {
-						for (Entry<User, Integer> entry : plugin.topVoterWeekly.entrySet()) {
-							if (entry.getKey().getUUID().equals(p.getUniqueId().toString())) {
-								return "" + num;
-							}
-							num++;
-						}
-					} else if (args[1].equalsIgnoreCase("daily")) {
-						for (Entry<User, Integer> entry : plugin.topVoterDaily.entrySet()) {
-							if (entry.getKey().getUUID().equals(p.getUniqueId().toString())) {
-								return "" + num;
-							}
-							num++;
-						}
+		placeholders.add(new PlaceHolder<User>("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"));
 
-		return identifier;
+		placeholders.add(new PlaceHolder<User>("Top_All_") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int num = 1;
+				int number = Integer.parseInt(identifier.split("_")[2]);
+				for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.AllTime).entrySet()) {
+					if (num == number) {
+						return entry.getKey().getPlayerName();
+					}
+					num++;
+				}
+				return "";
+			}
+		}.useStartsWith().withDescription("Get user at postion in top voter"));
+
+		placeholders.add(new PlaceHolder<User>("Top_Month_Position") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int num = 1;
+				for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.Monthly).entrySet()) {
+					if (entry.getKey().getUUID().equals(p.getUniqueId().toString())) {
+						return "" + num;
+					}
+					num++;
+				}
+				return "";
+			}
+		}.withDescription("Get user top voter position"));
+
+		placeholders.add(new PlaceHolder<User>("Top_Month_") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int num = 1;
+				int number = Integer.parseInt(identifier.split("_")[2]);
+				for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.Monthly).entrySet()) {
+					if (num == number) {
+						return entry.getKey().getPlayerName();
+					}
+					num++;
+				}
+				return "";
+			}
+		}.useStartsWith().withDescription("Get user at position in top voter"));
+
+		placeholders.add(new PlaceHolder<User>("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<User>("Top_Week_Position") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int num = 1;
+				for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.Weekly).entrySet()) {
+					if (entry.getKey().getUUID().equals(p.getUniqueId().toString())) {
+						return "" + num;
+					}
+					num++;
+				}
+				return "";
+			}
+		}.withDescription("Get user top voter position"));
+
+		placeholders.add(new PlaceHolder<User>("Top_Week_") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int num = 1;
+				int number = Integer.parseInt(identifier.split("_")[2]);
+				for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.Weekly).entrySet()) {
+					if (num == number) {
+						return entry.getKey().getPlayerName();
+					}
+					num++;
+				}
+				return "";
+			}
+		}.useStartsWith().withDescription("Get user at postion in top voter"));
+
+		placeholders.add(new PlaceHolder<User>("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<User>("Top_Daily_Position") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int num = 1;
+				for (Entry<User, Integer> entry : plugin.getTopVoter(TopVoter.Daily).entrySet()) {
+					if (entry.getKey().getUUID().equals(p.getUniqueId().toString())) {
+						return "" + num;
+					}
+					num++;
+				}
+				return "";
+			}
+		}.withDescription("Get user top voter position"));
+
+		placeholders.add(new PlaceHolder<User>("Top_Daily_") {
+
+			@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().getPlayerName();
+					}
+					num++;
+				}
+				return "";
+			}
+		}.useStartsWith().withDescription("Get user at postion in top voter"));
+
+		placeholders.add(new PlaceHolder<User>("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<User>("VotePartyVotesCurrent") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(VoteParty.getInstance().getTotalVotes());
+			}
+		}.withDescription("Current amount of voteparty votes"));
+
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("VotePartyVotesNeeded") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(VoteParty.getInstance().getNeededVotes());
+			}
+		}.withDescription("Voteparty votes needed"));
+
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("VotePartyVotesRequired") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				return Integer.toString(VoteParty.getInstance().getVotesRequired());
+			}
+		}.withDescription("Amount of votes needed for voteparty"));
+
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("GlobalMonthTotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int total = 0;
+				for (int num : Main.plugin.getTopVoter(TopVoter.Monthly).values()) {
+					total += num;
+				}
+				return Integer.toString(total);
+			}
+		}.withDescription("Global month total"));
+
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("GlobalAllTimeTotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int total = 0;
+				for (int num : Main.plugin.getTopVoter(TopVoter.AllTime).values()) {
+					total += num;
+				}
+				return Integer.toString(total);
+			}
+		}.withDescription("Global alltime total"));
+
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("GlobalWeeklyTotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int total = 0;
+				for (int num : Main.plugin.getTopVoter(TopVoter.Weekly).values()) {
+					total += num;
+				}
+				return Integer.toString(total);
+			}
+		}.withDescription("Global weekly total"));
+
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("GlobalDailyTotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int total = 0;
+				for (int num : Main.plugin.getTopVoter(TopVoter.Daily).values()) {
+					total += num;
+				}
+				return Integer.toString(total);
+			}
+		}.withDescription("Global daily total"));
 	}
-
-	public String playerLastVote(User user, String siteName) {
-		if (!ConfigVoteSites.getInstance().getVoteSitesNames().contains(siteName)) {
-			return "";
-		}
-
-		VoteSite voteSite = plugin.getVoteSite(siteName);
-		return Commands.getInstance().voteCommandLastDate(user, voteSite);
-	}
-
-	public String playerNextVote(User user, String siteName) {
-		if (!ConfigVoteSites.getInstance().getVoteSitesNames().contains(siteName)) {
-			return "";
-		}
-
-		VoteSite voteSite = plugin.getVoteSite(siteName);
-		return Commands.getInstance().voteCommandNextInfo(user, voteSite);
-	}
-
-	public boolean startsWithIgnoreCase(String str1, String str2) {
-		return str1.toLowerCase().startsWith(str2.toLowerCase());
-	}
-
 }

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

@@ -1,114 +0,0 @@
-package com.Ben12345rocks.VotingPlugin.Util.Updater;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-import org.bukkit.Bukkit;
-
-import com.Ben12345rocks.AdvancedCore.Util.Updater.Updater;
-import com.Ben12345rocks.VotingPlugin.Main;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class CheckUpdate.
- */
-public class CheckUpdate {
-
-	/** The instance. */
-	static CheckUpdate instance = new CheckUpdate();
-
-	/** The plugin. */
-	static Main plugin = Main.plugin;
-
-	/**
-	 * Gets the single instance of CheckUpdate.
-	 *
-	 * @return single instance of CheckUpdate
-	 */
-	public static CheckUpdate getInstance() {
-		return instance;
-	}
-
-	/**
-	 * Instantiates a new check update.
-	 */
-	private CheckUpdate() {
-	}
-
-	/**
-	 * Instantiates a new check update.
-	 *
-	 * @param plugin
-	 *            the plugin
-	 */
-	public CheckUpdate(Main plugin) {
-		CheckUpdate.plugin = plugin;
-	}
-
-	/**
-	 * Check update.
-	 */
-	public void checkUpdate() {
-		plugin.updater = new Updater(plugin, 15358, false);
-		final Updater.UpdateResult result = plugin.updater.getResult();
-		switch (result) {
-		case FAIL_SPIGOT: {
-			plugin.getLogger().info("Failed to check for update for " + plugin.getName() + "!");
-			break;
-		}
-		case NO_UPDATE: {
-			plugin.getLogger().info(plugin.getName() + " is up to date! Version: " + plugin.updater.getVersion());
-			break;
-		}
-		case UPDATE_AVAILABLE: {
-			plugin.getLogger()
-					.info(plugin.getName() + " has an update available! Your Version: "
-							+ plugin.getDescription().getVersion() + " New Version: " + plugin.updater.getVersion()
-							+ " Use /av download to get the latest update!");
-			break;
-		}
-		default: {
-			break;
-		}
-		}
-	}
-
-	public void checkUpdateBasic() {
-		plugin.updater = new Updater(plugin, 15358, false);
-		final Updater.UpdateResult result = plugin.updater.getResult();
-		switch (result) {
-		case UPDATE_AVAILABLE: {
-			plugin.getLogger()
-					.info(plugin.getName() + " has an update available! Your Version: "
-							+ plugin.getDescription().getVersion() + " New Version: " + plugin.updater.getVersion()
-							+ " Use /av download to get the latest update!");
-			break;
-		}
-		default: {
-			break;
-		}
-		}
-	}
-
-	/**
-	 * Start up.
-	 */
-	public void startUp() {
-		Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				checkUpdate();
-				new Timer().schedule(new TimerTask() {
-
-					@Override
-					public void run() {
-						checkUpdateBasic();
-					}
-				}, 1000 * 60 * 1200, 1000 * 60 * 1200);
-
-			}
-		}, 10l);
-	}
-
-}

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

@@ -1,20 +1,25 @@
+
 package com.Ben12345rocks.VotingPlugin.VoteParty;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
-import com.Ben12345rocks.AdvancedCore.Listeners.DayChangeEvent;
-import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
-import com.Ben12345rocks.AdvancedCore.Objects.UUID;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.DayChangeEvent;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.MonthChangeEvent;
+import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
+import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
+import com.Ben12345rocks.VotingPlugin.Events.VotePartyEvent;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 
@@ -82,10 +87,21 @@ public class VoteParty implements Listener {
 	 * Check.
 	 */
 	public void check() {
-		if (getTotalVotes() >= Config.getInstance().getVotePartyVotesRequired()) {
-			setTotalVotes(getTotalVotes() - Config.getInstance().getVotePartyVotesRequired());
-			giveRewards();
+		if (getTotalVotes() >= getVotesRequired()) {
+			setTotalVotes(getTotalVotes() - getVotesRequired());
+
+			VotePartyEvent event = new VotePartyEvent();
+			Bukkit.getPluginManager().callEvent(event);
+			if (event.isCancelled()) {
+				return;
+			}
 			MiscUtils.getInstance().broadcast(Config.getInstance().getVotePartyBroadcast());
+			giveRewards();
+
+			if (Config.getInstance().getVotePartyIncreaseVotesRquired() > 0) {
+				ServerData.getInstance().setVotePartyExtraRequired(ServerData.getInstance().getVotePartyExtraRequired()
+						+ Config.getInstance().getVotePartyIncreaseVotesRquired());
+			}
 		}
 
 	}
@@ -97,16 +113,20 @@ public class VoteParty implements Listener {
 	 *            the sender
 	 */
 	public void commandVoteParty(CommandSender sender) {
-		ArrayList<String> msg = Config.getInstance().getFormatCommandsVoteParty();
-		int votesRequired = Config.getInstance().getVotePartyVotesRequired();
-		int votes = getTotalVotes();
-		int neededVotes = votesRequired - votes;
-		HashMap<String, String> placeholders = new HashMap<String, String>();
-		placeholders.put("votesrequired", "" + votesRequired);
-		placeholders.put("neededvotes", "" + neededVotes);
-		placeholders.put("votes", "" + votes);
-		msg = ArrayUtils.getInstance().colorize(ArrayUtils.getInstance().replacePlaceHolder(msg, placeholders));
-		sender.sendMessage(ArrayUtils.getInstance().convert(msg));
+		if (Config.getInstance().getVotePartyEnabled()) {
+			ArrayList<String> msg = Config.getInstance().getFormatCommandsVoteParty();
+			int votesRequired = getVotesRequired();
+			int votes = getTotalVotes();
+			int neededVotes = votesRequired - votes;
+			HashMap<String, String> placeholders = new HashMap<String, String>();
+			placeholders.put("votesrequired", "" + votesRequired);
+			placeholders.put("neededvotes", "" + neededVotes);
+			placeholders.put("votes", "" + votes);
+			msg = ArrayUtils.getInstance().colorize(ArrayUtils.getInstance().replacePlaceHolder(msg, placeholders));
+			sender.sendMessage(ArrayUtils.getInstance().convert(msg));
+		} else {
+			sender.sendMessage(StringUtils.getInstance().colorize("&cVoteParty not enabled"));
+		}
 	}
 
 	/**
@@ -115,7 +135,7 @@ public class VoteParty implements Listener {
 	 * @return the needed votes
 	 */
 	public int getNeededVotes() {
-		int votesRequired = Config.getInstance().getVotePartyVotesRequired();
+		int votesRequired = getVotesRequired();
 		int votes = getTotalVotes();
 		int neededVotes = votesRequired - votes;
 		return neededVotes;
@@ -144,22 +164,27 @@ public class VoteParty implements Listener {
 		return new ArrayList<String>();
 	}
 
-	/**
-	 * Give reward.
-	 *
-	 * @param user
-	 *            the user
-	 */
+	public int getVotesRequired() {
+		int required = Config.getInstance().getVotePartyVotesRequired();
+		int extra = ServerData.getInstance().getVotePartyExtraRequired();
+		if (extra > 0) {
+			return required + extra;
+		}
+		return required;
+	}
+
 	public void giveReward(User user) {
-		/*
-		 * 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"); }
-		 */
+		if (Config.getInstance().getVotePartyUserVotesRequired() > 0) {
+			if (user.getVotePartyVotes() < Config.getInstance().getVotePartyUserVotesRequired()) {
+				return;
+			}
+		}
+		giveReward(user, user.isOnline());
+	}
+
+	public void giveReward(User user, boolean online) {
 		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getVotePartyRewardsPath())
-				.setOnline(user.isOnline())
+				.setOnline(online)
 				.withPlaceHolder("VotesRequired", "" + Config.getInstance().getVotePartyVotesRequired()).send(user);
 	}
 
@@ -167,12 +192,25 @@ public class VoteParty implements Listener {
 	 * Give rewards.
 	 */
 	public void giveRewards() {
+		for (final String cmd : Config.getInstance().getVotePartyCommands()) {
+			Bukkit.getScheduler().runTask(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), cmd);
+				}
+
+			});
+		}
+
 		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);
@@ -184,8 +222,14 @@ public class VoteParty implements Listener {
 	@EventHandler
 	public void onDayChange(DayChangeEvent event) {
 		if (Config.getInstance().getVotePartyResetEachDay()) {
-			setTotalVotes(0);
-			setVotedUsers(new ArrayList<String>());
+			reset();
+		}
+	}
+
+	@EventHandler
+	public void onMonthChange(MonthChangeEvent event) {
+		if (Config.getInstance().getVotePartyResetMontly()) {
+			reset();
 		}
 	}
 
@@ -195,12 +239,14 @@ public class VoteParty implements Listener {
 
 	public void reset() {
 		setVotedUsers(new ArrayList<String>());
+		setTotalVotes(0);
 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
 			if (user.getVotePartyVotes() != 0) {
 				user.setVotePartyVotes(0);
 			}
 		}
+
 	}
 
 	/**
@@ -225,4 +271,14 @@ public class VoteParty implements Listener {
 		ServerData.getInstance().saveData();
 	}
 
+	public synchronized void vote(User user, boolean realVote) {
+		if (Config.getInstance().getVotePartyEnabled()) {
+			if (Config.getInstance().getVotePartyCountFakeVotes() || realVote) {
+				addTotal(user);
+				addVotePlayer(user);
+				check();
+			}
+		}
+	}
+
 }

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

@@ -3,7 +3,7 @@ package com.Ben12345rocks.VotingPlugin.VoteReminding;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
-import com.Ben12345rocks.AdvancedCore.Objects.RewardBuilder;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
@@ -103,7 +103,7 @@ public class VoteReminding {
 	 *            the user
 	 */
 	public void runRemind(User user) {
-		if (Config.getInstance().getVoteRemindingEnabled() && user.canVoteAll()) {
+		if (Config.getInstance().getVoteRemindingEnabled() && user.canVoteAll() && user.shouldBeReminded()) {
 			user.setReminded(true);
 			giveReward(user);
 
@@ -114,12 +114,14 @@ public class VoteReminding {
 
 	public void runRemindLogin(User user) {
 		if (Config.getInstance().getVoteRemindingEnabled()
-				&& (!UserManager.getInstance().getAllUUIDs().contains(user.getUUID()) || user.canVoteAll())) {
+				&& (!UserManager.getInstance().getAllUUIDs().contains(user.getUUID()) || user.canVoteAll())
+				&& user.shouldBeReminded()) {
 			giveReward(user);
-			user.setReminded(true);
+			if (user.getData().hasData()) {
+				user.setReminded(true);
+			}
 			plugin.debug(user.getPlayerName() + " was reminded!");
 
 		}
 	}
-
 }

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

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

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/VotingPluginHooks.java

@@ -0,0 +1,31 @@
+package com.Ben12345rocks.VotingPlugin;
+
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.Injected.RewardInject;
+import com.Ben12345rocks.AdvancedCore.Rewards.InjectedRequirement.RequirementInject;
+import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+
+public class VotingPluginHooks {
+	private static VotingPluginHooks instance = new VotingPluginHooks();
+
+	public static VotingPluginHooks getInstance() {
+		return instance;
+	}
+
+	public void addCustomRequirement(RequirementInject inject) {
+		RewardHandler.getInstance().addInjectedRequirements(inject);
+	}
+
+	public void addCustomReward(RewardInject inject) {
+		RewardHandler.getInstance().addInjectedReward(inject);
+	}
+
+	public Main getMainClass() {
+		return Main.plugin;
+	}
+
+	public UserManager getUserManager() {
+		return UserManager.getInstance();
+	}
+
+}