Update version number

More reminding options

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Bug report for VotingPlugin
+title: ''
+labels: Possible Bug
+assignees: ''
+
+---
+
+**Versions**
+Plugin version and spigot version.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots/Configs**
+If applicable, add screenshots to help explain your problem and/or configs relating to the issue.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea
+title: ''
+labels: Possible Feature
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/question-concerns.md

@@ -0,0 +1,17 @@
+---
+name: Question/Concerns
+about: Ask about a question or a concern about the plugin
+title: ''
+labels: Question/Concern
+assignees: ''
+
+---
+
+**Versions**
+Plugin version and spigot version
+
+**Relevant information**
+Configs that relate to the issue in a pastebin.
+
+**Context**
+Context about the question/concern

.github/stale.yml

@@ -0,0 +1,16 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 20
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 5
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - Priority
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

README.md

@@ -2,9 +2,13 @@
 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
+https://github.com/Ben12345rocks/VotingPlugin/blob/master/VotingPlugin/Resources/LICENSE.txt
 
 ### Maven:
 

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

@@ -9,6 +9,7 @@ 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.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
@@ -24,4 +25,6 @@ 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.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8

VotingPlugin/Resources/BungeeSettings.yml

@@ -0,0 +1,47 @@
+# --------------------------
+# Bungee Setup 
+# Only if using votingplugin bungee to send votes
+# REQUIRES RESTART FOR CHANGES TO TAKE EFFECT
+# --------------------------
+
+# Plugin using bungee, requires plugin on bungee server
+UseBungeecord: false
+
+# For pluginmessaging method only
+# Whether to broadcast on cached votes
+BungeeBroadcastAlways: false
+
+# What type of bungee setup
+# Requires restart and set on all servers
+# https://github.com/Ben12345rocks/VotingPlugin/wiki/Bungeecoord-Setups
+# Available:
+# SOCKETS
+# PLUGINMESSAGING
+# MYSQL
+BungeeMethod: PLUGINMESSAGING
+
+# Enables more debug messages for communication between servers
+# Use /votingpluginbungee status for testing communication
+BungeeDebug: false
+
+# Get the plugin to broadcast to all servers
+# If false you need to enable 
+BungeeBroadcast: false
+
+# What server this is in bungee (must match)
+# Also can be applied to rewards
+Server: PleaseSet
+
+# -----------------------------
+# For socket setup below only
+# -----------------------------
+
+# Bungee communication, add bungee host/port here
+BungeeServer:
+  Host: '127.0.0.1'
+  Port: 1297
+  
+# Bungee communication, add this to bungee server
+SpigotServer:
+  Host: '127.0.0.1'
+  Port: 1298

VotingPlugin/Resources/Config.yml

@@ -2,9 +2,11 @@
 # Main Config
 # See wiki for help: 
 # https://github.com/Ben12345rocks/VotingPlugin/wiki
-
+# Config is sorted in sections
+# Use Control + F to search with Notepad++
+# 
 # Valid Options:
-# - SQLITE
+# - SQLITE 
 # - FLAT
 # - MYSQL
 DataStorage: SQLITE
@@ -32,6 +34,10 @@ MySQL:
 # Recommend: False (Will prevent creating random user data)
 AllowUnjoined: false
 
+# Use server lookup for when allowunjoined is set to false
+# Recommend leaving enabled unless you face issues
+AllowUnJoinedCheckServer: true
+
 # ------------------------------------------------
 # VoteReminding
 # ------------------------------------------------
@@ -107,6 +113,8 @@ Commands:
   # disable /vote reward commands
   # Effective after restart
   DisableVoteRewardGUIs: false
+  # Enable to use book GUI instead of normal GUI
+  VoteBookGUI: false
 
 Format:
   # CommandHandler help message
@@ -125,7 +133,7 @@ Format:
     # %url% = site URL
     Vote: 
       Text:
-      - '&4&lVote for our server!'
+      - '&6&lVote for our server!'
       
       # If you want to want to use the feature below where the plugin will
       # automaticly list the sites then set the message in the text above
@@ -134,7 +142,10 @@ Format:
       # make sure to set VoteURL in your VoteSites
       # Requires above to be true
       # Text will be sent before this
-      Sites: '&4%num%: &c&l%SiteName% - &c%url%'
+      Sites: '&6%num%: &e&l%SiteName% - &e%url%'
+      
+      # If true, links will always be forced as urls
+      ForceLinks: true
       
       # Format for /vote next
       Next: 
@@ -237,7 +248,7 @@ Format:
       # %Points% = player points
       Points: '&a%Player% currently has &a&l%Points%&a Points!'
       
-      ToggleBroadcast:
+      ToggleBroadcasts:
         Enabled: '&cYou will now see vote broadcasts'
         Disabled: '&cYou will no longer see vote broadcasts'
   
@@ -310,6 +321,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
@@ -324,6 +339,8 @@ GUI:
         Data: 0
         Amount: 1
         Name: '&4URL'
+        Lore:
+        - '&aClick me for links'
         # You can set skulls of the player using the following
         # Remove the # to enable
         #Skull: '%Player%'
@@ -347,7 +364,7 @@ GUI:
         Name: '&4Total'
     Top:
       Item:
-        Material: 'SIGN'
+        Material: 'OAK_SIGN'
         Data: 0
         Amount: 1
         Name: '&4Top'
@@ -377,6 +394,7 @@ GUI:
     NextVote: '&cCan Vote In: %Info%'
     ViewAllUrlsButtonEnabled: true
     AllUrlsButton:
+      RequireAllSitesVoted: true
       AlreadyVotedItem:
         Material: 'REDSTONE_BLOCK'
         Data: 0 
@@ -401,6 +419,17 @@ GUI:
       Amount: 1
     URLText: '%VoteUrl%'
     
+  VoteURLBookGUI:
+    Title: '&cVoteURL'
+    SiteName: '&c%name%'
+    CanVoteText: 'Click me'
+    CanVoteColor: 'GREEN'
+    AlreadyVotedText: 'Click me'
+    AlreadyVotedColor: 'RED' 
+    Layout:
+    - '&c%Sitename%'
+    - '[UrlText]'
+    
   VoteRewardBackButton: false
   # Customize /vote reward
   # Show players what you get when you vote on each site
@@ -435,7 +464,14 @@ GUI:
     BackButton: true
   VoteToday:
     Name: 'VoteToday'
+    Line: '&6%VoteSite% : %Time%'
+    IconTitle: '%player%'
     BackButton: true
+    UseSkull: true
+    # If UseSkull is false, use this item
+    PlayerItem:
+      Material: 'PAPER'
+      Amount: 1
   VoteTop:
     Name: 'VoteTop %topvoter%'
     BackButton: false
@@ -443,9 +479,9 @@ GUI:
       Name: '&3&l%position%: &3%player%'
       Lore: '&3&lVotes: &3%votes%'
     SwitchItem:
-      Name: 'Switch TopVoter'
-      Lore: 'Currently: %Top%'
-      Material: 'SIGN'
+      Name: '&3Switch TopVoter'
+      Lore: '&bCurrently: %Top%'
+      Material: 'OAK_SIGN'
       Amount: 1
       # 8 Slots over from the bottom left
       Slot: 7
@@ -550,17 +586,25 @@ GUI:
   VoteShopName: 'VoteShop'
   
 BackButton:
-  Material: 'PAPER'
+  Material: 'BARRIER'
   Data: 0
   Amount: 1
   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'
+VoteShopRequireConfirmation: false
+VoteShopDisabled: '&cVote shop disabled'
 Shop:
   # Identifier
   # Used in placeholders for formats
+  # Do not have spaces in the identifier
   Diamond:
+    Identifier_Name: 'Diamond'
     # Item
     Material: 'DIAMOND'
     Data: 0
@@ -577,6 +621,13 @@ Shop:
     Permission: ''
     # Limit how many times you can buy this
     #Limit: 3
+    # Reset limit daily/weekly/monthly
+    #Reset:
+      #Daily: false
+      #Weekly: false
+      #Monthly: false
+    # If true, item is not buyable
+    #NotBuyable: false
     # Rewards to run if player buys successfully
     Rewards:
       Items:
@@ -588,136 +639,8 @@ Shop:
 # Extra Rewards
 # ------------------------------------------------
     
-# To disable reward set value to []
-# Eg:
-# FirstVote: [] (All in one line)
-# By default all rewards are disabled
-
-# First vote rewards
-FirstVote: 
-  Messages:
-    Player: '&aYou voted for your first time!'
-  Money: 100
-
-# All vote rewards
-# Reward for voting on all sites in one day
-AllSites: 
-  Messages:
-    Player: '&aYou voted on all sites in 1 day!'
-
-Cumulative:
-  # Number of votes required
-  # Allows multiple cumulative rewards
-  # Number be be around ' (E.g. '1')
-  # Can have multiple listed here
-  '20':
-    Enabled: false
-    # Wether or not votes must be made in same day/week
-    # Useful if you want to require a certain number of voting sites to be voted on
-    # for a daily/weekly reward instead of all of them
-    VotesInSameDay: false
-    VotesInSameWeek: false
-    Rewards: 
-      Messages:
-        Player: '&aYou got %cumulative% cumulative votes!'
-
-VoteParty:
-  # Wether or not vote party is enabled
-  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!'
-  # List of commands to execute, these only execute once.
-  # %player% does not work here
-  Commands: []
-  # Rewards to give
-  Rewards: 
-    Commands:
-    - say %player%
-    Items:
-      DIAMOND:
-        Material: 'DIAMOND'
-        Amount: 1
-  
-# Reset milestones at end of the month
-ResetMilestonesMonthly: false
-  
-MileStones:
-  # Number of votes required
-  # Allows multiple milestones
-  # Number be 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- = 2,4,6,8, and so on)
-    '2':
-      # Enabled or not
-      Enabled: false
-      # Rewards to give
-      Rewards:
-        Messages:
-          Player: "&aYou voted for %Streak% %Type%'s in a row!"
-  Week:
-    # Number of weeks in a row
-    # Requires atleast one vote per week
-    '2':
-      # Enabled or not
-      Enabled: false
-      # Rewards to give
-      Rewards:
-        Messages:
-          Player: "&aYou voted for %Streak% %Type%'s in a row!"
-  Month:
-    # Number of months in a row
-    # Requires atleast 1 vote per month
-    '2':
-      # Enabled or not
-      Enabled: false
-      # Rewards to give
-      Rewards:
-        Messages:
-          Player: "&aYou voted for %Streak% %Type%'s in a row!"
-  Requirement:
-    # Require certain percentage of votes
-    UsePercentage: false
-    # Percentage requirements of votes
-    # 50 = %50
-    Day: 50
-    Week: 50
-    Month: 50
-          
-  
-# ONLY USE THIS FOR TITLES/SOUNDS AND OTHER EFFECTS
-# 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: []
-
+# Moved to SpecialRewards.yml
+# Rewards here will be copied upon updating
 
 # ------------------------------------------------
 # Top Voter
@@ -746,6 +669,10 @@ LoadTopVoter:
   Monthly: true
   Weekly: false
   Daily: false
+  
+# Maxium number of players to show on top voter
+# Set to -1 for no limit
+MaxiumNumberOfTopVotersToLoad: -1
 
 # When top voter awards are given (even if there are none listed) it will store top voters
 # Files will created in TopVoters folder.
@@ -753,47 +680,6 @@ StoreTopVoters:
   Monthly: true
   Weekly: false
   Daily: false
-
-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:
-        Player: '&aYou came in first place in %TopVoter%!'
-  2:
-    Rewards:
-      Messages:
-        Player: '&aYou came in second place in %TopVoter%!'
-    
-EnableWeeklyAwards: false
-# Rewards to give on weekly top voter
-WeeklyAwards:
-  # Position. 1 is first in top voter, 2 is second, etc...
-  1:
-    Rewards:
-      Messages:
-        Player: '&aYou came in first place in %TopVoter%!'
-  2:
-    Rewards:
-      Messages:
-        Player: '&aYou came in second place in %TopVoter%!'
-    
-EnableDailyRewards: false
-# Rewards to give on daily top voter
-DailyAwards:
-  # Position. 1 is first in top voter, 2 is second, etc...
-  1:
-    # Reward files to give
-    Rewards:
-      Messages:
-        Player: '&aYou came in first place in %TopVoter%!'
-  2:
-    Rewards:
-      Messages:
-        Player: '&aYou came in second place in %TopVoter%!'
     
 # ------------------------------------------------
 # Advanced
@@ -814,13 +700,32 @@ ClickSound:
   Sound: 'UI_BUTTON_CLICK'
   Volume: 1.0
   Pitch: 1.0
+  
+# Playernames to not be broadcasted when voting
+# case sensitive
+VotingBroadcastBlacklist: []
 
+# Set to false to prevent javascript
+# parsing on placeholderapi placeholders
+UseJavascriptPlaceholders: true
+  
+# Limit monthly votes to number of days of a month multipled by the number of sites
+LimitMonthlyVotes: false
+
+# This is an extra safe guard to prevent milestones 
+# from being executed more than once
+# Shoudn't be needed, but enable if you have trouble with milestones
+PreventRepeatMilestones: false
+
+######################
 # Debug
-Debug: false
+######################
 
-# Extra Debug
-# Only needed in extreme cases
-ExtraDebug: false
+# Debug levels:
+# NONE
+# INFO
+# EXTRA
+DebugLevel: NONE
 
 # Debug info ingame
 # Players with permission "VotingPlugin.Debug"
@@ -828,18 +733,8 @@ ExtraDebug: false
 DebugInGame: false
 
 # Will log debug messages to VotingPlugin/Log/log.txt
-# Requires Debug to be on
-LogDebugToFile: false
-
-# Options for request api
-# Current methods
-# ANVIL
-# BOOK
-# CHAT
-# This is mainly used for admin gui's to type in values
-RequestAPI:
-  DefaultMethod: 'Anvil'
-  DisabledMethods: []
+# Only needed for extreme cases
+#LogDebugToFile: false
   
 # Whether or not to log every vote to a file
 # Use this if you wanna track player votes
@@ -870,6 +765,10 @@ CountFakeVotes: true
 # Requires restart to take affect
 GiveDefaultPermission: true
 
+# Permissions given by VotingPlugin.Player by default
+# Permissions listed here will no be accessible with the default permission
+DisabledDefaultPermissions: []
+
 # Remove old player files
 # Happens on startup or /av purge
 PurgeOldData: false
@@ -897,7 +796,7 @@ AutoDownload: false
 # Whether or not to disable update checks
 DisableUpdateChecking: false
 
-# Allow transfer of vote points
+# Allow transfer of vote points between players
 AllowVotePointTransfers: false
 
 # Disable this on a hub server for example
@@ -917,17 +816,43 @@ WaitUntilLoggedIn: true
 
 # Preload skulls to improve performance
 # If false, skulls will be cached as they are used
-PreloadSkulls: true
+PreloadSkulls: false
+
+# Setting to false disables saving skulls in a cache to improve speeds
+# Will reduce ram usage if disabled
+LoadSkulls: true
+
+# Use vault for permission checks
+# May not work on some plugins
+UseVaultPermissions: false
+
+# List of disabled commands from /vote
+# List the specific permission
+# E.g:
+# - PERMISSION
+DisabledCommands: []
+
+# Enable to true for extra player checks
+ExtraBackgroundUpdate: false
+
+# This will prevent spam clicking GUI's to prevent exploits
+# Number is time in between clicking in milliseconds
+SpamClickTime: 350
+# Message to send when inventory forced closed when spam clicking
+# Uncomment to use
+#SpamClickMessage: '&cDetected spam clicking GUI, closing to prevent exploits'
 
 # ---------------------------------------------------------
-# Mysql cache options
+# Mysql cache options 
 # Clearing cache forces the plugin to pull from database
+# Not needed unless you are using multiple servers
 # ---------------------------------------------------------
 
 # Clear cache on update, setting to true reduces update speed
+# Also may require AlwaysUpdate set to true
 ClearCacheOnUpdate: false
 
-# Clear mysql on player join always
+# Clear cache on player join always
 ClearCacheOnJoin: false
 
 # Clears cache for the player who voted only
@@ -935,21 +860,30 @@ ClearCacheOnJoin: false
 # Would recommend for some bungee setups
 ClearCacheOnVote: false
 
+# Clear cache when player leaves
+ClearCacheOnLeave: false
+
+ClearCacheOnVoteShopPurchase: true
+
 # ###############################################################
 # Deprecated options, don't recommend using any of these
 
-# Whether or not to disable checking names on mojang, disable if you hit the rate limit
-# Shouldn't make a noticeable impact if set to false
-#CheckNameMojang: false
+# Will force GUI's to close on every click
+AlwaysCloseInventory: false
+
+# Options for request api
+# Current methods:
+# ANVIL
+# BOOK
+# CHAT
+# This is mainly used for admin gui's to type in values
+RequestAPI:
+  DefaultMethod: 'Anvil'
+  DisabledMethods: []
 
 # 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/SpecialRewards.yml

@@ -0,0 +1,176 @@
+# To disable reward set value to []
+# or remove entirely
+# Eg:
+# FirstVote: [] (All in one line)
+# Rewards will be given if there is a reward to give
+
+# First vote rewards
+FirstVote: 
+  Messages:
+    Player: '&aYou voted for your first time!'
+
+# All vote rewards
+# Reward for voting on all sites in one day
+AllSites: 
+  Messages:
+    Player: '&aYou voted on all sites in 1 day!'
+
+Cumulative:
+  # Number of votes required
+  # Allows multiple cumulative rewards
+  # Number be be around ' (E.g. '1')
+  # Can have multiple listed here
+  '20':
+    Enabled: false
+    # Wether or not votes must be made in same day/week
+    # Useful if you want to require a certain number of voting sites to be voted on
+    # for a daily/weekly reward instead of all of them
+    VotesInSameDay: false
+    VotesInSameWeek: false
+    VotesInSameMonth: false
+    Rewards: 
+      Messages:
+        Player: '&aYou got %cumulative% cumulative votes!'
+
+# Vote party configuration
+VoteParty:
+  # Wether or not vote party is enabled
+  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
+  # Reset extra votes
+  ResetExtraVotesMonthly: 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!'
+  # 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 milestones at end of the month
+ResetMilestonesMonthly: false
+  
+MileStones:
+  # Number of votes required
+  # Allows multiple milestones
+  # 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- = 2,4,6,8, and so on)
+    '2':
+      # Enabled or not
+      Enabled: false
+      # Rewards to give
+      Rewards:
+        Messages:
+          Player: "&aYou voted for %Streak% %Type%'s in a row!"
+  Week:
+    # Number of weeks in a row
+    # Requires atleast one vote per week
+    '2':
+      # Enabled or not
+      Enabled: false
+      # Rewards to give
+      Rewards:
+        Messages:
+          Player: "&aYou voted for %Streak% %Type%'s in a row!"
+  Month:
+    # Number of months in a row
+    # Requires atleast 1 vote per month
+    '2':
+      # Enabled or not
+      Enabled: false
+      # Rewards to give
+      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 (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: []
+
+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:
+        Player: '&aYou came in first place in %TopVoter%!'
+  2:
+    Rewards:
+      Messages:
+        Player: '&aYou came in second place in %TopVoter%!'
+    
+EnableWeeklyAwards: false
+# Rewards to give on weekly top voter
+WeeklyAwards:
+  # Position. 1 is first in top voter, 2 is second, etc...
+  1:
+    Rewards:
+      Messages:
+        Player: '&aYou came in first place in %TopVoter%!'
+  2:
+    Rewards:
+      Messages:
+        Player: '&aYou came in second place in %TopVoter%!'
+    
+EnableDailyRewards: false
+# Rewards to give on daily top voter
+DailyAwards:
+  # Position. 1 is first in top voter, 2 is second, etc...
+  1:
+    # Reward files to give
+    Rewards:
+      Messages:
+        Player: '&aYou came in first place in %TopVoter%!'
+  2:
+    Rewards:
+      Messages:
+        Player: '&aYou came in second place in %TopVoter%!'

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,22 +18,30 @@ 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
     # Format for this can be set in Format.yml
     # Do not include colors here
+    # If you need to force a url set the url as this:
+    # VoteURL: '[Text="ANY TEXT TO CLICK ON HERE",url="URLHERE"]'
     VoteURL: 'link to vote URL here, used in /vote'
 
     # Time between votes in hours (used for /vote next)
     # Most sites are 24 hours
     VoteDelay: 24
     
+    # Use to have a minute votedelay
+    #VoteDelayMin: 30
+    
     # 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 (requires ForceOffline to be true in the reward)
@@ -39,17 +49,59 @@ VoteSites:
     # This basiclly disables offline voting if set to true, don't misinterpret this option
     ForceOffline: false
     
-    # VoteSite Material for GUI's
+    # VoteSite Material for some GUI's
     # Removing this may result in an error, required on each site
-    Item:
+    DisplayItem:
       Material: 'DIAMOND'
       Amount: 1
 
     # Rewards to give
     # https://github.com/Ben12345rocks/AdvancedCore/wiki/Rewards
     Rewards:
+      # 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
+    DisplayItem:
+      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 reward will be attempted
+          # Use permission requirement for rank based rewards
+          #RequirePermission: true
+          #Permission: 'permhere'
+          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'
     

VotingPlugin/Resources/bungee.yml

@@ -0,0 +1,4 @@
+name: ${project.name}
+version: ${project.version}
+main: com.Ben12345rocks.VotingPlugin.bungee.Bungee
+author: Ben12345rocks

VotingPlugin/Resources/bungeeconfig.yml

@@ -0,0 +1,60 @@
+# Set bungeecoord to true on servers on the network (In VotingPlugin)
+# Set server name in each server related to what it is on bungee
+#
+# MYSQL Required on all setups
+# MYSQL INFO --------------------------
+Host: ''
+# Default port is 3306
+Port: 3306 
+Database: ''
+Username: ''
+Password: ''
+# Max number of connections
+MaxConnections: 1
+# Maxium size of caching mysql
+# -1 for no limit
+# Affecting this value may affect performance
+MaxSize: -1
+# Table name prefix, for use with mutliple servers
+Prefix: ''
+#UseSSL: true
+
+Debug: false
+# Have a reward on each server
+# If false, will send to online server only
+SendVotesToAllServers: true
+# List of servers the plugin won't send the vote to
+# Uses names from bungeecoord config if not using SOCKETS method
+BlockedServers:
+- hub
+
+# What type of bungee setup
+# Requires restart and set on all servers
+# https://github.com/Ben12345rocks/VotingPlugin/wiki/Bungeecoord-Setups
+# Available:
+# SOCKETS 
+# PLUGINMESSAGING 
+# MYSQL
+BungeeMethod: PLUGINMESSAGING
+
+# ----------------------------
+# SOCKET METHOD Only, ignore otherwise
+# ----------------------------
+FallBackServer: factions
+
+# Tell servers to broadcast
+Broadcast: true
+
+# Bungee communication, Add this to each spigot server
+BungeeServer:
+  Host: '127.0.0.1'
+  Port: 1297
+  
+# Bungee communication, add each spigot server here
+SpigotServers:
+  lobby:
+    Host: '127.0.0.1'
+    Port: 1298
+  factions:
+    Host: '127.0.0.1'
+    Port: 1999

VotingPlugin/Resources/plugin.yml

@@ -3,8 +3,8 @@ version: ${project.version}
 main: com.Ben12345rocks.VotingPlugin.Main
 description: Highly Customizable Voting Listener!
 website: https://www.spigotmc.org/resources/votingplugin.15358/
-author: Ben12345rocks
-softdepend: [MVdWPlaceholders]
+author: BenCodez
+softdepend: [MVdWPlaceholders, Votifier, VotifierPlus, NuVotifier, CMI, Vault, PlaceholderAPI, ProtocolLib, MVdWPlaceholderAPI, AuthMe]
 api-version: 1.13
 commands:
   vote:
@@ -61,6 +61,12 @@ commands:
   votepoints:
     description: A command
     aliases: vpoints
+  votelist:
+    description: A command
+    aliases: vlist
+  voteall:
+    description: A command
+    aliases: vall
   votechoices:
     description: A command
     alaises: vchoices
@@ -85,6 +91,9 @@ commands:
   adminvotereload:
     description: Command Alias
     aliases: avreload
+  adminvotetestreward:
+    description: Command Alias
+    aliases: avtestreward
   adminvoteversion:
     description: Command Alias
     aliases: avversion
@@ -186,15 +195,25 @@ commands:
   adminvoteForceVoteParty:
     description: Command Alias
     aliases: avForceVoteParty
-  adminvoteUserEditValue:
-    description: Command Alias
-    aliases: avUserEditValue
   adminvoteSetRequestMethod:
     description: Command Alias
     aliases: avSetRequestMethod
   adminvoteUser:
     description: Command Alias
     aliases: avUser
+  adminvoteCurrentPluginTime:
+    description: Command Alias
+    aliases: avCurrentPluginTime
+  adminvoteResetPoints:
+    description: Command Alias
+    aliases: avResetPoints
+  adminvoteVotePartyExtraRequired:
+    description: Command Alias
+    aliases: avVotePartyExtraRequired
+  adminvoteRunCMD:
+    description: Command Alias
+    aliases: avRunCMD
+    
 permissions:
   VotingPlugin.Player:
     description: Allows basic access player commands
@@ -216,4 +235,6 @@ permissions:
     default: false
   VotingPlugin.Sign.Create:
     description: Permission to create sign
+  VotingPlugin.Admin.GenerateServiceSite:
+    description: Permission for generating votesite message
   

VotingPlugin/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>5.18.2</version>
+	<version>5.24</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -27,6 +27,7 @@
 				<filtering>true</filtering>
 				<includes>
 					<include>plugin.yml</include>
+					<include>bungee.yml</include>
 				</includes>
 			</resource>
 			<resource>
@@ -77,7 +78,7 @@
 			<plugin>
 				<groupId>org.projectlombok</groupId>
 				<artifactId>lombok-maven-plugin</artifactId>
-				<version>1.18.2.0</version>
+				<version>1.18.12.0</version>
 				<executions>
 					<execution>
 						<id>delombok</id>
@@ -120,6 +121,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>
@@ -229,6 +234,18 @@
 				<updatePolicy>always</updatePolicy>
 			</snapshots>
 		</repository>
+		<repository>
+			<id>maven-central</id>
+			<url>https://oss.sonatype.org/content/groups/public</url>
+		</repository>
+		<repository>
+			<id>bungeecord-repo</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+		</repository>
+		<repository>
+			<id>bintray-repo</id>
+			<url>https://dl.bintray.com/nuvotifier/maven/</url>
+		</repository>
 	</repositories>
 	<dependencies>
 		<dependency>
@@ -236,12 +253,13 @@
 			<artifactId>AdvancedCore</artifactId>
 			<version>master-SNAPSHOT</version>
 		</dependency>
-		<!-- <dependency> <groupId>com.Ben12345rocks</groupId> <artifactId>AdvancedCore</artifactId> 
+
+		<!--<dependency> <groupId>com.Ben12345rocks</groupId> <artifactId>AdvancedCore</artifactId> 
 			<version>LATEST</version> <scope>compile</scope> </dependency> -->
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.13.2-R0.1-SNAPSHOT</version>
+			<version>1.16.3-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -285,5 +303,27 @@
 			<scope>system</scope>
 			<systemPath>${project.basedir}/Jars/MVdWPlaceholderAPI.jar</systemPath>
 		</dependency>
+		<dependency>
+			<groupId>net.md-5</groupId>
+			<artifactId>bungeecord-api</artifactId>
+			<version>LATEST</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.vexsoftware</groupId>
+			<artifactId>nuvotifier-universal</artifactId>
+			<version>2.3.4</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.tchristofferson</groupId>
+			<artifactId>ConfigUpdater</artifactId>
+			<version>1.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>xyz.upperlevel.spigot.book</groupId>
+			<artifactId>spigot-book-api</artifactId>
+			<version>1.3</version>
+		</dependency>
 	</dependencies>
 </project>

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/BungeeHandler.java

@@ -0,0 +1,247 @@
+package com.Ben12345rocks.VotingPlugin;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.UUID;
+
+import com.Ben12345rocks.AdvancedCore.Util.Encryption.EncryptionHandler;
+import com.Ben12345rocks.AdvancedCore.Util.PluginMessage.PluginMessage;
+import com.Ben12345rocks.AdvancedCore.Util.PluginMessage.PluginMessageHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Sockets.ClientHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Sockets.SocketHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Sockets.SocketReceiver;
+import com.Ben12345rocks.VotingPlugin.Config.BungeeSettings;
+import com.Ben12345rocks.VotingPlugin.Data.ServerData;
+import com.Ben12345rocks.VotingPlugin.Objects.User;
+import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
+import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+import com.Ben12345rocks.VotingPlugin.bungee.BungeeMethod;
+
+import lombok.Getter;
+
+public class BungeeHandler {
+	private static BungeeHandler instance = new BungeeHandler();
+
+	public static BungeeHandler getInstance() {
+		return instance;
+	}
+
+	@Getter
+	private SocketHandler socketHandler;
+
+	@Getter
+	private ClientHandler clientHandler;
+
+	private EncryptionHandler encryptionHandler;
+
+	@Getter
+	private BungeeMethod method;
+
+	public void close() {
+		socketHandler.closeConnection();
+		clientHandler.stopConnection();
+	}
+
+	public void load() {
+		Main.plugin.debug("Loading bungee handler");
+
+		method = BungeeMethod.getByName(BungeeSettings.getInstance().getBungeeMethod());
+
+		Main.plugin.getLogger().info("Using BungeeMethod: " + method.toString());
+
+		if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			Main.plugin.registerBungeeChannels();
+
+			PluginMessage.getInstance().add(new PluginMessageHandler("Vote") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					String player = args.get(0);
+					String uuid = args.get(1);
+					String service = args.get(2);
+					long time = Long.parseLong(args.get(3));
+					Main.plugin.debug("pluginmessaging vote received from " + player + " on " + service);
+					User user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+					user.clearCache();
+
+					user.bungeeVotePluginMessaging(service, time);
+
+					if (!BungeeSettings.getInstance().isBungeeBroadcast()) {
+						if (Boolean.valueOf(args.get(4)) || BungeeSettings.getInstance().isBungeeBroadcastAlways()) {
+							VoteSite site = Main.plugin.getVoteSite(service);
+							if (site != null) {
+								site.broadcastVote(user, false);
+							} else {
+								Main.plugin.getLogger().warning("No votesite for " + service);
+							}
+						}
+					}
+
+					if (args.size() > 4 && Boolean.valueOf(args.get(5))) {
+						ServerData.getInstance().addServiceSite(service);
+					}
+
+				}
+			});
+
+			PluginMessage.getInstance().add(new PluginMessageHandler("VoteOnline") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					String player = args.get(0);
+					String uuid = args.get(1);
+					String service = args.get(2);
+					long time = Long.parseLong(args.get(3));
+					Main.plugin.debug("pluginmessaging voteonline received from " + player + " on " + service);
+					User user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+					user.clearCache();
+
+					user.bungeeVotePluginMessaging(service, time);
+
+					if (!BungeeSettings.getInstance().isBungeeBroadcast()) {
+						if (Boolean.valueOf(args.get(4)) || BungeeSettings.getInstance().isBungeeBroadcastAlways()) {
+							VoteSite site = Main.plugin.getVoteSite(service);
+							if (site != null) {
+								site.broadcastVote(user, false);
+							} else {
+								Main.plugin.getLogger().warning("No votesite for " + service);
+							}
+						}
+					}
+
+					if (args.size() > 4 && Boolean.valueOf(args.get(5))) {
+						ServerData.getInstance().addServiceSite(service);
+					}
+				}
+			});
+
+			PluginMessage.getInstance().add(new PluginMessageHandler("VoteUpdate") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					String player = args.get(0);
+					Main.plugin.debug("pluginmessaging voteupdate received for " + player);
+					User user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(player));
+					user.clearCache();
+
+					user.offVote();
+
+					Main.plugin.setUpdate(true);
+				}
+			});
+
+			PluginMessage.getInstance().add(new PluginMessageHandler("VoteBroadcast") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					String uuid = args.get(0);
+					String service = args.get(1);
+					User user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+					VoteSite site = Main.plugin.getVoteSite(service);
+					if (site != null) {
+						site.broadcastVote(user, false);
+					} else {
+						Main.plugin.getLogger().warning("No votesite for " + service);
+					}
+				}
+			});
+
+		} else if (method.equals(BungeeMethod.SOCKETS)) {
+			encryptionHandler = new EncryptionHandler(new File(Main.plugin.getDataFolder(), "secretkey.key"));
+
+			clientHandler = new ClientHandler(BungeeSettings.getInstance().getBungeeServerHost(),
+					BungeeSettings.getInstance().getBungeeServerPort(), encryptionHandler,
+					BungeeSettings.getInstance().isBungeeDebug());
+
+			socketHandler = new SocketHandler(Main.plugin.getVersion(),
+					BungeeSettings.getInstance().getSpigotServerHost(),
+					BungeeSettings.getInstance().getSpigotServerPort(), encryptionHandler,
+					BungeeSettings.getInstance().isBungeeDebug());
+
+			socketHandler.add(new SocketReceiver("bungeevote") {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 3) {
+						Main.plugin.extraDebug("BungeeVote from " + data[2] + ", processing");
+						String uuid = data[1];
+						User user = null;
+						if (!uuid.isEmpty()) {
+							user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+						} else {
+							user = UserManager.getInstance().getVotingPluginUser(data[2]);
+						}
+
+						user.clearCache();
+
+						user.bungeeVote(data[3]);
+					}
+				}
+			});
+
+			socketHandler.add(new SocketReceiver("bungeevoteonline") {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 3) {
+						Main.plugin.extraDebug("BungeeVoteOnline from " + data[2] + ", processing");
+						String uuid = data[1];
+						User user = null;
+						if (!uuid.isEmpty()) {
+							user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+						} else {
+							user = UserManager.getInstance().getVotingPluginUser(data[2]);
+						}
+
+						user.clearCache();
+
+						user.bungeeVoteOnline(data[3]);
+					}
+				}
+			});
+
+			socketHandler.add(new SocketReceiver("BungeeBroadcast") {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 2) {
+						VoteSite site = Main.plugin.getVoteSite(data[1]);
+						String p = data[3];
+						User user = UserManager.getInstance().getVotingPluginUser(p);
+						if (site != null) {
+							site.broadcastVote(user, false);
+						} else {
+							Main.plugin.getLogger().warning("No votesite for " + data[1]);
+						}
+					}
+				}
+			});
+
+			socketHandler.add(new SocketReceiver("Status") {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 0) {
+						Main.plugin.getLogger().info("Received status command, sending status back");
+						sendData("StatusOkay", Main.plugin.getOptions().getServer());
+
+					}
+				}
+			});
+
+			socketHandler.add(new SocketReceiver("BungeeUpdate") {
+
+				@Override
+				public void onReceive(String[] data) {
+					Main.plugin.setUpdate(true);
+				}
+			});
+
+			if (Main.plugin.getOptions().getServer().equalsIgnoreCase("pleaseset")) {
+				Main.plugin.getLogger().warning("Server name for bungee voting is not set, please set it");
+			}
+
+		}
+
+	}
+
+	public void sendData(String... strings) {
+		clientHandler.sendMessage(strings);
+	}
+}

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

@@ -17,12 +17,13 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permission;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.TimeChecker;
 import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
+import com.Ben12345rocks.AdvancedCore.Util.Messages.MessageBuilder;
+import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 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.Config.Config;
@@ -96,11 +97,11 @@ public class Commands {
 			maxPage++;
 		}
 
-		msg.add(StringUtils.getInstance().stringToComp("&3&lVotingPlugin Admin Help " + (page + 1) + "/" + maxPage));
-		msg.add(StringUtils.getInstance().stringToComp("&3&l() = Needed"));
-		msg.add(StringUtils.getInstance().stringToComp("&3&lAliases: adminvote, av"));
+		msg.add(StringParser.getInstance().stringToComp("&3&lVotingPlugin Admin Help " + (page + 1) + "/" + maxPage));
+		msg.add(StringParser.getInstance().stringToComp("&3&l() = Needed"));
+		msg.add(StringParser.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));
 		}
 
@@ -282,7 +283,7 @@ public class Commands {
 			}
 			sender.sendMessage(ArrayUtils.getInstance().convert(ArrayUtils.getInstance().colorize(text)));
 		} else {
-			sender.sendMessage(StringUtils.getInstance().colorize("&cPlayer not online: " + player));
+			sender.sendMessage(StringParser.getInstance().colorize("&cPlayer not online: " + player));
 		}
 
 	}
@@ -322,7 +323,7 @@ public class Commands {
 	 *            the page
 	 */
 	public void sendTopVoterAllTimeScoreBoard(final Player player, int page) {
-		if (AdvancedCoreHook.getInstance().getOptions().isSendScoreboards()) {
+		if (Main.plugin.getOptions().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
 			ArrayList<User> users = plugin.convertSet(plugin.getTopVoter(TopVoter.AllTime).keySet());
 
@@ -331,7 +332,7 @@ public class Commands {
 				pageSize++;
 			}
 
-			String title = StringUtils.getInstance().colorize(config.getFormatCommandVoteTopTitle()
+			String title = StringParser.getInstance().colorize(config.getFormatCommandVoteTopTitle()
 					.replace("%page%", "" + page).replace("%maxpages%", "" + pageSize).replace("%Top%", "All"));
 
 			SimpleScoreboard scoreboard = new SimpleScoreboard(title);
@@ -362,7 +363,7 @@ public class Commands {
 	 *            the page
 	 */
 	public void sendTopVoterDailyScoreBoard(final Player player, int page) {
-		if (AdvancedCoreHook.getInstance().getOptions().isSendScoreboards()) {
+		if (Main.plugin.getOptions().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
 			ArrayList<User> users = plugin.convertSet(plugin.getTopVoter(TopVoter.Daily).keySet());
 
@@ -371,7 +372,7 @@ public class Commands {
 				pageSize++;
 			}
 
-			String title = StringUtils.getInstance().colorize(config.getFormatCommandVoteTopTitle()
+			String title = StringParser.getInstance().colorize(config.getFormatCommandVoteTopTitle()
 					.replace("%page%", "" + page).replace("%maxpages%", "" + pageSize).replace("%Top%", "Daily"));
 
 			SimpleScoreboard scoreboard = new SimpleScoreboard(title);
@@ -402,7 +403,7 @@ public class Commands {
 	 *            the page
 	 */
 	public void sendTopVoterMonthlyScoreBoard(final Player player, int page) {
-		if (AdvancedCoreHook.getInstance().getOptions().isSendScoreboards()) {
+		if (Main.plugin.getOptions().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
 			ArrayList<User> users = plugin.convertSet(plugin.getTopVoter(TopVoter.Monthly).keySet());
 
@@ -411,7 +412,7 @@ public class Commands {
 				pageSize++;
 			}
 
-			String title = StringUtils.getInstance().colorize(config.getFormatCommandVoteTopTitle()
+			String title = StringParser.getInstance().colorize(config.getFormatCommandVoteTopTitle()
 					.replace("%page%", "" + page).replace("%maxpages%", "" + pageSize).replace("%Top%", "Monthly"));
 
 			SimpleScoreboard scoreboard = new SimpleScoreboard(title);
@@ -442,7 +443,7 @@ public class Commands {
 	 *            the page
 	 */
 	public void sendTopVoterWeeklyScoreBoard(final Player player, int page) {
-		if (AdvancedCoreHook.getInstance().getOptions().isSendScoreboards()) {
+		if (Main.plugin.getOptions().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
 			ArrayList<User> users = plugin.convertSet(plugin.getTopVoter(TopVoter.Weekly).keySet());
 
@@ -451,7 +452,7 @@ public class Commands {
 				pageSize++;
 			}
 
-			String title = StringUtils.getInstance().colorize(config.getFormatCommandVoteTopTitle()
+			String title = StringParser.getInstance().colorize(config.getFormatCommandVoteTopTitle()
 					.replace("%page%", "" + page).replace("%maxpages%", "" + pageSize).replace("%Top%", "Weekly"));
 
 			SimpleScoreboard scoreboard = new SimpleScoreboard(title);
@@ -483,7 +484,7 @@ public class Commands {
 	 *            the page
 	 */
 	public void sendVoteTodayScoreBoard(final Player player, int page) {
-		if (AdvancedCoreHook.getInstance().getOptions().isSendScoreboards()) {
+		if (Main.plugin.getOptions().isSendScoreboards()) {
 			int pagesize = Config.getInstance().getFormatPageSize();
 
 			String[] voteToday = voteToday();
@@ -571,7 +572,7 @@ public class Commands {
 
 		String playerName = user.getPlayerName();
 
-		msg.add(StringUtils.getInstance().replaceIgnoreCase(config.getFormatCommandsVoteLastTitle(), "%player%",
+		msg.add(StringParser.getInstance().replaceIgnoreCase(config.getFormatCommandsVoteLastTitle(), "%player%",
 				playerName));
 
 		for (VoteSite voteSite : plugin.getVoteSites()) {
@@ -597,6 +598,9 @@ public class Commands {
 		if (time > 0) {
 			Date date = new Date(time);
 			String timeString = new SimpleDateFormat(config.getFormatTimeFormat()).format(date);
+			if (StringParser.getInstance().containsIgnorecase(timeString, "YamlConfiguration")) {
+				plugin.getLogger().warning("Detected issue parsing time, check time format");
+			}
 			return timeString;
 		}
 		return "";
@@ -618,58 +622,58 @@ public class Commands {
 
 			String info = "";
 			if (diffDays == 1) {
-				info += StringUtils.getInstance()
-						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+				info += StringParser.getInstance()
+						.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
 								Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
 								Config.getInstance().getFormatTimeFormatsDay()), "amount", "" + diffDays);
 				info += " ";
 			} else if (diffDays > 1) {
-				info += StringUtils.getInstance()
-						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+				info += StringParser.getInstance()
+						.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
 								Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
 								Config.getInstance().getFormatTimeFormatsDays()), "amount", "" + diffDays);
 				info += " ";
 			}
 
 			if (diffHours == 1) {
-				info += StringUtils.getInstance()
-						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+				info += StringParser.getInstance()
+						.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
 								Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
 								Config.getInstance().getFormatTimeFormatsHour()), "amount", "" + diffHours);
 				info += " ";
 			} else if (diffHours > 1) {
-				info += StringUtils.getInstance()
-						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+				info += StringParser.getInstance()
+						.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
 								Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
 								Config.getInstance().getFormatTimeFormatsHours()), "amount", "" + diffHours);
 				info += " ";
 			}
 
 			if (diffMinutes == 1) {
-				info += StringUtils.getInstance()
-						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+				info += StringParser.getInstance()
+						.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
 								Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
 								Config.getInstance().getFormatTimeFormatsMinute()), "amount", "" + diffMinutes);
 				info += " ";
 			} else if (diffMinutes > 1) {
-				info += StringUtils.getInstance().replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+				info += StringParser.getInstance().replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
 						Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
 						Config.getInstance().getFormatTimeFormatsMinutes()), "amount", "" + diffMinutes);
 				info += " ";
 			}
 
 			if (diffSeconds == 1) {
-				info += StringUtils.getInstance()
-						.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+				info += StringParser.getInstance()
+						.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
 								Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
 								Config.getInstance().getFormatTimeFormatsSecond()), "amount", "" + diffSeconds);
 			} else {
-				info += StringUtils.getInstance().replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+				info += StringParser.getInstance().replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
 						Config.getInstance().getFormatCommandsVoteLastTimeFormat(), "TimeType",
 						Config.getInstance().getFormatTimeFormatsSeconds()), "amount", "" + diffSeconds);
 			}
 
-			info = StringUtils.getInstance()
+			info = StringParser.getInstance()
 					.replacePlaceHolder(Config.getInstance().getFormatCommandsVoteLastLastVoted(), "times", info);
 
 			return info;
@@ -686,7 +690,7 @@ public class Commands {
 		placeholders.put("SiteName", voteSite.getDisplayName());
 		placeholders.put("timesince", timeSince);
 
-		return StringUtils.getInstance().replacePlaceHolder(Config.getInstance().getFormatCommandsVoteLastLine(),
+		return StringParser.getInstance().replacePlaceHolder(Config.getInstance().getFormatCommandsVoteLastLine(),
 				placeholders);
 	}
 
@@ -702,18 +706,18 @@ public class Commands {
 
 		String playerName = user.getPlayerName();
 
-		msg.add(StringUtils.getInstance().colorize(StringUtils.getInstance()
+		msg.add(StringParser.getInstance().colorize(StringParser.getInstance()
 				.replaceIgnoreCase(config.getFormatCommandsVoteNextTitle(), "%player%", playerName)));
 
 		for (VoteSite voteSite : plugin.getVoteSites()) {
 
 			String msgLine = config.getFormatCommandsVoteNextLayout();
 
-			msgLine = StringUtils.getInstance().replaceIgnoreCase(msgLine, "%info%",
+			msgLine = StringParser.getInstance().replaceIgnoreCase(msgLine, "%info%",
 					voteCommandNextInfo(user, voteSite));
 
-			msgLine = StringUtils.getInstance().replaceIgnoreCase(msgLine, "%SiteName%", voteSite.getDisplayName());
-			msg.add(StringUtils.getInstance().colorize(msgLine));
+			msgLine = StringParser.getInstance().replaceIgnoreCase(msgLine, "%SiteName%", voteSite.getDisplayName());
+			msg.add(StringParser.getInstance().colorize(msgLine));
 
 		}
 		return ArrayUtils.getInstance().convert(msg);
@@ -732,17 +736,20 @@ 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()) {
 			double votedelay = voteSite.getVoteDelay();
-			if (votedelay == 0) {
+			if (votedelay == 0 && voteSite.getVoteDelayMin() == 0) {
 				String errorMsg = config.getFormatCommandsVoteNextInfoError();
 				info = errorMsg;
 			} else {
 
-				LocalDateTime nextvote = lastVote.plusHours((long) votedelay);
+				LocalDateTime nextvote = lastVote.plusHours((long) votedelay)
+						.plusMinutes((long) voteSite.getVoteDelayMin());
 
 				if (time == 0 || now.isAfter(nextvote)) {
 					info = config.getFormatCommandsVoteNextInfoCanVote();
@@ -753,30 +760,73 @@ public class Commands {
 					long diffMinutes = dur.getSeconds() / 60 - diffHours * 60;
 
 					String timeMsg = config.getFormatCommandsVoteNextInfoTime();
-					timeMsg = StringUtils.getInstance().replaceIgnoreCase(timeMsg, "%hours%", Long.toString(diffHours));
-					timeMsg = StringUtils.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
+					timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%hours%",
+							Long.toString(diffHours));
+					timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
 							Long.toString(diffMinutes));
 					info = timeMsg;
 
 				}
 			}
 		} else {
-			if (lastVote.getDayOfYear() == now.getDayOfYear() && lastVote.getYear() == now.getYear()) {
-				LocalDateTime midnight = LocalDateTime.now().plusDays(1).withHour(0).withMinute(0);
-				Duration dur = Duration.between(now, midnight);
+			LocalDateTime offsetoclockyesterday = TimeChecker.getInstance().getTime().plusDays(-1).withHour(0)
+					.withMinute(0).plusHours((long) voteSite.getTimeOffSet());
+			LocalDateTime offsetoclocktoday = TimeChecker.getInstance().getTime().withHour(0).withMinute(0)
+					.plusHours((long) voteSite.getTimeOffSet());
+			LocalDateTime offsetoclocktomorrow = TimeChecker.getInstance().getTime().plusDays(1).withHour(0)
+					.withMinute(0).plusHours((long) voteSite.getTimeOffSet());
 
-				int diffHours = (int) (dur.getSeconds() / (60 * 60));
-				long diffMinutes = dur.getSeconds() / 60 - diffHours * 60;
+			if (!now.isBefore(offsetoclocktoday)) {
+				if (!lastVote.isBefore(offsetoclocktoday)) {
+					Duration dur = Duration.between(now, offsetoclocktomorrow);
+					int diffHours = (int) (dur.getSeconds() / (60 * 60));
+					long diffMinutes = dur.getSeconds() / 60 - diffHours * 60;
 
-				String timeMsg = config.getFormatCommandsVoteNextInfoVoteDelayDaily();
-				timeMsg = StringUtils.getInstance().replaceIgnoreCase(timeMsg, "%hours%", Integer.toString(diffHours));
-				timeMsg = StringUtils.getInstance().replaceIgnoreCase(timeMsg, "%minutes%", Long.toString(diffMinutes));
-				info = timeMsg;
+					if (diffHours < 0) {
+						diffHours = diffHours * -1;
+					}
+					if (diffHours >= 24) {
+						diffHours = diffHours - 24;
+					}
+					if (diffMinutes < 0) {
+						diffMinutes = diffMinutes * -1;
+					}
 
+					String timeMsg = config.getFormatCommandsVoteNextInfoVoteDelayDaily();
+					timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%hours%",
+							Integer.toString(diffHours));
+					timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
+							Long.toString(diffMinutes));
+					info = timeMsg;
+				} else {
+					info = config.getFormatCommandsVoteNextInfoCanVote();
+				}
 			} else {
-				info = config.getFormatCommandsVoteNextInfoCanVote();
-			}
+				if (!lastVote.isBefore(offsetoclockyesterday)) {
+					Duration dur = Duration.between(now, offsetoclocktoday);
+					int diffHours = (int) (dur.getSeconds() / (60 * 60));
+					long diffMinutes = dur.getSeconds() / 60 - diffHours * 60;
 
+					if (diffHours < 0) {
+						diffHours = diffHours * -1;
+					}
+					if (diffHours >= 24) {
+						diffHours = diffHours - 24;
+					}
+					if (diffMinutes < 0) {
+						diffMinutes = diffMinutes * -1;
+					}
+
+					String timeMsg = config.getFormatCommandsVoteNextInfoVoteDelayDaily();
+					timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%hours%",
+							Integer.toString(diffHours));
+					timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
+							Long.toString(diffMinutes));
+					info = timeMsg;
+				} else {
+					info = config.getFormatCommandsVoteNextInfoCanVote();
+				}
+			}
 		}
 		return info;
 	}
@@ -797,11 +847,11 @@ public class Commands {
 		int all = user.getTotal(TopVoter.AllTime);
 
 		for (String s : config.getFormatCommandsVoteTotal()) {
-			String str = StringUtils.getInstance().replaceIgnoreCase(s, "%DailyTotal%", "" + daily);
-			str = StringUtils.getInstance().replaceIgnoreCase(str, "%WeeklyTotal%", "" + weekly);
-			str = StringUtils.getInstance().replaceIgnoreCase(str, "%MonthlyTotal%", "" + month);
-			str = StringUtils.getInstance().replaceIgnoreCase(str, "%AllTimeTotal%", "" + all);
-			str = StringUtils.getInstance().replaceIgnoreCase(str, "%player%", user.getPlayerName());
+			String str = StringParser.getInstance().replaceIgnoreCase(s, "%DailyTotal%", "" + daily);
+			str = StringParser.getInstance().replaceIgnoreCase(str, "%WeeklyTotal%", "" + weekly);
+			str = StringParser.getInstance().replaceIgnoreCase(str, "%MonthlyTotal%", "" + month);
+			str = StringParser.getInstance().replaceIgnoreCase(str, "%AllTimeTotal%", "" + all);
+			str = StringParser.getInstance().replaceIgnoreCase(str, "%player%", user.getPlayerName());
 			msg.add(str);
 		}
 
@@ -834,10 +884,10 @@ public class Commands {
 		}
 
 		for (String s : config.getFormatCommandsVoteTotalAll()) {
-			String str = StringUtils.getInstance().replaceIgnoreCase(s, "%DailyTotal%", "" + daily);
-			str = StringUtils.getInstance().replaceIgnoreCase(str, "%WeeklyTotal%", "" + weekly);
-			str = StringUtils.getInstance().replaceIgnoreCase(str, "%MonthlyTotal%", "" + month);
-			str = StringUtils.getInstance().replaceIgnoreCase(str, "%AllTimeTotal%", "" + all);
+			String str = StringParser.getInstance().replaceIgnoreCase(s, "%DailyTotal%", "" + daily);
+			str = StringParser.getInstance().replaceIgnoreCase(str, "%WeeklyTotal%", "" + weekly);
+			str = StringParser.getInstance().replaceIgnoreCase(str, "%MonthlyTotal%", "" + month);
+			str = StringParser.getInstance().replaceIgnoreCase(str, "%AllTimeTotal%", "" + all);
 			msg.add(str);
 		}
 
@@ -855,7 +905,7 @@ public class Commands {
 	public ArrayList<TextComponent> voteHelpText(CommandSender sender) {
 		ArrayList<TextComponent> texts = new ArrayList<TextComponent>();
 		HashMap<String, TextComponent> unsorted = new HashMap<String, TextComponent>();
-		texts.add(StringUtils.getInstance().stringToComp(config.getFormatCommandsVoteHelpTitle()));
+		texts.add(StringParser.getInstance().stringToComp(config.getFormatCommandsVoteHelpTitle()));
 
 		boolean requirePerms = config.getFormatCommandsVoteHelpRequirePermission();
 
@@ -876,6 +926,54 @@ public class Commands {
 		return texts;
 	}
 
+	public long voteNextDurationTime(User user, VoteSite voteSite) {
+		long time = user.getTime(voteSite);
+		LocalDateTime now = TimeChecker.getInstance().getTime();
+		;
+		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault())
+				.plusHours(Main.plugin.getOptions().getTimeHourOffSet());
+
+		if (!voteSite.isVoteDelayDaily()) {
+			double votedelay = voteSite.getVoteDelay();
+			if (votedelay == 0 && voteSite.getVoteDelayMin() == 0) {
+				return 0;
+			} else {
+				LocalDateTime nextvote = lastVote.plusHours((long) votedelay)
+						.plusMinutes((long) voteSite.getVoteDelayMin());
+
+				if (time == 0 || now.isAfter(nextvote)) {
+					return 0;
+				} else {
+					Duration dur = Duration.between(now, nextvote);
+					return dur.getSeconds();
+				}
+			}
+		} else {
+			LocalDateTime offsetoclockyesterday = TimeChecker.getInstance().getTime().plusDays(-1).withHour(0)
+					.withMinute(0).plusHours((long) voteSite.getTimeOffSet());
+			LocalDateTime offsetoclocktoday = TimeChecker.getInstance().getTime().withHour(0).withMinute(0)
+					.plusHours((long) voteSite.getTimeOffSet());
+			LocalDateTime offsetoclocktomorrow = TimeChecker.getInstance().getTime().plusDays(1).withHour(0)
+					.withMinute(0).plusHours((long) voteSite.getTimeOffSet());
+
+			if (!now.isBefore(offsetoclocktoday)) {
+				if (!lastVote.isBefore(offsetoclocktoday)) {
+					Duration dur = Duration.between(now, offsetoclocktomorrow);
+					return dur.getSeconds();
+				} else {
+					return 0;
+				}
+			} else {
+				if (!lastVote.isBefore(offsetoclockyesterday)) {
+					Duration dur = Duration.between(now, offsetoclocktoday);
+					return dur.getSeconds();
+				} else {
+					return 0;
+				}
+			}
+		}
+	}
+
 	/**
 	 * Vote today.
 	 *
@@ -892,16 +990,17 @@ public class Commands {
 				placeholders.put("player", user.getPlayerName());
 				placeholders.put("votesite", voteSite.getKey());
 				placeholders.put("time", timeString);
-				msg.add(StringUtils.getInstance()
+				msg.add(StringParser.getInstance()
 						.replacePlaceHolder(Config.getInstance().getFormatCommandsVoteTodayLine(), placeholders));
-			//	msg.add("&6" + user.getPlayerName() + " : " + voteSite.getKey() + " : " + timeString);
+				// msg.add("&6" + user.getPlayerName() + " : " + voteSite.getKey() + " : " +
+				// timeString);
 			}
 		}
 		msg = ArrayUtils.getInstance().colorize(msg);
 		return ArrayUtils.getInstance().convert(msg);
 	}
 
-	public String[] voteURLs(User user) {
+	public String[] voteURLs(User user, boolean json) {
 		ArrayList<String> sites = new ArrayList<String>();
 
 		List<String> title = config.getFormatCommandsVoteText();
@@ -912,16 +1011,15 @@ public class Commands {
 			int counter = 0;
 			for (VoteSite voteSite : plugin.getVoteSites()) {
 				counter++;
-				String voteURL = voteSite.getVoteURL();
-				String msg = config.getFormatCommandsVoteURLS();
-				msg = StringUtils.getInstance().colorize(msg);
-				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);
+				String voteURL = voteSite.getVoteURL(json);
+				MessageBuilder message = new MessageBuilder(config.getFormatCommandsVoteURLS());
+				message.replacePlaceholder("num", Integer.toString(counter)).replacePlaceholder("url", voteURL)
+						.replacePlaceholder("SiteName", voteSite.getDisplayName());
+				if (user != null && user.getPlayerName() != null) {
+					message.replacePlaceholder("player", "" + user.getPlayerName()).replacePlaceholder("Next",
+							"" + voteCommandNextInfo(user, voteSite));
+				}
+				sites.add(message.colorize().getText());
 			}
 		}
 		if (user != null) {
@@ -933,6 +1031,7 @@ public class Commands {
 
 			sites = ArrayUtils.getInstance().replacePlaceHolder(sites, phs);
 		}
+
 		sites = ArrayUtils.getInstance().colorize(sites);
 		return ArrayUtils.getInstance().convert(sites);
 	}

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

@@ -11,6 +11,7 @@ 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.EditGUIValueList;
 import com.Ben12345rocks.AdvancedCore.Util.EditGUI.ValueTypes.EditGUIValueNumber;
 import com.Ben12345rocks.AdvancedCore.Util.EditGUI.ValueTypes.EditGUIValueString;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
@@ -250,6 +251,20 @@ public class AdminGUI {
 			}
 		}));
 
+		if (voteSite.getSiteData().isList("Rewards")) {
+
+			inv.addButton(
+					new EditGUIButton(new EditGUIValueList("Rewards", voteSite.getSiteData().getStringList("Rewards")) {
+
+						@Override
+						public void setValue(Player p, ArrayList<String> rewards) {
+							VoteSite voteSite = (VoteSite) getInv().getMeta(player, "VoteSite");
+							ConfigVoteSites.getInstance().set(voteSite.getKey(), "Rewards", rewards);
+							plugin.reload();
+						}
+					}));
+		}
+
 		inv.openInventory(player);
 	}
 }

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

@@ -3,28 +3,31 @@ package com.Ben12345rocks.VotingPlugin.Commands.GUI;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map.Entry;
 import java.util.Set;
 
 import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
+import com.Ben12345rocks.AdvancedCore.NMSManager.NMSManager;
 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;
 import com.Ben12345rocks.AdvancedCore.Util.Item.ItemBuilder;
+import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Commands.Commands;
+import com.Ben12345rocks.VotingPlugin.Config.BungeeSettings;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
@@ -32,6 +35,10 @@ import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
+import xyz.upperlevel.spigot.book.BookUtil;
+
 public class PlayerGUIs {
 	static PlayerGUIs instance = new PlayerGUIs();
 
@@ -53,12 +60,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.BARRIER, 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) {
@@ -68,8 +91,8 @@ public class PlayerGUIs {
 
 	public void openVoteBest(Player player, User user) {
 		setSelectedPlayer(player, user);
-		BInventory inv = new BInventory(StringUtils.getInstance()
-				.replacePlaceHolder(Config.getInstance().getGUIVoteBestName(), "player", user.getPlayerName()));
+		BInventory inv = new BInventory(Config.getInstance().getGUIVoteBestName());
+		inv.addPlaceholder("player", user.getPlayerName());
 
 		inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteBestDayBestItem())
 				.addPlaceholder("Best", "" + user.getBestDayVoteStreak())) {
@@ -111,13 +134,18 @@ public class PlayerGUIs {
 				&& !player.hasPermission("VotingPlugin.Mod"))
 				|| (!player.hasPermission("VotingPlugin.Commands.Vote.GUI")
 						&& !player.hasPermission("VotingPlugin.Player"))) {
-			player.sendMessage(
-					StringUtils.getInstance().colorize(AdvancedCoreHook.getInstance().getOptions().getFormatNoPerms()));
+			player.sendMessage(StringParser.getInstance().colorize(Main.plugin.getOptions().getFormatNoPerms()));
 			return;
 		}
 		setSelectedPlayer(player, user);
-		BInventory inv = new BInventory(StringUtils.getInstance()
-				.replacePlaceHolder(Config.getInstance().getGUIVoteGUIName(), "player", user.getPlayerName()));
+		BInventory inv = new BInventory(Config.getInstance().getGUIVoteGUIName());
+		if (!Config.getInstance().isAlwaysCloseInventory()) {
+			inv.dontClose();
+		}
+
+		inv.addPlaceholder("points", "" + user.getPoints());
+		inv.addPlaceholder("player", user.getPlayerName());
+		inv.addPlaceholder("top", Config.getInstance().getVoteTopDefault());
 
 		for (String slot : Config.getInstance().getVoteGUISlots()) {
 			ItemBuilder builder = new ItemBuilder(Config.getInstance().getVoteGUISlotSection(slot));
@@ -126,9 +154,10 @@ public class PlayerGUIs {
 
 			lore = ArrayUtils.getInstance().convert(Config.getInstance().getVoteGUISlotLore(slot));
 
+			String str = Config.getInstance().getVoteTopDefault();
 			if (lore.length == 0) {
 				if (slot.equalsIgnoreCase("url")) {
-					lore = Commands.getInstance().voteURLs(user);
+					lore = new String[] { "&aClick me" };
 				} else if (slot.equalsIgnoreCase("next")) {
 					lore = Commands.getInstance().voteCommandNext(user);
 				} else if (slot.equalsIgnoreCase("last")) {
@@ -136,7 +165,7 @@ public class PlayerGUIs {
 				} else if (slot.equalsIgnoreCase("total")) {
 					lore = Commands.getInstance().voteCommandTotal(user);
 				} else if (slot.equalsIgnoreCase("top")) {
-					String str = Config.getInstance().getVoteTopDefault();
+
 					if (str.equalsIgnoreCase("monthly")) {
 						lore = TopVoterHandler.getInstance().topVoterMonthly(1);
 					} else if (str.equalsIgnoreCase("weekly")) {
@@ -153,48 +182,50 @@ public class PlayerGUIs {
 				}
 			}
 
-			HashMap<String, String> placeholders = new HashMap<String, String>();
-			placeholders.put("points", "" + user.getPoints());
-
-			builder.setPlaceholders(placeholders);
 			builder.setLore(ArrayUtils.getInstance().convert(lore));
 
 			inv.addButton(new BInventoryButton(builder) {
 
 				@Override
 				public void onClick(ClickEvent event) {
-					Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
-						@Override
-						public void run() {
-							Player player = event.getWhoClicked();
-							String cmd = Config.getInstance().getVoteGUISlotCommand(slot);
-							User user = getSelectedPlayer(player);
-							if (!cmd.equals("")) {
+					Player player = event.getWhoClicked();
+					String cmd = Config.getInstance().getVoteGUISlotCommand(slot);
+					User user = getSelectedPlayer(player);
+					if (cmd.equalsIgnoreCase("none")) {
+						return;
+					} else if (!cmd.equals("")) {
+						event.runSync(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("url")) {
+							user.sendMessage(Commands.getInstance().voteURLs(user, true));
+							event.closeInventory();
+						} 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);
 						}
-					});
-
+					}
 				}
+
 			});
 		}
 
@@ -203,8 +234,8 @@ public class PlayerGUIs {
 
 	public void openVoteLast(Player player, User user) {
 		setSelectedPlayer(player, user);
-		BInventory inv = new BInventory(StringUtils.getInstance()
-				.replacePlaceHolder(Config.getInstance().getGUIVoteLastName(), "player", user.getPlayerName()));
+		BInventory inv = new BInventory(Config.getInstance().getGUIVoteLastName());
+		inv.addPlaceholder("player", user.getPlayerName());
 		for (VoteSite site : plugin.getVoteSites()) {
 			inv.addButton(inv.getNextSlot(), new BInventoryButton(site.getItem().setName(site.getDisplayName())
 					.setLore(Commands.getInstance().voteCommandLastLine(user, site)).setAmountNone(1)) {
@@ -217,14 +248,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);
@@ -232,8 +256,8 @@ public class PlayerGUIs {
 
 	public void openVoteNext(Player player, User user) {
 		setSelectedPlayer(player, user);
-		BInventory inv = new BInventory(StringUtils.getInstance()
-				.replacePlaceHolder(Config.getInstance().getGUIVoteNextName(), "player", user.getPlayerName()));
+		BInventory inv = new BInventory(Config.getInstance().getGUIVoteNextName());
+		inv.addPlaceholder("player", user.getPlayerName());
 		for (VoteSite site : plugin.getVoteSites()) {
 			inv.addButton(inv.getNextSlot(), new BInventoryButton(site.getItem().setName(site.getDisplayName())
 					.setLore(Commands.getInstance().voteCommandNextInfo(user, site)).setAmountNone(1)) {
@@ -246,21 +270,14 @@ 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"));
+			player.sendMessage(StringParser.getInstance().colorize(Config.getInstance().getVoteShopDisabled()));
 			return;
 		}
 
@@ -286,79 +303,145 @@ public class PlayerGUIs {
 				}
 			}
 
-			if (hasPerm && limitPass) {
-				ItemBuilder builder = new ItemBuilder(Config.getInstance().getIdentifierSection(identifier));
+			if (!Config.getInstance().getVoteShopNotBuyable(identifier)) {
+				if (hasPerm && (limitPass || !Config.getInstance().isVoteShopHideLimitedReached())) {
+					ItemBuilder builder = new ItemBuilder(Config.getInstance().getIdentifierSection(identifier));
 
-				inv.addButton(new BInventoryButton(builder) {
+					inv.addButton(new BInventoryButton(builder) {
 
-					@Override
-					public void onClick(ClickEvent event) {
-						Player player = event.getWhoClicked();
+						@Override
+						public void onClick(ClickEvent event) {
+							Player player = event.getWhoClicked();
+							event.getButton().getInv().closeInv(player, null);
 
-						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;
-								}
+							User user = UserManager.getInstance().getVotingPluginUser(player);
+							if (Config.getInstance().isClearCacheOnVoteShopPurchase()
+									|| BungeeSettings.getInstance().isUseBungeecoord()) {
+								user.clearCache();
 							}
+							String identifier = (String) getData("identifier");
+							int limit = (int) getData("Limit");
+							int points = Config.getInstance().getIdentifierCost(identifier);
+							if (identifier != null) {
 
-							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)) {
+								// limit fail-safe, should never be needed, except in rare cases
+								boolean limitPass = true;
+								if (limit > 0) {
+									if (user.getVoteShopIdentifierLimit(identifier) >= limit) {
+										limitPass = false;
+									}
+								}
 
-									RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-											Config.getInstance().getIdentifierRewardsPath(identifier),
-											new RewardOptions().setPlaceholders(placeholders));
+								if (limitPass) {
+									if (!Config.getInstance().isVoteShopRequireConfirmation()) {
+										HashMap<String, String> placeholders = new HashMap<String, String>();
+										placeholders.put("identifier",
+												Config.getInstance().getIdentifierIdentifierName(identifier));
+										placeholders.put("points", "" + points);
+										placeholders.put("limit", "" + limit);
+										if (user.removePoints(points)) {
 
-									user.sendMessage(StringUtils.getInstance().replacePlaceHolder(
-											Config.getInstance().getFormatShopPurchaseMsg(), placeholders));
-									if (limit > 0) {
-										user.setVoteShopIdentifierLimit(identifier,
-												user.getVoteShopIdentifierLimit(identifier) + 1);
+											RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
+													Config.getInstance().getIdentifierRewardsPath(identifier),
+													new RewardOptions().setPlaceholders(placeholders));
+
+											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
+													Config.getInstance().getFormatShopPurchaseMsg(), placeholders));
+											if (limit > 0) {
+												user.setVoteShopIdentifierLimit(identifier,
+														user.getVoteShopIdentifierLimit(identifier) + 1);
+											}
+										} else {
+											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
+													Config.getInstance().getFormatShopFailedMsg(), placeholders));
+										}
+									} else {
+										openVoteShopConfirmation(player, identifier);
 									}
 								} else {
-									user.sendMessage(StringUtils.getInstance().replacePlaceHolder(
-											Config.getInstance().getFormatShopFailedMsg(), placeholders));
+									user.sendMessage(Config.getInstance().getVoteShopLimitReached());
 								}
 							}
 						}
-					}
 
-				}.addData("identifier", identifier).addData("Limit", limit));
+					}.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(new BInventoryButton(PlayerGUIs.getInstance().getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					PlayerGUIs.getInstance().openVoteGUI(event.getPlayer(),
-							UserManager.getInstance().getVotingPluginUser(player));
-				}
-
-			});
-
+			inv.addButton(getBackButton());
 		}
 
 		inv.openInventory(player);
 	}
 
+	public void openVoteShopConfirmation(Player player, String identifier) {
+		PlayerUtils.getInstance().setPlayerMeta(player, "ident", identifier);
+		BInventory inv = new BInventory("Confirm Purchase?");
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.EMERALD_BLOCK).setName("&aYes")) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				String ident = (String) PlayerUtils.getInstance().getPlayerMeta(event.getPlayer(), "ident");
+				User user = UserManager.getInstance().getVotingPluginUser(event.getPlayer());
+				int points = Config.getInstance().getIdentifierCost(ident);
+				int limit = Config.getInstance().getIdentifierLimit(identifier);
+				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(StringParser.getInstance()
+							.replacePlaceHolder(Config.getInstance().getFormatShopPurchaseMsg(), placeholders));
+					if (limit > 0) {
+						user.setVoteShopIdentifierLimit(identifier, user.getVoteShopIdentifierLimit(identifier) + 1);
+					}
+				} else {
+					user.sendMessage(StringParser.getInstance()
+							.replacePlaceHolder(Config.getInstance().getFormatShopFailedMsg(), placeholders));
+				}
+				Bukkit.getScheduler().runTask(plugin, new Runnable() {
+
+					@Override
+					public void run() {
+						event.getPlayer().closeInventory();
+					}
+				});
+
+			}
+		});
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.BARRIER).setName("&cNo")) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				event.getPlayer().closeInventory();
+			}
+		});
+		inv.openInventory(player);
+	}
+
 	public void openVoteStreak(Player player, User user) {
 		setSelectedPlayer(player, user);
-		BInventory inv = new BInventory(StringUtils.getInstance()
-				.replacePlaceHolder(Config.getInstance().getGUIVoteStreakName(), "player", user.getPlayerName()));
+		BInventory inv = new BInventory(Config.getInstance().getGUIVoteStreakName());
+		inv.addPlaceholder("player", user.getPlayerName());
 
 		inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteStreakCurrentDayStreakItem())
 				.addPlaceholder("Streak", "" + user.getDayVoteStreak())) {
@@ -417,13 +500,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);
@@ -432,50 +509,127 @@ public class PlayerGUIs {
 	public void openVoteToday(Player player) {
 		setSelectedPlayer(player, null);
 		BInventory inv = new BInventory(Config.getInstance().getGUIVoteTodayName());
+		if (!Config.getInstance().isAlwaysCloseInventory()) {
+			inv.dontClose();
+		}
 		for (User user : plugin.getVoteToday().keySet()) {
 
 			for (VoteSite voteSite : plugin.getVoteToday().get(user).keySet()) {
 				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(Config.getInstance().getFormatTimeFormat());
 				String timeString = plugin.getVoteToday().get(user).get(voteSite).format(formatter);
-				String msg = "&6" + voteSite.getDisplayName() + " : " + timeString;
-				inv.addButton(inv.getNextSlot(), new BInventoryButton(user.getPlayerName(), new String[] { msg },
-						MiscUtils.getInstance().setSkullOwner(user.getOfflinePlayer())) {
+				String msg = Config.getInstance().getGUIVoteTodayLine();
+				HashMap<String, String> placeholders = new HashMap<String, String>();
+				placeholders.put("VoteSite", voteSite.getDisplayName());
+				placeholders.put("Time", timeString);
+				msg = StringParser.getInstance().replacePlaceHolder(msg, placeholders);
+				ItemBuilder item = null;
+				if (Config.getInstance().isGUIVoteTodayUseSkull() && !NMSManager.getInstance().isVersion("1.12")) {
+					item = new ItemBuilder(new ItemStack(Material.PLAYER_HEAD, 1)).setSkullOwner(player);
+				} else {
+					item = new ItemBuilder(Config.getInstance().getGUIVoteTodayPlayerItem());
+				}
+				item.setName(StringParser.getInstance().replacePlaceHolder(
+						Config.getInstance().getGUIVoteTodayIconTitle(), "player", user.getPlayerName()));
+				item.setLore(msg);
+				inv.addButton(inv.getNextSlot(), new BInventoryButton(item) {
 
 					@Override
 					public void onClick(ClickEvent clickEvent) {
 						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 openVoteTop(Player player, TopVoter top) {
-		if (top == null) {
-			top = TopVoter.getDefault();
+		try {
+			if (top == null) {
+				top = TopVoter.getDefault();
+			}
+			Set<Entry<User, Integer>> users = null;
+
+			String topVoter = top.getName();
+			@SuppressWarnings("unchecked")
+			LinkedHashMap<User, Integer> topVotes = (LinkedHashMap<User, Integer>) plugin.getTopVoter(top).clone();
+			users = topVotes.entrySet();
+
+			BInventory inv = new BInventory(Config.getInstance().getGUIVoteTopName());
+			inv.addPlaceholder("topvoter", topVoter);
+			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++;
+			}
+
+			final TopVoter cur = top;
+			inv.getPageButtons().add(new BInventoryButton(
+					new ItemBuilder(Config.getInstance().getGUIVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
+						openVoteTop(player, cur.next());
+					} else {
+						openVoteTop(player, cur.prev());
+					}
+				}
+			});
+
+			if (Config.getInstance().getGUIVoteTopBackButton()) {
+				inv.getPageButtons().add(getBackButton().setSlot(1));
+			}
+
+			inv.setPages(true);
+			inv.setMaxInvSize(Config.getInstance().getGUIVoteTopSize());
+			inv.openInventory(player);
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
+	}
+
+	public void openVoteTopLastMonth(Player player) {
 		Set<Entry<User, Integer>> users = null;
 
-		String topVoter = top.getName();
-		users = plugin.getTopVoter(top).entrySet();
+		users = plugin.getLastMonthTopVoter().entrySet();
 
-		BInventory inv = new BInventory(StringUtils.getInstance()
-				.replacePlaceHolder(Config.getInstance().getGUIVoteTopName(), "topvoter", topVoter));
+		BInventory inv = new BInventory(Config.getInstance().getGUIVoteTopName());
+		inv.addPlaceholder("topvoter", "Last Month");
+		if (!Config.getInstance().isAlwaysCloseInventory()) {
+			inv.dontClose();
+		}
 
 		int pos = 1;
 		for (Entry<User, Integer> entry : users) {
@@ -503,28 +657,8 @@ public class PlayerGUIs {
 			pos++;
 		}
 
-		final TopVoter cur = top;
-		inv.getPageButtons().add(new BInventoryButton(
-				new ItemBuilder(Config.getInstance().getGUIVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
-
-			@Override
-			public void onClick(ClickEvent clickEvent) {
-				if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
-					openVoteTop(player, cur.next());
-				} else {
-					openVoteTop(player, cur.prev());
-				}
-			}
-		});
-
 		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);
@@ -535,8 +669,8 @@ public class PlayerGUIs {
 
 	public void openVoteTotal(Player player, User user) {
 		setSelectedPlayer(player, user);
-		BInventory inv = new BInventory(StringUtils.getInstance()
-				.replacePlaceHolder(Config.getInstance().getGUIVoteTotalName(), "player", user.getPlayerName()));
+		BInventory inv = new BInventory(Config.getInstance().getGUIVoteTotalName());
+		inv.addPlaceholder("player", user.getPlayerName());
 
 		for (TopVoter top : TopVoter.values()) {
 			inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteTotalItem(top))
@@ -550,14 +684,7 @@ public class PlayerGUIs {
 		}
 
 		if (Config.getInstance().getGUIVoteTotalBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-
-			});
+			inv.addButton(getBackButton());
 		}
 		inv.openInventory(player);
 	}
@@ -570,93 +697,178 @@ public class PlayerGUIs {
 	 */
 	public void openVoteURL(Player player) {
 		setSelectedPlayer(player, null);
-		BInventory inv = new BInventory(Config.getInstance().getGUIVoteURLName());
-
 		User user = UserManager.getInstance().getVotingPluginUser(player);
+		if (!Config.getInstance().isCommandsVoteBookGUI()) {
+			// normal GUI
+			BInventory inv = new BInventory(Config.getInstance().getGUIVoteURLName());
 
-		int count = 0;
-		if (Config.getInstance().getVoteURLViewAllUrlsButtonEnabled()) {
-			ItemBuilder builderAll = new ItemBuilder(
-					Config.getInstance().getVoteURLAlreadyVotedAllUrlsButtonItemSection());
-			if (user.canVoteAll()) {
-				builderAll = new ItemBuilder(Config.getInstance().getVoteURLCanVoteAllUrlsButtonItemSection());
-			}
-
-			if (!builderAll.hasCustomDisplayName()) {
-				builderAll.setName("&4All Voting Sites");
-			}
-			if (!builderAll.hasCustomLore()) {
-				builderAll.setLore("&cClick Me");
-			}
-
-			inv.addButton(count, new BInventoryButton(builderAll) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					User user = UserManager.getInstance().getVotingPluginUser(event.getPlayer());
-					user.sendMessage(Commands.getInstance().voteURLs(user));
-
+			int count = 0;
+			if (Config.getInstance().getVoteURLViewAllUrlsButtonEnabled()) {
+				ItemBuilder builderAll = new ItemBuilder(
+						Config.getInstance().getVoteURLAlreadyVotedAllUrlsButtonItemSection());
+				if (Config.getInstance().isGuiVoteURLAllUrlsButtonrequireAllSitesVoted()) {
+					if (user.canVoteAny()) {
+						builderAll = new ItemBuilder(Config.getInstance().getVoteURLCanVoteAllUrlsButtonItemSection());
+					}
+				} else {
+					if (user.canVoteAll()) {
+						builderAll = new ItemBuilder(Config.getInstance().getVoteURLCanVoteAllUrlsButtonItemSection());
+					}
 				}
-			});
 
-			count++;
-		}
+				if (!builderAll.hasCustomDisplayName()) {
+					builderAll.setName("&4All Voting Sites");
+				}
+				if (!builderAll.hasCustomLore()) {
+					builderAll.setLore("&cClick Me");
+				}
 
-		for (final VoteSite voteSite : plugin.getVoteSites()) {
-			ItemBuilder builder = new ItemBuilder(Config.getInstance().getVoteURLAlreadyVotedItemSection());
-			if (user.canVoteSite(voteSite)) {
-				builder = new ItemBuilder(Config.getInstance().getVoteURLCanVoteItemSection());
-			} else {
-				builder.addLoreLine(Config.getInstance().getVoteURLNextVote().replace("%Info%",
-						Commands.getInstance().voteCommandNextInfo(user, voteSite)));
+				inv.addButton(count, new BInventoryButton(builderAll) {
+
+					@Override
+					public void onClick(ClickEvent event) {
+						User user = UserManager.getInstance().getVotingPluginUser(event.getPlayer());
+						user.sendMessage(Commands.getInstance().voteURLs(user, true));
+					}
+				});
+
+				count++;
 			}
 
-			builder.setName(Config.getInstance().getVoteURLSiteName().replace("%Name%", voteSite.getDisplayName()));
+			for (final VoteSite voteSite : plugin.getVoteSites()) {
+				ItemBuilder builder = new ItemBuilder(Config.getInstance().getVoteURLAlreadyVotedItemSection());
+				if (user.canVoteSite(voteSite)) {
+					builder = new ItemBuilder(Config.getInstance().getVoteURLCanVoteItemSection());
+				} else {
+					builder.addLoreLine(Config.getInstance().getVoteURLNextVote().replace("%Info%",
+							Commands.getInstance().voteCommandNextInfo(user, voteSite)));
+				}
 
-			inv.addButton(count, new BInventoryButton(builder) {
+				builder.setName(Config.getInstance().getVoteURLSiteName().replace("%Name%", voteSite.getDisplayName()));
 
-				@Override
-				public void onClick(ClickEvent event) {
-					Player player = event.getPlayer();
-					if (player != null) {
-						if (Config.getInstance().isCommandsVoteRewardFromVoteURL()
-								&& event.getClick().equals(ClickType.RIGHT)) {
-							voteReward(player, voteSite.getKey());
+				inv.addButton(count, new BInventoryButton(builder) {
+
+					@Override
+					public void onClick(ClickEvent event) {
+						Player player = event.getPlayer();
+						if (player != null) {
+							if (Config.getInstance().isCommandsVoteRewardFromVoteURL()
+									&& event.getClick().equals(ClickType.RIGHT)) {
+								voteReward(player, voteSite.getKey());
+							} else {
+								User user = UserManager.getInstance().getVotingPluginUser(player);
+								user.sendMessage(
+										StringParser.getInstance()
+												.replacePlaceHolder(
+														StringParser.getInstance()
+																.replacePlaceHolder(
+																		StringParser.getInstance().replacePlaceHolder(
+																				Config.getInstance()
+																						.getGUIVoteURLURLText(),
+																				"voteurl", voteSite.getVoteURL()),
+																		"sitename", voteSite.getDisplayName()),
+														"player", player.getName()));
+							}
+						}
+
+					}
+				});
+				count++;
+			}
+
+			if (Config.getInstance().getGUIVoteURLBackButton()) {
+				inv.addButton(getBackButton());
+			}
+
+			inv.openInventory(player);
+		} else {
+			// book gui
+			ArrayList<BaseComponent[]> builder = new ArrayList<BaseComponent[]>();
+			BookUtil.PageBuilder currentPage = new BookUtil.PageBuilder();
+			int lines = 0;
+			for (final VoteSite site : plugin.getVoteSites()) {
+
+				try {
+					ArrayList<String> layout = Config.getInstance().getGUIVoteURLBookGUILayout();
+
+					lines += layout.size();
+					if (lines > 14) {
+						builder.add(currentPage.build());
+						currentPage = new BookUtil.PageBuilder();
+						lines = layout.size();
+						plugin.debug("New page");
+					}
+
+					HashMap<String, String> placeholders = new HashMap<String, String>();
+					placeholders.put("Sitename", site.getDisplayName());
+					ChatColor color = ChatColor.valueOf(Config.getInstance().getGUIVoteURLBookGUIAlreadyVotedColor());
+					String text = Config.getInstance().getGUIVoteURLBookGUIAlreadyVotedText();
+					if (user.canVoteSite(site)) {
+						color = ChatColor.valueOf(Config.getInstance().getGUIVoteURLBookGUICanVoteColor());
+						text = Config.getInstance().getGUIVoteURLBookGUICanVoteText();
+					}
+					String url = ChatColor.stripColor(StringParser.getInstance()
+							.colorize(StringParser.getInstance().parseJson(site.getVoteURL(false)).toPlainText()));
+					if (!url.startsWith("http")) {
+						if (!url.startsWith("www.")) {
+							url = "https://www." + url;
 						} 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()));
+							url = "https://" + url;
 						}
 					}
 
-				}
-			});
-			count++;
-		}
+					for (String str : layout) {
+						str = StringParser.getInstance().replacePlaceHolder(str, placeholders);
 
-		if (Config.getInstance().getGUIVoteURLBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
+						if (StringParser.getInstance().containsIgnorecase(str, "[UrlText]")) {
+							String[] split = str.split("[UrlText]");
+							String s = split[0].substring(0, split[0].length() - 1);
+							BaseComponent comp = new TextComponent(StringParser.getInstance().colorize(s));
+							comp.addExtra(BookUtil.TextBuilder.of(text).color(color)
+									.onClick(BookUtil.ClickAction.openUrl(url))
+									.onHover(BookUtil.HoverAction.showText(url)).build());
+							comp.addExtra(StringParser.getInstance().colorize(str.substring(s.length() + 9)));
+							currentPage.add(comp);
+						} else {
+							currentPage.add(StringParser.getInstance().colorize(str));
+						}
+						currentPage.newLine();
+					}
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+
+			builder.add(currentPage.build());
+
+			ItemStack book = BookUtil.writtenBook().author(player.getName())
+					.title(StringParser.getInstance().colorize(Config.getInstance().getGUIVoteURLBookGUITitle()))
+					.pages(builder).build();
+
+			Bukkit.getScheduler().runTask(plugin, new Runnable() {
 
 				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
+				public void run() {
+					BookUtil.openPlayer(player, book);
 				}
 			});
+
 		}
-
-		inv.openInventory(player);
-
 	}
 
 	public void openVoteURL(Player player, String voteSite) {
+		if (!plugin.isVoteSite(voteSite)) {
+			player.sendMessage("Not a valid votesite");
+			return;
+		}
 		User user = UserManager.getInstance().getVotingPluginUser(player);
 		VoteSite site = plugin.getVoteSite(voteSite);
-		BInventory inv = new BInventory(StringUtils.getInstance()
-				.replacePlaceHolder(Config.getInstance().getGUIVoteURLSiteName(), "site", site.getDisplayName()));
+		BInventory inv = new BInventory(Config.getInstance().getGUIVoteURLSiteName());
+		inv.addPlaceholder("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")) {
@@ -687,13 +899,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);
 	}
@@ -748,13 +954,7 @@ public class PlayerGUIs {
 		}
 
 		if (Config.getInstance().isVoteRewardBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-			});
+			inv.addButton(getBackButton());
 		}
 
 		inv.openInventory(player);

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

@@ -11,7 +11,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 
 import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandler;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
+import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.VotingPlugin.Main;
 
 /**
@@ -39,7 +39,7 @@ public class AdminVoteTabCompleter implements TabCompleter {
 				args.length - 1));
 
 		for (String str : cmds) {
-			if (StringUtils.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
+			if (StringParser.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
 				tab.add(str);
 			}
 		}

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

@@ -13,8 +13,8 @@ import org.bukkit.command.TabCompleter;
 
 import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
 import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 
 /**
@@ -87,7 +87,7 @@ public class AliasesTabCompleter implements TabCompleter {
 		}
 
 		for (String str : cmds) {
-			if (StringUtils.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
+			if (StringParser.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
 				tab.add(str);
 			}
 		}

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

@@ -11,7 +11,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 
 import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandler;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
+import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.VotingPlugin.Main;
 
 // TODO: Auto-generated Javadoc
@@ -40,7 +40,7 @@ public class VoteTabCompleter implements TabCompleter {
 				args.length - 1));
 
 		for (String str : cmds) {
-			if (StringUtils.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
+			if (StringParser.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
 				tab.add(str);
 			}
 		}

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

@@ -0,0 +1,82 @@
+package com.Ben12345rocks.VotingPlugin.Config;
+
+import java.io.File;
+
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.AnnotationHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataBoolean;
+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 lombok.Getter;
+
+public class BungeeSettings extends YMLFile {
+	/** The instance. */
+	static BungeeSettings instance = new BungeeSettings();
+
+	/** The plugin. */
+	static Main plugin = Main.plugin;
+
+	/**
+	 * Gets the single instance of Config.
+	 *
+	 * @return single instance of Config
+	 */
+	public static BungeeSettings getInstance() {
+		return instance;
+	}
+
+	@ConfigDataBoolean(path = "UseBungeecord", secondPath = "UseBungeecoord")
+	@Getter
+	private boolean useBungeecoord = false;
+
+	@ConfigDataBoolean(path = "BungeeBroadcast")
+	@Getter
+	private boolean bungeeBroadcast = false;
+
+	@ConfigDataBoolean(path = "BungeeBroadcastAlways")
+	@Getter
+	private boolean bungeeBroadcastAlways = false;
+
+	@ConfigDataBoolean(path = "BungeeDebug")
+	@Getter
+	private boolean bungeeDebug = false;
+
+	@ConfigDataString(path = "BungeeMethod")
+	@Getter
+	private String bungeeMethod = "SOCKETS";
+
+	@ConfigDataString(path = "BungeeServer.Host")
+	@Getter
+	private String bungeeServerHost = "";
+
+	@ConfigDataString(path = "Server")
+	@Getter
+	private String server = "PleaseSet";
+
+	@ConfigDataString(path = "SpigotServer.Host")
+	@Getter
+	private String spigotServerHost = "";
+
+	@ConfigDataInt(path = "BungeeServer.Port")
+	@Getter
+	private int bungeeServerPort = 1297;
+
+	@ConfigDataInt(path = "SpigotServer.Port")
+	@Getter
+	private int spigotServerPort = 1298;
+
+	public BungeeSettings() {
+		super(new File(Main.plugin.getDataFolder(), "BungeeSettings.yml"));
+	}
+
+	public void loadValues() {
+		new AnnotationHandler().load(getData(), this);
+	}
+
+	@Override
+	public void onFileCreation() {
+		plugin.saveResource("BungeeSettings.yml", true);
+	}
+}

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

@@ -9,9 +9,11 @@ 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.ConfigDataConfigurationSection;
 import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataInt;
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataListString;
 import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataString;
+import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.YML.YMLFile;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
@@ -56,6 +58,14 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean commandsVoteRewardFromVoteURL = false;
 
+	@ConfigDataBoolean(path = "ClearCacheOnVoteShopPurchase")
+	@Getter
+	private boolean clearCacheOnVoteShopPurchase = true;
+
+	@ConfigDataBoolean(path = "ExtraBackgroundUpdate")
+	@Getter
+	private boolean extraBackgroundUpdate = false;
+
 	@ConfigDataString(path = "Format.Commands.Vote.Last.TimeFormat", defaultValue = "%amount% %TimeType%")
 	@Getter
 	private String formatCommandsVoteLastTimeFormat;
@@ -68,9 +78,9 @@ public class Config extends YMLFile {
 	@Getter
 	private String formatCommandsVoteLastNeverVoted;
 
-	@ConfigDataString(path = "Format.Commands.Vote.Last.LastVoted", defaultValue = "%times% ago")
+	@ConfigDataString(path = "Format.Commands.Vote.Last.LastVoted")
 	@Getter
-	private String formatCommandsVoteLastLastVoted;
+	private String formatCommandsVoteLastLastVoted = "%times% ago";
 
 	@ConfigDataString(path = "Format.TimeFormats.Days", defaultValue = "Days")
 	@Getter
@@ -124,20 +134,26 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean addTotals = true;
 
+	@ConfigDataBoolean(path = "AlterColumns")
 	@Getter
-	private String allSitesRewardPath = "AllSites";
+	private boolean alterColumns = true;
+
+	@Getter
+	@ConfigDataString(path = "VoteShopDisabled")
+	private String voteShopDisabled = "&cVote shop disabled";
 
 	@ConfigDataBoolean(path = "AlternateUUIDLookup")
 	@Getter
 	private boolean alternateUUIDLookup = false;
 
-	@Getter
-	private String anySiteRewardsPath = "AnySiteRewards";
-
 	@ConfigDataBoolean(path = "AutoCreateVoteSites")
 	@Getter
 	private boolean autoCreateVoteSites = true;
 
+	@ConfigDataBoolean(path = "GUI.VoteURL.AllUrlsButton.RequireAllSitesVoted")
+	@Getter
+	private boolean guiVoteURLAllUrlsButtonrequireAllSitesVoted = true;
+
 	@ConfigDataBoolean(path = "Format.BroadcastVote")
 	@Getter
 	private boolean broadcastVotesEnabled = true;
@@ -194,9 +210,9 @@ public class Config extends YMLFile {
 	@Getter
 	private int convertDelay;
 
-	@ConfigDataBoolean(path = "EnableDailyRewards")
+	@ConfigDataInt(path = "ConvertAmount")
 	@Getter
-	private boolean enableDailyRewards = false;
+	private int convertAmount = 250;
 
 	@ConfigDataBoolean(path = "DisableUpdateChecking")
 	@Getter
@@ -206,48 +222,34 @@ public class Config extends YMLFile {
 	@Getter
 	private int delayBetweenUpdates = 3;
 
+	@ConfigDataInt(path = "MaxiumNumberOfTopVotersToLoad")
+	@Getter
+	private int MaxiumNumberOfTopVotersToLoad = -1;
+
 	@ConfigDataBoolean(path = "DisableNoServiceSiteMessage")
 	@Getter
 	private boolean disableNoServiceSiteMessage = false;
 
+	@ConfigDataListString(path = "DisabledDefaultPermissions")
+	@Getter
+	private ArrayList<String> disabledDefaultPermissions = new ArrayList<String>();
+
 	@ConfigDataBoolean(path = "DisableAdvancedTab")
 	@Getter
 	private boolean disableAdvancedTab = false;
 
+	@ConfigDataBoolean(path = "VoteShopRequireConfirmation")
 	@Getter
-	private String firstVoteRewardsPath = "FirstVote";
+	private boolean voteShopRequireConfirmation = false;
+
+	@ConfigDataBoolean(path = "Format.Commands.Vote.ForceLinks")
+	@Getter
+	private boolean formatCommandsVoteForceLinks = true;
 
 	@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;
@@ -264,6 +266,22 @@ public class Config extends YMLFile {
 	@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;
 
@@ -271,6 +289,88 @@ public class Config extends YMLFile {
 	@Getter
 	private String formatCommandsVoteTodayLine = "&6%player% : %VoteSite% : %Time%";
 
+	@ConfigDataString(path = "GUI.VoteToday.Line")
+	@Getter
+	private String GUIVoteTodayLine = "&6%VoteSite% : %Time%";
+
+	@ConfigDataBoolean(path = "GUI.VoteToday.UseSkull", defaultValue = true)
+	@Getter
+	private boolean GUIVoteTodayUseSkull = true;
+
+	@ConfigDataConfigurationSection(path = "GUI.VoteToday.PlayerItem")
+	@Getter
+	private ConfigurationSection GUIVoteTodayPlayerItem;
+
+	@ConfigDataString(path = "GUI.VoteToday.IconTitle")
+	@Getter
+	private String GUIVoteTodayIconTitle = "%player%";
+
+	@ConfigDataBoolean(path = "OverrideVersionDisable")
+	@Getter
+	private boolean overrideVersionDisable = false;
+
+	@ConfigDataBoolean(path = "LastMonthGUI")
+	@Getter
+	private boolean lastMonthGUI = false;
+
+	@ConfigDataBoolean(path = "AllowUnJoinedCheckServer")
+	@Getter
+	private boolean allowUnJoinedCheckServer = true;
+
+	@ConfigDataBoolean(path = "Commands.VoteBookGUI")
+	@Getter
+	private boolean commandsVoteBookGUI = false;
+
+	@ConfigDataBoolean(path = "UseJavascriptPlaceholders")
+	@Getter
+	private boolean useJavascriptPlaceholders = true;
+
+	@ConfigDataBoolean(path = "UseBungeecord", secondPath = "UseBungeecoord")
+	@Getter
+	@Deprecated
+	private boolean useBungeecoord = false;
+
+	@ConfigDataBoolean(path = "PreventRepeatMilestones")
+	@Getter
+	private boolean preventRepeatMilestones = false;
+
+	@ConfigDataListString(path = "DisabledCommands")
+	@Getter
+	private ArrayList<String> disabledCommands = new ArrayList<String>();
+
+	@ConfigDataListString(path = "VotingBroadcastBlacklist")
+	@Getter
+	private ArrayList<String> votingBroadcastBlacklist = new ArrayList<String>();
+
+	@ConfigDataListString(path = "GUI.VoteURLBookGUI.Layout")
+	@Getter
+	private ArrayList<String> GUIVoteURLBookGUILayout = ArrayUtils.getInstance()
+			.convert(new String[] { "&c%Sitename%", "[UrlText]" });
+
+	@ConfigDataString(path = "GUI.VoteURLBookGUI.Title")
+	@Getter
+	private String GUIVoteURLBookGUITitle = "&cVoteURL";
+
+	@ConfigDataString(path = "GUI.VoteURLBookGUI.SiteName")
+	@Getter
+	private String GUIVoteURLBookGUISiteName = "&c%name%";
+
+	@ConfigDataString(path = "GUI.VoteURLBookGUI.CanVoteText")
+	@Getter
+	private String GUIVoteURLBookGUICanVoteText = "Click me";
+
+	@ConfigDataString(path = "GUI.VoteURLBookGUI.AlreadyVotedText")
+	@Getter
+	private String GUIVoteURLBookGUIAlreadyVotedText = "Click me";
+
+	@ConfigDataString(path = "GUI.VoteURLBookGUI.CanVoteColor")
+	@Getter
+	private String GUIVoteURLBookGUICanVoteColor = "GREEN";
+
+	@ConfigDataString(path = "GUI.VoteURLBookGUI.AlreadyVotedColor")
+	@Getter
+	private String GUIVoteURLBookGUIAlreadyVotedColor = "RED";
+
 	/**
 	 * Instantiates a new config.
 	 */
@@ -292,78 +392,6 @@ public class Config extends YMLFile {
 		return (ArrayList<String>) getData().getList("BlackList", new ArrayList<String>());
 	}
 
-	/**
-	 * Gets the cumulative reward enabled.
-	 *
-	 * @param cumulative
-	 *            the cumulative
-	 * @return the cumulative reward enabled
-	 */
-	public boolean getCumulativeRewardEnabled(int cumulative) {
-		return getData().getBoolean("Cumulative." + cumulative + ".Enabled");
-	}
-
-	/**
-	 * Gets the cumulative rewards path
-	 *
-	 * @param cumulative
-	 *            the cumulative
-	 * @return the cumulative rewards
-	 */
-	public String getCumulativeRewardsPath(int cumulative) {
-		return "Cumulative." + cumulative + ".Rewards";
-	}
-
-	/**
-	 * Gets the cumulative votes.
-	 *
-	 * @return the cumulative votes
-	 */
-	public Set<String> getCumulativeVotes() {
-		try {
-			Set<String> set = getData().getConfigurationSection("Cumulative").getKeys(false);
-			if (set != null) {
-				return set;
-			}
-			return new HashSet<String>();
-		} catch (Exception ex) {
-			return new HashSet<String>();
-		}
-	}
-
-	/**
-	 * Gets the cumulative votes in same day.
-	 *
-	 * @param cumulative
-	 *            the cumulative
-	 * @return the cumulative votes in same day
-	 */
-	public boolean getCumulativeVotesInSameDay(int cumulative) {
-		return getData().getBoolean("Cumulative." + cumulative + ".VotesInSameDay");
-	}
-
-	public boolean getCumulativeVotesInSameWeek(int cumulative) {
-		return getData().getBoolean("Cumulative." + cumulative + ".VotesInSameWeek");
-	}
-
-	public String getDailyAwardRewardsPath(String path) {
-		return "DailyAwards." + path + ".Rewards";
-	}
-
-	/**
-	 * Gets the daily possible reward places.
-	 *
-	 * @return the daily possible reward places
-	 */
-	public Set<String> getDailyPossibleRewardPlaces() {
-		try {
-			return getData().getConfigurationSection("DailyAwards").getKeys(false);
-		} catch (Exception ex) {
-			return new HashSet<String>();
-
-		}
-	}
-
 	/**
 	 * Gets the broad cast msg.
 	 *
@@ -904,6 +932,10 @@ public class Config extends YMLFile {
 		return getData().getInt("Shop." + identifier + ".Cost");
 	}
 
+	public String getIdentifierIdentifierName(String identifier) {
+		return getData().getString("Shop." + identifier + ".Identifier_Name", identifier);
+	}
+
 	public int getIdentifierLimit(String identifier) {
 		return getData().getInt("Shop." + identifier + ".Limit", -1);
 	}
@@ -956,62 +988,6 @@ public class Config extends YMLFile {
 		return getData().getBoolean("LoadTopVoter.Weekly");
 	}
 
-	/**
-	 * Gets the milestone reward enabled.
-	 *
-	 * @param milestones
-	 *            the milestones
-	 * @return the milestone reward enabled
-	 */
-	public boolean getMilestoneRewardEnabled(int milestones) {
-		return getData().getBoolean("MileStones." + milestones + ".Enabled");
-	}
-
-	/**
-	 * Gets the milestone rewards.
-	 *
-	 * @param milestones
-	 *            the milestones
-	 * @return the milestone rewards
-	 */
-	public String getMilestoneRewardsPath(int milestones) {
-		return "MileStones." + milestones + ".Rewards";
-	}
-
-	/**
-	 * Gets the milestone votes.
-	 *
-	 * @return the milestone votes
-	 */
-	public Set<String> getMilestoneVotes() {
-		try {
-			Set<String> set = getData().getConfigurationSection("MileStones").getKeys(false);
-			if (set != null) {
-				return set;
-			}
-			return new HashSet<String>();
-		} catch (Exception ex) {
-			return new HashSet<String>();
-		}
-	}
-
-	public String getMonthlyAwardRewardsPath(String path) {
-		return "MonthlyAwards." + path + ".Rewards";
-	}
-
-	/**
-	 * Gets the monthly possible reward places.
-	 *
-	 * @return the monthly possible reward places
-	 */
-	public Set<String> getMonthlyPossibleRewardPlaces() {
-		try {
-			return getData().getConfigurationSection("MonthlyAwards").getKeys(false);
-		} catch (Exception ex) {
-			return new HashSet<String>();
-		}
-	}
-
 	public int getPointsOnVote() {
 		return getData().getInt("PointsOnVote", 1);
 	}
@@ -1043,10 +1019,6 @@ public class Config extends YMLFile {
 		return (ArrayList<String>) getData().getList("RequestAPI.DisabledMethods", new ArrayList<String>());
 	}
 
-	public boolean getResetMilestonesMonthly() {
-		return getData().getBoolean("ResetMilestonesMonthly");
-	}
-
 	/**
 	 * Gets the store top voters daily.
 	 *
@@ -1134,62 +1106,6 @@ public class Config extends YMLFile {
 		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);
-	}
-
-	/**
-	 * Gets the vote party enabled.
-	 *
-	 * @return the vote party enabled
-	 */
-	public boolean getVotePartyEnabled() {
-		return getData().getBoolean("VoteParty.Enabled");
-	}
-
-	/**
-	 * Gets the vote party give all players.
-	 *
-	 * @return the vote party give all players
-	 */
-	public boolean getVotePartyGiveAllPlayers() {
-		return getData().getBoolean("VoteParty.GiveAllPlayers");
-	}
-
-	public int getVotePartyIncreaseVotesRquired() {
-		return getData().getInt("VoteParty.IncreaseVotesRquired", 0);
-	}
-
-	public boolean getVotePartyResetEachDay() {
-		return getData().getBoolean("VoteParty.ResetEachDay");
-	}
-
-	public boolean getVotePartyResetMontly() {
-		return getData().getBoolean("VoteParty.ResetMonthly");
-	}
-
-	public int getVotePartyUserVotesRequired() {
-		return getData().getInt("VoteParty.UserVotesRequired");
-	}
-
-	/**
-	 * Gets the vote party votes required.
-	 *
-	 * @return the vote party votes required
-	 */
-	public int getVotePartyVotesRequired() {
-		return getData().getInt("VoteParty.VotesRequired");
-	}
-
 	/**
 	 * Gets the enabled.
 	 *
@@ -1247,10 +1163,26 @@ public class Config extends YMLFile {
 		return getData().getString("GUI.VoteShopName", "VoteShop");
 	}
 
+	public boolean getVoteShopNotBuyable(String shop) {
+		return getData().getBoolean("Shop." + shop + ".NotBuyable", false);
+	}
+
 	public String getVoteShopPermission(String ident) {
 		return getData().getString("Shop." + ident + ".Permission", "");
 	}
 
+	public boolean getVoteShopResetDaily(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Daily", false);
+	}
+
+	public boolean getVoteShopResetMonthly(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Monthly", false);
+	}
+
+	public boolean getVoteShopResetWeekly(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Weekly", false);
+	}
+
 	/**
 	 * Gets the vote site items.
 	 *
@@ -1286,35 +1218,6 @@ public class Config extends YMLFile {
 		return getData().getInt("GUI.VoteReward." + siteName + ".Items." + item + ".Slot");
 	}
 
-	/**
-	 * Gets the votes required.
-	 *
-	 * @return the votes required
-	 */
-	public int getVotesRequired() {
-		return getData().getInt("VotesRequired");
-	}
-
-	public boolean getVoteStreakRewardEnabled(String type, String s) {
-		return getData().getBoolean("VoteStreak." + type + "." + s + ".Enabled");
-	}
-
-	public String getVoteStreakRewardsPath(String type, String string) {
-		return "VoteStreak." + type + "." + string + ".Rewards";
-	}
-
-	public Set<String> getVoteStreakVotes(String type) {
-		try {
-			Set<String> set = getData().getConfigurationSection("VoteStreak." + type).getKeys(false);
-			if (set != null) {
-				return set;
-			}
-			return new HashSet<String>();
-		} catch (Exception ex) {
-			return new HashSet<String>();
-		}
-	}
-
 	public String getVoteTopDefault() {
 		return getData().getString("VoteTopDefault", "Monthly");
 	}
@@ -1380,23 +1283,6 @@ public class Config extends YMLFile {
 		return getData().getBoolean("GUI.VoteURL.ViewAllUrlsButtonEnabled");
 	}
 
-	public String getWeeklyAwardRewardsPath(String path) {
-		return "WeeklyAwards." + path + ".Rewards";
-	}
-
-	/**
-	 * Gets the weekly possible reward places.
-	 *
-	 * @return the weekly possible reward places
-	 */
-	public Set<String> getWeeklyPossibleRewardPlaces() {
-		try {
-			return getData().getConfigurationSection("WeeklyAwards").getKeys(false);
-		} catch (Exception ex) {
-			return new HashSet<String>();
-		}
-	}
-
 	public void loadValues() {
 		new AnnotationHandler().load(getData(), this);
 	}

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

@@ -6,11 +6,14 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
 
+import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.YML.YMLFile;
 import com.Ben12345rocks.VotingPlugin.Main;
@@ -60,11 +63,18 @@ 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, "DisplayItem.Material", "GRASS");
+			set(siteName, "DisplayItem.Amount", 1);
 			set(siteName, "Rewards.Messages.Player", "&aThanks for voting on %ServiceSite%!");
 
 			plugin.loadVoteSites();
+
+			for (Player p : Bukkit.getOnlinePlayers()) {
+				if (p.hasPermission("VotingPlugin.Admin.GenerateServiceSite") || p.isOp()) {
+					p.sendMessage(StringParser.getInstance().colorize("&cGenerating votesite for service site "
+							+ siteName + ", please check console for details"));
+				}
+			}
 		}
 	}
 
@@ -88,6 +98,9 @@ public class ConfigVoteSites extends YMLFile {
 	}
 
 	public ConfigurationSection getItem(String site) {
+		if (getData(site).isConfigurationSection("DisplayItem")) {
+			return getData(site).getConfigurationSection("DisplayItem");
+		}
 		return getData(site).getConfigurationSection("Item");
 	}
 
@@ -124,6 +137,10 @@ public class ConfigVoteSites extends YMLFile {
 		return getData(siteName).getString("ServiceSite");
 	}
 
+	public int getTimeOffSet(String siteName) {
+		return getData(siteName).getInt("TimeOffSet", 0);
+	}
+
 	/**
 	 * Gets the vote delay.
 	 *
@@ -135,6 +152,10 @@ public class ConfigVoteSites extends YMLFile {
 		return getData(siteName).getInt("VoteDelay");
 	}
 
+	public int getVoteDelayMin(String siteName) {
+		return getData(siteName).getInt("VoteDelayMin", 0);
+	}
+
 	/**
 	 * Gets the vote site enabled.
 	 *

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

@@ -0,0 +1,303 @@
+package com.Ben12345rocks.VotingPlugin.Config;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
+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.YML.YMLFile;
+import com.Ben12345rocks.VotingPlugin.Main;
+
+import lombok.Getter;
+
+public class SpecialRewardsConfig extends YMLFile {
+	/** The instance. */
+	static SpecialRewardsConfig instance = new SpecialRewardsConfig();
+
+	/** The plugin. */
+	static Main plugin = Main.plugin;
+
+	/**
+	 * Gets the single instance of Config.
+	 *
+	 * @return single instance of Config
+	 */
+	public static SpecialRewardsConfig getInstance() {
+		return instance;
+	}
+
+	@ConfigDataBoolean(path = "EnableWeeklyAwards")
+	@Getter
+	private boolean enableWeeklyAwards = false;
+
+	@ConfigDataBoolean(path = "EnableDailyRewards")
+	@Getter
+	private boolean enableDailyRewards = false;
+
+	@ConfigDataBoolean(path = "EnableMonthlyAwards")
+	@Getter
+	private boolean enableMonthlyAwards = false;
+
+	@Getter
+	private String anySiteRewardsPath = "AnySiteRewards";
+
+	@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 = "VoteParty.ResetExtraVotesMonthly")
+	@Getter
+	private boolean votePartyResetExtraVotesMonthly = false;
+
+	@Getter
+	private String allSitesRewardPath = "AllSites";
+
+	@Getter
+	private String votePartyRewardsPath = "VoteParty.Rewards";
+
+	@Getter
+	private String firstVoteRewardsPath = "FirstVote";
+
+	public SpecialRewardsConfig() {
+		super(new File(Main.plugin.getDataFolder(), "SpecialRewards.yml"));
+	}
+
+	public boolean getCumulativeRewardEnabled(int cumulative) {
+		return getData().getBoolean("Cumulative." + cumulative + ".Enabled");
+	}
+
+	public String getCumulativeRewardsPath(int cumulative) {
+		return "Cumulative." + cumulative + ".Rewards";
+	}
+
+	/**
+	 * Gets the cumulative votes.
+	 *
+	 * @return the cumulative votes
+	 */
+	public Set<String> getCumulativeVotes() {
+		try {
+			Set<String> set = getData().getConfigurationSection("Cumulative").getKeys(false);
+			if (set != null) {
+				return set;
+			}
+			return new HashSet<String>();
+		} catch (Exception ex) {
+			return new HashSet<String>();
+		}
+	}
+
+	/**
+	 * Gets the cumulative votes in same day.
+	 *
+	 * @param cumulative
+	 *            the cumulative
+	 * @return the cumulative votes in same day
+	 */
+	public boolean getCumulativeVotesInSameDay(int cumulative) {
+		return getData().getBoolean("Cumulative." + cumulative + ".VotesInSameDay");
+	}
+
+	public boolean getCumulativeVotesInSameMonth(int cumulative) {
+		return getData().getBoolean("Cumulative." + cumulative + ".VotesInSameMonth");
+	}
+
+	public boolean getCumulativeVotesInSameWeek(int cumulative) {
+		return getData().getBoolean("Cumulative." + cumulative + ".VotesInSameWeek");
+	}
+
+	public String getDailyAwardRewardsPath(String path) {
+		return "DailyAwards." + path + ".Rewards";
+	}
+
+	/**
+	 * Gets the daily possible reward places.
+	 *
+	 * @return the daily possible reward places
+	 */
+	public Set<String> getDailyPossibleRewardPlaces() {
+		try {
+			return getData().getConfigurationSection("DailyAwards").getKeys(false);
+		} catch (Exception ex) {
+			return new HashSet<String>();
+
+		}
+	}
+
+	/**
+	 * Gets the milestone reward enabled.
+	 *
+	 * @param milestones
+	 *            the milestones
+	 * @return the milestone reward enabled
+	 */
+	public boolean getMilestoneRewardEnabled(int milestones) {
+		return getData().getBoolean("MileStones." + milestones + ".Enabled");
+	}
+
+	/**
+	 * Gets the milestone rewards.
+	 *
+	 * @param milestones
+	 *            the milestones
+	 * @return the milestone rewards
+	 */
+	public String getMilestoneRewardsPath(int milestones) {
+		return "MileStones." + milestones + ".Rewards";
+	}
+
+	/**
+	 * Gets the milestone votes.
+	 *
+	 * @return the milestone votes
+	 */
+	public Set<String> getMilestoneVotes() {
+		try {
+			Set<String> set = getData().getConfigurationSection("MileStones").getKeys(false);
+			if (set != null) {
+				return set;
+			}
+			return new HashSet<String>();
+		} catch (Exception ex) {
+			return new HashSet<String>();
+		}
+	}
+
+	public String getMonthlyAwardRewardsPath(String path) {
+		return "MonthlyAwards." + path + ".Rewards";
+	}
+
+	/**
+	 * Gets the monthly possible reward places.
+	 *
+	 * @return the monthly possible reward places
+	 */
+	public Set<String> getMonthlyPossibleRewardPlaces() {
+		try {
+			return getData().getConfigurationSection("MonthlyAwards").getKeys(false);
+		} catch (Exception ex) {
+			return new HashSet<String>();
+		}
+	}
+
+	public boolean getResetMilestonesMonthly() {
+		return getData().getBoolean("ResetMilestonesMonthly");
+	}
+
+	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);
+	}
+
+	/**
+	 * Gets the vote party enabled.
+	 *
+	 * @return the vote party enabled
+	 */
+	public boolean getVotePartyEnabled() {
+		return getData().getBoolean("VoteParty.Enabled");
+	}
+
+	/**
+	 * Gets the vote party give all players.
+	 *
+	 * @return the vote party give all players
+	 */
+	public boolean getVotePartyGiveAllPlayers() {
+		return getData().getBoolean("VoteParty.GiveAllPlayers");
+	}
+
+	public int getVotePartyIncreaseVotesRquired() {
+		return getData().getInt("VoteParty.IncreaseVotesRquired", 0);
+	}
+
+	public boolean getVotePartyResetEachDay() {
+		return getData().getBoolean("VoteParty.ResetEachDay");
+	}
+
+	public boolean getVotePartyResetMontly() {
+		return getData().getBoolean("VoteParty.ResetMonthly");
+	}
+
+	public int getVotePartyUserVotesRequired() {
+		return getData().getInt("VoteParty.UserVotesRequired");
+	}
+
+	/**
+	 * Gets the vote party votes required.
+	 *
+	 * @return the vote party votes required
+	 */
+	public int getVotePartyVotesRequired() {
+		return getData().getInt("VoteParty.VotesRequired");
+	}
+
+	public boolean getVoteStreakRewardEnabled(String type, String s) {
+		return getData().getBoolean("VoteStreak." + type + "." + s + ".Enabled");
+	}
+
+	public String getVoteStreakRewardsPath(String type, String string) {
+		return "VoteStreak." + type + "." + string + ".Rewards";
+	}
+
+	public Set<String> getVoteStreakVotes(String type) {
+		try {
+			Set<String> set = getData().getConfigurationSection("VoteStreak." + type).getKeys(false);
+			if (set != null) {
+				return set;
+			}
+			return new HashSet<String>();
+		} catch (Exception ex) {
+			return new HashSet<String>();
+		}
+	}
+
+	public String getWeeklyAwardRewardsPath(String path) {
+		return "WeeklyAwards." + path + ".Rewards";
+	}
+
+	/**
+	 * Gets the weekly possible reward places.
+	 *
+	 * @return the weekly possible reward places
+	 */
+	public Set<String> getWeeklyPossibleRewardPlaces() {
+		try {
+			return getData().getConfigurationSection("WeeklyAwards").getKeys(false);
+		} catch (Exception ex) {
+			return new HashSet<String>();
+		}
+	}
+
+	public void loadValues() {
+		new AnnotationHandler().load(getData(), this);
+	}
+
+	@Override
+	public void onFileCreation() {
+		plugin.saveResource("SpecialRewards.yml", true);
+	}
+}

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

@@ -0,0 +1,91 @@
+package com.Ben12345rocks.VotingPlugin.CoolDown;
+
+import java.util.TimerTask;
+
+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.SpecialRewardsConfig;
+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() {
+		Main.plugin.getTimer().schedule(new TimerTask() {
+
+			@Override
+			public void run() {
+				if (Main.plugin != null) {
+					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();
+							}
+						} else {
+							cancel();
+						}
+					}
+				} else {
+					cancel();
+				}
+			}
+		}, 1000 * 60 * 3);
+
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void onCoolDownEnd(PlayerVoteCoolDownEndEvent event) {
+		RewardHandler.getInstance().giveReward(event.getPlayer(), SpecialRewardsConfig.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

@@ -78,8 +78,8 @@ public class ServerData {
 		getData().set("Signs." + count + ".Data", data);
 		getData().set("Signs." + count + ".Position", position);
 		saveData();
-		plugin.getSigns().add(new SignHandler("" + count, getSignLocation("" + count), getSignData("" + count),
-				getSignPosition("" + count)));
+		plugin.getSigns().add(new SignHandler("" + count, getSignLocation("" + count), getSignSkullLocation("" + count),
+				getSignData("" + count), getSignPosition("" + count)));
 	}
 
 	/**
@@ -151,6 +151,22 @@ public class ServerData {
 		}
 	}
 
+	/**
+	 * Gets the sign location.
+	 *
+	 * @param sign
+	 *            the sign
+	 * @return the sign location
+	 */
+	public Location getSignSkullLocation(String sign) {
+		if (getData().getString("Signs." + sign + ".Skull.World", "").isEmpty()) {
+			return null;
+		}
+		return new Location(Bukkit.getWorld(getData().getString("Signs." + sign + ".Skull.World")),
+				getData().getDouble("Signs." + sign + ".Skull.X"), getData().getDouble("Signs." + sign + ".Skull.Y"),
+				getData().getDouble("Signs." + sign + ".Skull.Z"));
+	}
+
 	public int getVotePartyExtraRequired() {
 		return getData().getInt("VotePartyExtraRequired", 0);
 	}
@@ -194,6 +210,10 @@ public class ServerData {
 		getData().set("Signs." + sign + ".Data", null);
 		getData().set("Signs." + sign + ".Position", null);
 		getData().set("Signs." + sign, null);
+		getData().set("Signs." + sign + ".Skull.World", null);
+		getData().set("Signs." + sign + ".Skull.X", null);
+		getData().set("Signs." + sign + ".Skull.Y", null);
+		getData().set("Signs." + sign + ".Skull.Z", null);
 		saveData();
 	}
 
@@ -209,31 +229,32 @@ public class ServerData {
 		saveData();
 	}
 
-	/**
-	 * Sets the sign.
-	 *
-	 * @param count
-	 *            the count
-	 * @param location
-	 *            the location
-	 * @param data
-	 *            the data
-	 * @param position
-	 *            the position
-	 */
-	public void setSign(String count, Location location, String data, int position) {
+	public void setSign(String count, Location location, Location skullLocation, String data, int position) {
 
 		getData().set("Signs." + count + ".World", location.getWorld().getName());
-		int x = (int) location.getX();
-		int z = (int) location.getZ();
-		getData().set("Signs." + count + ".X", x);
-		getData().set("Signs." + count + ".Y", location.getY());
-		getData().set("Signs." + count + ".Z", z);
+		getData().set("Signs." + count + ".X", (int) location.getX());
+		getData().set("Signs." + count + ".Y", (int) location.getY());
+		getData().set("Signs." + count + ".Z", (int) location.getZ());
 		getData().set("Signs." + count + ".Data", data);
 		getData().set("Signs." + count + ".Position", position);
+		if (skullLocation != null) {
+			getData().set("Signs." + count + ".Skull.World", skullLocation.getWorld().getName());
+			getData().set("Signs." + count + ".Skull.X", (int) skullLocation.getX());
+			getData().set("Signs." + count + ".Skull.Y", (int) skullLocation.getY());
+			getData().set("Signs." + count + ".Skull.Z", (int) skullLocation.getZ());
+		}
 		saveData();
 	}
 
+	public void setSkullLocation(String count, Location skullLocation) {
+		if (skullLocation != null) {
+			getData().set("Signs." + count + ".Skull.World", skullLocation.getWorld().getName());
+			getData().set("Signs." + count + ".Skull.X", (int) skullLocation.getX());
+			getData().set("Signs." + count + ".Skull.Y", (int) skullLocation.getY());
+			getData().set("Signs." + count + ".Skull.Z", (int) skullLocation.getZ());
+		}
+	}
+
 	/**
 	 * Sets the version.
 	 */

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

@@ -44,8 +44,8 @@ public class PlayerReceivePointsEvent extends Event {
 
 	public PlayerReceivePointsEvent(User user, int points) {
 		super(true);
-		setPlayer(user);
-		setPoints(points);
+		this.player = user;
+		this.points = points;
 	}
 
 	/*

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

@@ -40,8 +40,8 @@ public class PlayerSpecialRewardEvent extends Event {
 
 	public PlayerSpecialRewardEvent(User user, SpecialRewardType type) {
 		super(true);
-		setType(type);
-		setUser(user);
+		this.type = type;
+		this.user = user;
 	}
 
 	/*

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

@@ -42,16 +42,32 @@ public class PlayerVoteEvent extends Event {
 	@Setter
 	private boolean realVote = true;
 
+	@Getter
+	@Setter
+	private boolean addTotals = true;
+
 	@Getter
 	@Setter
 	private String serviceSite = "";
 
+	@Getter
+	@Setter
+	private long time;
+
+	@Getter
+	@Setter
+	private boolean bungee = false;
+
+	@Getter
+	@Setter
+	private boolean forceBungee = false;
+
 	public PlayerVoteEvent(VoteSite voteSite, String voteUsername, String serviceSite, boolean realVote) {
 		super(true);
-		setPlayer(voteUsername);
-		setVoteSite(voteSite);
-		setRealVote(realVote);
-		setServiceSite(serviceSite);
+		this.player = voteUsername;
+		this.voteSite = voteSite;
+		this.realVote = realVote;
+		this.serviceSite = serviceSite;
 	}
 
 	/*

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

@@ -30,18 +30,24 @@ public class PlayerCommandSendListener implements Listener {
 			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);
+		if (!Main.plugin.getAdvancedTab().containsKey(event.getPlayer().getUniqueId())) {
+			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);
+					}
 				}
 			}
+			Main.plugin.getAdvancedTab().put(event.getPlayer().getUniqueId(), removeCmds);
+		} else {
+			removeCmds = Main.plugin.getAdvancedTab().get(event.getPlayer().getUniqueId());
 		}
 		event.getCommands().removeAll(removeCmds);
 	}

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

@@ -1,6 +1,7 @@
 package com.Ben12345rocks.VotingPlugin.Listeners;
 
 import org.bukkit.block.Sign;
+import org.bukkit.block.Skull;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -8,6 +9,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 
+import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Signs.SignHandler;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
@@ -49,9 +51,33 @@ public class PlayerInteract implements Listener {
 						// plugin.debug(player.getName() +
 						// " right clicked a top voter sign, sending message");
 						UserManager.getInstance().getVotingPluginUser(player).sendMessage(sign.getRightClickMessage());
+
+						if (!sign.isSkullSet()) {
+							if (PlayerUtils.getInstance().hasServerPermission(event.getPlayer().getName(),
+									"VotingPlugin.Sign.Create")
+									|| PlayerUtils.getInstance().hasServerPermission(event.getPlayer().getName(),
+											"VotingPlugin.Admin")) {
+								player.sendMessage("Skull not set, click to set skull");
+								PlayerUtils.getInstance().setPlayerMeta(player, "skullset", sign.getSign());
+							}
+						}
 					}
 				}
 
+			} else if (event.getClickedBlock().getState() instanceof Skull) {
+				Object ob = PlayerUtils.getInstance().getPlayerMeta(player, "skullset");
+				if (ob != null) {
+					String sign1 = (String) ob;
+					for (SignHandler sign : plugin.getSigns()) {
+						if (sign.getSign().equals(sign1)) {
+							sign.setSkullLocation(event.getClickedBlock().getLocation());
+							sign.storeSign();
+							sign.checkSkulls();
+							player.sendMessage("Skull set");
+						}
+					}
+					PlayerUtils.getInstance().setPlayerMeta(player, "skullset", null);
+				}
 			}
 		}
 	}

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

@@ -1,14 +1,16 @@
 package com.Ben12345rocks.VotingPlugin.Listeners;
 
+import org.bukkit.Bukkit;
 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.PlayerQuitEvent;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.Listeners.AdvancedCoreLoginEvent;
 import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
 import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 
@@ -40,21 +42,41 @@ public class PlayerJoinEvent implements Listener {
 	 */
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
 	public void onPlayerLogin(AdvancedCoreLoginEvent event) {
-		if (event.getPlayer() == null || (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)
-				&& AdvancedCoreHook.getInstance().getMysql() == null)) {
+		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 check console for details");
+		}
+
+		boolean data = user.getData().hasData();
 
 		// run remind
 		user.loginMessage();
 
-		if (user.getData().hasData()) {
+		if (data) {
 			// give offline vote (if they voted offline)
 			user.offVote();
 		}
+	}
+
+	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+	public void onPlayerQuit(PlayerQuitEvent event) {
+		if (Config.getInstance().isDisableAdvancedTab()) {
+			return;
+		}
+		final java.util.UUID uuid = event.getPlayer().getUniqueId();
+		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				Main.plugin.getAdvancedTab().remove(uuid);
+			}
+		});
 
 	}
 }

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

@@ -1,15 +1,20 @@
 package com.Ben12345rocks.VotingPlugin.Listeners;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.ArrayList;
 
+import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
+import com.Ben12345rocks.AdvancedCore.Util.PluginMessage.PluginMessage;
+import com.Ben12345rocks.VotingPlugin.BungeeHandler;
 import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Config.BungeeSettings;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteEvent;
@@ -18,6 +23,7 @@ import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
 import com.Ben12345rocks.VotingPlugin.SpecialRewards.SpecialRewards;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
+import com.Ben12345rocks.VotingPlugin.bungee.BungeeMethod;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -55,7 +61,7 @@ public class PlayerVoteListener implements Listener {
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onplayerVote(PlayerVoteEvent event) {
 		String playerName = event.getPlayer();
-		if (!PlayerUtils.getInstance().isValidUser(playerName)) {
+		if (!PlayerUtils.getInstance().isValidUser(playerName, Config.getInstance().isAllowUnJoinedCheckServer())) {
 			if (!config.isAllowUnjoined()) {
 				plugin.getLogger().warning("Player " + playerName
 						+ " has not joined before, disregarding vote, set AllowUnjoined to true to prevent this");
@@ -85,7 +91,7 @@ public class PlayerVoteListener implements Listener {
 		User user = UserManager.getInstance().getVotingPluginUser(playerName);
 		user.updateName();
 
-		if (Config.getInstance().isClearCacheOnVote()) {
+		if (Config.getInstance().isClearCacheOnVote() || BungeeSettings.getInstance().isUseBungeecoord()) {
 			user.clearCache();
 		}
 
@@ -100,14 +106,30 @@ public class PlayerVoteListener implements Listener {
 			VoteParty.getInstance().vote(user, event.isRealVote());
 
 			// broadcast vote if enabled in config
-			if (config.isBroadcastVotesEnabled()) {
+			if (config.isBroadcastVotesEnabled()
+					&& (BungeeSettings.getInstance().isBungeeBroadcast() || !event.isBungee())) {
 				if (!Config.getInstance().getFormatBroadcastWhenOnline() || user.isOnline()) {
 					voteSite.broadcastVote(user);
 				}
 			}
 
 			// update last vote time
-			user.setTime(voteSite);
+			if (event.getTime() != 0) {
+				user.setTime(voteSite, event.getTime());
+			} else {
+				user.setTime(voteSite);
+			}
+			user.setLastVoteCoolDownCheck(false, voteSite);
+
+			// try logging to file
+			if (Config.getInstance().isLogVotesToFile()) {
+				try {
+					Main.plugin.logVote(LocalDateTime.now().atZone(ZoneId.systemDefault()).toLocalDateTime(),
+							playerName, voteSite.getKey());
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
 
 			// check first vote rewards
 			SpecialRewards.getInstance().checkFirstVote(user);
@@ -118,9 +140,9 @@ public class PlayerVoteListener implements Listener {
 
 			// check if player has voted on all sites in one day
 
-			if ((user.isOnline() || voteSite.isGiveOffline())
-					&& AdvancedCoreHook.getInstance().getOptions().isProcessRewards()) {
-				user.playerVote(voteSite, true, false);
+			if (((user.isOnline() || voteSite.isGiveOffline()) && Main.plugin.getOptions().isProcessRewards())
+					|| event.isBungee()) {
+				user.playerVote(voteSite, true, false, event.isForceBungee());
 				user.closeInv();
 			} else {
 				user.addOfflineVote(voteSite.getKey());
@@ -129,7 +151,7 @@ public class PlayerVoteListener implements Listener {
 			}
 
 			// add to total votes
-			if (Config.getInstance().isCountFakeVotes() || event.isRealVote()) {
+			if ((Config.getInstance().isCountFakeVotes() || event.isRealVote()) && event.isAddTotals()) {
 				if (Config.getInstance().isAddTotals()) {
 					user.addTotal();
 					user.addTotalDaily();
@@ -144,6 +166,22 @@ public class PlayerVoteListener implements Listener {
 			SpecialRewards.getInstance().checkAllSites(user);
 			SpecialRewards.getInstance().checkCumualativeVotes(user);
 			SpecialRewards.getInstance().checkMilestone(user);
+
+			if (BungeeSettings.getInstance().isUseBungeecoord()) {
+				if (BungeeHandler.getInstance().getMethod().equals(BungeeMethod.MYSQL)) {
+					final String uuid = user.getUUID();
+					Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+
+						@Override
+						public void run() {
+							if (Bukkit.getOnlinePlayers().size() > 0) {
+								PluginMessage.getInstance().sendPluginMessage(
+										PlayerUtils.getInstance().getRandomOnlinePlayer(), "VoteUpdate", uuid);
+							}
+						}
+					}, 40);
+				}
+			}
 		}
 
 		plugin.setUpdate(true);

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

@@ -5,8 +5,8 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.SignChangeEvent;
 
+import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
@@ -51,7 +51,7 @@ public class SignChange implements Listener {
 				try {
 					ServerData.getInstance().addSign(event.getBlock().getLocation(), event.getLine(2),
 							Integer.parseInt(event.getLine(1)));
-					event.getPlayer().sendMessage(StringUtils.getInstance().colorize("&aAdded sign!"));
+					event.getPlayer().sendMessage(StringParser.getInstance().colorize("&aAdded sign!"));
 					Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 						@Override
@@ -60,12 +60,12 @@ public class SignChange implements Listener {
 						}
 					});
 				} catch (Exception ex) {
-					event.getPlayer().sendMessage(StringUtils.getInstance().colorize("&cError on sign creation!"));
+					event.getPlayer().sendMessage(StringParser.getInstance().colorize("&cError on sign creation!"));
 					ex.printStackTrace();
 				}
 			} else {
 				event.getPlayer()
-						.sendMessage(StringUtils.getInstance().colorize(Config.getInstance().getFormatNoPerms()));
+						.sendMessage(StringParser.getInstance().colorize(Config.getInstance().getFormatNoPerms()));
 			}
 		}
 

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

@@ -7,11 +7,13 @@ 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;
 
@@ -51,6 +53,7 @@ public class VotiferEvent implements Listener {
 
 		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() {
 
@@ -65,10 +68,12 @@ public class VotiferEvent implements Listener {
 			return;
 		}
 
-		plugin.getLogger().info("Recieved a vote from '" + voteSite + "' by player '" + voteUsername + "'!");
+		plugin.getLogger()
+				.info("Received 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() {
 
@@ -77,15 +82,26 @@ public class VotiferEvent implements Listener {
 				String voteSiteName = plugin.getVoteSiteName(voteSite);
 
 				ArrayList<String> sites = configVoteSites.getVoteSitesNames();
+				boolean createSite = false;
 				if (sites != null) {
-					if (!sites.contains(voteSiteName) && Config.getInstance().isAutoCreateVoteSites()) {
-						plugin.getLogger()
-								.warning("VoteSite " + voteSiteName + " doe not exist, generaterating one...");
-						ConfigVoteSites.getInstance().generateVoteSite(voteSiteName);
+					if (!sites.contains(voteSiteName)) {
+						createSite = true;
 					}
-				} else if (Config.getInstance().isAutoCreateVoteSites()) {
-					plugin.getLogger().warning("VoteSite " + voteSiteName + " doe not exist, generaterating one...");
+				} 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,

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

@@ -6,6 +6,9 @@ import org.bukkit.event.Listener;
 
 import com.Ben12345rocks.AdvancedCore.Listeners.PluginUpdateVersionEvent;
 import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Config.BungeeSettings;
+import com.Ben12345rocks.VotingPlugin.Config.Config;
+import com.Ben12345rocks.VotingPlugin.Config.SpecialRewardsConfig;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -32,12 +35,59 @@ public class VotingPluginUpdateEvent implements Listener {
 	 * @param event
 	 *            the event
 	 */
+	@SuppressWarnings("deprecation")
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
 	public void onPluginUpdate(PluginUpdateVersionEvent event) {
 		if (event.getPlugin().getName().equals(plugin.getDescription().getName())) {
 			if (!event.getOldVersion().equals("")) {
 				plugin.getLogger().info("VotingPlugin Updated to " + plugin.getDescription().getVersion() + " from "
 						+ event.getOldVersion());
+
+				if (SpecialRewardsConfig.getInstance().isJustCreated()) {
+					// copy old data over
+					plugin.getLogger().info("Coping data from Config.yml into SpecialRewards.yml");
+
+					String[] copies = new String[] { "VoteCoolDownEndedReward", "AnySiteRewards", "VoteStreak",
+							"MileStones", "VoteParty", "Cumulative", "AllSites", "FirstVote", "DailyAwards",
+							"WeeklyAwards", "MonthlyAwards" };
+					for (String str : copies) {
+						SpecialRewardsConfig.getInstance().getData().set(str,
+								Config.getInstance().getData().getConfigurationSection(str));
+					}
+
+					String[] copies1 = new String[] { "ResetMilestonesMonthly", "EnableMonthlyAwards",
+							"EnableWeeklyAwards", "EnableDailyRewards" };
+					for (String str : copies1) {
+						SpecialRewardsConfig.getInstance().getData().set(str,
+								Config.getInstance().getData().getBoolean(str));
+					}
+					SpecialRewardsConfig.getInstance().saveData();
+				}
+
+				if (BungeeSettings.getInstance().isJustCreated()) {
+					// copy old data over
+					plugin.getLogger().info("Coping data from Config.yml into BungeeSettings.yml");
+
+					String[] copies = new String[] { "BungeeServer", "SpigotServer" };
+					for (String str : copies) {
+						BungeeSettings.getInstance().getData().set(str,
+								Config.getInstance().getData().getConfigurationSection(str));
+					}
+
+					BungeeSettings.getInstance().getData().set("UseBungeecord",
+							Config.getInstance().isUseBungeecoord());
+
+					String[] copies1 = new String[] { "BungeeBroadcastAlways", "BungeeDebug", "BungeeBroadcast" };
+					for (String str : copies1) {
+						BungeeSettings.getInstance().getData().set(str, Config.getInstance().getData().getBoolean(str));
+					}
+
+					String[] copies2 = new String[] { "BungeeMethod", "Server" };
+					for (String str : copies2) {
+						BungeeSettings.getInstance().getData().set(str, Config.getInstance().getData().getString(str));
+					}
+					BungeeSettings.getInstance().saveData();
+				}
 			}
 		}
 	}

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

@@ -2,6 +2,7 @@ package com.Ben12345rocks.VotingPlugin.Objects;
 
 import java.time.Instant;
 import java.time.LocalDateTime;
+import java.time.YearMonth;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -14,21 +15,26 @@ import java.util.stream.Collectors;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 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.Messages.StringParser;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
+import com.Ben12345rocks.VotingPlugin.BungeeHandler;
 import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Config.BungeeSettings;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
-import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.Config.SpecialRewardsConfig;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerReceivePointsEvent;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteCoolDownEndEvent;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteEvent;
 import com.Ben12345rocks.VotingPlugin.SpecialRewards.SpecialRewards;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
 import com.Ben12345rocks.VotingPlugin.VoteReminding.VoteReminding;
+import com.Ben12345rocks.VotingPlugin.bungee.BungeeMethod;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -113,47 +119,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		setOfflineVotes(offlineVotes);
 	}
 
-	public boolean hasPercentageTotal(TopVoter top, double percentage, LocalDateTime time) {
-		int total = getTotal(top);
-		switch (top) {
-			case Daily:
-				return total / plugin.getVoteSites().size() * 100 > percentage;
-			case Monthly:
-				return total / (plugin.getVoteSites().size() * time.getMonth().length(false)) * 100 > percentage;
-			case Weekly:
-				return total / (plugin.getVoteSites().size() * 7) * 100 > percentage;
-			default:
-				return false;
-		}
-	}
-
-	public void checkDayVoteStreak() {
-		if (!voteStreakUpdatedToday(LocalDateTime.now())) {
-			if (!Config.getInstance().isVoteStreakRequirementUsePercentage()
-					|| hasPercentageTotal(TopVoter.Daily, Config.getInstance().getVoteStreakRequirementDay(), null)) {
-				addDayVoteStreak();
-				SpecialRewards.getInstance().checkVoteStreak(this, "Day");
-				setDayVoteStreakLastUpdate(System.currentTimeMillis());
-			}
-		}
-	}
-
-	public boolean voteStreakUpdatedToday(LocalDateTime time) {
-		return MiscUtils.getInstance().getTime(getDayVoteStreakLastUpdate()).getDayOfYear() == time.getDayOfYear();
-	}
-
-	public long getDayVoteStreakLastUpdate() {
-		String str = getData().getString("DayVoteStreakLastUpdate");
-		if (str.isEmpty()) {
-			return 0;
-		}
-		return Long.parseLong(str);
-	}
-
-	public void setDayVoteStreakLastUpdate(long time) {
-		getData().setString("DayVoteStreakLastUpdate", "" + time);
-	}
-
 	/**
 	 * Adds the points.
 	 */
@@ -177,7 +142,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		if (event.isCancelled()) {
 			return;
 		}
-
 		setPoints(getPoints() + event.getPoints());
 	}
 
@@ -213,6 +177,62 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		setWeekVoteStreak(getWeekVoteStreak() + 1);
 	}
 
+	public void bungeeVote(String service) {
+		if (BungeeSettings.getInstance().isUseBungeecoord()) {
+			Main.plugin.debug("Bungee vote for " + getPlayerName() + " on " + service);
+
+			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service), getPlayerName(), service,
+					true);
+			voteEvent.setBungee(true);
+			voteEvent.setForceBungee(true);
+			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					plugin.getServer().getPluginManager().callEvent(voteEvent);
+				}
+			});
+		}
+	}
+
+	public void bungeeVoteOnline(String service) {
+		if (BungeeSettings.getInstance().isUseBungeecoord()) {
+			Main.plugin.debug("Bungee online vote for " + getPlayerName() + " on " + service);
+
+			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service), getPlayerName(), service,
+					true);
+			voteEvent.setBungee(true);
+			voteEvent.setForceBungee(false);
+			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					plugin.getServer().getPluginManager().callEvent(voteEvent);
+				}
+			});
+		}
+	}
+
+	public void bungeeVotePluginMessaging(String service, long time) {
+		if (BungeeSettings.getInstance().isUseBungeecoord()) {
+			Main.plugin.debug("Pluginmessaging vote for " + getPlayerName() + " on " + service);
+
+			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service), getPlayerName(), service,
+					true);
+			voteEvent.setBungee(true);
+			voteEvent.setForceBungee(true);
+			voteEvent.setTime(time);
+			voteEvent.setAddTotals(false);
+			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					plugin.getServer().getPluginManager().callEvent(voteEvent);
+				}
+			});
+		}
+	}
+
 	/**
 	 * Can vote all.
 	 *
@@ -228,6 +248,16 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		return true;
 	}
 
+	public boolean canVoteAny() {
+		for (VoteSite voteSite : plugin.getVoteSites()) {
+			boolean canVote = canVoteSite(voteSite);
+			if (canVote) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * Can vote site.
 	 *
@@ -237,30 +267,36 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	 */
 	public boolean canVoteSite(VoteSite voteSite) {
 
-		String siteName = voteSite.getKey();
 		long time = getTime(voteSite);
 		if (time == 0) {
 			return true;
 		}
-		LocalDateTime now = LocalDateTime.now();
-		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault());
+		try {
+			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);
+			if (!voteSite.isVoteDelayDaily()) {
+				double votedelay = voteSite.getVoteDelay();
 
-			if (votedelay == 0) {
+				if (votedelay == 0) {
+					return false;
+				}
+
+				LocalDateTime nextvote = lastVote.plusHours((long) votedelay)
+						.plusMinutes((long) voteSite.getVoteDelayMin());
+
+				return now.isAfter(nextvote);
+			} else {
+				if (now.getDayOfYear() != lastVote.getDayOfYear() || now.getYear() != lastVote.getYear()) {
+					return true;
+				}
 				return false;
 			}
-
-			LocalDateTime nextvote = lastVote.plusHours(votedelay);
-
-			return now.isAfter(nextvote);
-		} else {
-			if (now.getDayOfYear() != lastVote.getDayOfYear() || now.getYear() != lastVote.getYear()) {
-				return true;
-			}
-			return false;
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
+		return false;
 
 	}
 
@@ -302,6 +338,28 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		return true;
 	}
 
+	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 (!SpecialRewardsConfig.getInstance().isVoteStreakRequirementUsePercentage() || hasPercentageTotal(
+					TopVoter.Daily, SpecialRewardsConfig.getInstance().getVoteStreakRequirementDay(), null)) {
+				addDayVoteStreak();
+				SpecialRewards.getInstance().checkVoteStreak(this, "Day");
+				setDayVoteStreakLastUpdate(System.currentTimeMillis());
+			}
+		}
+	}
+
 	public void clearOfflineRewards() {
 		setOfflineVotes(new ArrayList<String>());
 		setOfflineRewards(new ArrayList<String>());
@@ -340,6 +398,14 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.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");
 	}
@@ -369,6 +435,35 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.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");
 	}
@@ -442,6 +537,16 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		return getUserData().getInt("Points");
 	}
 
+	public int getSitesVotedOn() {
+		int amount = 0;
+		for (VoteSite site : plugin.getVoteSites()) {
+			if (!canVoteSite(site)) {
+				amount++;
+			}
+		}
+		return amount;
+	}
+
 	/**
 	 * Gets the time.
 	 *
@@ -491,18 +596,21 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	}
 
 	public void giveDailyTopVoterAward(int place, String path) {
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getDailyAwardRewardsPath(path))
-				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Daily").setOnline(isOnline())
-				.send(this);
+		new RewardBuilder(SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getDailyAwardRewardsPath(path)).withPlaceHolder("place", "" + place)
+						.withPlaceHolder("topvoter", "Daily").withPlaceHolder("votes", "" + getTotal(TopVoter.Daily))
+						.setOnline(isOnline()).send(this);
 	}
 
 	public void giveMonthlyTopVoterAward(int place, String path) {
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getMonthlyAwardRewardsPath(path))
-				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Monthly").setOnline(isOnline())
-				.send(this);
+		new RewardBuilder(SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getMonthlyAwardRewardsPath(path))
+						.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Monthly")
+						.withPlaceHolder("votes", "" + getTotal(TopVoter.Monthly)).setOnline(isOnline()).send(this);
 	}
 
 	public void giveOfflineOtherRewards() {
+		// old reward api, will be removed in the future
 		ArrayList<String> offlineRewards = getOfflineOtherRewards();
 		for (String str : offlineRewards) {
 			if (str.equalsIgnoreCase("FirstVote")) {
@@ -513,20 +621,20 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 				VoteParty.getInstance().giveReward(this, false);
 			} else if (str.contains("Cumulative")) {
 				String st = str.substring("Cumulative".length());
-				if (StringUtils.getInstance().isInt(st)) {
+				if (StringParser.getInstance().isInt(st)) {
 					int votesRequired = Integer.parseInt(st);
 					if (votesRequired != 0) {
-						if (Config.getInstance().getCumulativeRewardEnabled(votesRequired)) {
+						if (SpecialRewardsConfig.getInstance().getCumulativeRewardEnabled(votesRequired)) {
 							SpecialRewards.getInstance().giveCumulativeVoteReward(this, false, votesRequired);
 						}
 					}
 				}
 			} else if (str.contains("MileStone")) {
 				String st = str.substring("MileStone".length());
-				if (StringUtils.getInstance().isInt(st)) {
+				if (StringParser.getInstance().isInt(st)) {
 					int votesRequired = Integer.parseInt(st);
 					if (votesRequired > 0) {
-						if (Config.getInstance().getMilestoneRewardEnabled(votesRequired)) {
+						if (SpecialRewardsConfig.getInstance().getMilestoneRewardEnabled(votesRequired)) {
 							SpecialRewards.getInstance().giveMilestoneVoteReward(this, true, votesRequired);
 						}
 					}
@@ -537,7 +645,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 					String type = args[1];
 					String st = args[2];
 
-					if (Config.getInstance().getVoteStreakRewardEnabled(type, st)) {
+					if (SpecialRewardsConfig.getInstance().getVoteStreakRewardEnabled(type, st)) {
 						SpecialRewards.getInstance().giveVoteStreakReward(this, false, type, "" + st, -1);
 					}
 
@@ -553,9 +661,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	}
 
 	public void giveWeeklyTopVoterAward(int place, String path) {
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getWeeklyAwardRewardsPath(path))
-				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Weekly").setOnline(isOnline())
-				.send(this);
+		new RewardBuilder(SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getWeeklyAwardRewardsPath(path)).withPlaceHolder("place", "" + place)
+						.withPlaceHolder("topvoter", "Weekly").withPlaceHolder("votes", "" + getTotal(TopVoter.Weekly))
+						.setOnline(isOnline()).send(this);
 	}
 
 	/**
@@ -564,6 +673,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	 * @return true if user got the first vote reward
 	 */
 	public boolean hasGottenFirstVote() {
+		if (BungeeSettings.getInstance().isUseBungeecoord()
+				&& BungeeHandler.getInstance().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
+			return getTotal(TopVoter.AllTime) > 1;
+		}
 		return getTotal(TopVoter.AllTime) != 0;
 	}
 
@@ -582,6 +695,20 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.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 getUserData().getBoolean("Reminded");
 	}
@@ -603,11 +730,12 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	 * Off vote.
 	 */
 	public void offVote() {
-		if (!AdvancedCoreHook.getInstance().getOptions().isProcessRewards()) {
-			AdvancedCoreHook.getInstance().debug("Processing rewards is disabled");
+		if (!Main.plugin.getOptions().isProcessRewards()) {
+			Main.plugin.debug("Processing rewards is disabled");
 			return;
 		}
-		AdvancedCoreHook.getInstance().extraDebug("Checking offline vote site votes");
+
+		Main.plugin.extraDebug("Checking offline vote site votes");
 		Player player = getPlayer();
 		if (player != null) {
 			boolean topVoterIngorePerm = player.hasPermission("VotingPlugin.TopVoter.Ignore");
@@ -620,37 +748,27 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 				sendVoteEffects(true);
 			}
 
+			setOfflineVotes(new ArrayList<String>());
+
 			for (int i = 0; i < offlineVotes.size(); i++) {
 				if (plugin.hasVoteSite(offlineVotes.get(i))) {
 					plugin.debug("Giving offline site reward: " + offlineVotes.get(i));
-					playerVote(plugin.getVoteSite(offlineVotes.get(i)), false, true);
+					playerVote(plugin.getVoteSite(offlineVotes.get(i)), false, true, false);
 				} else {
 					plugin.debug("Site doesn't exist: " + offlineVotes.get(i));
 				}
 			}
 
-			setOfflineVotes(new ArrayList<String>());
-
 			giveOfflineOtherRewards();
 		}
 	}
 
-	/**
-	 * Player vote.
-	 *
-	 * @param voteSite
-	 *            the vote site
-	 * @param online
-	 *            the online
-	 * @param broadcast
-	 *            the broadcast
-	 */
-	public void playerVote(VoteSite voteSite, boolean online, boolean broadcast) {
+	public void playerVote(VoteSite voteSite, boolean online, boolean broadcast, boolean bungee) {
 		if (Config.getInstance().getFormatBroadcastWhenOnline() && Config.getInstance().isBroadcastVotesEnabled()
 				&& broadcast) {
 			voteSite.broadcastVote(this);
 		}
-		voteSite.giveRewards(this, online);
+		voteSite.giveRewards(this, online, bungee);
 	}
 
 	/**
@@ -669,9 +787,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	}
 
 	public void resetTotals(TopVoter topVoter) {
-		if (topVoter.equals(TopVoter.Monthly)) {
-			setLastMonthTotal(getTotal(TopVoter.Monthly));
-		}
 		setTotal(topVoter, 0);
 	}
 
@@ -682,13 +797,13 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	 *            the online
 	 */
 	public void sendVoteEffects(boolean online) {
-		RewardHandler.getInstance().giveReward(this, Config.getInstance().getData(),
-				Config.getInstance().getAnySiteRewardsPath(), new RewardOptions().setOnline(online));
+		RewardHandler.getInstance().giveReward(this, SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.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) {
@@ -705,7 +820,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 
 	@Deprecated
 	public void setDailyTotal(int total) {
-		getUserData().setInt("DailyTotal", total);
+		setTotal(TopVoter.Daily, total);
 	}
 
 	public void setDayVoteStreak(int streak) {
@@ -715,6 +830,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		}
 	}
 
+	public void setDayVoteStreakLastUpdate(long time) {
+		getData().setString("DayVoteStreakLastUpdate", "" + time);
+	}
+
 	public void setDisableBroadcast(boolean value) {
 		getUserData().setBoolean("DisableBroadcast", value);
 	}
@@ -746,10 +865,25 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.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()) {
@@ -765,7 +899,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 
 	@Deprecated
 	public void setMonthTotal(int total) {
-		getData().setInt("MonthTotal", total);
+		setTotal(TopVoter.Monthly, total);
 	}
 
 	public void setMonthVoteStreak(int streak) {
@@ -790,7 +924,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	 *            the new points
 	 */
 	public void setPoints(int value) {
-		getUserData().setInt("Points", value);
+		getUserData().setInt("Points", value, !BungeeSettings.getInstance().isUseBungeecoord());
 	}
 
 	public void setReminded(boolean reminded) {
@@ -820,6 +954,13 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 				getUserData().setInt("DailyTotal", value);
 				break;
 			case Monthly:
+				if (Config.getInstance().isLimitMonthlyVotes()) {
+					LocalDateTime time = TimeChecker.getInstance().getTime();
+					int days = YearMonth.of(time.getYear(), time.getMonth()).lengthOfMonth();
+					if (value >= days * plugin.getVoteSites().size()) {
+						value = days * plugin.getVoteSites().size();
+					}
+				}
 				getData().setInt("MonthTotal", value);
 				break;
 			case Weekly:
@@ -841,7 +982,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 
 	@Deprecated
 	public void setWeeklyTotal(int total) {
-		getUserData().setInt("WeeklyTotal", total);
+		setTotal(TopVoter.Weekly, total);
 	}
 
 	public void setWeekVoteStreak(int streak) {
@@ -861,4 +1002,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		return true;
 	}
 
+	public boolean voteStreakUpdatedToday(LocalDateTime time) {
+		return MiscUtils.getInstance().getTime(getDayVoteStreakLastUpdate()).getDayOfYear() == time.getDayOfYear();
+	}
+
 }

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

@@ -11,14 +11,19 @@ import org.bukkit.entity.Player;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Item.ItemBuilder;
+import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 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.Misc.PlayerUtils;
+import com.Ben12345rocks.AdvancedCore.Util.PluginMessage.PluginMessage;
+import com.Ben12345rocks.VotingPlugin.BungeeHandler;
 import com.Ben12345rocks.VotingPlugin.Main;
+import com.Ben12345rocks.VotingPlugin.Config.BungeeSettings;
 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 com.Ben12345rocks.VotingPlugin.bungee.BungeeMethod;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -37,7 +42,6 @@ public class VoteSite {
 	/** The plugin. */
 	static Main plugin = Main.plugin;
 
-	@Getter
 	@Setter
 	private String voteURL;
 
@@ -57,6 +61,14 @@ public class VoteSite {
 	@Setter
 	private double voteDelay;
 
+	@Getter
+	@Setter
+	private double voteDelayMin;
+
+	@Getter
+	@Setter
+	private double timeOffSet;
+
 	@Getter
 	@Setter
 	private boolean enabled;
@@ -101,31 +113,59 @@ public class VoteSite {
 		init();
 	}
 
+	public void broadcastVote(User user) {
+		broadcastVote(user, true);
+	}
+
 	/**
 	 * Broadcast vote.
 	 *
 	 * @param user
 	 *            the user
+	 * @param checkBungee
+	 *            check bungee broadcast
 	 */
-	public void broadcastVote(User user) {
+	public void broadcastVote(User user, boolean checkBungee) {
 		if (!user.isVanished()) {
-			String playerName = user.getPlayerName();
-			String bc = StringUtils.getInstance().colorize(config.getFormatBroadCastMsg());
-			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);
-				}
-			}
+			if (checkBungee && BungeeSettings.getInstance().isBungeeBroadcast()
+					&& BungeeSettings.getInstance().isUseBungeecoord()) {
+				if (BungeeHandler.getInstance().getMethod().equals(BungeeMethod.SOCKETS)) {
+					BungeeHandler.getInstance().sendData("Broadcast", getServiceSite(), user.getPlayerName());
+				} else if (BungeeHandler.getInstance().getMethod().equals(BungeeMethod.MYSQL)
+						|| BungeeHandler.getInstance().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
+					String uuid = user.getUUID();
+					String service = getServiceSite();
 
-			MiscUtils.getInstance().broadcast(bc, players);
+					if (Bukkit.getOnlinePlayers().size() > 0) {
+						PluginMessage.getInstance().sendPluginMessage(PlayerUtils.getInstance().getRandomOnlinePlayer(),
+								"VoteBroadcast", uuid, service);
+					}
+				}
+
+			} else {
+				String playerName = user.getPlayerName();
+				if (config.getVotingBroadcastBlacklist().contains(playerName)) {
+					plugin.getLogger().info("Not broadcasting for " + playerName + ", in blacklist");
+					return;
+				}
+				String bc = StringParser.getInstance().colorize(config.getFormatBroadCastMsg());
+				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 = StringParser.getInstance().replacePlaceHolder(bc, placeholders);
+				bc = StringParser.getInstance().replacePlaceHolders(user.getOfflinePlayer(), bc);
+				ArrayList<Player> players = new ArrayList<Player>();
+				for (Player p : Bukkit.getOnlinePlayers()) {
+					if (!UserManager.getInstance().getVotingPluginUser(p).getDisableBroadcast()) {
+						players.add(p);
+					}
+				}
+
+				MiscUtils.getInstance().broadcast(bc, players);
+			}
 		} else {
 			plugin.debug(user.getPlayerName() + " is vanished, not broadcasting");
 		}
@@ -144,22 +184,35 @@ public class VoteSite {
 		}
 	}
 
-	/**
-	 * Give rewards.
-	 *
-	 * @param user
-	 *            the user
-	 * @param online
-	 *            the online
-	 */
-	public void giveRewards(User user, boolean online) {
+	public ConfigurationSection getSiteData() {
+		return configVoteSites.getData(key);
+	}
+
+	public String getVoteURL() {
+		return getVoteURL(true);
+	}
+
+	public String getVoteURL(boolean json) {
+		if (!Config.getInstance().isFormatCommandsVoteForceLinks() || !json) {
+			return voteURL;
+		} else {
+			if (!voteURL.startsWith("http")) {
+				return "[Text=\"" + voteURL + "\",url=\"http://" + voteURL + "\"]";
+			}
+			return "[Text=\"" + voteURL + "\",url=\"" + voteURL + "\"]";
+		}
+	}
+
+	public void giveRewards(User user, boolean online, boolean bungee) {
 		new RewardBuilder(configVoteSites.getData(), configVoteSites.getRewardsPath(key)).setOnline(online)
 				.withPlaceHolder("ServiceSite", getServiceSite()).withPlaceHolder("SiteName", getDisplayName())
-				.withPlaceHolder("VoteDelay", "" + getVoteDelay()).withPlaceHolder("VoteURL", getVoteURL()).send(user);
+				.withPlaceHolder("VoteDelay", "" + getVoteDelay()).withPlaceHolder("VoteURL", getVoteURL())
+				.setServer(bungee).send(user);
 
 		new RewardBuilder(configVoteSites.getData(), configVoteSites.getEverySiteRewardPath()).setOnline(online)
 				.withPlaceHolder("ServiceSite", getServiceSite()).withPlaceHolder("SiteName", getDisplayName())
-				.withPlaceHolder("VoteDelay", "" + getVoteDelay()).withPlaceHolder("VoteURL", getVoteURL()).send(user);
+				.withPlaceHolder("VoteDelay", "" + getVoteDelay()).withPlaceHolder("VoteURL", getVoteURL())
+				.setServer(bungee).send(user);
 	}
 
 	public boolean hasRewards() {
@@ -173,6 +226,7 @@ public class VoteSite {
 		setVoteURL(configVoteSites.getVoteURL(key));
 		setServiceSite(configVoteSites.getServiceSite(key));
 		setVoteDelay(configVoteSites.getVoteDelay(key));
+		setVoteDelayMin(configVoteSites.getVoteDelayMin(key));
 		setEnabled(configVoteSites.getVoteSiteEnabled(key));
 		setPriority(configVoteSites.getPriority(key));
 		displayName = configVoteSites.getDisplayName(key);
@@ -183,6 +237,7 @@ public class VoteSite {
 		voteDelayDaily = configVoteSites.getVoteSiteResetVoteDelayDaily(key);
 		giveOffline = configVoteSites.getVoteSiteGiveOffline(key);
 		waitUntilVoteDelay = configVoteSites.getWaitUntilVoteDelay(key);
+		timeOffSet = configVoteSites.getTimeOffSet(key);
 	}
 
 	public boolean isVaidServiceSite() {

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

@@ -9,8 +9,9 @@ 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.NMSManager.NMSManager;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
@@ -36,6 +37,10 @@ public class SignHandler {
 	@Setter
 	private Location location;
 
+	@Getter
+	@Setter
+	private Location skullLocation;
+
 	@Getter
 	@Setter
 	private String data;
@@ -59,21 +64,10 @@ public class SignHandler {
 	@Setter
 	private boolean valid;
 
-	/**
-	 * Instantiates a new sign handler.
-	 *
-	 * @param sign
-	 *            the sign
-	 * @param location
-	 *            the location
-	 * @param data
-	 *            the data
-	 * @param position
-	 *            the position
-	 */
-	public SignHandler(String sign, Location location, String data, int position) {
+	public SignHandler(String sign, Location location, Location skullLocation, String data, int position) {
 		setSign(sign);
 		setLocation(location);
+		setSkullLocation(skullLocation);
 		setData(data);
 		this.position = position;
 		setValid(true);
@@ -100,6 +94,11 @@ public class SignHandler {
 		if (playerName.equalsIgnoreCase("No Player") || playerName.equals("")) {
 			return;
 		}
+		if (skullLocation != null) {
+			checkSkull(skullLocation.getBlock());
+			return;
+		}
+
 		Location loc = location;
 		Location loc1 = new Location(loc.getWorld(), loc.getBlockX() - 1, loc.getBlockY() - 1, loc.getBlockZ() - 1);
 		Location loc2 = new Location(loc.getWorld(), loc.getBlockX() + 1, loc.getBlockY() + 1, loc.getBlockZ() + 1);
@@ -149,6 +148,10 @@ public class SignHandler {
 		return loc.equals(getLocation());
 	}
 
+	public boolean isSkullSet() {
+		return skullLocation != null;
+	}
+
 	/**
 	 * Removes the sign.
 	 */
@@ -160,7 +163,7 @@ public class SignHandler {
 	 * Store sign.
 	 */
 	public void storeSign() {
-		ServerData.getInstance().setSign(sign, location, data, position);
+		ServerData.getInstance().setSign(sign, location, skullLocation, data, position);
 	}
 
 	/**
@@ -250,26 +253,28 @@ public class SignHandler {
 					}
 
 				} catch (Exception ex) {
-					AdvancedCoreHook.getInstance().debug(ex);
+					Main.plugin.debug(ex);
 				}
 			}
 		}, delay);
 	}
 
 	public void updateSkulls(Location loc1, Location loc2) {
-		BlockState state = getLocation().getBlock().getState();
-		if (state instanceof Sign) {
-			org.bukkit.material.Sign s = (org.bukkit.material.Sign) state.getData();
-			Block b = location.getBlock().getRelative(s.getAttachedFace());
-			Block above = b.getRelative(BlockFace.UP);
-			if (checkSkull(above)) {
-				return;
+		if (!NMSManager.getInstance().isVersion("1.12")) {
+			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);
+			for (Block block : MiscUtils.getInstance().getRegionBlocks(location.getWorld(), loc1, loc2)) {
+				checkSkull(block);
+			}
 		}
 	}
 }

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

@@ -69,7 +69,8 @@ public class Signs {
 		for (String sign : ServerData.getInstance().getSigns()) {
 			// plugin.getLogger().info("Loading sign " + sign);
 			plugin.getSigns().add(new SignHandler(sign, ServerData.getInstance().getSignLocation(sign),
-					ServerData.getInstance().getSignData(sign), ServerData.getInstance().getSignPosition(sign)));
+					ServerData.getInstance().getSignSkullLocation(sign), ServerData.getInstance().getSignData(sign),
+					ServerData.getInstance().getSignPosition(sign)));
 		}
 	}
 
@@ -89,7 +90,8 @@ public class Signs {
 		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.debug("Sign " + i + " invalid, removing from data: "
+						+ plugin.getSigns().get(i).getLocation().toString());
 				plugin.getSigns().get(i).removeSign();
 				plugin.getSigns().remove(i);
 			} else {

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

@@ -1,5 +1,6 @@
 package com.Ben12345rocks.VotingPlugin.SpecialRewards;
 
+import java.util.ArrayList;
 import java.util.Set;
 
 import org.bukkit.Bukkit;
@@ -7,10 +8,11 @@ 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.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.Config.SpecialRewardsConfig;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerSpecialRewardEvent;
 import com.Ben12345rocks.VotingPlugin.Events.SpecialRewardType;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
@@ -83,19 +85,21 @@ public class SpecialRewards {
 	 */
 	public boolean checkCumualativeVotes(User user) {
 		boolean gotCumulative = false;
-		Set<String> votes = Config.getInstance().getCumulativeVotes();
+		Set<String> votes = SpecialRewardsConfig.getInstance().getCumulativeVotes();
 		for (String vote : votes) {
-			if (StringUtils.getInstance().isInt(vote)) {
+			if (StringParser.getInstance().isInt(vote)) {
 				int votesRequired = Integer.parseInt(vote);
 				if (votesRequired != 0) {
-					if (Config.getInstance().getCumulativeRewardEnabled(votesRequired)
-							&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-									Config.getInstance().getCumulativeRewardsPath(votesRequired))) {
+					if (SpecialRewardsConfig.getInstance().getCumulativeRewardEnabled(votesRequired)
+							&& RewardHandler.getInstance().hasRewards(SpecialRewardsConfig.getInstance().getData(),
+									SpecialRewardsConfig.getInstance().getCumulativeRewardsPath(votesRequired))) {
 						int total = 0;
-						if (Config.getInstance().getCumulativeVotesInSameDay(votesRequired)) {
+						if (SpecialRewardsConfig.getInstance().getCumulativeVotesInSameDay(votesRequired)) {
 							total = user.getTotal(TopVoter.Daily);
-						} else if (Config.getInstance().getCumulativeVotesInSameWeek(votesRequired)) {
+						} else if (SpecialRewardsConfig.getInstance().getCumulativeVotesInSameWeek(votesRequired)) {
 							total = user.getTotal(TopVoter.Weekly);
+						} else if (SpecialRewardsConfig.getInstance().getCumulativeVotesInSameMonth(votesRequired)) {
+							total = user.getTotal(TopVoter.Monthly);
 						} else {
 							total = user.getTotal(TopVoter.AllTime);
 						}
@@ -125,8 +129,8 @@ public class SpecialRewards {
 	 * @return true, if successful
 	 */
 	public boolean checkFirstVote(User user) {
-		if (RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-				Config.getInstance().getFirstVoteRewardsPath())) {
+		if (RewardHandler.getInstance().hasRewards(SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getFirstVoteRewardsPath())) {
 			if (!user.hasGottenFirstVote()) {
 				giveFirstVoteRewards(user, user.isOnline());
 				return true;
@@ -144,15 +148,40 @@ public class SpecialRewards {
 	 * @return true, if successful
 	 */
 	public boolean checkMilestone(User user) {
+		if (Config.getInstance().isPreventRepeatMilestones()) {
+			ArrayList<Integer> nums = new ArrayList<Integer>();
+
+			for (String str : SpecialRewardsConfig.getInstance().getMilestoneVotes()) {
+				try {
+					nums.add(Integer.parseInt(str));
+				} catch (Exception e) {
+					plugin.getLogger().warning("Failed to get number from " + str);
+				}
+			}
+
+			int milestoneCount = user.getMilestoneCount();
+			for (int num : nums) {
+				if (milestoneCount >= num) {
+					if (!user.hasGottenMilestone(num)) {
+						plugin.getLogger().info("Milestone " + num + " for " + user.getPlayerName()
+								+ " not already given when it should be, Current AllTimeTotal: "
+								+ user.getTotal(TopVoter.AllTime) + ", Current MileStoneCount: "
+								+ user.getMilestoneCount());
+						user.setHasGotteMilestone(num, true);
+					}
+				}
+			}
+		}
+
 		boolean gotMilestone = false;
-		Set<String> votes = Config.getInstance().getMilestoneVotes();
+		Set<String> votes = SpecialRewardsConfig.getInstance().getMilestoneVotes();
 		for (String vote : votes) {
-			if (StringUtils.getInstance().isInt(vote)) {
+			if (StringParser.getInstance().isInt(vote)) {
 				int votesRequired = Integer.parseInt(vote);
 				if (votesRequired != 0) {
-					if (Config.getInstance().getMilestoneRewardEnabled(votesRequired)
-							&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-									Config.getInstance().getMilestoneRewardsPath(votesRequired))) {
+					if (SpecialRewardsConfig.getInstance().getMilestoneRewardEnabled(votesRequired)
+							&& RewardHandler.getInstance().hasRewards(SpecialRewardsConfig.getInstance().getData(),
+									SpecialRewardsConfig.getInstance().getMilestoneRewardsPath(votesRequired))) {
 
 						int userVotesTotal = user.getMilestoneCount();
 						if (userVotesTotal >= votesRequired && !user.hasGottenMilestone(votesRequired)) {
@@ -173,7 +202,7 @@ public class SpecialRewards {
 	public boolean checkVoteStreak(User user, String type) {
 		boolean gotReward = false;
 
-		Set<String> streaks = Config.getInstance().getVoteStreakVotes(type);
+		Set<String> streaks = SpecialRewardsConfig.getInstance().getVoteStreakVotes(type);
 		for (String streak : streaks) {
 			String s = streak.replaceAll("-", "");
 			boolean multiple = false;
@@ -181,12 +210,12 @@ public class SpecialRewards {
 				// multiple
 				multiple = true;
 			}
-			if (StringUtils.getInstance().isInt(s)) {
+			if (StringParser.getInstance().isInt(s)) {
 				int streakRequired = Integer.parseInt(s);
 				if (streakRequired != 0) {
-					if (Config.getInstance().getVoteStreakRewardEnabled(type, streak)
-							&& RewardHandler.getInstance().hasRewards(Config.getInstance().getData(),
-									Config.getInstance().getVoteStreakRewardsPath(type, "" + streak))) {
+					if (SpecialRewardsConfig.getInstance().getVoteStreakRewardEnabled(type, streak)
+							&& RewardHandler.getInstance().hasRewards(SpecialRewardsConfig.getInstance().getData(),
+									SpecialRewardsConfig.getInstance().getVoteStreakRewardsPath(type, "" + streak))) {
 						int curStreak = 0;
 						if (type.equalsIgnoreCase("day")) {
 							curStreak = user.getDayVoteStreak();
@@ -235,8 +264,8 @@ public class SpecialRewards {
 		if (event.isCancelled()) {
 			return;
 		}
-		RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-				Config.getInstance().getAllSitesRewardPath(), new RewardOptions().setOnline(online));
+		RewardHandler.getInstance().giveReward(user, SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getAllSitesRewardPath(), new RewardOptions().setOnline(online));
 	}
 
 	/**
@@ -258,8 +287,9 @@ public class SpecialRewards {
 			return;
 		}
 
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getCumulativeRewardsPath(cumulative))
-				.setOnline(online).withPlaceHolder("Cumulative", "" + cumulative).send(user);
+		new RewardBuilder(SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getCumulativeRewardsPath(cumulative)).setOnline(online)
+						.withPlaceHolder("Cumulative", "" + cumulative).send(user);
 	}
 
 	/**
@@ -277,8 +307,8 @@ public class SpecialRewards {
 		if (event.isCancelled()) {
 			return;
 		}
-		RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-				Config.getInstance().getFirstVoteRewardsPath(), new RewardOptions().setOnline(online));
+		RewardHandler.getInstance().giveReward(user, SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getFirstVoteRewardsPath(), new RewardOptions().setOnline(online));
 	}
 
 	/**
@@ -299,8 +329,9 @@ public class SpecialRewards {
 		if (event.isCancelled()) {
 			return;
 		}
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getMilestoneRewardsPath(milestone))
-				.setOnline(online).withPlaceHolder("Milestone", "" + milestone).send(user);
+		new RewardBuilder(SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getMilestoneRewardsPath(milestone)).setOnline(online)
+						.withPlaceHolder("Milestone", "" + milestone).send(user);
 	}
 
 	public void giveVoteStreakReward(User user, boolean online, String type, String string, int votes) {
@@ -311,8 +342,9 @@ public class SpecialRewards {
 		if (event.isCancelled()) {
 			return;
 		}
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getVoteStreakRewardsPath(type, string))
-				.setOnline(online).withPlaceHolder("Type", type).withPlaceHolder("Streak", "" + votes).send(user);
+		new RewardBuilder(SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getVoteStreakRewardsPath(type, string)).setOnline(online)
+						.withPlaceHolder("Type", type).withPlaceHolder("Streak", "" + votes).send(user);
 	}
 
 }

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

@@ -2,9 +2,12 @@ package com.Ben12345rocks.VotingPlugin.Test;
 
 import java.util.ArrayList;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
+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 {
@@ -17,6 +20,33 @@ public class VoteTester {
 
 	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>();
@@ -37,9 +67,8 @@ public class VoteTester {
 		long timePerVoteAvg = timeTotal / timesPerVote.size();
 		Main.plugin.getLogger()
 				.info("Time to process votes (" + amount + "): " + time + " ms, average per vote " + timePerVoteAvg
-						+ " ms. " + AdvancedCoreHook.getInstance().getStorageType() + ", "
-						+ UserManager.getInstance().getAllUUIDs().size() + " users. "
-						+ Main.plugin.getVoteSites().size() + " votesites");
+						+ " ms. " + Main.plugin.getStorageType() + ", " + UserManager.getInstance().getAllUUIDs().size()
+						+ " users. " + Main.plugin.getVoteSites().size() + " votesites");
 	}
 
 }

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

@@ -15,6 +15,10 @@ public enum TopVoter {
 		return AllTime;
 	}
 
+	public static TopVoter[] valuesMinusAllTime() {
+		return new TopVoter[] { TopVoter.Daily, TopVoter.Weekly, TopVoter.Monthly };
+	}
+
 	public static TopVoter getTopVoter(String str) {
 		for (TopVoter value : values()) {
 			if (value.toString().equalsIgnoreCase(str)) {

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

@@ -16,18 +16,18 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 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.Messages.StringParser;
 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.Config.SpecialRewardsConfig;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
 import com.Ben12345rocks.VotingPlugin.SpecialRewards.SpecialRewards;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
@@ -97,111 +97,169 @@ public class TopVoterHandler implements Listener {
 		return place;
 	}
 
+	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");
+		}
+
+	}
+
 	@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.voteStreakUpdatedToday(LocalDateTime.now().minusDays(1))) {
-				if (user.getDayVoteStreak() != 0) {
-					user.setDayVoteStreak(0);
+		synchronized (Main.plugin) {
+			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+				if (!user.voteStreakUpdatedToday(LocalDateTime.now().minusDays(1))) {
+					if (user.getDayVoteStreak() != 0) {
+						user.setDayVoteStreak(0);
+					}
+				}
+
+				if (user.getHighestDailyTotal() < user.getTotal(TopVoter.Daily)) {
+					user.setHighestDailyTotal(user.getTotal(TopVoter.Daily));
+				}
+				for (String shopIdent : Config.getInstance().getIdentifiers()) {
+					if (Config.getInstance().getVoteShopResetDaily(shopIdent)) {
+						user.setVoteShopIdentifierLimit(shopIdent, 0);
+					}
 				}
 			}
 
-			if (user.getHighestDailyTotal() < user.getTotal(TopVoter.Daily)) {
-				user.setHighestDailyTotal(user.getTotal(TopVoter.Daily));
+			if (Config.getInstance().getStoreTopVotersDaily()) {
+				plugin.getLogger().info("Saving TopVoters Daily");
+				storeTopVoters(TopVoter.Daily);
 			}
-		}
 
-		if (Config.getInstance().getStoreTopVotersDaily()) {
-			plugin.debug("Storing TopVoters Daily");
-			storeTopVoters(TopVoter.Daily);
-		}
-
-		if (Config.getInstance().isEnableDailyRewards()) {
-			HashMap<Integer, String> places = handlePlaces(Config.getInstance().getDailyPossibleRewardPlaces());
-			int i = 0;
-			int lastTotal = -1;
-			for (User user : plugin.getTopVoter(TopVoter.Daily).keySet()) {
-				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-					if (Config.getInstance().getTopVoterAwardsTies()) {
-						if (user.getTotal(TopVoter.Daily) != lastTotal) {
-							i++;
+			try {
+				if (SpecialRewardsConfig.getInstance().isEnableDailyRewards()) {
+					HashMap<Integer, String> places = handlePlaces(
+							SpecialRewardsConfig.getInstance().getDailyPossibleRewardPlaces());
+					int i = 0;
+					int lastTotal = -1;
+					@SuppressWarnings("unchecked")
+					LinkedHashMap<User, Integer> clone = (LinkedHashMap<User, Integer>) plugin
+							.getTopVoter(TopVoter.Daily).clone();
+					for (User user : clone.keySet()) {
+						if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
+							if (Config.getInstance().getTopVoterAwardsTies()) {
+								if (user.getTotal(TopVoter.Daily) != lastTotal) {
+									i++;
+								}
+							} else {
+								i++;
+							}
+							if (places.containsKey(i)) {
+								user.giveDailyTopVoterAward(i, places.get(i));
+							}
 						}
-					} else {
-						i++;
-					}
-					if (places.containsKey(i)) {
-						user.giveDailyTopVoterAward(i, places.get(i));
+						lastTotal = user.getTotal(TopVoter.Daily);
 					}
 				}
-				lastTotal = user.getTotal(TopVoter.Daily);
+			} catch (Exception e) {
+				e.printStackTrace();
 			}
-		}
-		resetTotals(TopVoter.Daily);
 
+			resetTotals(TopVoter.Daily);
+		}
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onMonthChange(MonthChangeEvent event) {
-		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-			User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getTotal(TopVoter.Monthly) == 0 && user.getMonthVoteStreak() != 0) {
-				user.setMonthVoteStreak(0);
-			} else {
-				if (!Config.getInstance().isVoteStreakRequirementUsePercentage() || user.hasPercentageTotal(
-						TopVoter.Monthly, Config.getInstance().getVoteStreakRequirementMonth(),
-						LocalDateTime.now().minusDays(1))) {
-					user.addMonthVoteStreak();
-					SpecialRewards.getInstance().checkVoteStreak(user, "Month");
-				}
-			}
-
-			if (user.getHighestMonthlyTotal() < user.getTotal(TopVoter.Monthly)) {
-				user.setHighestMonthlyTotal(user.getTotal(TopVoter.Monthly));
-			}
-		}
-
-		if (Config.getInstance().getStoreTopVotersMonthly()) {
-			plugin.debug("Storing TopVoters Monthly");
-			storeTopVoters(TopVoter.Monthly);
-		}
-
-		if (Config.getInstance().isEnableMonthlyAwards()) {
-			HashMap<Integer, String> places = handlePlaces(Config.getInstance().getMonthlyPossibleRewardPlaces());
-			int i = 0;
-			int lastTotal = -1;
-			for (User user : plugin.getTopVoter(TopVoter.Monthly).keySet()) {
-
-				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-					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);
-			}
-		}
-		resetTotals(TopVoter.Monthly);
-
-		if (Config.getInstance().getResetMilestonesMonthly()) {
+		synchronized (Main.plugin) {
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-				user.setMilestoneCount(0);
-				user.setHasGottenMilestone(new HashMap<String, Boolean>());
+				if (user.getTotal(TopVoter.Monthly) == 0 && user.getMonthVoteStreak() != 0) {
+					user.setMonthVoteStreak(0);
+				} else {
+					if (!SpecialRewardsConfig.getInstance().isVoteStreakRequirementUsePercentage()
+							|| user.hasPercentageTotal(TopVoter.Monthly,
+									SpecialRewardsConfig.getInstance().getVoteStreakRequirementMonth(),
+									LocalDateTime.now().minusDays(1))) {
+						user.addMonthVoteStreak();
+						SpecialRewards.getInstance().checkVoteStreak(user, "Month");
+					}
+				}
+
+				for (String shopIdent : Config.getInstance().getIdentifiers()) {
+					if (Config.getInstance().getVoteShopResetMonthly(shopIdent)) {
+						user.setVoteShopIdentifierLimit(shopIdent, 0);
+					}
+				}
+
+				user.setLastMonthTotal(user.getTotal(TopVoter.Monthly));
+
+				if (user.getHighestMonthlyTotal() < user.getTotal(TopVoter.Monthly)) {
+					user.setHighestMonthlyTotal(user.getTotal(TopVoter.Monthly));
+				}
 			}
 
+			if (Config.getInstance().getStoreTopVotersMonthly()) {
+				plugin.getLogger().info("Saving TopVoters Monthly");
+				storeTopVoters(TopVoter.Monthly);
+			}
+
+			try {
+				if (SpecialRewardsConfig.getInstance().isEnableMonthlyAwards()) {
+					HashMap<Integer, String> places = handlePlaces(
+							SpecialRewardsConfig.getInstance().getMonthlyPossibleRewardPlaces());
+					int i = 0;
+					int lastTotal = -1;
+
+					@SuppressWarnings("unchecked")
+					LinkedHashMap<User, Integer> clone = (LinkedHashMap<User, Integer>) plugin
+							.getTopVoter(TopVoter.Monthly).clone();
+					for (User user : clone.keySet()) {
+
+						if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
+							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);
+					}
+
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+
+			resetTotals(TopVoter.Monthly);
+
+			if (SpecialRewardsConfig.getInstance().getResetMilestonesMonthly()) {
+				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+					User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+					user.setMilestoneCount(0);
+					user.setHasGottenMilestone(new HashMap<String, Boolean>());
+				}
+
+			}
 		}
 	}
 
@@ -213,50 +271,66 @@ public class TopVoterHandler implements Listener {
 
 	@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.getTotal(TopVoter.Weekly) == 0 && user.getWeekVoteStreak() != 0) {
-				user.setWeekVoteStreak(0);
-			} else {
-				if (!Config.getInstance().isVoteStreakRequirementUsePercentage() || user.hasPercentageTotal(
-						TopVoter.Weekly, Config.getInstance().getVoteStreakRequirementWeek(), null)) {
-					user.addWeekVoteStreak();
-					SpecialRewards.getInstance().checkVoteStreak(user, "Week");
+		synchronized (Main.plugin) {
+			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+				if (user.getTotal(TopVoter.Weekly) == 0 && user.getWeekVoteStreak() != 0) {
+					user.setWeekVoteStreak(0);
+				} else {
+					if (!SpecialRewardsConfig.getInstance().isVoteStreakRequirementUsePercentage()
+							|| user.hasPercentageTotal(TopVoter.Weekly,
+									SpecialRewardsConfig.getInstance().getVoteStreakRequirementWeek(), null)) {
+						user.addWeekVoteStreak();
+						SpecialRewards.getInstance().checkVoteStreak(user, "Week");
+					}
+				}
+
+				for (String shopIdent : Config.getInstance().getIdentifiers()) {
+					if (Config.getInstance().getVoteShopResetWeekly(shopIdent)) {
+						user.setVoteShopIdentifierLimit(shopIdent, 0);
+					}
+				}
+
+				if (user.getHighestWeeklyTotal() < user.getTotal(TopVoter.Weekly)) {
+					user.setHighestWeeklyTotal(user.getTotal(TopVoter.Weekly));
 				}
 			}
 
-			if (user.getHighestWeeklyTotal() < user.getTotal(TopVoter.Weekly)) {
-				user.setHighestWeeklyTotal(user.getTotal(TopVoter.Weekly));
+			if (Config.getInstance().getStoreTopVotersWeekly()) {
+				plugin.getLogger().info("Saving TopVoters Weekly");
+				storeTopVoters(TopVoter.Weekly);
 			}
-		}
 
-		if (Config.getInstance().getStoreTopVotersWeekly()) {
-			plugin.debug("Storing TopVoters Weekly");
-			storeTopVoters(TopVoter.Weekly);
-		}
-
-		if (Config.getInstance().isEnableWeeklyAwards()) {
-			HashMap<Integer, String> places = handlePlaces(Config.getInstance().getWeeklyPossibleRewardPlaces());
-			int i = 0;
-			int lastTotal = -1;
-			for (User user : plugin.getTopVoter(TopVoter.Weekly).keySet()) {
-				if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
-					if (Config.getInstance().getTopVoterAwardsTies()) {
-						if (user.getTotal(TopVoter.Weekly) != lastTotal) {
-							i++;
+			try {
+				if (SpecialRewardsConfig.getInstance().isEnableWeeklyAwards()) {
+					HashMap<Integer, String> places = handlePlaces(
+							SpecialRewardsConfig.getInstance().getWeeklyPossibleRewardPlaces());
+					int i = 0;
+					int lastTotal = -1;
+					@SuppressWarnings("unchecked")
+					LinkedHashMap<User, Integer> clone = (LinkedHashMap<User, Integer>) plugin
+							.getTopVoter(TopVoter.Weekly).clone();
+					for (User user : clone.keySet()) {
+						if (!Config.getInstance().getTopVoterIgnorePermission() || !user.isTopVoterIgnore()) {
+							if (Config.getInstance().getTopVoterAwardsTies()) {
+								if (user.getTotal(TopVoter.Weekly) != lastTotal) {
+									i++;
+								}
+							} else {
+								i++;
+							}
+							if (places.containsKey(i)) {
+								user.giveWeeklyTopVoterAward(i, places.get(i));
+							}
 						}
-					} else {
-						i++;
-					}
-					if (places.containsKey(i)) {
-						user.giveWeeklyTopVoterAward(i, places.get(i));
+						lastTotal = user.getTotal(TopVoter.Weekly);
 					}
 				}
-				lastTotal = user.getTotal(TopVoter.Weekly);
+			} catch (Exception e) {
+				e.printStackTrace();
 			}
+			resetTotals(TopVoter.Weekly);
 		}
-		resetTotals(TopVoter.Weekly);
-
 	}
 
 	public void register() {
@@ -356,7 +430,7 @@ public class TopVoterHandler implements Listener {
 		title = title.replace("%page%", "" + page);
 		title = title.replace("%maxpages%", "" + pageSize);
 		title = title.replace("%Top%", "All Time");
-		msg.add(StringUtils.getInstance().colorize(title));
+		msg.add(StringParser.getInstance().colorize(title));
 
 		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 			msg.add(topVoters.get(i));
@@ -396,7 +470,7 @@ public class TopVoterHandler implements Listener {
 		title = title.replace("%page%", "" + page);
 		title = title.replace("%maxpages%", "" + pageSize);
 		title = title.replace("%Top%", "Daily");
-		msg.add(StringUtils.getInstance().colorize(title));
+		msg.add(StringParser.getInstance().colorize(title));
 
 		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 			msg.add(topVoters.get(i));
@@ -436,7 +510,7 @@ public class TopVoterHandler implements Listener {
 		title = title.replace("%page%", "" + page);
 		title = title.replace("%maxpages%", "" + pageSize);
 		title = title.replace("%Top%", "Monthly");
-		msg.add(StringUtils.getInstance().colorize(title));
+		msg.add(StringParser.getInstance().colorize(title));
 
 		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 			msg.add(topVoters.get(i));
@@ -462,7 +536,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());
 
@@ -489,7 +563,7 @@ public class TopVoterHandler implements Listener {
 			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.getTopVoter(TopVoter.Monthly).get(users.get(i)));
 			msg.add(line);
@@ -515,7 +589,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());
 
@@ -557,7 +631,7 @@ public class TopVoterHandler implements Listener {
 		title = title.replace("%page%", "" + page);
 		title = title.replace("%maxpages%", "" + pageSize);
 		title = title.replace("%Top%", "Weekly");
-		msg.add(StringUtils.getInstance().colorize(title));
+		msg.add(StringParser.getInstance().colorize(title));
 
 		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 			msg.add(topVoters.get(i));
@@ -579,16 +653,32 @@ public class TopVoterHandler implements Listener {
 			}
 		}
 
+		plugin.debug("Number of users to check top voter: " + users.size());
+
 		for (TopVoter top : TopVoter.values()) {
-			plugin.getTopVoter(top).clear();
 			if (Config.getInstance().getLoadTopVoter(top)) {
+				LinkedHashMap<User, Integer> map = new LinkedHashMap<User, Integer>();
+
 				for (User user : users) {
 					int total = user.getTotal(top);
 					if (total > 0) {
-						plugin.getTopVoter(top).put(user, total);
+						map.put(user, total);
 					}
 				}
-				plugin.getTopVoter().put(top, sortByValues(plugin.getTopVoter(top), false));
+
+				map = sortByValues(map, false);
+				int limitSize = Config.getInstance().getMaxiumNumberOfTopVotersToLoad();
+				if (limitSize > 0) {
+					ArrayList<User> listKeys = new ArrayList<User>(map.keySet());
+					if (listKeys.size() > limitSize) {
+						for (int i = listKeys.size() - 1; i >= 0 && i >= limitSize; i--) {
+							map.remove(listKeys.get(i));
+						}
+					}
+
+				}
+				plugin.getTopVoter(top).clear();
+				plugin.getTopVoter().put(top, map);
 				plugin.debug(top.toString() + " TopVoter loaded");
 			}
 		}

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

@@ -2,7 +2,9 @@ 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;
@@ -49,7 +51,7 @@ public class MVdWPlaceholders {
 	public void loadMVdWPlaceholders() {
 		if (Bukkit.getPluginManager().isPluginEnabled("MVdWPlaceholderAPI")) {
 			// The plugin is enabled
-			for (final PlaceHolder place : PlaceHolders.getInstance().getPlaceholders()) {
+			for (final PlaceHolder<User> place : PlaceHolders.getInstance().getPlaceholders()) {
 				String str = place.getIdentifier();
 				if (!str.endsWith("_")) {
 					PlaceholderAPI.registerPlaceholder(Main.plugin, "VotingPlugin_" + str, new PlaceholderReplacer() {
@@ -66,7 +68,7 @@ public class MVdWPlaceholders {
 
 			}
 
-			for (final PlaceHolder place : PlaceHolders.getInstance().getNonPlayerPlaceholders()) {
+			for (final PlaceHolder<User> place : PlaceHolders.getInstance().getNonPlayerPlaceholders()) {
 				String str = place.getIdentifier();
 				if (!str.endsWith("_")) {
 					PlaceholderAPI.registerPlaceholder(Main.plugin, "VotingPlugin_" + str, new PlaceholderReplacer() {

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

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

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

@@ -1,12 +1,16 @@
 package com.Ben12345rocks.VotingPlugin.Util.PlaceHolders;
 
+import java.text.NumberFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Locale;
 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.Messages.StringParser;
+import com.Ben12345rocks.AdvancedCore.Util.Placeholder.PlaceHolder;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Commands.Commands;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
@@ -40,10 +44,10 @@ public class PlaceHolders {
 	}
 
 	@Getter
-	private ArrayList<PlaceHolder> placeholders = new ArrayList<PlaceHolder>();
+	private ArrayList<PlaceHolder<User>> placeholders = new ArrayList<PlaceHolder<User>>();
 
 	@Getter
-	private ArrayList<PlaceHolder> nonPlayerPlaceholders = new ArrayList<PlaceHolder>();
+	private ArrayList<PlaceHolder<User>> nonPlayerPlaceholders = new ArrayList<PlaceHolder<User>>();
 
 	/**
 	 * Instantiates a new place holders.
@@ -62,9 +66,11 @@ public class PlaceHolders {
 	}
 
 	public String getPlaceHolder(OfflinePlayer p, String identifier) {
-		identifier = StringUtils.getInstance().replaceJavascript(p, identifier);
+		if (Config.getInstance().isUseJavascriptPlaceholders()) {
+			identifier = StringParser.getInstance().replaceJavascript(p, identifier);
+		}
 
-		for (PlaceHolder placeholder : nonPlayerPlaceholders) {
+		for (PlaceHolder<User> placeholder : nonPlayerPlaceholders) {
 			if (placeholder.matches(identifier)) {
 				return placeholder.placeholderRequest(p, null, identifier);
 			}
@@ -72,17 +78,19 @@ public class PlaceHolders {
 
 		User user = UserManager.getInstance().getVotingPluginUser(p);
 
-		for (PlaceHolder placeholder : placeholders) {
+		for (PlaceHolder<User> placeholder : placeholders) {
 			if (placeholder.matches(identifier)) {
 				return placeholder.placeholderRequest(p, user, identifier);
 			}
 		}
 
-		return identifier;
+		return "Not a valid placeholder";
 	}
 
 	public String getPlaceHolder(Player p, String identifier) {
-		identifier = StringUtils.getInstance().replaceJavascript(p, identifier);
+		if (Config.getInstance().isUseJavascriptPlaceholders()) {
+			identifier = StringParser.getInstance().replaceJavascript(p, identifier);
+		}
 		return getPlaceHolder((OfflinePlayer) p, identifier);
 	}
 
@@ -91,7 +99,7 @@ public class PlaceHolders {
 		nonPlayerPlaceholders.clear();
 
 		// older placeholders, might be removed in the future
-		placeholders.add(new PlaceHolder("total") {
+		placeholders.add(new PlaceHolder<User>("total") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -99,7 +107,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Month total"));
 
-		placeholders.add(new PlaceHolder("alltimetotal") {
+		placeholders.add(new PlaceHolder<User>("alltimetotal") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -107,7 +115,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Alltime total"));
 
-		placeholders.add(new PlaceHolder("lastmonthtotal") {
+		placeholders.add(new PlaceHolder<User>("lastmonthtotal") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -117,7 +125,7 @@ public class PlaceHolders {
 
 		// end of older placeholders
 
-		placeholders.add(new PlaceHolder("DisableBroadcast") {
+		placeholders.add(new PlaceHolder<User>("DisableBroadcast") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -125,7 +133,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Returns true/false if user has broadcast disabled"));
 
-		placeholders.add(new PlaceHolder("MilestoneCount") {
+		placeholders.add(new PlaceHolder<User>("MilestoneCount") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -135,7 +143,7 @@ public class PlaceHolders {
 
 		for (final String identifier : Config.getInstance().getIdentifiers()) {
 			if (Config.getInstance().getIdentifierLimit(identifier) > 0) {
-				placeholders.add(new PlaceHolder("VoteShopLimit_" + identifier) {
+				placeholders.add(new PlaceHolder<User>("VoteShopLimit_" + identifier) {
 
 					@Override
 					public String placeholderRequest(OfflinePlayer p, User user, String ident) {
@@ -146,7 +154,7 @@ public class PlaceHolders {
 		}
 
 		for (final TopVoter top : TopVoter.values()) {
-			placeholders.add(new PlaceHolder("Total_" + top.toString()) {
+			placeholders.add(new PlaceHolder<User>("Total_" + top.toString()) {
 
 				@Override
 				public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -155,7 +163,7 @@ public class PlaceHolders {
 			}.withDescription("User total for " + top.getName()));
 		}
 
-		placeholders.add(new PlaceHolder("BestDailyTotal") {
+		placeholders.add(new PlaceHolder<User>("BestDailyTotal") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -163,7 +171,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Best daily total"));
 
-		placeholders.add(new PlaceHolder("BestWeeklyTotal") {
+		placeholders.add(new PlaceHolder<User>("BestWeeklyTotal") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -171,7 +179,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Best weekly total"));
 
-		placeholders.add(new PlaceHolder("BestMonthlyTotal") {
+		placeholders.add(new PlaceHolder<User>("BestMonthlyTotal") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -179,7 +187,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Best monthly total"));
 
-		placeholders.add(new PlaceHolder("DailyVoteStreak") {
+		placeholders.add(new PlaceHolder<User>("DailyVoteStreak") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -187,7 +195,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Current daily votestreak"));
 
-		placeholders.add(new PlaceHolder("WeeklyVoteStreak") {
+		placeholders.add(new PlaceHolder<User>("WeeklyVoteStreak") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -195,7 +203,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Current weekly votestreak"));
 
-		placeholders.add(new PlaceHolder("MonthVoteStreak") {
+		placeholders.add(new PlaceHolder<User>("MonthVoteStreak") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -203,7 +211,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Current month votestreak"));
 
-		placeholders.add(new PlaceHolder("BestDailyVoteStreak") {
+		placeholders.add(new PlaceHolder<User>("BestDailyVoteStreak") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -211,7 +219,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Best daily votestreak"));
 
-		placeholders.add(new PlaceHolder("BestWeeklyVoteStreak") {
+		placeholders.add(new PlaceHolder<User>("BestWeeklyVoteStreak") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -219,7 +227,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Best weekly votestreak"));
 
-		placeholders.add(new PlaceHolder("BestMonthVoteStreak") {
+		placeholders.add(new PlaceHolder<User>("BestMonthVoteStreak") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -227,7 +235,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Best month votestreak"));
 
-		placeholders.add(new PlaceHolder("Points") {
+		placeholders.add(new PlaceHolder<User>("Points") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -235,7 +243,16 @@ public class PlaceHolders {
 			}
 		}.withDescription("User points"));
 
-		placeholders.add(new PlaceHolder("CanVote") {
+		placeholders.add(new PlaceHolder<User>("Points_Format") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US);
+				return numberFormat.format(user.getPoints());
+			}
+		}.withDescription("User points"));
+
+		placeholders.add(new PlaceHolder<User>("CanVote") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -243,22 +260,51 @@ public class PlaceHolders {
 			}
 		}.withDescription("Return true/false if player can vote on all sites"));
 
+		placeholders.add(new PlaceHolder<User>("Next_AnySite") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				if (user.canVoteAny()) {
+					return Config.getInstance().getFormatCommandsVoteNextInfoCanVote();
+				}
+				long smallest = -1;
+				HashMap<Long, VoteSite> times = new HashMap<Long, VoteSite>();
+				for (VoteSite site : plugin.getVoteSites()) {
+					long t = Commands.getInstance().voteNextDurationTime(user, site);
+					if (smallest == -1) {
+						smallest = t;
+					}
+					if (t < smallest) {
+						smallest = t;
+					}
+					times.put(t, site);
+				}
+				for (Entry<Long, VoteSite> entry : times.entrySet()) {
+					if (entry.getKey().longValue() == smallest) {
+						return Commands.getInstance().voteCommandNextInfo(user, entry.getValue());
+					}
+				}
+
+				return "Error";
+			}
+		}.withDescription("How long until user can vote on anysite"));
+
 		for (final VoteSite voteSite : plugin.getVoteSites()) {
-			placeholders.add(new PlaceHolder("Next_" + voteSite.getKey()) {
+			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("Last_" + 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("CanVote_" + voteSite.getKey()) {
+			placeholders.add(new PlaceHolder<User>("CanVote_" + voteSite.getKey()) {
 
 				@Override
 				public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -267,7 +313,7 @@ public class PlaceHolders {
 			}.withDescription("Whether or not player can vote on " + voteSite.getKey()));
 		}
 
-		placeholders.add(new PlaceHolder("Top_All_Position") {
+		placeholders.add(new PlaceHolder<User>("Top_All_Position") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -282,7 +328,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Get user top voter position"));
 
-		placeholders.add(new PlaceHolder("Top_AllVotes_") {
+		placeholders.add(new PlaceHolder<User>("Top_AllVotes_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -298,7 +344,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user votes at position in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_All_") {
+		placeholders.add(new PlaceHolder<User>("Top_All_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -314,7 +360,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user at postion in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_Month_Position") {
+		placeholders.add(new PlaceHolder<User>("Top_Month_Position") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -329,7 +375,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Get user top voter position"));
 
-		placeholders.add(new PlaceHolder("Top_Month_") {
+		placeholders.add(new PlaceHolder<User>("Top_Month_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -345,7 +391,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user at position in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_MonthVotes_") {
+		placeholders.add(new PlaceHolder<User>("Top_MonthVotes_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -361,7 +407,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user votes at position in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_Week_Position") {
+		placeholders.add(new PlaceHolder<User>("Top_Week_Position") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -376,7 +422,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Get user top voter position"));
 
-		placeholders.add(new PlaceHolder("Top_Week_") {
+		placeholders.add(new PlaceHolder<User>("Top_Week_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -392,7 +438,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user at postion in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_WeekVotes_") {
+		placeholders.add(new PlaceHolder<User>("Top_WeekVotes_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -408,7 +454,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user votes at position in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_Daily_Position") {
+		placeholders.add(new PlaceHolder<User>("Top_Daily_Position") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -423,7 +469,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Get user top voter position"));
 
-		placeholders.add(new PlaceHolder("Top_Daily_") {
+		placeholders.add(new PlaceHolder<User>("Top_Daily_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -439,7 +485,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user at postion in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_DailyVotes_") {
+		placeholders.add(new PlaceHolder<User>("Top_DailyVotes_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -457,7 +503,7 @@ public class PlaceHolders {
 
 		// non players
 
-		nonPlayerPlaceholders.add(new PlaceHolder("VotePartyVotesCurrent") {
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("VotePartyVotesCurrent") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -465,7 +511,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Current amount of voteparty votes"));
 
-		nonPlayerPlaceholders.add(new PlaceHolder("VotePartyVotesNeeded") {
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("VotePartyVotesNeeded") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -473,12 +519,60 @@ public class PlaceHolders {
 			}
 		}.withDescription("Voteparty votes needed"));
 
-		nonPlayerPlaceholders.add(new PlaceHolder("VotePartyVotesRequired") {
+		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"));
 	}
 }

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

@@ -13,11 +13,12 @@ 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.Messages.StringParser;
 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.SpecialRewardsConfig;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
 import com.Ben12345rocks.VotingPlugin.Events.VotePartyEvent;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
@@ -95,12 +96,12 @@ public class VoteParty implements Listener {
 			if (event.isCancelled()) {
 				return;
 			}
-			MiscUtils.getInstance().broadcast(Config.getInstance().getVotePartyBroadcast());
+			MiscUtils.getInstance().broadcast(SpecialRewardsConfig.getInstance().getVotePartyBroadcast());
 			giveRewards();
 
-			if (Config.getInstance().getVotePartyIncreaseVotesRquired() > 0) {
+			if (SpecialRewardsConfig.getInstance().getVotePartyIncreaseVotesRquired() > 0) {
 				ServerData.getInstance().setVotePartyExtraRequired(ServerData.getInstance().getVotePartyExtraRequired()
-						+ Config.getInstance().getVotePartyIncreaseVotesRquired());
+						+ SpecialRewardsConfig.getInstance().getVotePartyIncreaseVotesRquired());
 			}
 		}
 
@@ -113,7 +114,7 @@ public class VoteParty implements Listener {
 	 *            the sender
 	 */
 	public void commandVoteParty(CommandSender sender) {
-		if (Config.getInstance().getVotePartyEnabled()) {
+		if (SpecialRewardsConfig.getInstance().getVotePartyEnabled()) {
 			ArrayList<String> msg = Config.getInstance().getFormatCommandsVoteParty();
 			int votesRequired = getVotesRequired();
 			int votes = getTotalVotes();
@@ -125,7 +126,7 @@ public class VoteParty implements Listener {
 			msg = ArrayUtils.getInstance().colorize(ArrayUtils.getInstance().replacePlaceHolder(msg, placeholders));
 			sender.sendMessage(ArrayUtils.getInstance().convert(msg));
 		} else {
-			sender.sendMessage(StringUtils.getInstance().colorize("&cVoteParty not enabled"));
+			sender.sendMessage(StringParser.getInstance().colorize("&cVoteParty not enabled"));
 		}
 	}
 
@@ -165,7 +166,7 @@ public class VoteParty implements Listener {
 	}
 
 	public int getVotesRequired() {
-		int required = Config.getInstance().getVotePartyVotesRequired();
+		int required = SpecialRewardsConfig.getInstance().getVotePartyVotesRequired();
 		int extra = ServerData.getInstance().getVotePartyExtraRequired();
 		if (extra > 0) {
 			return required + extra;
@@ -174,8 +175,8 @@ public class VoteParty implements Listener {
 	}
 
 	public void giveReward(User user) {
-		if (Config.getInstance().getVotePartyUserVotesRequired() > 0) {
-			if (user.getVotePartyVotes() < Config.getInstance().getVotePartyUserVotesRequired()) {
+		if (SpecialRewardsConfig.getInstance().getVotePartyUserVotesRequired() > 0) {
+			if (user.getVotePartyVotes() < SpecialRewardsConfig.getInstance().getVotePartyUserVotesRequired()) {
 				return;
 			}
 		}
@@ -183,16 +184,18 @@ public class VoteParty implements Listener {
 	}
 
 	public void giveReward(User user, boolean online) {
-		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getVotePartyRewardsPath())
-				.setOnline(online)
-				.withPlaceHolder("VotesRequired", "" + Config.getInstance().getVotePartyVotesRequired()).send(user);
+		new RewardBuilder(SpecialRewardsConfig.getInstance().getData(),
+				SpecialRewardsConfig.getInstance().getVotePartyRewardsPath()).setOnline(online)
+						.withPlaceHolder("VotesRequired",
+								"" + SpecialRewardsConfig.getInstance().getVotePartyVotesRequired())
+						.send(user);
 	}
 
 	/**
 	 * Give rewards.
 	 */
 	public void giveRewards() {
-		for (final String cmd : Config.getInstance().getVotePartyCommands()) {
+		for (final String cmd : SpecialRewardsConfig.getInstance().getVotePartyCommands()) {
 			Bukkit.getScheduler().runTask(plugin, new Runnable() {
 
 				@Override
@@ -203,13 +206,14 @@ public class VoteParty implements Listener {
 			});
 		}
 
-		if (Config.getInstance().getVotePartyGiveAllPlayers()) {
-			plugin.debug("Giving all players vote party");
+		if (SpecialRewardsConfig.getInstance().getVotePartyGiveAllPlayers()) {
+			plugin.debug("Trying to give all players vote party");
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
 				giveReward(user);
 			}
 		} else {
+			plugin.debug("Trying to give all online players vote party");
 			plugin.debug(ArrayUtils.getInstance().makeStringList(getVotedUsers()));
 			for (String uuid : getVotedUsers()) {
 				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
@@ -221,16 +225,20 @@ public class VoteParty implements Listener {
 
 	@EventHandler
 	public void onDayChange(DayChangeEvent event) {
-		if (Config.getInstance().getVotePartyResetEachDay()) {
+		if (SpecialRewardsConfig.getInstance().getVotePartyResetEachDay()) {
 			reset();
 		}
 	}
 
 	@EventHandler
 	public void onMonthChange(MonthChangeEvent event) {
-		if (Config.getInstance().getVotePartyResetMontly()) {
+		if (SpecialRewardsConfig.getInstance().getVotePartyResetMontly()) {
 			reset();
 		}
+
+		if (SpecialRewardsConfig.getInstance().isVotePartyResetExtraVotesMonthly()) {
+			ServerData.getInstance().setVotePartyExtraRequired(0);
+		}
 	}
 
 	public void register() {
@@ -272,8 +280,8 @@ public class VoteParty implements Listener {
 	}
 
 	public synchronized void vote(User user, boolean realVote) {
-		if (Config.getInstance().getVotePartyEnabled()) {
-			if (Config.getInstance().getVotePartyCountFakeVotes() || realVote) {
+		if (SpecialRewardsConfig.getInstance().getVotePartyEnabled()) {
+			if (SpecialRewardsConfig.getInstance().getVotePartyCountFakeVotes() || realVote) {
 				addTotal(user);
 				addVotePlayer(user);
 				check();

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

@@ -58,7 +58,7 @@ public class VoteReminding {
 
 		if (PlayerUtils.getInstance().hasServerPermission(playerName, "VotingPlugin.Login.RemindVotes")
 				|| PlayerUtils.getInstance().hasServerPermission(playerName, "VotingPlugin.Player")) {
-			if (user.canVoteAll()) {
+			if (user.canVoteAll() || (user.canVoteAny() && user.hasPermission("VotingPlugin.Login.RemindVotes.Any"))) {
 				Player player = Bukkit.getPlayer(playerName);
 				if (player != null) {
 					if (!Config.getInstance().getVoteRemindingRemindOnlyOnce()) {

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

@@ -2,6 +2,7 @@ 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 {
@@ -11,12 +12,16 @@ public class VotingPluginHooks {
 		return instance;
 	}
 
-	public Main getMainClass() {
-		return Main.plugin;
+	public void addCustomRequirement(RequirementInject inject) {
+		RewardHandler.getInstance().addInjectedRequirements(inject);
 	}
 
 	public void addCustomReward(RewardInject inject) {
-		RewardHandler.getInstance().getInjectedRewards().add(inject);
+		RewardHandler.getInstance().addInjectedReward(inject);
+	}
+
+	public Main getMainClass() {
+		return Main.plugin;
 	}
 
 	public UserManager getUserManager() {

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/bungee/Bungee.java

@@ -0,0 +1,553 @@
+package com.Ben12345rocks.VotingPlugin.bungee;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import com.Ben12345rocks.AdvancedCore.UserStorage.sql.Column;
+import com.Ben12345rocks.AdvancedCore.UserStorage.sql.DataType;
+import com.Ben12345rocks.AdvancedCore.Util.Encryption.EncryptionHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
+import com.Ben12345rocks.AdvancedCore.Util.Sockets.ClientHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Sockets.SocketHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Sockets.SocketReceiver;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.vexsoftware.votifier.bungee.events.VotifierEvent;
+import com.vexsoftware.votifier.model.Vote;
+
+import lombok.Getter;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.event.PluginMessageEvent;
+import net.md_5.bungee.api.event.ServerConnectedEvent;
+import net.md_5.bungee.api.plugin.Plugin;
+import net.md_5.bungee.config.Configuration;
+import net.md_5.bungee.event.EventHandler;
+
+public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listener {
+
+	@Getter
+	private Config config;
+
+	@Getter
+	private BungeeMySQL mysql;
+
+	private SocketHandler socketHandler;
+
+	private HashMap<String, ClientHandler> clientHandles;
+
+	private EncryptionHandler encryptionHandler;
+
+	@Getter
+	private BungeeMethod method;
+
+	private HashMap<String, ArrayList<OfflineBungeeVote>> cachedVotes = new HashMap<String, ArrayList<OfflineBungeeVote>>();
+
+	private HashMap<String, ArrayList<OfflineBungeeVote>> cachedOnlineVotes = new HashMap<String, ArrayList<OfflineBungeeVote>>();
+
+	private VoteCache voteCacheFile;
+
+	public void checkCachedVotes(String server) {
+		if (getProxy().getServerInfo(server) != null) {
+			if (!getProxy().getServerInfo(server).getPlayers().isEmpty()) {
+				if (cachedVotes.containsKey(server)) {
+					ArrayList<OfflineBungeeVote> c = cachedVotes.get(server);
+					if (!c.isEmpty()) {
+						for (OfflineBungeeVote cache : c) {
+							sendPluginMessageServer(server, "Vote", cache.getPlayerName(), cache.getUuid(),
+									cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
+									"" + cache.isRealVote());
+						}
+						cachedVotes.put(server, new ArrayList<OfflineBungeeVote>());
+					}
+				}
+			}
+		}
+	}
+
+	public void checkOnlineVotes(ProxiedPlayer player, String uuid) {
+		if (player != null && player.isConnected() && cachedOnlineVotes.containsKey(uuid)) {
+			ArrayList<OfflineBungeeVote> c = cachedOnlineVotes.get(uuid);
+			if (!c.isEmpty()) {
+				for (OfflineBungeeVote cache : c) {
+					sendPluginMessageServer(getProxy().getPlayer(UUID.fromString(uuid)).getServer().getInfo().getName(),
+							"VoteOnline", cache.getPlayerName(), cache.getUuid(), cache.getService(),
+							"" + cache.getTime(), Boolean.FALSE.toString(), "" + cache.isRealVote());
+				}
+				cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
+			}
+		}
+	}
+
+	public void debug(String msg) {
+		if (config.getDebug()) {
+			getLogger().info("Debug: " + msg);
+		}
+	}
+
+	public UUID fetchUUID(String playerName) throws Exception {
+		// Get response from Mojang API
+		URL url = new URL("https://api.mojang.com/users/profiles/minecraft/" + playerName);
+		HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+		connection.connect();
+
+		if (connection.getResponseCode() == 400) {
+			getProxy().getLogger().info("There is no player with the name \"" + playerName + "\"!");
+			return null;
+		}
+
+		InputStream inputStream = connection.getInputStream();
+		BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+
+		// Parse JSON response and get UUID
+		JsonElement element = new JsonParser().parse(bufferedReader);
+		JsonObject object = element.getAsJsonObject();
+		String uuidAsString = object.get("id").getAsString();
+
+		// Return UUID
+		return parseUUIDFromString(uuidAsString);
+	}
+
+	public String getProperName(String uuid, String currentName) {
+		ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
+		if (p != null && p.isConnected()) {
+			return p.getName();
+		}
+		return currentName;
+	}
+
+	public String getUUID(String playerName) {
+		ProxiedPlayer p = getProxy().getPlayer(playerName);
+		if (p != null && p.isConnected()) {
+			return p.getUniqueId().toString();
+		}
+		String str = mysql.getUUID(playerName);
+		if (str != null) {
+			return str;
+		}
+		return "";
+	}
+
+	@Override
+	public void onDisable() {
+		if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			for (Entry<String, ArrayList<OfflineBungeeVote>> entry : cachedVotes.entrySet()) {
+				String server = entry.getKey();
+				int num = 0;
+				for (OfflineBungeeVote voteData : entry.getValue()) {
+					voteCacheFile.addVote(server, num, voteData);
+					num++;
+				}
+			}
+			for (Entry<String, ArrayList<OfflineBungeeVote>> entry : cachedOnlineVotes.entrySet()) {
+				String name = entry.getKey();
+				int num = 0;
+				for (OfflineBungeeVote voteData : entry.getValue()) {
+					voteCacheFile.addVoteOnline(name, num, voteData);
+					num++;
+				}
+			}
+		}
+	}
+
+	@Override
+	public void onEnable() {
+		getProxy().getPluginManager().registerListener(this, this);
+		config = new Config(this);
+		config.load();
+
+		mysql = new BungeeMySQL("VotingPlugin_Users", config.getData());
+
+		// column types
+		getMysql().alterColumnType("TopVoterIgnore", "VARCHAR(5)");
+		getMysql().alterColumnType("CheckWorld", "VARCHAR(5)");
+		getMysql().alterColumnType("Reminded", "VARCHAR(5)");
+		getMysql().alterColumnType("DisableBroadcast", "VARCHAR(5)");
+		getMysql().alterColumnType("LastOnline", "VARCHAR(20)");
+		getMysql().alterColumnType("PlayerName", "VARCHAR(30)");
+		getMysql().alterColumnType("DailyTotal", "INT DEFAULT '0'");
+		getMysql().alterColumnType("WeeklyTotal", "INT DEFAULT '0'");
+		getMysql().alterColumnType("DayVoteStreak", "INT DEFAULT '0'");
+		getMysql().alterColumnType("BestDayVoteStreak", "INT DEFAULT '0'");
+		getMysql().alterColumnType("WeekVoteStreak", "INT DEFAULT '0'");
+		getMysql().alterColumnType("BestWeekVoteStreak", "INT DEFAULT '0'");
+		getMysql().alterColumnType("VotePartyVotes", "INT DEFAULT '0'");
+		getMysql().alterColumnType("MonthVoteStreak", "INT DEFAULT '0'");
+		getMysql().alterColumnType("Points", "INT DEFAULT '0'");
+		getMysql().alterColumnType("HighestDailyTotal", "INT DEFAULT '0'");
+		getMysql().alterColumnType("AllTimeTotal", "INT DEFAULT '0'");
+		getMysql().alterColumnType("HighestMonthlyTotal", "INT DEFAULT '0'");
+		getMysql().alterColumnType("MilestoneCount", "INT DEFAULT '0'");
+		getMysql().alterColumnType("MonthTotal", "INT DEFAULT '0'");
+		getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
+		getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
+		getMysql().alterColumnType("OfflineRewards", "MEDIUMTEXT");
+
+		getProxy().getPluginManager().registerCommand(this, new VotingPluginBungeeCommand(this));
+
+		method = BungeeMethod.getByName(config.getBungeeMethod());
+
+		if (method.equals(BungeeMethod.MYSQL)) {
+			this.getProxy().registerChannel("VotingPlugin:VotingPlugin".toLowerCase());
+
+		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			voteCacheFile = new VoteCache(this);
+			voteCacheFile.load();
+
+			try {
+				for (String server : voteCacheFile.getServers()) {
+					ArrayList<OfflineBungeeVote> vote = new ArrayList<OfflineBungeeVote>();
+					for (String num : voteCacheFile.getServerVotes(server)) {
+						Configuration data = voteCacheFile.getServerVotes(server, num);
+						vote.add(new OfflineBungeeVote(data.getString("Name"), data.getString("UUID"),
+								data.getString("Service"), data.getLong("Time"), data.getBoolean("Real")));
+					}
+					cachedVotes.put(server, vote);
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+
+			try {
+				for (String player : voteCacheFile.getPlayers()) {
+					ArrayList<OfflineBungeeVote> vote = new ArrayList<OfflineBungeeVote>();
+					for (String num : voteCacheFile.getServerVotes(player)) {
+						Configuration data = voteCacheFile.getOnlineVotes(player, num);
+						vote.add(new OfflineBungeeVote(data.getString("Name"), data.getString("UUID"),
+								data.getString("Service"), data.getLong("Time"), data.getBoolean("Real")));
+					}
+					cachedOnlineVotes.put(player, vote);
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+
+			voteCacheFile.clearData();
+
+			getProxy().getScheduler().schedule(this, new Runnable() {
+
+				@Override
+				public void run() {
+					for (String server : cachedVotes.keySet()) {
+						checkCachedVotes(server);
+					}
+
+					for (String player : cachedOnlineVotes.keySet()) {
+						checkOnlineVotes(getProxy().getPlayer(UUID.fromString(player)), player);
+					}
+				}
+			}, 15l, TimeUnit.SECONDS);
+
+			this.getProxy().registerChannel("VotingPlugin:VotingPlugin".toLowerCase());
+		} else if (method.equals(BungeeMethod.SOCKETS)) {
+			encryptionHandler = new EncryptionHandler(new File(getDataFolder(), "secretkey.key"));
+
+			socketHandler = new SocketHandler(getDescription().getVersion(), config.getBungeeHost(),
+					config.getBungeePort(), encryptionHandler, config.getDebug());
+
+			socketHandler.add(new SocketReceiver() {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 1) {
+						if (data.length > 2) {
+							if (data[0].equalsIgnoreCase("Broadcast")) {
+								sendServerMessage(data);
+							}
+						}
+					}
+
+				}
+			});
+
+			socketHandler.add(new SocketReceiver() {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 1) {
+						if (data[0].equalsIgnoreCase("StatusOkay")) {
+							String server = data[1];
+							getLogger().info("Voting communicaton okay with " + server);
+						}
+					}
+
+				}
+			});
+
+			clientHandles = new HashMap<String, ClientHandler>();
+			List<String> l = config.getBlockedServers();
+			for (String s : config.getSpigotServers()) {
+				if (!l.contains(s)) {
+					Configuration d = config.getSpigotServerConfiguration(s);
+					clientHandles.put(s, new ClientHandler(d.getString("Host", ""), d.getInt("Port", 1298),
+							encryptionHandler, config.getDebug()));
+				}
+			}
+		}
+
+		getLogger().info("VotingPlugin loaded, using method: " + method.toString());
+	}
+
+	@EventHandler
+	public void onPluginMessage(PluginMessageEvent ev) {
+		if (!ev.getTag().equals("VotingPlugin:VotingPlugin".toLowerCase())) {
+			return;
+		}
+		ByteArrayInputStream instream = new ByteArrayInputStream(ev.getData());
+		DataInputStream in = new DataInputStream(instream);
+		try {
+			ByteArrayOutputStream outstream = new ByteArrayOutputStream();
+			DataOutputStream out = new DataOutputStream(outstream);
+			String subchannel = in.readUTF();
+			int size = in.readInt();
+			out.writeUTF(subchannel);
+			out.writeInt(size);
+			for (int i = 0; i < size; i++) {
+				out.writeUTF(in.readUTF());
+			}
+			for (String send : getProxy().getServers().keySet()) {
+				if (getProxy().getServers().get(send).getPlayers().size() > 0) {
+					getProxy().getServers().get(send).sendData("VotingPlugin:VotingPlugin".toLowerCase(),
+							outstream.toByteArray());
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	@EventHandler
+	public void onServerConnected(ServerConnectedEvent event) {
+		final String server = event.getServer().getInfo().getName();
+		final String uuid = event.getPlayer().getUniqueId().toString();
+		getProxy().getScheduler().schedule(this, new Runnable() {
+
+			@Override
+			public void run() {
+				checkCachedVotes(server);
+				checkOnlineVotes(event.getPlayer(), uuid);
+			}
+
+		}, 2, TimeUnit.SECONDS);
+	}
+
+	@EventHandler
+	public void onVote(VotifierEvent event) {
+		Vote vote = event.getVote();
+		getLogger().info("Vote received " + vote.getUsername() + " from service site " + vote.getServiceName());
+
+		vote(vote.getUsername(), vote.getServiceName(), true);
+
+	}
+
+	private UUID parseUUIDFromString(String uuidAsString) {
+		String[] parts = { "0x" + uuidAsString.substring(0, 8), "0x" + uuidAsString.substring(8, 12),
+				"0x" + uuidAsString.substring(12, 16), "0x" + uuidAsString.substring(16, 20),
+				"0x" + uuidAsString.substring(20, 32) };
+
+		long mostSigBits = Long.decode(parts[0]).longValue();
+		mostSigBits <<= 16;
+		mostSigBits |= Long.decode(parts[1]).longValue();
+		mostSigBits <<= 16;
+		mostSigBits |= Long.decode(parts[2]).longValue();
+
+		long leastSigBits = Long.decode(parts[3]).longValue();
+		leastSigBits <<= 48;
+		leastSigBits |= Long.decode(parts[4]).longValue();
+
+		return new UUID(mostSigBits, leastSigBits);
+	}
+
+	public void reload() {
+		config.load();
+	}
+
+	public void sendPluginMessageServer(String server, String channel, String... messageData) {
+		ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream();
+		DataOutputStream out = new DataOutputStream(byteOutStream);
+		try {
+			out.writeUTF(channel);
+			out.writeInt(messageData.length);
+			for (String message : messageData) {
+				out.writeUTF(message);
+			}
+			if (getProxy().getServers().get(server).getPlayers().size() > 0) {
+				getProxy().getServers().get(server).sendData("VotingPlugin:VotingPlugin".toLowerCase(),
+						byteOutStream.toByteArray(), false);
+			}
+			out.close();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		debug("Sending plugin message " + server + " " + channel + " "
+				+ ArrayUtils.getInstance().makeStringList(ArrayUtils.getInstance().convert(messageData)));
+
+	}
+
+	public void sendServerMessage(String... messageData) {
+		for (ClientHandler h : clientHandles.values()) {
+			h.sendMessage(messageData);
+		}
+	}
+
+	public void sendServerMessageServer(String server, String... messageData) {
+		if (clientHandles.containsKey(server)) {
+			clientHandles.get(server).sendMessage(messageData);
+		}
+	}
+
+	public void sendSocketVote(String name, String service) {
+		String uuid = getUUID(name);
+
+		if (config.getSendVotesToAllServers()) {
+			sendServerMessage("bungeevote", uuid, name, service);
+			if (config.getBroadcast()) {
+				sendServerMessage("BungeeBroadcast", service, uuid, name);
+			}
+		} else {
+			// online server only
+			ProxiedPlayer p = getProxy().getPlayer(name);
+
+			String server = "";
+			if (p != null && p.isConnected()) {
+				server = p.getServer().getInfo().getName();
+			} else {
+				server = config.getFallBack();
+			}
+			if (config.getBlockedServers().contains(server)) {
+				server = config.getFallBack();
+			}
+
+			sendServerMessageServer(server, "bungeevoteonline", uuid, name, service);
+			if (config.getBroadcast()) {
+				sendServerMessage("BungeeBroadcast", service, uuid, name);
+			}
+			sendServerMessage("BungeeUpdate");
+		}
+
+	}
+
+	public void status(CommandSender sender) {
+		sendServerMessage("status");
+	}
+
+	public void vote(String player, String service, boolean realVote) {
+		if (player == null || player.isEmpty()) {
+			getLogger().info("No name from vote on " + service);
+			return;
+		}
+		if (method.equals(BungeeMethod.SOCKETS)) {
+			sendSocketVote(player, service);
+		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			String uuid = getUUID(player);
+			if (uuid.isEmpty()) {
+				UUID u = null;
+				try {
+					u = fetchUUID(player);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+				if (u == null) {
+					debug("Failed to get uuid for " + player);
+					return;
+				}
+				uuid = u.toString();
+			}
+
+			player = getProperName(uuid, player);
+
+			if (!mysql.getUuids().contains(uuid)) {
+				mysql.update(uuid, "PlayerName", player, DataType.STRING);
+			}
+
+			// add totals here
+			ArrayList<Column> data = mysql.getExactQuery(new Column("uuid", uuid, DataType.STRING));
+			for (Column d : data) {
+				if (d.getName().equalsIgnoreCase("alltimetotal") || d.getName().equalsIgnoreCase("monthtotal")
+						|| d.getName().equalsIgnoreCase("weeklytotal") || d.getName().equalsIgnoreCase("dailytotal")
+						|| d.getName().equalsIgnoreCase("Points") || d.getName().equalsIgnoreCase("MilestoneCount")) {
+					Object value = d.getValue();
+					int num = 0;
+					if (value instanceof Integer) {
+						try {
+							num = (int) value;
+						} catch (ClassCastException | NullPointerException ex) {
+						}
+					} else if (value instanceof String) {
+						try {
+							num = Integer.parseInt((String) value);
+						} catch (Exception e) {
+						}
+					}
+					mysql.update(uuid, d.getName(), num + 1, DataType.STRING);
+
+					debug("Setting " + d.getName() + " to " + (num + 1));
+
+				}
+			}
+
+			long time = LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+
+			if (config.getSendVotesToAllServers()) {
+				for (String s : getProxy().getServers().keySet()) {
+					if (!config.getBlockedServers().contains(s)) {
+						ServerInfo info = getProxy().getServerInfo(s);
+						if (info.getPlayers().isEmpty()) {
+							// cache
+							if (!cachedVotes.containsKey(s)) {
+								cachedVotes.put(s, new ArrayList<OfflineBungeeVote>());
+							}
+							ArrayList<OfflineBungeeVote> list = cachedVotes.get(s);
+							list.add(new OfflineBungeeVote(player, uuid, service, time, realVote));
+							cachedVotes.put(s, list);
+
+							debug("Caching vote for " + player + " on " + service + " for " + s);
+
+						} else {
+							// send
+							sendPluginMessageServer(s, "Vote", player, uuid, service, "" + time,
+									Boolean.TRUE.toString(), "" + realVote);
+						}
+					}
+				}
+			} else {
+				ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
+				if (p != null && p.isConnected()) {
+					sendPluginMessageServer(p.getServer().getInfo().getName(), "VoteOnline", player, uuid, service,
+							"" + time, Boolean.TRUE.toString(), "" + realVote);
+				} else {
+					if (!cachedOnlineVotes.containsKey(uuid)) {
+						cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
+					}
+					ArrayList<OfflineBungeeVote> list = cachedOnlineVotes.get(uuid);
+					if (list == null) {
+						list = new ArrayList<OfflineBungeeVote>();
+					}
+					list.add(new OfflineBungeeVote(player, uuid, service, time, realVote));
+					cachedOnlineVotes.put(uuid, list);
+					debug("Caching online vote for " + player + " on " + service);
+				}
+			}
+
+		}
+	}
+
+}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/bungee/BungeeMethod.java

@@ -0,0 +1,14 @@
+package com.Ben12345rocks.VotingPlugin.bungee;
+
+public enum BungeeMethod {
+	SOCKETS, PLUGINMESSAGING, MYSQL;
+
+	public static BungeeMethod getByName(String str) {
+		for (BungeeMethod method : values()) {
+			if (method.toString().equalsIgnoreCase(str)) {
+				return method;
+			}
+		}
+		return SOCKETS;
+	}
+}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/bungee/BungeeMySQL.java

@@ -0,0 +1,468 @@
+package com.Ben12345rocks.VotingPlugin.bungee;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.Ben12345rocks.AdvancedCore.UserStorage.mysql.api.queries.Query;
+import com.Ben12345rocks.AdvancedCore.UserStorage.sql.Column;
+import com.Ben12345rocks.AdvancedCore.UserStorage.sql.DataType;
+
+import net.md_5.bungee.config.Configuration;
+
+public class BungeeMySQL {
+	private com.Ben12345rocks.AdvancedCore.UserStorage.mysql.api.MySQL mysql;
+
+	private List<String> columns = Collections.synchronizedList(new ArrayList<String>());
+
+	// private HashMap<String, ArrayList<Column>> table;
+
+	// ConcurrentMap<String, ArrayList<Column>> table = new
+	// ConcurrentHashMap<String, ArrayList<Column>>();
+
+	private String name;
+
+	private Set<String> uuids = Collections.synchronizedSet(new HashSet<String>());
+
+	private Object object2 = new Object();
+
+	private Object object3 = new Object();
+
+	private Object object4 = new Object();
+
+	private List<String> intColumns = new ArrayList<String>();
+
+	public BungeeMySQL(String tableName, Configuration section) {
+		String tablePrefix = section.getString("Prefix");
+		String hostName = section.getString("Host");
+		int port = section.getInt("Port");
+		String user = section.getString("Username");
+		String pass = section.getString("Password");
+		String database = section.getString("Database");
+		long lifeTime = section.getLong("MaxLifeTime", -1);
+		int maxThreads = section.getInt("MaxConnections", 1);
+		String str = section.getString("Line", "");
+		if (maxThreads < 1) {
+			maxThreads = 1;
+		}
+		boolean useSSL = section.getBoolean("UseSSL", false);
+		if (!section.getString("Name", "").isEmpty()) {
+			tableName = section.getString("Name", "");
+		}
+
+		name = tableName;
+		if (tablePrefix != null) {
+			name = tablePrefix + tableName;
+		}
+		mysql = new com.Ben12345rocks.AdvancedCore.UserStorage.mysql.api.MySQL(maxThreads);
+		if (!mysql.connect(hostName, "" + port, user, pass, database, useSSL, lifeTime, str)) {
+
+		}
+		try {
+			Query q = new Query(mysql, "USE " + database + ";");
+			q.executeUpdateAsync();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+		String sql = "CREATE TABLE IF NOT EXISTS " + getName() + " (";
+		sql += "uuid VARCHAR(37),";
+		sql += "PRIMARY KEY ( uuid )";
+		sql += ");";
+		Query query;
+		try {
+			query = new Query(mysql, sql);
+
+			query.executeUpdateAsync();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+
+		loadData();
+
+		// tempoary to improve performance from old tables
+		// addToQue("ALTER TABLE " + getName() + " MODIFY uuid VARCHAR(37);");
+		alterColumnType("uuid", "VARCHAR(37)");
+	}
+
+	public void addColumn(String column, DataType dataType) {
+		synchronized (object3) {
+			String sql = "ALTER TABLE " + getName() + " ADD COLUMN " + column + " text" + ";";
+			try {
+				Query query = new Query(mysql, sql);
+				query.executeUpdate();
+
+				getColumns().add(column);
+			} catch (SQLException e) {
+				e.printStackTrace();
+			}
+
+		}
+	}
+
+	public void alterColumnType(String column, String newType) {
+		checkColumn(column, DataType.STRING);
+		if (newType.contains("INT")) {
+			try {
+				new Query(mysql, "UPDATE " + getName() + " SET " + column + " = '0' where trim(coalesce(" + column
+						+ ", '')) = '';").executeUpdateAsync();
+			} catch (SQLException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			;
+			if (!intColumns.contains(column)) {
+				intColumns.add(column);
+			}
+		}
+		try {
+			new Query(mysql, "ALTER TABLE " + getName() + " MODIFY " + column + " " + newType + ";")
+					.executeUpdateAsync();
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+
+	public void checkColumn(String column, DataType dataType) {
+		synchronized (object4) {
+			if (!getColumns().contains(column)) {
+				if (!getColumnsQueury().contains(column)) {
+					addColumn(column, dataType);
+				}
+			}
+		}
+	}
+
+	public void clearCache() {
+		clearCacheBasic();
+	}
+
+	public void clearCacheBasic() {
+		columns.clear();
+		columns.addAll(getColumnsQueury());
+		uuids.clear();
+		uuids.addAll(getUuidsQuery());
+	}
+
+	public void close() {
+		mysql.disconnect();
+	}
+
+	public boolean containsKeyQuery(String index) {
+		String sqlStr = "SELECT uuid FROM " + getName() + ";";
+		try {
+			ResultSet rs = null;
+
+			Connection conn = mysql.getConnectionManager().getConnection();
+			PreparedStatement sql = conn.prepareStatement(sqlStr);
+
+			rs = sql.executeQuery();
+			/*
+			 * Query query = new Query(mysql, sql);
+			 * ResultSet rs = query.executeQuery();
+			 */
+			while (rs.next()) {
+				if (rs.getString("uuid").equals(index)) {
+					sql.close();
+					conn.close();
+					return true;
+				}
+			}
+			sql.close();
+			conn.close();
+		} catch (SQLException ex) {
+			ex.printStackTrace();
+		}
+		return false;
+	}
+
+	public List<String> getColumns() {
+		if (columns == null || columns.size() == 0) {
+			loadData();
+		}
+		return columns;
+	}
+
+	public ArrayList<String> getColumnsQueury() {
+		ArrayList<String> columns = new ArrayList<String>();
+		try {
+			ResultSet rs = null;
+
+			Connection conn = mysql.getConnectionManager().getConnection();
+			PreparedStatement sql = conn.prepareStatement("SELECT * FROM " + getName() + ";");
+
+			rs = sql.executeQuery();
+			/*
+			 * Query query = new Query(mysql, "SELECT * FROM " + getName() + ";");
+			 * ResultSet rs = query.executeQuery();
+			 */
+
+			ResultSetMetaData metadata = rs.getMetaData();
+			int columnCount = 0;
+			if (metadata != null) {
+				columnCount = metadata.getColumnCount();
+
+				for (int i = 1; i <= columnCount; i++) {
+					String columnName = metadata.getColumnName(i);
+					columns.add(columnName);
+				}
+				sql.close();
+				conn.close();
+				return columns;
+			}
+			sql.close();
+			conn.close();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return columns;
+
+	}
+
+	public ArrayList<Column> getExactQuery(Column column) {
+		ArrayList<Column> result = new ArrayList<>();
+		String query = "SELECT * FROM " + getName() + " WHERE `" + column.getName() + "`='"
+				+ column.getValue().toString() + "';";
+
+		try {
+			ResultSet rs = null;
+
+			Connection conn = mysql.getConnectionManager().getConnection();
+			PreparedStatement sql = conn.prepareStatement(query);
+
+			rs = sql.executeQuery();
+
+			/*
+			 * Query sql = new Query(mysql, query);
+			 * sql.setParameter(1, column.getValue().toString());
+			 * ResultSet rs = sql.executeQuery();
+			 */
+			if (rs.next()) {
+				for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
+					String columnName = rs.getMetaData().getColumnLabel(i);
+					Column rCol = null;
+					if (intColumns.contains(columnName)) {
+						rCol = new Column(columnName, DataType.INTEGER);
+					} else {
+						rCol = new Column(columnName, DataType.STRING);
+					}
+					// System.out.println(i + " " +
+					// rs.getMetaData().getColumnLabel(i));
+					rCol.setValue(rs.getString(i));
+					// System.out.println(rCol.getValue());
+					result.add(rCol);
+				}
+			}
+			sql.close();
+			conn.close();
+			return result;
+		} catch (SQLException e) {
+			e.printStackTrace();
+		} catch (ArrayIndexOutOfBoundsException e) {
+		}
+
+		for (String col : getColumns()) {
+			result.add(new Column(col, DataType.STRING));
+		}
+		return result;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public ArrayList<String> getNamesQuery() {
+		ArrayList<String> uuids = new ArrayList<String>();
+
+		checkColumn("PlayerName", DataType.STRING);
+		ArrayList<Column> rows = getRowsNameQuery();
+		if (rows != null) {
+			for (Column c : rows) {
+				uuids.add((String) c.getValue());
+			}
+		}
+
+		return uuids;
+	}
+
+	public ArrayList<Column> getRowsNameQuery() {
+		ArrayList<Column> result = new ArrayList<Column>();
+		String sqlStr = "SELECT PlayerName FROM " + getName() + ";";
+
+		try {
+			ResultSet rs = null;
+
+			Connection conn = mysql.getConnectionManager().getConnection();
+			PreparedStatement sql = conn.prepareStatement(sqlStr);
+
+			rs = sql.executeQuery();
+			/*
+			 * Query query = new Query(mysql, sql);
+			 * ResultSet rs = query.executeQuery();
+			 */
+
+			while (rs.next()) {
+				Column rCol = new Column("PlayerName", rs.getString("PlayerName"), DataType.STRING);
+				result.add(rCol);
+			}
+			sql.close();
+			conn.close();
+		} catch (SQLException e) {
+		}
+
+		return result;
+	}
+
+	public ArrayList<Column> getRowsQuery() {
+		ArrayList<Column> result = new ArrayList<Column>();
+		String sqlStr = "SELECT uuid FROM " + getName() + ";";
+
+		try {
+			ResultSet rs = null;
+
+			Connection conn = mysql.getConnectionManager().getConnection();
+			PreparedStatement sql = conn.prepareStatement(sqlStr);
+
+			rs = sql.executeQuery();
+			/*
+			 * Query query = new Query(mysql, sql);
+			 * ResultSet rs = query.executeQuery();
+			 */
+
+			while (rs.next()) {
+				Column rCol = new Column("uuid", rs.getString("uuid"), DataType.STRING);
+				result.add(rCol);
+			}
+			sql.close();
+			conn.close();
+		} catch (SQLException e) {
+			return null;
+		}
+
+		return result;
+	}
+
+	public String getUUID(String playerName) {
+		String query = "SELECT uuid FROM " + getName() + " WHERE " + "PlayerName" + "='" + playerName + "';";
+		try {
+			ResultSet rs = null;
+
+			Connection conn = mysql.getConnectionManager().getConnection();
+			PreparedStatement sql = conn.prepareStatement(query);
+
+			rs = sql.executeQuery();
+			/*
+			 * Query sql = new Query(mysql, query);
+			 * ResultSet rs = sql.executeQuery();
+			 */
+			if (rs.next()) {
+				String uuid = rs.getString("uuid");
+				if (uuid != null && !uuid.isEmpty()) {
+					sql.close();
+					conn.close();
+					return uuid;
+				}
+			}
+			sql.close();
+			conn.close();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		} catch (ArrayIndexOutOfBoundsException e) {
+		}
+		return null;
+	}
+
+	public Set<String> getUuids() {
+		if (uuids == null || uuids.size() == 0) {
+			uuids.clear();
+			uuids.addAll(getUuidsQuery());
+			return uuids;
+		}
+		return uuids;
+	}
+
+	public ArrayList<String> getUuidsQuery() {
+		ArrayList<String> uuids = new ArrayList<String>();
+
+		ArrayList<Column> rows = getRowsQuery();
+		for (Column c : rows) {
+			uuids.add((String) c.getValue());
+		}
+
+		return uuids;
+	}
+
+	public void insert(String index, String column, Object value, DataType dataType) {
+		insertQuery(index, column, value, dataType);
+
+	}
+
+	public void insertQuery(String index, String column, Object value, DataType dataType) {
+		synchronized (object2) {
+			String query = "INSERT " + getName() + " ";
+
+			query += "set uuid='" + index + "', ";
+			query += column + "='" + value.toString() + "';";
+			// AdvancedCorePlugin.getInstance().extraDebug(query);
+
+			try {
+				uuids.add(index);
+				new Query(mysql, query).executeUpdateAsync();
+			} catch (SQLException e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	public boolean isIntColumn(String key) {
+		return intColumns.contains(key);
+	}
+
+	public void loadData() {
+		columns = getColumnsQueury();
+
+		try {
+			Connection con = mysql.getConnectionManager().getConnection();
+			con.close();
+
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void update(String index, String column, Object value, DataType dataType) {
+		checkColumn(column, dataType);
+		if (getUuids().contains(index)) {
+			synchronized (object2) {
+				String query = "UPDATE " + getName() + " SET ";
+
+				if (dataType == DataType.STRING) {
+					query += column + "='" + value.toString() + "'";
+				} else {
+					query += column + "=" + value;
+
+				}
+				query += " WHERE `uuid`=";
+				query += "'" + index + "';";
+
+				try {
+					Query q = new Query(mysql, query);
+					q.executeUpdate();
+				} catch (SQLException e) {
+					e.printStackTrace();
+				}
+			}
+
+		} else {
+			insert(index, column, value, dataType);
+		}
+
+	}
+}

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

@@ -0,0 +1,99 @@
+package com.Ben12345rocks.VotingPlugin.bungee;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.Collection;
+import java.util.List;
+
+import lombok.Getter;
+import net.md_5.bungee.config.Configuration;
+import net.md_5.bungee.config.ConfigurationProvider;
+import net.md_5.bungee.config.YamlConfiguration;
+
+public class Config {
+	private Bungee bungee;
+	@Getter
+	private Configuration data;
+
+	public Config(Bungee bungee) {
+		this.bungee = bungee;
+	}
+
+	public List<String> getBlockedServers() {
+		return getData().getStringList("BlockedServers");
+	}
+
+	public boolean getBroadcast() {
+		return getData().getBoolean("Broadcast", false);
+	}
+
+	public String getBungeeHost() {
+		return getData().getString("BungeeServer.Host", "");
+	}
+
+	public String getBungeeMethod() {
+		return getData().getString("BungeeMethod", "SOCKETS");
+	}
+
+	public int getBungeePort() {
+		return getData().getInt("BungeeServer.Port", 1297);
+	}
+
+	public boolean getDebug() {
+		return getData().getBoolean("Debug", false);
+	}
+
+	public String getFallBack() {
+		return getData().getString("FallBackServer", "");
+	}
+
+	public boolean getSendToOnlineServer() {
+		return getData().getBoolean("SendToOnlineServer");
+	}
+
+	public boolean getSendVotesToAllServers() {
+		return getData().getBoolean("SendVotesToAllServers");
+	}
+
+	public Configuration getSpigotServerConfiguration(String s) {
+		return getData().getSection("SpigotServers." + s);
+	}
+
+	public Collection<String> getSpigotServers() {
+		return getData().getSection("SpigotServers").getKeys();
+	}
+
+	public void load() {
+		if (!bungee.getDataFolder().exists()) {
+			bungee.getDataFolder().mkdir();
+		}
+
+		File file = new File(bungee.getDataFolder(), "bungeeconfig.yml");
+
+		if (!file.exists()) {
+			try (InputStream in = bungee.getResourceAsStream("bungeeconfig.yml")) {
+				Files.copy(in, file.toPath());
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		try {
+			data = ConfigurationProvider.getProvider(YamlConfiguration.class)
+					.load(new File(bungee.getDataFolder(), "bungeeconfig.yml"));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void save() {
+		try {
+			ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
+					new File(bungee.getDataFolder(), "bungeeconfig.yml"));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/bungee/OfflineBungeeVote.java

@@ -0,0 +1,26 @@
+package com.Ben12345rocks.VotingPlugin.bungee;
+
+import lombok.Getter;
+
+public class OfflineBungeeVote {
+
+	@Getter
+	private String playerName;
+	@Getter
+	private String uuid;
+	@Getter
+	private String service;
+	@Getter
+	private long time;
+	@Getter
+	private boolean realVote;
+
+	public OfflineBungeeVote(String playerName, String uuid, String service, long time, boolean realVote) {
+		this.playerName = playerName;
+		this.uuid = uuid;
+		this.service = service;
+		this.time = time;
+		this.realVote = realVote;
+	}
+
+}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/bungee/VoteCache.java

@@ -0,0 +1,102 @@
+package com.Ben12345rocks.VotingPlugin.bungee;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+
+import lombok.Getter;
+import net.md_5.bungee.config.Configuration;
+import net.md_5.bungee.config.ConfigurationProvider;
+import net.md_5.bungee.config.YamlConfiguration;
+
+public class VoteCache {
+	private Bungee bungee;
+	@Getter
+	private Configuration data;
+
+	public VoteCache(Bungee bungee) {
+		this.bungee = bungee;
+	}
+
+	public void addVote(String server, int num, OfflineBungeeVote voteData) {
+		Configuration section = getData().getSection("VoteCache." + server + "." + num);
+		section.set("Name", voteData.getPlayerName());
+		section.set("Service", voteData.getService());
+		section.set("UUID", voteData.getUuid());
+		section.set("Time", voteData.getTime());
+		section.set("Real", voteData.isRealVote());
+		save();
+	}
+
+	public void addVoteOnline(String player, int num, OfflineBungeeVote voteData) {
+		Configuration section = getData().getSection("OnlineCache." + player + "." + num);
+		section.set("Name", voteData.getPlayerName());
+		section.set("Service", voteData.getService());
+		section.set("UUID", voteData.getUuid());
+		section.set("Time", voteData.getTime());
+		section.set("Real", voteData.isRealVote());
+		save();
+	}
+
+	public void clearData() {
+		getData().set("VoteCache", null);
+		getData().set("OnlineCache", null);
+		save();
+	}
+
+	public Collection<String> getOnlineVotes(String name) {
+		return getData().getSection("OnlineCache." + name).getKeys();
+	}
+
+	public Configuration getOnlineVotes(String name, String num) {
+		return getData().getSection("OnlineCache." + name + "." + num);
+	}
+
+	public Collection<String> getPlayers() {
+		return getData().getSection("OnlineCache").getKeys();
+	}
+
+	public Collection<String> getServers() {
+		return getData().getSection("VoteCache").getKeys();
+	}
+
+	public Collection<String> getServerVotes(String server) {
+		return getData().getSection("VoteCache." + server).getKeys();
+	}
+
+	public Configuration getServerVotes(String server, String num) {
+		return getData().getSection("VoteCache." + server + "." + num);
+	}
+
+	public void load() {
+		if (!bungee.getDataFolder().exists()) {
+			bungee.getDataFolder().mkdir();
+		}
+
+		File file = new File(bungee.getDataFolder(), "votecache.yml");
+
+		if (!file.exists()) {
+			try {
+				file.createNewFile();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		try {
+			data = ConfigurationProvider.getProvider(YamlConfiguration.class)
+					.load(new File(bungee.getDataFolder(), "votecache.yml"));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void save() {
+		try {
+			ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
+					new File(bungee.getDataFolder(), "votecache.yml"));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+}

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/bungee/VotingPluginBungeeCommand.java

@@ -0,0 +1,52 @@
+package com.Ben12345rocks.VotingPlugin.bungee;
+
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.plugin.Command;
+
+public class VotingPluginBungeeCommand extends Command {
+	private Bungee bungee;
+
+	public VotingPluginBungeeCommand(Bungee bungee) {
+		super("votingpluginbungee", "votingplugin.admin");
+		this.bungee = bungee;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if (sender.hasPermission("votingplugin.admin")) {
+			if (args.length > 0) {
+				if (args[0].equalsIgnoreCase("reload")) {
+					bungee.reload();
+					sender.sendMessage(new TextComponent("Reloading VotingPluginBungee"));
+				}
+				if (args[0].equalsIgnoreCase("vote")) {
+					if (args.length >= 2) {
+						String user = args[1];
+						String site = args[2];
+						bungee.vote(user, site, false);
+						sender.sendMessage(new TextComponent("Sending vote"));
+					}
+				}
+				if (args[0].equalsIgnoreCase("status")) {
+					if (bungee.getMethod().equals(BungeeMethod.SOCKETS)) {
+						sender.sendMessage(new TextComponent(
+								"Checking status, waiting for response, check console, only for socket method"));
+						bungee.status(sender);
+					} else {
+						sender.sendMessage(new TextComponent("Not using socket method, command unavailable"));
+					}
+				}
+				if (args[0].equalsIgnoreCase("help")) {
+					TextComponent[] msg = new TextComponent[3];
+					msg[0] = new TextComponent("&avotingpluginbungee reload - Reload plugin");
+					msg[1] = new TextComponent("&avotingpluginbungee vote (player) (servicesite) - Send bungee vote");
+					msg[2] = new TextComponent("&avotingplugin status - Check socket connection status");
+					sender.sendMessage(msg);
+				}
+			}
+		} else {
+			sender.sendMessage(new TextComponent("You do not have permission to do this!"));
+		}
+	}
+}