Update version number to 6.16

Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.2 to 3.5.3 in /VotingPlugin

.github/FUNDING.yml

@@ -0,0 +1,14 @@
+# These are supported funding model platforms
+
+github: BenCodez # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+#patreon: # Replace with a single Patreon username
+#open_collective: # Replace with a single Open Collective username
+#ko_fi: # Replace with a single Ko-fi username
+#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+#liberapay: # Replace with a single Liberapay username
+#issuehunt: # Replace with a single IssueHunt username
+#lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+#polar: # Replace with a single Polar username
+#buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+custom: ["https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YQBX25RTXJ5DG"]

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "maven" # See documentation for possible values
+    directory: "/VotingPlugin/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/stale.yml

@@ -1,17 +0,0 @@
-# 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
-  - nonstale
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-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

.github/workflows/publish-javadoc.yml

@@ -0,0 +1,24 @@
+name: Deploy Javadoc
+
+on:
+  release:
+    types: [published]
+    branches:
+      - master
+      - main
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy JavaDoc 🚀
+        uses: MathieuSoysal/Javadoc-publisher.yml@main
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          javadoc-branch: gh-pages
+          java-version: 17
+          target-folder: ''
+          project: maven # or gradle
+          # subdirectories: moduleA moduleB #for subdirectories support, needs to be run with custom command
+          custom-command: mvn -f VotingPlugin/pom.xml deploy -P javadoc javadoc:aggregate
+          javadoc-source-folder: 'VotingPlugin/target/apidocs'

.github/workflows/stale.yml

@@ -0,0 +1,27 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: '19 16 * * *'
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v5
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'Stale issue message'
+        stale-pr-message: 'Stale pull request message'
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'

README.md

@@ -2,10 +2,6 @@
 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/BenCodez/VotingPlugin/blob/master/VotingPlugin/Resources/LICENSE.txt
@@ -23,19 +19,6 @@ https://github.com/BenCodez/VotingPlugin/blob/master/VotingPlugin/Resources/LICE
 	    <version>LATEST</version>
 	    <scope>provided</scope>
     </dependency>
-
-    BACKUP/OLD WAY
-    <repository>
-        <id>jitpack.io</id>
-        <url>https://jitpack.io</url>
-    </repository>
-    
-    <dependency>
-	    <groupId>com.github.BenCodez</groupId>
-	    <artifactId>VotingPlugin</artifactId>
-	    <version>LATEST</version>
-	    <scope>provided</scope>
-	</dependency>
   
   Versions:  
   LATEST - latest stable release  

VotingPlugin/.gitignore

@@ -5,3 +5,4 @@
 /*.iml
 /.settings/
 /.classpath
+/.factorypath

VotingPlugin/Resources/BungeeSettings.yml

@@ -1,21 +1,32 @@
-# --------------------------
+##########################################
 # 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
 
 # What type of bungee setup
 # Requires restart and set on all servers
-# https://github.com/BenCodez/VotingPlugin/wiki/Bungeecoord-Setups
+# https://github.com/BenCodez/VotingPlugin/wiki/Bungeecord-Setups
 # Available:
 # SOCKETS
-# PLUGINMESSAGING
+# PLUGINMESSAGING (Recommended)
 # MYSQL
+# REDIS (2nd Most Recommended)
 BungeeMethod: PLUGINMESSAGING
 
+# Use Redis for between server communication, set BungeeMethod to REDIS to use this
+Redis:
+  Host: localhost
+  Port: 6379
+# To get the user name, run redis-cli, if you set a password, run "auth <your password>" and if the out put is "OK" run "ACL USERS"
+  Username: 'default'
+  Password: ''
+  # Set a prefix from an entire proxy network if using multi-proxy setup below
+  Prefix: ''
+
 # Enables more debug messages for communication between servers
 # Use /votingpluginbungee status for testing communication
 BungeeDebug: false
@@ -52,6 +63,13 @@ PerServerPoints: false
 # Should allow some compability with other plugins
 TriggerVotifierEvent: false
 
+# If enabled plugin will give extra allsites reward if deterimned that it should
+# E.g. user votes offline for 7 days, they will only get 1 allsites reward by default
+# When enabled, they should get 7
+# Only applies to PLUGINMESSAGING
+# Recommend enabling ExtraAllSitesCheck in config.yml as well
+GiveExtraAllSitesRewards: false
+
 # What server this is in bungee (must match)
 # Also can be applied to rewards
 Server: PleaseSet
@@ -62,8 +80,49 @@ Server: PleaseSet
 # Can edit via /av gui
 BungeeVotePartyRewards: {}
 
-# -----------------------------
-# For socket setup below only
-# -----------------------------
+# List of commands to run on bungee party
+# This runs a one time command only
+BungeeVotePartyGlobalCommands: []
+
+####################################################################################
+# Global mysql data handle for between server commmunications
+# This is NOT required for bungee voting to work
+# This is still a WIP, use with caution
+# This will create a different table then from users storing server info to process
+#
+# If you use this you need to enable this on BungeeSettings.yml on each server with votingplugin
+# Make sure server name is set correctly in BungeeSettings.yml or this will not work correctly
+# 
+# Please use PLUGINMESSAGING for this, SOCKETS should work as well, but not fully tested
+#
+# This will make votes cache until time change has finished processing
+# In the event a server is offline or time change fails, the time change process
+# will continue after a set amount of time (in essense skipping a specific server)
+# This will also respect blocked servers in bungeeconfig.yml
+GlobalData:
+  Enabled: false
+  # Use existing mysql connection from config.yml
+  UseMainMySQL: true
+  # Mysql settings only used if above is false
+  Host: ''
+  # Default port is 3306
+  Port: 3306 
+  Database: ''
+  Username: ''
+  Password: ''
+  # Max number of connections
+  MaxConnections: 1
+  # Must be the same on all servers
+  Prefix: ''
+  #UseSSL: true
+  #PublicKeyRetrieval: false
+  #Attempt to use mariadb driver
+  #UseMariaDB: false
+
+##########################################
+# For socket setup
+# Recommend to try PLUGINMESSAGING setup first
+# Options hidden by default to avoid confusion
+##########################################
 # Options available here:
-# https://github.com/BenCodez/VotingPlugin/wiki/Bungee-Setup-SOCKETS
+# https://github.com/BenCodez/VotingPlugin/wiki/Bungee-Setup-SOCKETS

VotingPlugin/Resources/Config.yml

@@ -4,10 +4,13 @@
 # https://github.com/BenCodez/VotingPlugin/wiki
 # Config is sorted in sections
 # Use Control + F to search with Notepad++
-# 
+
+
+###########################################
+# User storage
+###########################################
 # Valid Options:
 # - SQLITE 
-# - FLAT
 # - MYSQL
 DataStorage: SQLITE
 
@@ -30,23 +33,13 @@ MySQL:
   #MaxLifeTime: -1
   #Additional info on connection string
   #Line: ''
+  #Attempt to use mariadb driver
+  #UseMariaDB: false
 
-# --------------------
-# AllowUnJoined options
-# May need to set to true for bungee setup
-# --------------------
 
-# Let players who never joined before vote
-# 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
-# ------------------------------------------------
+###########################################
 
 # Configuration for VoteReminding
 # By default this should be all setup to work
@@ -57,7 +50,7 @@ VoteReminding:
   # Requires VoteDelays to be setup properly
   # Use /vote next to see when you can be reminded
   # Players require the perm "VotingPlugin.Login.RemindVotes" or "VotingPlugin.Player"
-  # To remind if any votesite is available (rather than all) use the permission "VotingPlugin.Login.RemindVotes.Any"
+  # To remind if all votesites are available (rather than any) use the permission "VotingPlugin.Login.RemindVotes.All"
   Enabled: true
 
   # Will remind player on login if he can vote
@@ -89,9 +82,9 @@ VoteReminding:
       Message: '&cRemember to vote'
       Delay: 30
     
-# ------------------------------------------------
-# Format
-# ------------------------------------------------
+###########################################
+# Format options
+###########################################
     
 # Common PlacesHolders:
 # Special PlaceHolders will be commented where available
@@ -107,7 +100,11 @@ Format:
 
   # Broadcast vote message
   # Set to an empty message to disable
+  # Use %NewLine% for a new line
   BroadcastMsg: '&6[&4Broadcast&6] &2Thanks &c%player% &2for voting on %SiteName%'
+  # If true uses broadcast setting below for offline votes
+  OnlyOneOfflineBroadcast: false
+  OfflineBroadcast: '&6[&4Broadcast&6] &2Thanks &c%player% &2for voting on %numberofvotes% times!'
   
   # Broadcast only when player is online
   BroadcastWhenOnline: false
@@ -115,6 +112,8 @@ Format:
   # Broadcast every x number of minutes with number of players that voted
   AlternateBroadcast:
     Enabled: false
+    # Use %players% for all players names
+    # Use %numberofplayers% for number of players that voted
     Broadcast: '&6[&4Broadcast&6] &2%numberofplayers% voted in the last half hour! /vote'
     # Delay in minutes
     Delay: 30
@@ -173,6 +172,8 @@ Format:
         TimeFormat: '%amount% %TimeType%'
         LastVoted: '%times% ago'
         NeverVoted: 'Never voted'
+        # Whether or not to include seconds into last voted time
+        IncludeSeconds: true
         
       # Format for /vote total
       Total:
@@ -246,6 +247,16 @@ Format:
       # %Points% = player points
       Points: '&a%Player% currently has &a&l%Points%&a Points!'
       
+      # /vote givepoints command
+      # Transfer between players command
+      # Enable command below
+      GivePoints:
+        NotEnoughPoints: '&cNot enough points'
+        NotJoinedServer: '&c%player% has not joined the server'
+        NumberLowerThanZero: '&cNumber of points needs to be greater than 0'
+        TransferFrom: '&c%transfer% points given to %touser%'
+        TransferTo: '&cYou received %transfer% points from %fromuser%'
+      
       ToggleBroadcasts:
         Enabled: '&cYou will now see vote broadcasts'
         Disabled: '&cYou will no longer see vote broadcasts'
@@ -297,6 +308,7 @@ Format:
   # Shop messages when using the /vote shop
   ShopPurchase: '&aYou bought the %Identifier% for %Points% Points!'
   ShopFailed: '&cYou do not have %Points% points to purchase this!'
+  ShopNotPurchasable: '&cThis item is not buyable!'
   
   # User not exist message, from commands such as /vote next (player)
   UserNotExist: '&cUser does not exist: %player%'
@@ -321,11 +333,24 @@ Format:
     Weekly: 'Weekly'
     Monthly: 'Monthly'
     AllTime: 'AllTime'
+  
+  # Invalid command messages
+  InvalidCommand:
+    Vote: '&4No valid arguments, see /vote help!'
+    AdminVote: '&4No valid arguments, see /adminvote help!'
+    
+# Playernames to not be broadcasted when voting
+# case sensitive
+VotingBroadcastBlacklist: []
 
-# ------------------------------------------------
+# Playernames to not be broadcasted when broadcast comes from reward file
+# case sensitive
+BroadcastBlacklist: []
+
+###########################################
 # Top Voter
 # Top voter rewards available in specialrewards.yml
-# ------------------------------------------------
+###########################################
 
 # Top voter blacklist
 # Hide these names from top voter lists
@@ -361,123 +386,13 @@ MaxiumNumberOfTopVotersToLoad: 1000
 StoreTopVoters:
   Weekly: false
   Daily: false
-    
-# ------------------------------------------------
-# Advanced
-# Most of these values can be left untouched for most setups
-# ------------------------------------------------
-
-# If true vanished players are treated as if they are offline
-TreatVanishAsOffline: false
-
-# If true, cooldown check is disabled
-DisableCoolDownCheck: false
-
-# If true, disable PlayerInteractEvent (for clicking signs and skulls)
-DisableInteractEvent: false
-
-# Delays login event, delays vote reminding and more
-# In ticks
-DelayLoginEvent: 0
-
-# If false, votestreaks will be disabled
-UseVoteStreaks: true
-
-# If false, storing best totals will be disabled
-UseHighestTotals: true
-
-# If true, /vote will open /vote gui by default
-UseVoteGUIMainCommand: false
-
-# Number of points to give on vote
-# Set to 0 to give no points
-PointsOnVote: 1
-
-# Set this to false to disable the plugin adding totals
-# Not really recommended
-AddTotals: true
-
-# If true, items given for rewards are dropped on the ground
-# If false, items will be given when there is space
-DropOnFullInv: true
-
-# If true, allsites will have an extra check to prevent duplicate allsites from being given
-ExtraAllSitesCheck: false
-
-# Click sound when using gui
-# Set to none for no sound
-ClickSound: 
-  Sound: 'UI_BUTTON_CLICK'
-  Volume: 1.0
-  Pitch: 1.0
-  
-# Playernames to not be broadcasted when voting
-# case sensitive
-VotingBroadcastBlacklist: []
-
-# When enabled, javascript will be parsed on placeholders (from placeholderapi)
-# allows more fancy placeholders with math for example
-UseJavascriptPlaceholders: false
   
 # 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
-
-# Close inventory on player vote
-# This is to prevent any possible exploits
-CloseInventoryOnVote: true
-
-# When enabled the command /vote setprimaryaccount (playername)
-# will be shown (after restart)
-# Primary account will be used instead of the players account to get
-# placeholder and other data such as vote reminding
-# Mainly to be used for alts and such
-UsePrimaryAccountForPlaceholders: false
-
-# Always force placeholders to return value if the value isn't cached
-# This should prevent server from crashing when pulling placeholders on main thread
-# Only affects placeholderapi placeholders
-AlwaysWaitForCachePlaceholders: false
-
-# Set which placeholders to cache at all times
-# Use for placeholders to are pulled constantly or on the main thread
-# Mainly aimed for scoreboards
-# Placeholders may auto cache in certain conditions
-# Will use additional memory, but not a lot
-# Still in early stages, please report bugs
-# Please remove VotingPlugin_ from the placeholder listed here
-CachedPlaceholders: []
-#- Total_AllTime
-
-# If true, permissions will be handled differently
-MultiplePermissionsCheck: false
-
-AddCustomCommands: false
-
-# Injects custom command to /vote
-# Requires AddCustomCommand: true to be set
-CustomCommands:
-  # identifier, not specific name
-  command1:
-    Args:
-    - token
-    # Message to send on command
-    Message: 'token message'
-    # Permission for this command
-    Permission: 'votingplugin.commands.vote.token'
-    # help message
-    HelpMessage: 'See tokens'
-    # Forces player to run this command
-    Commands:
-    - tokencommand
-
-######################
+###########################################
 # Debug
-######################
+###########################################
 
 # Debug levels:
 # NONE
@@ -499,16 +414,83 @@ DebugInGame: false
 # Not recommended though
 LogVotesToFile: false
 
-# Only update in the background when needed when set to false
-AlwaysUpdate: false
+###########################################
+# Placeholderapi placeholders settings
+###########################################
 
-# Update in the background only if players are online
-UpdateWithPlayersOnlineOnly: false
+# When enabled the command /vote setprimaryaccount (playername)
+# will be shown (after restart)
+# Primary account will be used instead of the players account to get
+# placeholder and other data such as vote reminding
+# Mainly to be used for alts and such
+UsePrimaryAccountForPlaceholders: false
 
-# Delay between background updates like signs and more
-# Default: 3 Minutes
-# Longer times result in longer wait in stuff updating after a vote, like topvoter
-DelayBetweenUpdates: 3
+# Valid Options:
+# AUTOALL - Auto cache placeholders after they have been used and cache all players placeholder all the time
+# AUTO - Auto cache after they have been used and cache online players placeholders (Recommended)
+# SPECIFIC - Only cache certain placeholders for online players
+# SPECIFICALL - Only cache certain placeholders for all players
+# NONE - Don't cache any placeholders
+PlaceholderCacheLevel: AUTO
+
+# Placeholder controls
+# Add _process to end of placeholder to force a return value rather than . or .. if no cached value is ready
+# Add _nocache to end of placeholder to skip cache and retrive a live value, uses a direct mysql connection, do not use on main thread
+#
+
+# Set which placeholders to cache at all times
+# Use for placeholders to are pulled constantly or on the main thread
+# Mainly aimed for scoreboards that pull placeholders often
+# Placeholders may auto cache in certain conditions (if enabled above)
+# Will use additional memory, but not a lot
+# Still in early stages, please report bugs
+# Please remove VotingPlugin_ from the placeholder listed here
+CachedPlaceholders: []
+#- Total_AllTime
+
+# When enabled, javascript will be parsed on placeholders (from placeholderapi)
+# allows more fancy placeholders with math for example
+UseJavascriptPlaceholders: false
+
+# Custom placeholder returns
+# For the example below use %votingplugin_custom_enoughpoints_5%
+# DO NOT USE ON MAIN THREAD IF POSSIBLE
+# Keep everything lowercase
+# Example:
+#CustomPlaceholderReturns:
+#  'enoughpoints_5':
+#    'true': 'User has enough points'
+#    'false': 'User does not have enough points'
+CustomPlaceholderReturns: {}
+
+###########################################
+# Login options
+###########################################
+
+# If true vanished players are treated as if they are offline
+TreatVanishAsOffline: false
+
+# Delays login event, delays vote reminding and more
+# In miliseconds, 1000 = 1 second
+DelayLoginEvent: 0
+
+# Wait until user is logged in with AuthMe
+# Requires AuthMe or LoginSecurity
+WaitUntilLoggedIn: true
+
+###########################################
+# Disable/Enable features
+###########################################
+
+# If true, cooldown check is disabled
+DisableCoolDownCheck: false
+
+# If true, disable PlayerInteractEvent (for clicking signs and skulls)
+DisableInteractEvent: false
+
+# Disable this on a hub server for example
+# Still processes rewards for offline rewards (just won't give any)
+ProcessRewards: true
 
 # Set to true to disable no service site message on voting
 # You should never have to touch this if everything is setup properly
@@ -519,55 +501,88 @@ DisableNoServiceSiteMessage: false
 # If true fake votes will give points and totals
 CountFakeVotes: true
 
-# Give VotingPlugin.Player by default
-# Requires restart to take affect
-GiveDefaultPermission: true
+# Whether or not to disable update checks
+DisableUpdateChecking: false
 
-# Permissions given by VotingPlugin.Player by default
-# Permissions listed here will no be accessible with the default permission
-DisabledDefaultPermissions: []
+# Enable per site cooldown events, requires more resources to use
+# Requires restart
+PerSiteCoolDownEvents: false
 
-# Remove old player files
-# Happens on startup or /av purge
-PurgeOldData: false
-
-# Minimum number of days offline in order to purge
-PurgeMin: 90
-
-# Whether or not to create daily backups. (Only the most recent ones get kept)
-CreateBackups: true
+# Queue votes during a time change (doesn't apply to bungee voting)
+# Votes will be given when time change is completed
+QueueVotesDuringTimeChange: false
 
 # If true, plugin will automaticly generate votesites
 # Disable this if you experience issues with sites being created randomly
 # Most cases this will work all the time
 AutoCreateVoteSites: true
 
+# Experiemtental feature
+# Uses https://github.com/BenCodez/VotingPlugin/wiki/Minecraft-Server-Lists
+# Not all voting sites use the domain name as the service sites
+# This feature is an attempt to ease setup for new users by matching domain name to actual service site
+AdvancedServiceSiteHandling: false
+
+# Set this to false to disable the plugin adding totals
+# Not really recommended
+AddTotals: true
+
+# Disabling this prevents offline votes from adding totals to users
+AddTotalsOffline: true
+
+# If false, votestreaks will be disabled
+UseVoteStreaks: true
+
+# If false, storing best totals will be disabled
+UseHighestTotals: true
+
+# Geyser/Bedrock player support
+# Set prefix used for voting
+# Players should vote with prefix
+# https://github.com/BenCodez/VotingPlugin/wiki/Bedrock-Player-Support
+BedrockPlayerPrefix: '.'
+
+# Whether or not to create daily backups. (Only the most recent ones get kept)
+CreateBackups: true
+
 # Automaticly download the latest version
 # Will require a restart to actually update
 # Note: It takes 30-40 minutes before being able to download the latest build
 # You can also use /av download
 AutoDownload: false
 
-# Whether or not to disable update checks
-DisableUpdateChecking: false
+# If false plugin will use offline player UUIDs
+OnlineMode: true
 
-# Allow transfer of vote points between players
-AllowVotePointTransfers: false
+# Disable checking on world change
+# May improve performance
+#DisableCheckOnWorldChange: false
 
-# Disable this on a hub server for example
-# Still processes rewards for offline rewards (just won't give any)
-ProcessRewards: true
+# Disable javascript processing in messages/rewards
+DisableJavascript: false
 
-# Disable checking permissions on tab complete
-DisableAdvancedTab: false
+# If true, number of vote shop purchases will be tracked
+# Data will be tracked in serverdata.yml, may change in the future
+# No commands to view data currently 
+TrackShopPurchases: false
 
-# Load command aliases, such as /avgui
-# Requires restart to take effect
-LoadCommandAliases: true
+# Limits about of offline votesites
+# Does not currently work with bungee votes from votingplugin
+OfflineVotesLimit:
+  # Enable or disable
+  Enabled: false
+  # Limit of votes per votesite
+  Amount: 5
+  
+# Default worlds set for all rewards
+DefaultRewardWorlds: []
 
-# Wait until user is logged in with AuthMe
-# Requires AuthMe
-WaitUntilLoggedIn: true
+# Default blackedlisted worlds set for all rewards
+DefaultRewardBlackListedWorlds: []
+
+###########################################
+# Skull settings
+###########################################
 
 # Preload skulls to improve performance for vote top
 # when using skulls as the item to display players
@@ -579,10 +594,53 @@ PreloadSkulls: false
 # Will reduce ram usage (very little) if disabled, but slow GUI speeds when using skulls
 LoadSkulls: true
 
-# Limit number of users to load in a second
-# Effects background tasks mainly
-# set to -1 to disable (default value)
-#PlayerDataLoadLimit: 500
+###########################################
+# Extra checks on vote
+###########################################
+
+# If true, allsites will have an extra check to prevent duplicate allsites from being given
+ExtraAllSitesCheck: 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
+
+# Number of points to give on vote
+# Set to 0 to give no points
+PointsOnVote: 1
+
+# May need to enable this for bungee setups
+# Let players who never joined before vote
+# 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
+
+##############################################
+# Command/Permission settings
+##############################################
+
+# Give VotingPlugin.Player by default
+# 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: []
+
+# If true, /vote will open /vote gui by default
+UseVoteGUIMainCommand: false
+
+# Disable checking permissions on tab complete
+# Could increase performance slightly, but probably not
+DisableAdvancedTab: false
+
+# Load command aliases, such as /avgui
+# Requires restart to take effect
+LoadCommandAliases: true
 
 # Use vault for permission checks
 # May not work on some plugins
@@ -594,27 +652,104 @@ UseVaultPermissions: false
 # - PERMISSION
 DisabledCommands: []
 
-# Enable Geyser prefix support
-GeyserPrefixSupport: false
-GeyserPrefix: '*'
+# If true, permissions will be handled differently
+MultiplePermissionsCheck: false
+
+# Allow transfer of vote points between players
+# Requires restart for command to load
+# Command: /vote givepoints (player) (points)
+AllowVotePointTransfers: false
+
+AddCustomCommands: false
+
+# Injects custom command to /vote
+# Requires AddCustomCommand: true to be set
+CustomCommands:
+  # identifier, not specific name
+  command1:
+    Args:
+    - token
+    # Message to send on command
+    Message: 'token message'
+    # Permission for this command
+    Permission: 'votingplugin.commands.vote.token'
+    # help message
+    HelpMessage: 'See tokens'
+    # Forces player to run this command
+    Commands:
+    - tokencommand
+
+##############################################
+# Background task settings
+##############################################
+
+# Only update in the background when needed when set to false
+AlwaysUpdate: false
+
+# Update in the background only if players are online
+UpdateWithPlayersOnlineOnly: false
+
+# Delay between background updates like signs and more
+# Default: 3 Minutes
+# Longer times result in longer wait in stuff updating after a vote, like topvoter
+DelayBetweenUpdates: 3
 
 # Enable to true for extra player checks
 # Recommend leaving this to false
 ExtraBackgroundUpdate: false
 
+##########################################
+# Inventory controls
+##########################################
+
+# Click sound when using gui
+# Set to none for no sound
+ClickSound: 
+  Sound: 'UI_BUTTON_CLICK'
+  Volume: 1.0
+  Pitch: 1.0
+
+# If true, items given for rewards are dropped on the ground
+# If false, items will be given when there is space
+DropOnFullInv: true
+
 # This will prevent spam clicking GUI's to prevent exploits
 # Number is time in between clicking in milliseconds
-SpamClickTime: 150
+SpamClickTime: 100
 # Message to send when inventory forced closed when spam clicking
 # Uncomment to use
 #SpamClickMessage: '&cDetected spam clicking GUI, closing to prevent exploits'
 
-# ###############################################################
-# Deprecated options, don't recommend using any of these
-
 # Will force GUI's to close on every click
 AlwaysCloseInventory: false
 
+# Close inventory on player vote
+# This is to prevent any possible exploits
+CloseInventoryOnVote: true
+
+# This will close GUI's if you shift click them rather than a regular
+# This can help prevent exploits
+CloseGUIOnShiftClick: false
+
+###########################################
+# Purge settings
+###########################################
+# Remove old player files
+# Happens on startup or /av purge
+PurgeOldData: false
+
+# Minimum number of days offline in order to purge
+PurgeMin: 90
+
+##########################################
+# Extra options
+# Options below don't need to be touched
+##########################################
+
+# If enabled, data is repulled from storage on vote shop purchase
+# This prevents possible exploits with vote shop
+ExtraVoteShopCheck: true
+
 # Options for request api
 # Current methods:
 # ANVIL
@@ -625,9 +760,3 @@ RequestAPI:
   DefaultMethod: 'Anvil'
   DisabledMethods: []
 
-# Shouldn't need to change this
-#AutoKillInvs: true
-
-# Disable checking on world change
-# May improve performance
-#DisableCheckOnWorldChange: false

VotingPlugin/Resources/GUI.yml

@@ -71,7 +71,7 @@ CHEST:
         Name: '&4Vote Shop'
         Lore:
         - '&aYou currently have %points% points'
-    # 'ExtraName' below is an identifier, can be whatever
+    # 'ExtraItem' below is an identifier, can be whatever
     # ExtraItem:
       # Item:
         # Material: 'DIRT'
@@ -123,6 +123,7 @@ CHEST:
     # URL when clicking item in /vote (GUI version)
     URLText: '%VoteUrl%'
     # #Add Extra items
+    # This extra item format works across other gui settings below
     # ExtraItems:
       # Item1:
         # Material: DIRT
@@ -138,9 +139,14 @@ CHEST:
     # %time% = time, using timeformat below
     # %timesince% = time since vote
     Line: '&6%timeSince%'
+    ClickableLinks: true
   VoteNext:
     Name: 'VoteNext: %player%'
     BackButton: true
+    # Extra customization for displaying site names in GUI only
+    #CustomSiteNamesDisplays:
+    #  Site1: site name display
+    LoreLine: '%time%'
   VoteToday:
     Name: 'VoteToday'
     Line: '&6%VoteSite% : %Time%'
@@ -160,11 +166,17 @@ CHEST:
       Lore: '&3&lVotes: &3%votes%'
     # Opens main GUI of the specific player that gets clicked
     OpenMainGUIOnClick: true
+    # Close GUI when clicking on a player item
+    CloseGUIOnClick: true
     SwitchItem:
       Name: '&3Switch TopVoter'
       Lore: '&bCurrently: %Top%'
       Material: 'OAK_SIGN'
       Amount: 1
+      # Top voters for the switch item to use
+      #TopVoters:
+      #- ALLTIME
+      #- MONTHLY
       # 8 Slots over from the bottom left
       # Bottom of GUI
       Slot: 7
@@ -175,6 +187,15 @@ CHEST:
     # Item for player in GUI if use skull is false
     PlayerItem:
       Material: 'PAPER'
+    Customization:
+      Enabled: false
+      # List of slots for top voter
+      PlayerSlots: []
+      # Add extra items
+      ExtraItems: {}
+      RemoveBottomBar: false
+      # Set slot for backbutton
+      BackButtonSlot: 0
   VoteTotal:
     Name: 'VoteTotal: %player%'
     BackButton: true
@@ -277,6 +298,8 @@ CHEST:
     OpenVoteURL: false
     # If true, backbutton will be the last slot of the GUI
     EndOfGUI: false
+    # If true, this item will become an exit button instead
+    Exit: false
 
   VoteShopBackButton: true
   VoteShopEnabled: true
@@ -286,6 +309,12 @@ CHEST:
   VoteShopLimitReached: '&aYou reached your limit'
   VoteShopRequireConfirmation: false
   VoteShopDisabled: '&cVote shop disabled'
+  # If true, shop gui will reopen, updating all placeholders
+  VoteShopReopenGUIOnPurchase: false
+  # VoteShop extra items for display only
+  #VoteShopExtraItems:
+    #Item:
+      #...
   Shop:
     # Identifier
     # Used in placeholders for formats
@@ -306,6 +335,8 @@ CHEST:
       Cost: 3
       # Permission required, leave blank for no permission
       Permission: ''
+      # Hide if player doesn't have permission (only if permission is set)
+      HideOnNoPermission: true
       # Whether or not to keep GUI open after purchase
       CloseGUI: true
       # Require confirmation on purchase, overrides global option above
@@ -349,7 +380,11 @@ BOOK:
     CanVoteText: 'Click me'
     CanVoteColor: 'GREEN'
     AlreadyVotedText: 'Click me'
-    AlreadyVotedColor: 'RED' 
+    AlreadyVotedColor: 'RED'
+    # If true the layout below is the full book text 
+    Manual: false
+    # Only works if Manual is enabled
+    TopLayout: []
     Layout:
     - '&3&l%Sitename%'
     - '[UrlText]'

VotingPlugin/Resources/SpecialRewards.yml

@@ -13,10 +13,17 @@ FirstVote:
 FirstVoteToday: {}
 
 # All vote rewards
-# Reward for voting on all sites in one day
+# One time reward for voting on all sites in one day
+# Enable ExtraAllSitesCheck if you get double rewards
 AllSites: 
   Messages:
     Player: '&aYou voted on all sites in 1 day!'
+    
+# Give a reward for voting on all sites minus 1
+# Similar to allsites
+#AlmostAllSites:
+#  Messages:
+#    Player: '&aYou almost voted on all sites in 1 day!'
 
 
 # If true only cumulative reward at a time can be given
@@ -33,7 +40,7 @@ Cumulative:
   # Can have multiple listed here
   '20':
     Enabled: false
-    # Wether or not votes must be made in same day/week
+    # Whether 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
     # Valid options
@@ -42,6 +49,11 @@ Cumulative:
     # Weekly
     # Daily
     TotalToUse: AllTime
+    # Blacklist recurring votes
+    #BlackList:
+    #- 40
+    # Whether or not to gives cumulative reward for every x number of votes, default: true
+    #Recurring: true
     Rewards: 
       Messages:
         Player: '&aYou got %cumulative% cumulative votes!'
@@ -69,7 +81,11 @@ VoteParty:
   ResetMonthly: false
   # If true, will give voteparty only once per day
   OnlyOncePerDay: false
-  # Reset extra votes
+  # If true, will give voteparty once per week only
+  OnlyOncePerWeek: false
+  # Reset extra votes weekly
+  ResetExtraVotesWeekly: false
+  # Reset extra votes monthly
   ResetExtraVotesMonthly: false
   # Count votes from /av vote?
   CountFakeVotes: true
@@ -79,9 +95,16 @@ VoteParty:
   CountOfflineVotes: true
   # Broadcast when vote party reached
   Broadcast: '&cReached the vote party amount!'
+  # Send a broadcast at a certain number of votes left and send a vote reminder
+  VoteReminderBroadcast: '%votesrequired% left to go, go vote!'
+  # List of votes required amounts for when to send vote party reminders
+  VoteReminderAtVotes: []
   # List of commands to execute, these only execute once.
   # %player% does not work here
-  Commands: []
+  GlobalCommands: []
+  # List of commands to execute once
+  # Only run will run
+  GlobalRandomCommand: []
   # Rewards to give per player
   Rewards: 
     # Uncomment below for online players to be rewarded only
@@ -114,6 +137,7 @@ VoteStreak:
     # 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)
+    # This may not work perfectly on bungee setups at this time
     '2':
       # Enabled or not
       Enabled: false

VotingPlugin/Resources/VoteSites.yml

@@ -2,6 +2,7 @@ VoteSites:
   # VoteSite key
   # Used for saving data for votesites
   # Use a short name if you can
+  # No spaces or dots
   ExampleVoteSite:
     # Enable voteSite
     # If false, votesite will not be loaded by plugin
@@ -26,7 +27,7 @@ VoteSites:
     ServiceSite: 'PlanetMinecraft.com'
 
     # vote url for /vote
-    # Format for this can be set in Format.yml
+    # Format for this can be set in Config.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"]'
@@ -37,6 +38,7 @@ VoteSites:
     VoteDelay: 24
     
     # Use to have a minute votedelay
+    # Must set a value on VoteDelay if you plan on only using this setting
     #VoteDelayMin: 30
     
     # Require waiting until votedelay time has pasted in order to accept vote
@@ -47,8 +49,11 @@ VoteSites:
     # Recommend: false
     VoteDelayDaily: false
     
-    #Offset time for /vote next caculations
-    #TimeOffSet: 0
+    # Replaces offset, set the exact hour based on server time
+    # Include server time offset when setting this
+    # 2 = 2 am server time
+    # Use 1-24
+    #VoteDelayDailyHour: 14
     
     # If true, rewards can be executed offline (requires ForceOffline to be true in the reward)
     # Setting this to true will execute the reward offline while the player is offline
@@ -60,9 +65,15 @@ VoteSites:
     DisplayItem:
       Material: 'DIAMOND'
       Amount: 1
+      
+    # Reward to run when cooldown ends for this votesite
+    # Enable PerSiteCoolDownEvents in Config.yml to use this
+    #CoolDownEndRewards:
+    #  Messages:
+    #    Player: '&aTime to go vote on site1'
 
     # Rewards to give
-    # https://github.com/Ben12345rocks/AdvancedCore/wiki/Rewards
+    # https://github.com/BenCodez/AdvancedCore/wiki/Rewards
     Rewards:
       # Execute console commands
       Commands:
@@ -108,7 +119,7 @@ VoteSites:
           Messages:
             Player: 'You got unlucky'
             
-      # Give 1 diamond
+      # Give 1 diamond regardless of above
       Items:
         item1:
           Material: DIAMOND

VotingPlugin/Resources/bungeeconfig.yml

@@ -12,9 +12,54 @@ Password: ''
 # Max number of connections
 MaxConnections: 1
 # Table name prefix, for use with mutliple servers
+# Don't use with PLUGINMESSAGING bungee setup
 Prefix: ''
 #UseSSL: true
 #PublicKeyRetrieval: false
+#Attempt to use mariadb driver
+#UseMariaDB: false
+
+
+####################################################################################
+# Global mysql data handle for between server commmunications
+# This is NOT required for bungee voting to work
+# This is still a WIP, use with caution
+# This will create a different table then from users storing server info to process
+#
+# If you use this you need to enable this on BungeeSettings.yml on each server with votingplugin
+# Make sure server name is set correctly in BungeeSettings.yml or this will not work correctly
+# 
+# Please use PLUGINMESSAGING for this, SOCKETS should work as well, but not fully tested
+#
+# This will make votes cache until time change has finished processing
+# In the event a server is offline or time change fails, the time change process
+# will continue after a set amount of time (in essense skipping a specific server)
+# This will also respect blocked servers
+GlobalData:
+  Enabled: false
+  # Use existing connection above
+  UseMainMySQL: true
+  # Mysql settings only used if above is false
+  Host: ''
+  # Default port is 3306
+  Port: 3306 
+  Database: ''
+  Username: ''
+  Password: ''
+  # Max number of connections
+  MaxConnections: 1
+  # Must be the same on all servers
+  Prefix: ''
+  #UseSSL: true
+  #PublicKeyRetrieval: false
+  #Attempt to use mariadb driver
+  #UseMariaDB: false
+  
+# Time offset for time changes
+# Must match on all servers
+TimeHourOffSet: 0
+
+####################################################################################
 
 Debug: false
 # Have a reward on each server
@@ -25,15 +70,30 @@ SendVotesToAllServers: true
 BlockedServers:
 - hub
 
+
+# Similar to BlockServers
+# If a server is listed then blockedservers is ignored
+WhiteListedServers: []
+
 # What type of bungee setup
 # Requires restart and set on all servers
 # https://github.com/BenCodez/VotingPlugin/wiki/Bungeecoord-Setups
 # Available:
 # SOCKETS 
-# PLUGINMESSAGING 
+# PLUGINMESSAGING (Recommended)
 # MYSQL
+# REDIS
 BungeeMethod: PLUGINMESSAGING
 
+# Use Redis for between server communication, set BungeeMethod to REDIS to use this
+Redis:
+  Host: localhost
+  Port: 6379
+  Username: ''
+  Password: ''
+  # Set a prefix from an entire proxy network if using mutli-proxy setup below
+  Prefix: ''
+
 # If false, votes will be checked if user is a valid player that has joined to server
 # Works for PLUGINMESSAGING and SOCKETS methods only
 # This requires spigot servers AllowUnJoined to be set to true in Config.yml
@@ -44,18 +104,30 @@ PointsOnVote: 1
 
 # If true, bungee will handle adding totals
 # If false, spigot servers will EACH set their own totals
-# If false, AllowUnJoined should false on bungee, spigot servers will handle that
-# Recommened to leave true, setting to false setups are currently unsupported
+# If false, AllowUnJoined should be enabled on bungee, spigot servers will handle that
+# Recommeneded to leave enabled, setups with this disabled are currently unsupported
 BungeeManageTotals: true
 
-# Support for redis
-# experimental
-RedisSupport: false
-
 # Tell servers to broadcast
 # Set DisableBroadcast to true on spigot servers (BungeeSettings.yml) as well
 Broadcast: true
 
+# Geyser/bedrock player settings
+# https://github.com/BenCodez/VotingPlugin/wiki/Bedrock-Player-Support
+BedrockPlayerPrefix: '.'
+
+# Time votes will be cached on proxy
+# -1 means no time limit
+# Time in days
+VoteCacheTime: -1
+
+# Maxium number of votes possible per day
+# Usually matches the amount of votesites
+# Will limit vote totals to match accordingly
+# Only applies for month total
+# Set to -1 to disable
+MaxAmountOfVotesPerDay: -1
+
 VoteParty:
   # If enabled, will trigger vote party reward 
   # in BungeeSettings.yml under BungeeVotePartyReward
@@ -74,18 +146,80 @@ VoteParty:
   BungeeCommands: []
   Broadcast: '&aVote party has been reached!'
   
+# Online mode for UUIDS
+# Offline mode setups are not fully tested and are not supported currently
+OnlineMode: true
 
-# ----------------------------
+##########################################
 # PLUGINMESSAGING Settings
-# ----------------------------
+##########################################
 
 # Applies to PLUGINMESSAGING only
 # Votes will be forwarded when specific player is online
+# If set to false, rewards should still reward when player logs in (by default)
 WaitForUserOnline: false
 
-# ----------------------------
-# SOCKET Settings
-# ONLY for SOCKET method
-# ----------------------------
-# Options available here:
-# https://github.com/BenCodez/VotingPlugin/wiki/Bungee-Setup-SOCKETS
+
+##########################################
+# Multi-proxy setup
+# This is still a WIP, use with caution
+# Primary server needs votifier and config option enabled
+# Set socket host on each proxy and primary server set sub proxies
+# All servers should be on pluginmessaging or sockets setup
+##########################################
+
+# Support for multiple proxies
+MultiProxySupport: false
+
+# Enable on primary proxy server with votifier
+PrimaryServer: false
+
+# If enabled, player will only get 1 reward on a server on the network
+# Must be enabled on all proxies for this to work
+# Must also disable sendtoallservers
+MultiProxyOneGlobalReward: false
+
+# Multi-proxy available methods:
+#  SOCKET
+#  REDIS
+MultiProxyMethod: SOCKET
+
+##########################################
+# REDIS Settings
+##########################################
+
+# Set multiproxymethod to REDIS to use redis
+MultiProxyRedis:
+  # If true the plugin will use the exsiting connection set above
+  # Must be on REDIS method to use this setting
+  UseExistingConnection: false
+  Host: localhost
+  Port: 6379
+  Username: ''
+  Password: ''
+  
+# Set each server it's own proxy name here (can be anything)
+ProxyServerName: proxy1
+
+# Set names of other proxy servers
+# Must match what's set as the proxy server name above from other servers
+# On non primary proxy server just set the primary proxy server name here
+ProxyServers:
+- proxy2
+- proxy3
+
+##########################################
+# SOCKET settings for mutli-proxy
+##########################################
+
+# Set this for each proxy
+MultiProxySocketHost:
+  Host: 0.0.0.0
+  Port: 1234
+
+# Set other sub proxies here
+# On non primary proxy only set primary proxy
+MultiProxyServers:
+  secondproxy:
+    Host: 0.0.0.0
+    Port: 1235

VotingPlugin/Resources/plugin.yml

@@ -1,257 +1,271 @@
-name: ${project.name}
-version: ${project.version}
-main: com.bencodez.votingplugin.VotingPluginMain
-description: Highly Customizable Voting Listener!
-website: https://www.spigotmc.org/resources/votingplugin.15358/
-author: BenCodez
-softdepend: [MVdWPlaceholders, Votifier, VotifierPlus, NuVotifier, CMI, Vault, PlaceholderAPI, ProtocolLib, MVdWPlaceholderAPI, AuthMe]
-loadbefore: [MCPerks]
-api-version: 1.13
-libraries:
-  - org.openjdk.nashorn:nashorn-core:15.3
-commands:
-  vote:
-    description: Vote command
-  adminvote:
-    description: Admin commands for VotingPlugin
-  av:
-    description: Admin commands for VotingPlugin
-  votehelp:
-    description: See access to a list of commands, Formated in Format.yml
-    aliases: vhelp
-  votetotal:
-    description: See totals of votes
-    aliases: vtotal
-  votelast:
-    description: See the last time you voted
-    aliases: vlast
-  votenext:
-    description: See when you can vote next
-    aliases: vnext
-  votetop:
-    description: See top voters
-    aliases: vtop
-  votetoday:
-    description: See who voted today
-    aliases: vtoday
-  votegui:
-    description: Open VoteGUI
-    aliases: vgui
-  voteurl:
-    description: Open VoteURL
-    aliases: vurl
-  votereward:
-    description: Open VoteReward GUI
-    aliases: vreward
-  vote?:
-    description: View Help
-    aliases: v?
-  voteparty:
-    description: A command
-    aliases: vparty
-  voteshop:
-    description: A command
-    aliases: vshop
-  votebest:
-    description: A command
-    aliases: vbest
-  votestreak:
-    description: A command
-    aliases: vstreak
-  votetogglebroadcast:
-    description: A command
-    aliases: vtogglebroadcast
-  votepoints:
-    description: A command
-    aliases: vpoints
-  votetogglereminders:
-    aliases: [vtogglereminder,vtoggle]
-  votelist:
-    description: A command
-    aliases: vlist
-  voteall:
-    description: A command
-    aliases: vall
-  votechoices:
-    description: A command
-    alaises: vchoices
-  votegivepoints:
-    description: A command
-    alaises: vgivepoints
-  adminvotehelp:
-    description: Open adminvote help
-    aliases: avhelp
-  adminvote?:
-    description: Open adminvote help
-    aliases: av?
-  adminvotereport:
-    description: Command Alias
-    aliases: avreport
-  adminvoteperms:
-    description: Command Alias
-    aliases: avperms
-  adminvotereload:
-    description: Command Alias
-    aliases: avreload
-  adminvotetestreward:
-    description: Command Alias
-    aliases: avtestreward
-  adminvoteversion:
-    description: Command Alias
-    aliases: avversion
-  adminvotesites:
-    description: Command Alias
-    aliases: avsites
-  adminvoterewards:
-    description: Command Alias
-    aliases: avrewards
-  adminvoteuuid:
-    description: Command Alias
-    aliases: avuuid
-  adminvotevotesite:
-    description: Command Alias
-    aliases: avvotesite
-  adminvoteconfig:
-    description: Command Alias
-    aliases: avconfig
-  adminvoteupdatecheck:
-    description: Command Alias
-    aliases: avupdatecheck
-  adminvotevote:
-    description: Command Alias
-    aliases: [avvote, fakevote]
-  adminvotegui:
-    description: Command Alias
-    aliases: avgui
-  adminvotegivereward:
-    description: Command Alias
-    aliases: avgivereward
-  adminvoteConvertFromData:
-    description: Command Alias
-    aliases: avConvertFromData
-  adminvoteConvertToData:
-    description: Command Alias
-    aliases: avConvertFromData
-  adminvoteClearTotal:
-    description: Command Alias
-  adminvoteBackgroundUpdate:
-    description: Command Alias
-    aliases: avBackgroundUpdate
-  adminvoteClearCache:
-    description: Command Alias
-    aliases: avClearCache
-  adminvoteServiceSites:
-    description: Command Alias
-    aliases: avServiceSites
-  adminvoteVoteParty:
-    description: Command Alias
-    aliases: avVoteParty
-  adminvoteChoices:
-    description: Command Alias
-    aliases: avChoices
-  adminvoteReloadAll:
-    description: Command Alias
-    aliases: avReloadAll
-  adminvotePermsPlayer:
-    description: Command Alias
-    aliases: avPermsPlayer
-  adminvoteResyncMilestonesAlreadyGiven:
-    description: Command Alias
-    aliases: avResyncMilestonesAlreadyGiven
-  voteSetPrimaryAccount:
-    description: Command Alias
-  adminvoteClearOfflineVotes:
-    description: Command Alias
-    aliases: avClearOfflineVotes
-  adminvoteGiveAll:
-    description: Command Alias
-    aliases: avGiveAll
-  adminvoteGiveAllOnline:
-    description: Command Alias
-    aliases: avGiveAllOnline
-  adminvoteForceTimeChanged:
-    description: Command Alias
-    aliases: avForceTimeChanged
-  adminvoteplayername:
-    description: Command Alias
-    aliases: avplayername
-  adminvoteResyncMilestones:
-    description: Command Alias
-    aliases: avResyncMilestones
-  adminvoteClearOfflineRewards:
-    description: Command Alias
-    aliases: avClearOfflineRewards
-  adminvoteUserRemove:
-    description: Command Alias
-    aliases: avUserRemove
-  adminvotePurge:
-    description: Command Alias
-    aliases: avPurge
-  adminvoteJavascript:
-    description: Command Alias
-    aliases: avJavascript
-  adminvoteStatus:
-    description: Command Alias
-    aliases: avStatus
-  adminvoteTest:
-    description: Command Alias
-    aliases: avTest
-  adminvotePlaceholders:
-    description: Command Alias
-    aliases: avPlaceholders
-  adminvoteDownloadJenkins:
-    description: Command Alias
-    aliases: avDownloadJenkins
-  adminvoteSetRequestMethod:
-    description: Command Alias
-    aliases: avSetRequestMethod
-  adminvoteUser:
-    description: Command Alias
-    aliases: avUser
-  adminvoteCurrentPluginTime:
-    description: Command Alias
-    aliases: avCurrentPluginTime
-  adminvoteResetPoints:
-    description: Command Alias
-    aliases: avResetPoints
-  adminvoteRunCMD:
-    description: Command Alias
-    aliases: avRunCMD
-  adminvoteuseruuidremove:
-    description: Command Alias
-    aliases: avuseruuidremove
-  adminvoteedit:
-    description: Command Alias
-    aliases: avedit
-  adminvoteResetMilestoneCount:
-    description: Command Alias
-    aliases: avResetMilestoneCount
-permissions:
-  VotingPlugin.Player:
-    description: Allows basic access player commands
-  VotingPlugin.Mod:
-    description: Allows mod commands
-  VotingPlugin.Admin:
-    description: Allows admincommands
-  VotingPlugin.Login.RemindVotes:
-    description: Allows players to get remined on login if they can vote
-    default: true
-  VotingPlugin.Admin.Debug:
-    description: Permission to view debug info ingame
-  VotingPlugin.Signs.Create:
-    description: Allows access to create signs
-  VotingPlugin.TopVoter.Ignore:
-    description: Allows you to be exempt from top voter
-  VotingPlugin.NoRemind:
-    description: Ignore vote reminding
-    default: false
-  VotingPlugin.Sign.Create:
-    description: Permission to create sign
-  VotingPlugin.Admin.GenerateServiceSite:
-    description: Permission for generating votesite message
-  VotingPlugin.Login.RemindVotes:
-    description: Permission to allow timed reminders
-  VotingPlugin.Login.RemindVotes.All:
-    description: Remind if player can vote on all votesites, rather than any
-    default: false
-  
+name: ${project.name}
+version: ${project.version}
+main: com.bencodez.votingplugin.VotingPluginMain
+description: Highly Customizable Voting Listener!
+website: https://www.spigotmc.org/resources/votingplugin.15358/
+author: BenCodez
+softdepend:
+- MVdWPlaceholders
+- Votifier
+- VotifierPlus
+- NuVotifier
+- Vault
+- PlaceholderAPI
+- ProtocolLib
+- MVdWPlaceholderAPI
+- AuthMe
+- SuperVanish
+- PremiumVanish
+- LuckPerms
+loadbefore:
+- MCPerks
+api-version: 1.13
+folia-supported: true
+libraries:
+- org.openjdk.nashorn:nashorn-core:15.3
+commands:
+  vote:
+    description: Vote command
+  adminvote:
+    description: Admin commands for VotingPlugin
+  av:
+    description: Admin commands for VotingPlugin
+  votehelp:
+    description: See access to a list of commands, Formated in Format.yml
+    aliases: vhelp
+  votetotal:
+    description: See totals of votes
+    aliases: vtotal
+  votelast:
+    description: See the last time you voted
+    aliases: vlast
+  votenext:
+    description: See when you can vote next
+    aliases: vnext
+  votetop:
+    description: See top voters
+    aliases: vtop
+  votetoday:
+    description: See who voted today
+    aliases: vtoday
+  votegui:
+    description: Open VoteGUI
+    aliases: vgui
+  voteurl:
+    description: Open VoteURL
+    aliases: vurl
+  votereward:
+    description: Open VoteReward GUI
+    aliases: vreward
+  voteparty:
+    description: A command
+    aliases: vparty
+  voteshop:
+    description: A command
+    aliases: vshop
+  votebest:
+    description: A command
+    aliases: vbest
+  votestreak:
+    description: A command
+    aliases: vstreak
+  votetogglebroadcast:
+    description: A command
+    aliases: vtogglebroadcast
+  votepoints:
+    description: A command
+    aliases: vpoints
+  votetogglereminders:
+    aliases:
+    - vtogglereminder
+    - vtoggle
+  votelist:
+    description: A command
+    aliases: vlist
+  voteall:
+    description: A command
+    aliases: vall
+  votechoices:
+    description: A command
+    alaises: vchoices
+  votegivepoints:
+    description: A command
+    alaises: vgivepoints
+  adminvotehelp:
+    description: Open adminvote help
+    aliases: avhelp
+  adminvote?:
+    description: Open adminvote help
+    aliases: av?
+  adminvotereport:
+    description: Command Alias
+    aliases: avreport
+  adminvoteperms:
+    description: Command Alias
+    aliases: avperms
+  adminvotereload:
+    description: Command Alias
+    aliases: avreload
+  adminvotetestreward:
+    description: Command Alias
+    aliases: avtestreward
+  adminvoteversion:
+    description: Command Alias
+    aliases: avversion
+  adminvotesites:
+    description: Command Alias
+    aliases: avsites
+  adminvoterewards:
+    description: Command Alias
+    aliases: avrewards
+  adminvoteuuid:
+    description: Command Alias
+    aliases: avuuid
+  adminvotevotesite:
+    description: Command Alias
+    aliases: avvotesite
+  adminvoteconfig:
+    description: Command Alias
+    aliases: avconfig
+  adminvoteupdatecheck:
+    description: Command Alias
+    aliases: avupdatecheck
+  adminvotevote:
+    description: Command Alias
+    aliases:
+    - avvote
+    - fakevote
+  adminvotegui:
+    description: Command Alias
+    aliases: avgui
+  adminvotegivereward:
+    description: Command Alias
+    aliases: avgivereward
+  adminvoteconvertfromdata:
+    description: Command Alias
+    aliases: avconvertfromdata
+  adminvoteonverttodata:
+    description: Command Alias
+    aliases: avconverttodata
+  adminvotecleartotal:
+    description: Command Alias
+  adminvotebackgroundupdate:
+    description: Command Alias
+    aliases: avbackgroundupdate
+  adminvoteclearcache:
+    description: Command Alias
+    aliases: avclearcache
+  adminvoteservicesites:
+    description: Command Alias
+    aliases: avservicesites
+  adminvotevoteparty:
+    description: Command Alias
+    aliases: avvoteparty
+  adminvotechoices:
+    description: Command Alias
+    aliases: avchoices
+  adminvotereloadall:
+    description: Command Alias
+    aliases: avreloadall
+  adminvotepermsplayer:
+    description: Command Alias
+    aliases: avpermsplayer
+  adminvoteresyncmilestonesalreadygiven:
+    description: Command Alias
+    aliases: avresyncmilestonesalreadygiven
+  votesetprimaryaccount:
+    description: Command Alias
+  adminvoteclearofflinevotes:
+    description: Command Alias
+    aliases: avclearofflinevotes
+  adminvotegiveall:
+    description: Command Alias
+    aliases: avgiveall
+  adminvotegiveallonline:
+    description: Command Alias
+    aliases: avgiveallonline
+  adminvoteforcetimechanged:
+    description: Command Alias
+    aliases: avforcetimechanged
+  adminvoteplayername:
+    description: Command Alias
+    aliases: avplayername
+  adminvoteresyncmilestones:
+    description: Command Alias
+    aliases: avresyncmilestones
+  adminvoteclearofflinerewards:
+    description: Command Alias
+    aliases: avclearofflinerewards
+  adminvoteuserremove:
+    description: Command Alias
+    aliases: avuserremove
+  adminvotepurge:
+    description: Command Alias
+    aliases: avpurge
+  adminvotejavascript:
+    description: Command Alias
+    aliases: avjavascript
+  adminvotestatus:
+    description: Command Alias
+    aliases: avstatus
+  adminvotetest:
+    description: Command Alias
+    aliases: avtest
+  adminvoteplaceholders:
+    description: Command Alias
+    aliases: avplaceholders
+  adminvotedownloadjenkins:
+    description: Command Alias
+    aliases: avdownloadjenkins
+  adminvotesetrequestmethod:
+    description: Command Alias
+    aliases: avsetrequestmethod
+  adminvoteuser:
+    description: Command Alias
+    aliases: avuser
+  adminvotecurrentplugintime:
+    description: Command Alias
+    aliases: avcurrentplugintime
+  adminvoteresetpoints:
+    description: Command Alias
+    aliases: avresetpoints
+  adminvoteruncmd:
+    description: Command Alias
+    aliases: avruncmd
+  adminvoteuseruuidremove:
+    description: Command Alias
+    aliases: avuseruuidremove
+  adminvoteedit:
+    description: Command Alias
+    aliases: avedit
+  adminvoteresetmilestonecount:
+    description: Command Alias
+    aliases: avresetmilestonecount
+permissions:
+  VotingPlugin.Player:
+    description: Allows basic access player commands
+  VotingPlugin.Mod:
+    description: Allows mod commands
+  VotingPlugin.Admin:
+    description: Allows admincommands
+  VotingPlugin.Admin.Debug:
+    description: Permission to view debug info ingame
+  VotingPlugin.Signs.Create:
+    description: Allows access to create signs
+  VotingPlugin.TopVoter.Ignore:
+    description: Allows you to be exempt from top voter
+  VotingPlugin.NoRemind:
+    description: Ignore vote reminding
+    default: false
+  VotingPlugin.BypassWaitUntilVoteDelay:
+    description: Bypass WaitUntilVoteDelay
+    default: false
+  VotingPlugin.Sign.Create:
+    description: Permission to create sign
+  VotingPlugin.Admin.GenerateServiceSite:
+    description: Permission for generating votesite message
+  VotingPlugin.Login.RemindVotes:
+    description: Permission to allow timed reminders
+  VotingPlugin.Login.RemindVotes.All:
+    description: Remind if player can vote on all votesites, rather than any
+    default: false

VotingPlugin/pom.xml

@@ -1,13 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
-	<artifactId>votingplugin</artifactId>
-	<version>6.8</version>
+	<artifactId>${version.art}</artifactId>
+	<version>6.16</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
 		<github.global.server>github</github.global.server>
 		<project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
 		<build.number>NOTSET</build.number>
@@ -61,7 +59,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.3.1</version>
+				<version>3.4.1</version>
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>
@@ -90,7 +88,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.4.3</version>
+				<version>3.5.3</version>
 				<configuration>
 					<shadedArtifactAttached>false</shadedArtifactAttached>
 					<minimizeJar>true</minimizeJar>
@@ -164,7 +162,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.1.0</version>
+				<version>3.3.1</version>
 				<executions>
 					<execution>
 						<id>copy-resources</id>
@@ -194,7 +192,6 @@
 			<id>spigot-repo</id>
 			<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
 		</repository>
-
 		<repository>
 			<id>maven-central</id>
 			<url>https://oss.sonatype.org/content/groups/public</url>
@@ -212,33 +209,31 @@
 			<url>https://nexus.bencodez.com/repository/maven-public/</url>
 		</repository>
 		<repository>
-			<id>jitpack.io</id>
-			<url>https://jitpack.io</url>
+			<id>papermc</id>
+			<url>https://repo.papermc.io/repository/maven-public/</url>
+		</repository>
+		<repository>
+			<id>placeholderapi</id>
+			<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
 		</repository>
 	</repositories>
 	<dependencies>
-		<dependency>
-			<groupId>com.github.limework</groupId>
-			<artifactId>redisbungee</artifactId>
-			<version>0.6.5</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.17.1-R0.1-SNAPSHOT</version>
+			<version>1.20.6-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.2</version>
+			<version>1.18.32</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.md-5</groupId>
 			<artifactId>bungeecord-api</artifactId>
-			<version>1.17-R0.1-SNAPSHOT</version>
+			<version>1.20-R0.2</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -256,36 +251,56 @@
 		<dependency>
 			<groupId>com.velocitypowered</groupId>
 			<artifactId>velocity-api</artifactId>
-			<version>1.1.5</version>
+			<version>3.1.1</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.bstats</groupId>
 			<artifactId>bstats-velocity</artifactId>
-			<version>2.2.1</version>
+			<version>3.0.2</version>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>me.clip</groupId>
+			<artifactId>placeholderapi</artifactId>
+			<version>2.11.5</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
-			<id>prod</id>
-			<properties>
-				<build.profile.id>prod</build.profile.id>
-			</properties>
+			<id>normal</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
-			<repositories>
-				<repository>
-					<id>jitpack.io</id>
-					<url>https://jitpack.io</url>
-				</repository>
-			</repositories>
+			<properties>
+				<build.profile.id>normal</build.profile.id>
+				<version.art>votingplugin</version.art>
+				<maven.compiler.source>1.8</maven.compiler.source>
+				<maven.compiler.target>1.8</maven.compiler.target>
+			</properties>
 			<dependencies>
 				<dependency>
-					<groupId>com.github.bencodez</groupId>
+					<groupId>com.bencodez</groupId>
 					<artifactId>advancedcore</artifactId>
-					<version>master-SNAPSHOT</version>
+					<version>LATEST</version>
+					<scope>compile</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>normal-folia</id>
+			<properties>
+				<build.profile.id>normal</build.profile.id>
+				<version.art>votingplugin-folia</version.art>
+				<maven.compiler.source>17</maven.compiler.source>
+				<maven.compiler.target>17</maven.compiler.target>
+			</properties>
+			<dependencies>
+				<dependency>
+					<groupId>com.bencodez</groupId>
+					<artifactId>advancedcore-folia</artifactId>
+					<version>LATEST</version>
 					<scope>compile</scope>
 				</dependency>
 			</dependencies>
@@ -293,6 +308,9 @@
 		<profile>
 			<id>prod2</id>
 			<properties>
+				<version.art>votingplugin</version.art>
+				<maven.compiler.source>1.8</maven.compiler.source>
+				<maven.compiler.target>1.8</maven.compiler.target>
 				<build.profile.id>prod2</build.profile.id>
 			</properties>
 			<distributionManagement>
@@ -312,10 +330,23 @@
 			</dependencies>
 		</profile>
 		<profile>
-			<id>dev</id>
+			<id>deploy-snapshot</id>
 			<properties>
-				<build.profile.id>dev</build.profile.id>
+				<version.art>votingplugin</version.art>
+				<maven.compiler.source>1.8</maven.compiler.source>
+				<maven.compiler.target>1.8</maven.compiler.target>
+				<build.profile.id>deploy-snapshot</build.profile.id>
 			</properties>
+			<distributionManagement>
+				<snapshotRepository>
+					<id>nexus</id>
+					<url>https://nexus.bencodez.com/repository/maven-snapshots/</url>
+				</snapshotRepository>
+				<repository>
+					<id>nexus</id>
+					<url>https://nexus.bencodez.com/repository/maven-snapshots/</url>
+				</repository>
+			</distributionManagement>
 			<dependencies>
 				<dependency>
 					<groupId>com.bencodez</groupId>
@@ -324,12 +355,93 @@
 					<scope>compile</scope>
 				</dependency>
 			</dependencies>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-deploy-plugin</artifactId>
+						<version>3.1.1</version>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.sonatype.plugins</groupId>
+						<artifactId>nexus-staging-maven-plugin</artifactId>
+						<version>1.6.13</version>
+						<executions>
+							<execution>
+								<id>default-deploy</id>
+								<phase>deploy</phase>
+								<goals>
+									<goal>deploy</goal>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<serverId>nexus</serverId>
+							<nexusUrl>https://nexus.bencodez.com/nexus/</nexusUrl>
+							<skipStaging>true</skipStaging>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>javadoc</id>
+			<properties>
+				<version.art>votingplugin</version.art>
+				<maven.compiler.source>1.8</maven.compiler.source>
+				<maven.compiler.target>1.8</maven.compiler.target>
+				<build.profile.id>javadoc</build.profile.id>
+			</properties>
+			<distributionManagement>
+				<repository>
+					<id>internal.repo</id>
+					<name>Temporary Staging Repository</name>
+					<url>file://${project.build.directory}/mvn-repo</url>
+				</repository>
+			</distributionManagement>
+			<dependencies>
+				<dependency>
+					<groupId>com.bencodez</groupId>
+					<artifactId>advancedcore</artifactId>
+					<version>LATEST</version>
+					<scope>compile</scope>
+				</dependency>
+			</dependencies>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>3.6.3</version>
+						<executions>
+							<execution>
+								<id>attach-javadocs</id>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+								<phase>deploy</phase>
+								<configuration>
+									<sourcepath>${project.basedir}/target/delombok</sourcepath>
+									<outputDirectory>${project.basedir}/target/apidocs</outputDirectory>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
 		</profile>
 		<profile>
 			<id>deploy</id>
 			<properties>
+				<version.art>votingplugin</version.art>
+				<maven.compiler.source>1.8</maven.compiler.source>
+				<maven.compiler.target>1.8</maven.compiler.target>
 				<build.profile.id>deploy</build.profile.id>
 			</properties>
+
 			<dependencies>
 				<dependency>
 					<groupId>com.bencodez</groupId>
@@ -353,7 +465,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>2.10.4</version>
+						<version>3.6.3</version>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>
@@ -370,7 +482,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>3.0.0-M1</version>
+						<version>3.1.1</version>
 						<configuration>
 							<skip>true</skip>
 						</configuration>
@@ -378,7 +490,7 @@
 					<plugin>
 						<groupId>org.sonatype.plugins</groupId>
 						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.5.1</version>
+						<version>1.6.13</version>
 						<executions>
 							<execution>
 								<id>default-deploy</id>
@@ -394,7 +506,7 @@
 							<skipStaging>true</skipStaging>
 						</configuration>
 					</plugin>
-					<plugin>
+					<!--<plugin>
 						<groupId>com.github.github</groupId>
 						<artifactId>site-maven-plugin</artifactId>
 						<version>0.12</version>
@@ -420,7 +532,7 @@
 								</configuration>
 							</execution>
 						</executions>
-					</plugin>
+					</plugin>-->
 				</plugins>
 			</build>
 		</profile>

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

@@ -2,7 +2,7 @@ package com.Ben12345rocks.VotingPlugin.Objects;
 
 import org.bukkit.entity.Player;
 
-import com.bencodez.votingplugin.user.UserManager;
+import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 @Deprecated
@@ -10,7 +10,7 @@ public class User {
 	private VotingPluginUser user;
 
 	public User(Player p) {
-		user = UserManager.getInstance().getVotingPluginUser(p);
+		user = VotingPluginMain.plugin.getVotingPluginUserManager().getVotingPluginUser(p);
 	}
 
 	public void addPoints(int points) {

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

@@ -1,19 +1,35 @@
 package com.bencodez.votingplugin;
 
 import java.io.File;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
+import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.misc.encryption.EncryptionHandler;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
-import com.bencodez.advancedcore.api.time.events.DateChangedEvent;
+import com.bencodez.advancedcore.api.time.TimeType;
+import com.bencodez.advancedcore.api.user.UserStorage;
+import com.bencodez.advancedcore.api.user.usercache.value.DataValue;
+import com.bencodez.advancedcore.api.user.usercache.value.DataValueBoolean;
+import com.bencodez.advancedcore.api.user.userstorage.mysql.api.config.MysqlConfigSpigot;
+import com.bencodez.advancedcore.bungeeapi.GlobalMessage.GlobalMessageHandler;
+import com.bencodez.advancedcore.bungeeapi.GlobalMessage.GlobalMessageListener;
+import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalDataHandler;
+import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalMySQL;
 import com.bencodez.advancedcore.bungeeapi.pluginmessage.PluginMessageHandler;
+import com.bencodez.advancedcore.bungeeapi.redis.RedisHandler;
+import com.bencodez.advancedcore.bungeeapi.redis.RedisListener;
 import com.bencodez.advancedcore.bungeeapi.sockets.ClientHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketReceiver;
@@ -21,7 +37,6 @@ import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.bungee.BungeeVersion;
 import com.bencodez.votingplugin.objects.VoteSite;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 import lombok.Getter;
@@ -38,30 +53,215 @@ public class BungeeHandler implements Listener {
 	private VotingPluginMain plugin;
 
 	@Getter
-	private int bungeeVotePartyCurrent = 0;
+	private int bungeeVotePartyCurrent = -2;
 
 	@Getter
-	private int bungeeVotePartyRequired = 0;
+	private int bungeeVotePartyRequired = -2;
 
 	@Getter
 	private SocketHandler socketHandler;
 
+	private GlobalDataHandler globalDataHandler;
+
+	@Getter
+	private ScheduledExecutorService timer;
+
+	@Getter
+	private RedisHandler redisHandler;
+
+	@Getter
+	private GlobalMessageHandler globalMessageHandler;
+
+	private Thread redisThread;
+
 	public BungeeHandler(VotingPluginMain plugin) {
 		this.plugin = plugin;
 	}
 
 	public void close() {
-		socketHandler.closeConnection();
-		clientHandler.stopConnection();
+		if (socketHandler != null) {
+			socketHandler.closeConnection();
+		}
+		if (clientHandler != null) {
+			clientHandler.stopConnection();
+		}
 		plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
 		plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
+		if (globalDataHandler != null) {
+			globalDataHandler.getGlobalMysql().close();
+		}
 	}
 
-	@EventHandler
-	public void onDateChange(DateChangedEvent event) {
-		if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
-			plugin.getPluginMessaging().sendPluginMessage("timeupdate", plugin.getServerDataFile().getPrevMonth() + "//"
-					+ plugin.getServerDataFile().getPrevDay() + "//" + plugin.getServerDataFile().getPrevWeekDay());
+	/*
+	 * @EventHandler public void onDateChange(DateChangedEvent event) { if
+	 * (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+	 * plugin.getPluginMessaging().sendPluginMessage("timeupdate",
+	 * plugin.getServerDataFile().getPrevMonth() + "//" +
+	 * plugin.getServerDataFile().getPrevDay() + "//" +
+	 * plugin.getServerDataFile().getPrevWeekDay()); } }
+	 */
+
+	public void checkGlobalData() {
+		HashMap<String, DataValue> data = globalDataHandler.getExact(plugin.getBungeeSettings().getServer());
+		// plugin.debug(data.toString());
+
+		if (data.containsKey("ForceUpdate")) {
+			boolean b = checkGlobalDataTimeValue(data.get("ForceUpdate"));
+			if (b) {
+				if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
+					plugin.getMysql().clearCacheBasic();
+				}
+				plugin.getUserManager().getDataManager().clearCache();
+				plugin.setUpdate(true);
+				plugin.update();
+				globalDataHandler.setBoolean(plugin.getBungeeSettings().getServer(), "ForceUpdate", false);
+			}
+		}
+
+		boolean forceUpdate = false;
+
+		if (checkGlobalDataTime(TimeType.MONTH, data)) {
+			forceUpdate = true;
+		}
+		if (checkGlobalDataTime(TimeType.WEEK, data)) {
+			forceUpdate = true;
+		}
+		if (checkGlobalDataTime(TimeType.DAY, data)) {
+			forceUpdate = true;
+		}
+
+		if (forceUpdate) {
+			HashMap<String, DataValue> dataToSet = new HashMap<String, DataValue>();
+			dataToSet.put("FinishedProcessing", new DataValueBoolean(true));
+			dataToSet.put("Processing", new DataValueBoolean(false));
+			globalDataHandler.setData(plugin.getBungeeSettings().getServer(), dataToSet);
+		}
+	}
+
+	public boolean checkGlobalDataTimeValue(DataValue data) {
+		if (data.isBoolean()) {
+			return data.getBoolean();
+		}
+		return Boolean.valueOf(data.getString());
+	}
+
+	public boolean checkGlobalDataTime(TimeType type, HashMap<String, DataValue> data) {
+		boolean isProcessing = false;
+		if (data.containsKey(type.toString())) {
+
+			DataValue value = data.get(type.toString());
+			boolean b = checkGlobalDataTimeValue(value);
+			if (b) {
+				long lastUpdated = Long.valueOf(data.get("LastUpdated").getString()).longValue();
+				plugin.debug("LastUpdated: " + lastUpdated);
+				if (LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli() - lastUpdated > 1000 * 60 * 60
+						* 2) {
+					plugin.getLogger().warning("Ignoring bungee time change since it was more than 2 hours ago");
+					globalDataHandler.setBoolean(plugin.getBungeeSettings().getServer(), type.toString(), false);
+					return false;
+				}
+
+				globalDataHandler.setBoolean(plugin.getBungeeSettings().getServer(), "Processing", true);
+				isProcessing = true;
+
+				plugin.debug("Detected time change from bungee: " + type.toString());
+				plugin.getTimeChecker().forceChanged(type, false, true, true);
+				globalDataHandler.setBoolean(plugin.getBungeeSettings().getServer(), type.toString(), false);
+			}
+		}
+		return isProcessing;
+	}
+
+	public void loadGlobalMysql() {
+		if (plugin.getBungeeSettings().isGloblalDataEnabled()) {
+			if (timer != null) {
+				timer.shutdown();
+				try {
+					timer.awaitTermination(5, TimeUnit.SECONDS);
+				} catch (InterruptedException e) {
+					e.printStackTrace();
+				}
+				timer.shutdownNow();
+			}
+			timer = Executors.newScheduledThreadPool(1);
+			timer.scheduleWithFixedDelay(new Runnable() {
+
+				@Override
+				public void run() {
+					checkGlobalData();
+				}
+			}, 60, 10, TimeUnit.SECONDS);
+			timer.scheduleWithFixedDelay(new Runnable() {
+
+				@Override
+				public void run() {
+					globalDataHandler.setString(plugin.getBungeeSettings().getServer(), "LastOnline",
+							"" + LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli());
+				}
+			}, 1, 60, TimeUnit.MINUTES);
+			if (globalDataHandler != null) {
+				globalDataHandler.getGlobalMysql().close();
+			}
+			if (plugin.getBungeeSettings().isGloblalDataUseMainMySQL()
+					&& plugin.getStorageType().equals(UserStorage.MYSQL)) {
+				globalDataHandler = new GlobalDataHandler(
+						new GlobalMySQL("VotingPlugin_GlobalData", plugin.getMysql().getMysql()) {
+
+							@Override
+							public void warning(String text) {
+								plugin.getLogger().warning(text);
+							}
+
+							@Override
+							public void severe(String text) {
+								plugin.getLogger().severe(text);
+							}
+
+							@Override
+							public void debug(Exception e) {
+								plugin.debug(e);
+							}
+
+							@Override
+							public void debug(String text) {
+								plugin.debug(text);
+							}
+						});
+			} else {
+				globalDataHandler = new GlobalDataHandler(
+						new GlobalMySQL("VotingPlugin_GlobalData", new MysqlConfigSpigot(
+								plugin.getBungeeSettings().getData().getConfigurationSection("GlobalData"))) {
+
+							@Override
+							public void warning(String text) {
+								plugin.getLogger().warning(text);
+							}
+
+							@Override
+							public void severe(String text) {
+								plugin.getLogger().severe(text);
+							}
+
+							@Override
+							public void debug(Exception e) {
+								plugin.debug(e);
+							}
+
+							@Override
+							public void debug(String text) {
+								plugin.debug(text);
+							}
+						});
+			}
+			globalDataHandler.getGlobalMysql().alterColumnType("IgnoreTime", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("MONTH", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("WEEK", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("DAY", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("FinishedProcessing", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("Processing", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("LastUpdated", "MEDIUMTEXT");
+			globalDataHandler.getGlobalMysql().alterColumnType("ForceUpdate", "VARCHAR(5)");
+			plugin.getTimeChecker().setProcessingEnabled(false);
 		}
 	}
 
@@ -72,9 +272,371 @@ public class BungeeHandler implements Listener {
 
 		plugin.getLogger().info("Using BungeeMethod: " + method.toString());
 
+		loadGlobalMysql();
+
+		globalMessageHandler = new GlobalMessageHandler() {
+
+			@Override
+			public void sendMessage(String subChannel, String... messageData) {
+				if (method.equals(BungeeMethod.MYSQL)) {
+					plugin.getPluginMessaging().sendPluginMessage(subChannel, messageData);
+				} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+					plugin.getPluginMessaging().sendPluginMessage(subChannel, messageData);
+				} else if (method.equals(BungeeMethod.SOCKETS)) {
+					ArrayList<String> list = new ArrayList<String>();
+					list.add(subChannel);
+					list.addAll(ArrayUtils.getInstance().convert(messageData));
+					sendData(ArrayUtils.getInstance().convert(list));
+				} else if (method.equals(BungeeMethod.REDIS)) {
+					ArrayList<String> list = new ArrayList<String>();
+					list.add(subChannel);
+					list.addAll(ArrayUtils.getInstance().convert(messageData));
+					redisHandler.sendMessage(plugin.getBungeeSettings().getRedisPrefix() + "VotingPlugin",
+							ArrayUtils.getInstance().convert(list));
+				}
+			}
+		};
+
+		globalMessageHandler.addListener(new GlobalMessageListener("Vote") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				if (args.size() > 8) {
+					int bungeeVersion = Integer.parseInt(args.get(8));
+					if (bungeeVersion != BungeeVersion.getPluginMessageVersion()) {
+						plugin.getLogger().warning("Incompatible version with bungee, please update all servers"
+								+ bungeeVersion + ":" + BungeeVersion.getPluginMessageVersion());
+						return;
+					}
+
+					String player = args.get(0);
+					String uuid = args.get(1);
+					String service = args.get(2);
+					long time = Long.parseLong(args.get(3));
+					plugin.debug("pluginmessaging vote received from " + player + "/" + uuid + " on " + service);
+					VotingPluginUser user = plugin.getVotingPluginUserManager()
+							.getVotingPluginUser(UUID.fromString(uuid), player);
+
+					boolean wasOnline = Boolean.valueOf(args.get(4));
+
+					BungeeMessageData text = new BungeeMessageData(args.get(6));
+
+					bungeeVotePartyCurrent = text.getVotePartyCurrent();
+					bungeeVotePartyRequired = text.getVotePartyRequired();
+					plugin.getPlaceholders().onBungeeVotePartyUpdate();
+					plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
+					plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
+
+					boolean setTotals = Boolean.valueOf(args.get(7));
+
+					user.cache();
+
+					boolean broadcast = true;
+					boolean bungeeBroadcast = false;
+
+					if (args.size() > 9) {
+						bungeeBroadcast = Boolean.valueOf(args.get(9));
+					}
+
+					int num = 1;
+					if (args.size() > 10) {
+						num = Integer.valueOf(args.get(10));
+					}
+					int numberOfVotes = 1;
+					if (args.size() > 11) {
+						numberOfVotes = Integer.valueOf(args.get(11));
+					}
+
+					if (!bungeeBroadcast) {
+						if (!plugin.getBungeeSettings().isBungeeBroadcast()
+								&& !plugin.getBungeeSettings().isDisableBroadcast()) {
+							if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
+								if (plugin.getConfigFile().isFormatOnlyOneOfflineBroadcast() && !wasOnline) {
+									if (num == 1) {
+										user.offlineBroadcast(user, plugin.getBungeeSettings().isUseBungeecoord(),
+												numberOfVotes);
+									}
+								} else {
+									VoteSite site = plugin.getVoteSite(service, true);
+									if (site != null) {
+										site.broadcastVote(user, false);
+										broadcast = false;
+									} else {
+										plugin.getLogger().warning("No votesite for " + service);
+									}
+								}
+
+							}
+						}
+					} else {
+						broadcast = false;
+					}
+
+					user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline, broadcast, num);
+					if (plugin.getBungeeSettings().isPerServerPoints()) {
+						user.addPoints(plugin.getConfigFile().getPointsOnVote());
+					}
+
+					plugin.getSpecialRewards().bungeeAllSitesCheck(user, numberOfVotes, num);
+
+					if (Boolean.valueOf(args.get(5))) {
+						plugin.getServerData().addServiceSite(service);
+					}
+				} else {
+					plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
+				}
+			}
+		});
+
+		globalMessageHandler.addListener(new GlobalMessageListener("VoteOnline") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				if (args.size() > 8) {
+					int bungeeVersion = Integer.parseInt(args.get(8));
+					if (bungeeVersion != BungeeVersion.getPluginMessageVersion()) {
+						plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
+						return;
+					}
+					String player = args.get(0);
+					String uuid = args.get(1);
+					String service = args.get(2);
+					long time = Long.parseLong(args.get(3));
+					BungeeMessageData text = new BungeeMessageData(args.get(6));
+
+					bungeeVotePartyCurrent = text.getVotePartyCurrent();
+					bungeeVotePartyRequired = text.getVotePartyRequired();
+					plugin.getPlaceholders().onBungeeVotePartyUpdate();
+					plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
+					plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
+
+					plugin.debug("pluginmessaging voteonline received from " + player + "/" + uuid + " on " + service);
+					VotingPluginUser user = plugin.getVotingPluginUserManager()
+							.getVotingPluginUser(UUID.fromString(uuid), player);
+					user.cache();
+
+					if (plugin.getBungeeSettings().isPerServerPoints()) {
+						user.addPoints(plugin.getConfigFile().getPointsOnVote());
+					}
+
+					boolean setTotals = Boolean.valueOf(args.get(7));
+
+					boolean wasOnline = Boolean.valueOf(args.get(4));
+
+					boolean broadcast = true;
+					boolean bungeeBroadcast = false;
+
+					if (args.size() > 9) {
+						bungeeBroadcast = Boolean.valueOf(args.get(9));
+					}
+
+					int num = 1;
+					if (args.size() > 10) {
+						num = Integer.valueOf(args.get(10));
+					}
+
+					int numberOfVotes = 1;
+					if (args.size() > 11) {
+						numberOfVotes = Integer.valueOf(args.get(11));
+					}
+
+					if (!bungeeBroadcast) {
+						if (!plugin.getBungeeSettings().isBungeeBroadcast()
+								&& !plugin.getBungeeSettings().isDisableBroadcast()) {
+							if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
+								if (plugin.getConfigFile().isFormatOnlyOneOfflineBroadcast() && !wasOnline) {
+									if (num == 1) {
+										user.offlineBroadcast(user, plugin.getBungeeSettings().isUseBungeecoord(),
+												numberOfVotes);
+									}
+								} else {
+									VoteSite site = plugin.getVoteSite(service, true);
+									if (site != null) {
+										site.broadcastVote(user, false);
+										broadcast = false;
+									} else {
+										plugin.getLogger().warning("No votesite for " + service);
+									}
+								}
+
+							}
+						}
+					} else {
+						broadcast = false;
+					}
+
+					user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline, broadcast, num);
+					if (plugin.getBungeeSettings().isPerServerPoints()) {
+						user.addPoints(plugin.getConfigFile().getPointsOnVote());
+					}
+
+					plugin.getSpecialRewards().bungeeAllSitesCheck(user, numberOfVotes, num);
+
+					if (Boolean.valueOf(args.get(5))) {
+						plugin.getServerData().addServiceSite(service);
+					}
+				} else {
+					plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
+				}
+
+			}
+		});
+
+		globalMessageHandler.addListener(new GlobalMessageListener("VoteUpdate") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				String player = args.get(0);
+				plugin.debug("pluginmessaging voteupdate received for " + player);
+				VotingPluginUser user = plugin.getVotingPluginUserManager()
+						.getVotingPluginUser(UUID.fromString(player));
+				user.cache();
+
+				user.offVote();
+
+				if (args.size() > 3 && plugin.getBungeeSettings().isPerServerMilestones()) {
+					BungeeMessageData text = new BungeeMessageData(args.get(3));
+					plugin.getSpecialRewards().checkMilestone(user, text, true);
+				}
+
+				if (args.size() > 2) {
+					bungeeVotePartyCurrent = Integer.parseInt(args.get(1));
+					bungeeVotePartyRequired = Integer.parseInt(args.get(2));
+					plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
+					plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
+				}
+
+				plugin.setUpdate(true);
+			}
+		});
+
+		globalMessageHandler.addListener(new GlobalMessageListener("BungeeTimeChange") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				checkGlobalData();
+			}
+		});
+
+		globalMessageHandler.addListener(new GlobalMessageListener("VoteBroadcast") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				if (args.size() > 2) {
+					String uuid = args.get(0);
+					String service = args.get(2);
+					VotingPluginUser user = plugin.getVotingPluginUserManager()
+							.getVotingPluginUser(UUID.fromString(uuid), args.get(1));
+					VoteSite site = plugin.getVoteSite(service, true);
+					if (site != null) {
+						site.broadcastVote(user, false);
+					} else {
+						plugin.getLogger().warning("No votesite for " + service);
+					}
+				}
+			}
+		});
+		globalMessageHandler.addListener(new GlobalMessageListener("VoteBroadcastOffline") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				if (args.size() > 2) {
+					String uuid = args.get(0);
+					String votes = args.get(2);
+					VotingPluginUser user = plugin.getVotingPluginUserManager()
+							.getVotingPluginUser(UUID.fromString(uuid), args.get(1));
+					user.offlineBroadcast(user, false, Integer.parseInt(votes));
+				}
+			}
+		});
+		globalMessageHandler.addListener(new GlobalMessageListener("Status") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				String server = args.get(0);
+				sendMessage(globalMessageHandler, "statusokay", server);
+			}
+		});
+		globalMessageHandler.addListener(new GlobalMessageListener("ServerName") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				String server = args.get(0);
+				if (!plugin.getOptions().getServer().equals(server)) {
+					plugin.getLogger().warning("Server name doesn't match in BungeeSettings.yml, should be " + server);
+				}
+			}
+		});
+		globalMessageHandler.addListener(new GlobalMessageListener("VotePartyBungee") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				for (final String cmd : plugin.getBungeeSettings().getBungeeVotePartyGlobalCommands()) {
+					plugin.getBukkitScheduler().runTask(plugin, new Runnable() {
+
+						@Override
+						public void run() {
+							Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), cmd);
+						}
+
+					});
+				}
+				for (Player p : Bukkit.getOnlinePlayers()) {
+					new RewardBuilder(plugin.getBungeeSettings().getData(), "BungeeVotePartyRewards").send(p);
+				}
+			}
+		});
+		globalMessageHandler.addListener(new GlobalMessageListener("VotePartyBroadcast") {
+
+			@Override
+			public void onReceive(ArrayList<String> args) {
+				String broadcast = args.get(0);
+				MiscUtils.getInstance().broadcast(broadcast);
+			}
+		});
+
 		if (method.equals(BungeeMethod.MYSQL)) {
 			plugin.registerBungeeChannels("vp:vp");
+		} else if (method.equals(BungeeMethod.REDIS)) {
+			redisHandler = new RedisHandler(plugin.getBungeeSettings().getRedisHost(),
+					plugin.getBungeeSettings().getRedisPort(), plugin.getBungeeSettings().getRedisUsername(),
+					plugin.getBungeeSettings().getRedisPassword()) {
+
+				@Override
+				protected void onMessage(String channel, String[] message) {
+					plugin.getLogger().info(channel
+							+ ArrayUtils.getInstance().makeStringList(ArrayUtils.getInstance().convert(message)));
+					if (message.length > 0) {
+						ArrayList<String> list = new ArrayList<String>();
+						for (int i = 1; i < message.length; i++) {
+							list.add(message[i]);
+						}
+						globalMessageHandler.onMessage(message[0], list);
+					}
+				}
+
+				@Override
+				public void debug(String message) {
+					if (plugin.getBungeeSettings().isBungeeDebug()) {
+						plugin.debug(message);
+					}
+				}
+			};
+			redisThread = new Thread(new Runnable() {
+
+				@Override
+				public void run() {
+					if (plugin.isEnabled()) {
+						redisHandler.loadListener(
+								new RedisListener(redisHandler, plugin.getBungeeSettings().getRedisPrefix()
+										+ "VotingPlugin_" + plugin.getBungeeSettings().getServer()));
+					}
+				}
+			});
+			redisThread.start();
+
 		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+
 			plugin.registerBungeeChannels("vp:vp");
 
 			bungeeVotePartyCurrent = plugin.getServerData().getBungeeVotePartyCurrent();
@@ -85,204 +647,71 @@ public class BungeeHandler implements Listener {
 			plugin.getPluginMessaging().add(new PluginMessageHandler("Vote") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					if (args.size() > 8) {
-						int bungeeVersion = Integer.parseInt(args.get(8));
-						if (bungeeVersion != BungeeVersion.getPluginMessageVersion()) {
-							plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
-							return;
-						}
-
-						String player = args.get(0);
-						String uuid = args.get(1);
-						String service = args.get(2);
-						long time = Long.parseLong(args.get(3));
-						plugin.debug("pluginmessaging vote received from " + player + "/" + uuid + " on " + service);
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
-								player);
-
-						boolean wasOnline = Boolean.valueOf(args.get(4));
-
-						BungeeMessageData text = new BungeeMessageData(args.get(6));
-
-						bungeeVotePartyCurrent = text.getVotePartyCurrent();
-						bungeeVotePartyRequired = text.getVotePartyRequired();
-						plugin.getPlaceholders().onBungeeVotePartyUpdate();
-
-						boolean setTotals = Boolean.valueOf(args.get(7));
-
-						user.clearCache();
-
-						boolean broadcast = true;
-						boolean bungeeBroadcast = false;
-
-						if (args.size() > 9) {
-							bungeeBroadcast = Boolean.valueOf(args.get(9));
-						}
-
-						if (!bungeeBroadcast) {
-							if (!plugin.getBungeeSettings().isBungeeBroadcast()
-									&& !plugin.getBungeeSettings().isDisableBroadcast()) {
-								if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
-									VoteSite site = plugin.getVoteSite(service, true);
-									if (site != null) {
-										site.broadcastVote(user, false);
-										broadcast = false;
-									} else {
-										plugin.getLogger().warning("No votesite for " + service);
-									}
-								}
-							}
-						} else {
-							broadcast = false;
-						}
-
-						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline, broadcast);
-						if (plugin.getBungeeSettings().isPerServerPoints()) {
-							user.addPoints(plugin.getConfigFile().getPointsOnVote());
-						}
-
-						if (Boolean.valueOf(args.get(5))) {
-							plugin.getServerData().addServiceSite(service);
-						}
-					} else {
-						plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
-					}
-
+					globalMessageHandler.onMessage("Vote", args);
 				}
 			});
 
 			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteOnline") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					if (args.size() > 8) {
-						int bungeeVersion = Integer.parseInt(args.get(8));
-						if (bungeeVersion != BungeeVersion.getPluginMessageVersion()) {
-							plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
-							return;
-						}
-						String player = args.get(0);
-						String uuid = args.get(1);
-						String service = args.get(2);
-						long time = Long.parseLong(args.get(3));
-						BungeeMessageData text = new BungeeMessageData(args.get(6));
-
-						bungeeVotePartyCurrent = text.getVotePartyCurrent();
-						bungeeVotePartyRequired = text.getVotePartyRequired();
-						plugin.getPlaceholders().onBungeeVotePartyUpdate();
-
-						plugin.debug(
-								"pluginmessaging voteonline received from " + player + "/" + uuid + " on " + service);
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
-								player);
-						user.clearCache();
-
-						if (plugin.getBungeeSettings().isPerServerPoints()) {
-							user.addPoints(plugin.getConfigFile().getPointsOnVote());
-						}
-
-						boolean setTotals = Boolean.valueOf(args.get(7));
-
-						boolean wasOnline = Boolean.valueOf(args.get(4));
-
-						boolean broadcast = true;
-						boolean bungeeBroadcast = false;
-
-						if (args.size() > 9) {
-							bungeeBroadcast = Boolean.valueOf(args.get(9));
-						}
-
-						if (!bungeeBroadcast) {
-							if (!plugin.getBungeeSettings().isBungeeBroadcast()
-									&& !plugin.getBungeeSettings().isDisableBroadcast()) {
-								if (Boolean.valueOf(args.get(4))
-										|| plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
-									VoteSite site = plugin.getVoteSite(service, true);
-									if (site != null) {
-										site.broadcastVote(user, false);
-										broadcast = false;
-									} else {
-										plugin.getLogger().warning("No votesite for " + service);
-									}
-								}
-							}
-						} else {
-							broadcast = false;
-						}
-
-						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline, broadcast);
-						if (plugin.getBungeeSettings().isPerServerPoints()) {
-							user.addPoints(plugin.getConfigFile().getPointsOnVote());
-						}
-
-						if (Boolean.valueOf(args.get(5))) {
-							plugin.getServerData().addServiceSite(service);
-						}
-					} else {
-						plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
-					}
+					globalMessageHandler.onMessage("VoteOnline", args);
 				}
 			});
 
 			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteUpdate") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					String player = args.get(0);
-					plugin.debug("pluginmessaging voteupdate received for " + player);
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(player));
-					user.clearCache();
+					globalMessageHandler.onMessage("VoteUpdate", args);
+				}
+			});
 
-					user.offVote();
+			plugin.getPluginMessaging().add(new PluginMessageHandler("BungeeTimeChange") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					globalMessageHandler.onMessage("BungeeTimeChange", args);
 
-					if (args.size() > 2) {
-						bungeeVotePartyCurrent = Integer.parseInt(args.get(1));
-						bungeeVotePartyRequired = Integer.parseInt(args.get(2));
-					}
-
-					plugin.setUpdate(true);
 				}
 			});
 
 			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteBroadcast") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					if (args.size() > 2) {
-						String uuid = args.get(0);
-						String service = args.get(2);
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
-								args.get(1));
-						VoteSite site = plugin.getVoteSite(service, true);
-						if (site != null) {
-							site.broadcastVote(user, false);
-						} else {
-							plugin.getLogger().warning("No votesite for " + service);
-						}
-					}
+					globalMessageHandler.onMessage("VoteBroadcast", args);
+				}
+			});
+
+			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteBroadcastOffline") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					globalMessageHandler.onMessage("VoteBroadcastOffline", args);
 				}
 			});
 
 			plugin.getPluginMessaging().add(new PluginMessageHandler("Status") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					String server = args.get(0);
-					plugin.getPluginMessaging().sendPluginMessage("statusokay", server);
+					globalMessageHandler.onMessage("Status", args);
+				}
+			});
 
+			plugin.getPluginMessaging().add(new PluginMessageHandler("ServerName") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					globalMessageHandler.onMessage("ServerName", args);
 				}
 			});
 
 			plugin.getPluginMessaging().add(new PluginMessageHandler("VotePartyBungee") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					for (Player p : Bukkit.getOnlinePlayers()) {
-						new RewardBuilder(plugin.getBungeeSettings().getData(), "BungeeVotePartyRewards").send(p);
-					}
+					globalMessageHandler.onMessage("VotePartyBungee", args);
 				}
 			});
 
 			plugin.getPluginMessaging().add(new PluginMessageHandler("VotePartyBroadcast") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					String broadcast = args.get(0);
-					MiscUtils.getInstance().broadcast(broadcast);
+					globalMessageHandler.onMessage("VotePartyBroadcast", args);
 				}
 			});
 
@@ -295,7 +724,13 @@ public class BungeeHandler implements Listener {
 
 			socketHandler = new SocketHandler(plugin.getVersion(), plugin.getBungeeSettings().getSpigotServerHost(),
 					plugin.getBungeeSettings().getSpigotServerPort(), encryptionHandler,
-					plugin.getBungeeSettings().isBungeeDebug());
+					plugin.getBungeeSettings().isBungeeDebug()) {
+
+				@Override
+				public void log(String str) {
+					plugin.getLogger().info(str);
+				}
+			};
 
 			socketHandler.add(new SocketReceiver("bungeevote") {
 
@@ -306,12 +741,12 @@ public class BungeeHandler implements Listener {
 						String uuid = data[1];
 						VotingPluginUser user = null;
 						if (!uuid.isEmpty()) {
-							user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+							user = plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuid));
 						} else {
-							user = UserManager.getInstance().getVotingPluginUser(data[2]);
+							user = plugin.getVotingPluginUserManager().getVotingPluginUser(data[2]);
 						}
 
-						user.clearCache();
+						user.cache();
 
 						if (plugin.getBungeeSettings().isPerServerPoints()) {
 							user.addPoints(plugin.getConfigFile().getPointsOnVote());
@@ -322,6 +757,14 @@ public class BungeeHandler implements Listener {
 				}
 			});
 
+			socketHandler.add(new SocketReceiver("BungeeTimeChange") {
+
+				@Override
+				public void onReceive(String[] data) {
+					checkGlobalData();
+				}
+			});
+
 			socketHandler.add(new SocketReceiver("bungeevoteonline") {
 
 				@Override
@@ -331,12 +774,12 @@ public class BungeeHandler implements Listener {
 						String uuid = data[1];
 						VotingPluginUser user = null;
 						if (!uuid.isEmpty()) {
-							user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+							user = plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuid));
 						} else {
-							user = UserManager.getInstance().getVotingPluginUser(data[2]);
+							user = plugin.getVotingPluginUserManager().getVotingPluginUser(data[2]);
 						}
 
-						user.clearCache();
+						user.cache();
 
 						if (plugin.getBungeeSettings().isPerServerPoints()) {
 							user.addPoints(plugin.getConfigFile().getPointsOnVote());
@@ -347,6 +790,19 @@ public class BungeeHandler implements Listener {
 				}
 			});
 
+			socketHandler.add(new SocketReceiver("BroadcastOffline") {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 2) {
+						String votes = data[0];
+						String p = data[1];
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(p);
+						user.offlineBroadcast(user, false, Integer.parseInt(votes));
+					}
+				}
+			});
+
 			socketHandler.add(new SocketReceiver("BungeeBroadcast") {
 
 				@Override
@@ -354,7 +810,24 @@ public class BungeeHandler implements Listener {
 					if (data.length > 2) {
 						VoteSite site = plugin.getVoteSite(data[1], true);
 						String p = data[3];
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(p);
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(p);
+						if (site != null) {
+							site.broadcastVote(user, false);
+						} else {
+							plugin.getLogger().warning("No votesite for " + data[1]);
+						}
+					}
+				}
+			});
+
+			socketHandler.add(new SocketReceiver("Broadcast") {
+
+				@Override
+				public void onReceive(String[] data) {
+					if (data.length > 2) {
+						VoteSite site = plugin.getVoteSite(data[1], true);
+						String p = data[2];
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(p);
 						if (site != null) {
 							site.broadcastVote(user, false);
 						} else {

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

@@ -2,7 +2,6 @@ package com.bencodez.votingplugin;
 
 import org.bukkit.entity.Player;
 
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInject;
 import com.bencodez.advancedcore.api.rewards.injectedrequirement.RequirementInject;
 import com.bencodez.votingplugin.user.UserManager;
@@ -16,11 +15,11 @@ public class VotingPluginHooks {
 	}
 
 	public void addCustomRequirement(RequirementInject inject) {
-		RewardHandler.getInstance().addInjectedRequirements(inject);
+		getMainClass().getRewardHandler().addInjectedRequirements(inject);
 	}
 
 	public void addCustomReward(RewardInject inject) {
-		RewardHandler.getInstance().addInjectedReward(inject);
+		getMainClass().getRewardHandler().addInjectedReward(inject);
 	}
 
 	public void backgroundUpdate(Player player) {
@@ -34,7 +33,7 @@ public class VotingPluginHooks {
 	}
 
 	public UserManager getUserManager() {
-		return UserManager.getInstance();
+		return getMainClass().getVotingPluginUserManager();
 	}
 
 }

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

@@ -16,8 +16,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.TimerTask;
 import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -44,7 +46,6 @@ import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.rewards.DirectlyDefinedReward;
 import com.bencodez.advancedcore.api.rewards.Reward;
 import com.bencodez.advancedcore.api.rewards.RewardEditData;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardPlaceholderHandle;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInject;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInjectConfigurationSection;
@@ -52,6 +53,8 @@ import com.bencodez.advancedcore.api.rewards.injected.RewardInjectInt;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInjectValidator;
 import com.bencodez.advancedcore.api.skull.SkullHandler;
 import com.bencodez.advancedcore.api.updater.Updater;
+import com.bencodez.advancedcore.api.user.userstorage.Column;
+import com.bencodez.advancedcore.api.yml.YMLConfig;
 import com.bencodez.advancedcore.logger.Logger;
 import com.bencodez.advancedcore.nms.NMSManager;
 import com.bencodez.votingplugin.broadcast.BroadcastHandler;
@@ -78,8 +81,12 @@ import com.bencodez.votingplugin.listeners.VotingPluginUpdateEvent;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.placeholders.MVdWPlaceholders;
 import com.bencodez.votingplugin.placeholders.PlaceHolders;
+import com.bencodez.votingplugin.placeholders.VotingPluginExpansion;
+import com.bencodez.votingplugin.servicesites.ServiceSiteHandler;
 import com.bencodez.votingplugin.signs.Signs;
 import com.bencodez.votingplugin.specialrewards.SpecialRewards;
+import com.bencodez.votingplugin.test.VoteTester;
+import com.bencodez.votingplugin.timequeue.TimeQueueHandler;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.topvoter.TopVoterHandler;
 import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
@@ -143,6 +150,9 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	@Getter
 	private PlaceHolders placeholders;
 
+	@Getter
+	private VoteTester voteTester;
+
 	@Getter
 	private String profile = "";
 
@@ -208,17 +218,20 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	@Getter
 	private boolean ymlError = false;
 
+	@Getter
+	private ScheduledExecutorService voteTimer;
+
 	@Getter
 	private UserManager votingPluginUserManager;
 
-	private void addDirectlyDefinedRewards(DirectlyDefinedReward directlyDefinedReward) {
-		RewardHandler.getInstance().addDirectlyDefined(directlyDefinedReward);
+	public void addDirectlyDefinedRewards(DirectlyDefinedReward directlyDefinedReward) {
+		getRewardHandler().addDirectlyDefined(directlyDefinedReward);
 	}
 
 	public void basicBungeeUpdate() {
 		for (Player player : Bukkit.getOnlinePlayers()) {
-			VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
-			user.clearCache();
+			VotingPluginUser user = getVotingPluginUserManager().getVotingPluginUser(player);
+			user.cache();
 			user.offVote();
 			user.checkOfflineRewards();
 		}
@@ -250,13 +263,13 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		}
 
 		if (ymlError) {
-			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+			plugin.getBukkitScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
 
 				@Override
 				public void run() {
 					plugin.getLogger().severe("Failed to load a file, check startup log");
 				}
-			}, 10);
+			}, 1);
 		}
 	}
 
@@ -284,7 +297,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	 * @return the user
 	 */
 	public VotingPluginUser getUser(UUID uuid) {
-		return UserManager.getInstance().getVotingPluginUser(uuid);
+		return getVotingPluginUserManager().getVotingPluginUser(uuid);
 	}
 
 	private YamlConfiguration getVersionFile() {
@@ -330,29 +343,41 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	}
 
+	public ArrayList<VoteSite> getVoteSitesEnabled() {
+		ArrayList<VoteSite> sites = new ArrayList<VoteSite>();
+		for (VoteSite site : getVoteSites()) {
+			if (site.isEnabled()) {
+				sites.add(site);
+			}
+		}
+		return sites;
+	}
+
 	public String getVoteSiteName(boolean checkEnabled, String... urls) {
 		ArrayList<String> sites = getConfigVoteSites().getVoteSitesNames(checkEnabled);
+
 		for (String url : urls) {
 			if (url == null) {
 				return null;
 			}
-			if (sites != null) {
-				for (String siteName : sites) {
-					String URL = getConfigVoteSites().getServiceSite(siteName);
-					if (URL != null) {
-						if (URL.equalsIgnoreCase(url)) {
+			if (!url.isEmpty()) {
+				if (sites != null) {
+					for (String siteName : sites) {
+						String URL = getConfigVoteSites().getServiceSite(siteName);
+						if (URL != null) {
+							if (URL.equalsIgnoreCase(url)) {
+								return siteName;
+							}
+						}
+						if (siteName.equalsIgnoreCase(url)) {
 							return siteName;
 						}
-					}
-				}
-				for (String siteName : sites) {
-					if (siteName.equalsIgnoreCase(url)) {
-						return siteName;
+
 					}
 				}
 			}
-			return url;
 		}
+
 		for (String url : urls) {
 			return url;
 		}
@@ -402,7 +427,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	}
 
 	public void loadDirectlyDefined() {
-		RewardHandler.getInstance().getDirectlyDefinedRewards().clear();
+		getRewardHandler().getDirectlyDefinedRewards().clear();
 		// AllSites reward
 		addDirectlyDefinedRewards(new DirectlyDefinedReward("AllSites") {
 
@@ -427,6 +452,29 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			}
 		});
 
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("AlmostAllSites") {
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+		});
+
 		// FirstVote
 		addDirectlyDefinedRewards(new DirectlyDefinedReward("FirstVote") {
 
@@ -716,6 +764,29 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					getConfigVoteSites().setValue(path, value);
 				}
 			});
+
+			addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteSites." + site.getKey() + ".CoolDownEndRewards") {
+
+				@Override
+				public void createSection(String key) {
+					getConfigVoteSites().createSection(key);
+				}
+
+				@Override
+				public ConfigurationSection getFileData() {
+					return getConfigVoteSites().getData();
+				}
+
+				@Override
+				public void save() {
+					getConfigVoteSites().saveData();
+				}
+
+				@Override
+				public void setData(String path, Object value) {
+					getConfigVoteSites().setValue(path, value);
+				}
+			});
 		}
 
 		// vote streaks
@@ -872,39 +943,38 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 				getBungeeSettings().setValue(path, value);
 			}
 		});
+
+		getRewardHandler().checkDirectlyDefined();
+
 	}
 
 	private void loadTimer() {
-		Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+		plugin.getBukkitScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
 
 			@Override
 			public void run() {
-				getTimer().schedule(new TimerTask() {
+				getTimer().scheduleWithFixedDelay(new Runnable() {
 
 					@Override
 					public void run() {
 						if (plugin != null) {
 							update();
-						} else {
-							cancel();
 						}
 					}
-				}, 1000, 1000 * 60 * configFile.getDelayBetweenUpdates());
+				}, 1000, 1000 * 60 * configFile.getDelayBetweenUpdates(), TimeUnit.MILLISECONDS);
 
-				getTimer().schedule(new TimerTask() {
+				getTimer().scheduleWithFixedDelay(new Runnable() {
 
 					@Override
 					public void run() {
 						if (plugin != null && configFile.isExtraBackgroundUpdate()) {
 							basicBungeeUpdate();
-						} else {
-							cancel();
 						}
 					}
-				}, 1000, 1000 * 30);
+				}, 1000, 1000 * 30, TimeUnit.MILLISECONDS);
 
 			}
-		}, 40L);
+		}, 2);
 
 	}
 
@@ -952,22 +1022,45 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	 * Metrics.
 	 */
 	private void metrics() {
-		new VotingPluginMetrics().load(this);
+		new VotingPluginMetrics().load(plugin);
+	}
+
+	private void loadVoteTimer() {
+		voteTimer = Executors.newSingleThreadScheduledExecutor();
+	}
+
+	@Getter
+	private TimeQueueHandler timeQueueHandler;
+
+	private void loadBungeeHandler() {
+		bungeeHandler = new BungeeHandler(this);
+		bungeeHandler.load();
+
+		if (getOptions().getServer().equalsIgnoreCase("PleaseSet")) {
+			getLogger().warning("Bungeecoord is true and server name is not set, bungeecoord features may not work");
+		}
 	}
 
 	@Override
 	public void onPostLoad() {
 		loadVersionFile();
 		getOptions().setServer(bungeeSettings.getServer());
+
+		voteTester = new VoteTester(plugin);
+
+		loadVoteTimer();
+
 		if (bungeeSettings.isUseBungeecoord()) {
-			bungeeHandler = new BungeeHandler(this);
-			bungeeHandler.load();
+			loadBungeeHandler();
+		}
 
-			if (getOptions().getServer().equalsIgnoreCase("PleaseSet")) {
-				getLogger()
-						.warning("Bungeecoord is true and server name is not set, bungeecoord features may not work");
-			}
+		if (!bungeeSettings.isUseBungeecoord() || !bungeeSettings.isGloblalDataEnabled()) {
+			this.timeQueueHandler = new TimeQueueHandler(this);
+		}
 
+		if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
+			new VotingPluginExpansion(this).register();
+			getLogger().info("Loading PlaceholderAPI expansion");
 		}
 
 		registerCommands();
@@ -978,13 +1071,14 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		checkUpdate.startUp();
 		voteReminding = new VoteReminding(this);
 		voteReminding.loadRemindChecking();
+		voteReminding.loadReminds();
 		specialRewards = new SpecialRewards(this);
 		signs = new Signs(this);
 
 		coolDownCheck.checkEnabled();
 		coolDownCheck.load();
 
-		Bukkit.getScheduler().runTask(plugin, new Runnable() {
+		plugin.getBukkitScheduler().runTask(plugin, new Runnable() {
 
 			@Override
 			public void run() {
@@ -994,7 +1088,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		topVoterHandler = new TopVoterHandler(this);
 		lastMonthTopVoter = new LinkedHashMap<TopVoterPlayer, Integer>();
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+		plugin.getBukkitScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 			@Override
 			public void run() {
@@ -1017,7 +1111,13 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		topVoterHandler.register();
 
-		metrics();
+		plugin.getBukkitScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				metrics();
+			}
+		});
 
 		// javascript api
 		getJavascriptEngineRequests().add(new JavascriptPlaceholderRequest("User") {
@@ -1028,11 +1128,13 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			}
 		});
 		getJavascriptEngine().put("VotingPluginHooks", VotingPluginHooks.getInstance());
+		getJavascriptEngine().put("VotingPlugin", this);
 
 		loadTimer();
 
 		// placeholderapi loading
 		placeholders = new PlaceHolders(this);
+		getServerData().updatePlaceholders();
 		placeholders.load();
 
 		if (Bukkit.getPluginManager().isPluginEnabled("MVdWPlaceholderAPI")) {
@@ -1041,15 +1143,17 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		}
 
 		// Add rewards
-		RewardHandler.getInstance().addInjectedReward(new RewardInjectInt("Points", 0) {
+		getRewardHandler().addInjectedReward(new RewardInjectInt("Points", 0) {
 
 			@Override
 			public String onRewardRequest(Reward reward, com.bencodez.advancedcore.api.user.AdvancedCoreUser user,
 					int num, HashMap<String, String> placeholders) {
-				UserManager.getInstance().getVotingPluginUser(user).addPoints(num);
-				return null;
+				VotingPluginUser vpUser = getVotingPluginUserManager().getVotingPluginUser(user);
+				String str = "" + vpUser.addPoints(num);
+				debug("Setting points to " + str);
+				return str;
 			}
-		}.synchronize().addEditButton(
+		}.synchronize().asPlaceholder("newpoints").addEditButton(
 				new EditGUIButton(new ItemBuilder(Material.PAPER), new EditGUIValueNumber("Points", null) {
 
 					@Override
@@ -1067,7 +1171,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					}
 				}));
 
-		RewardHandler.getInstance().addInjectedReward(new RewardInjectConfigurationSection("VoteBossBar") {
+		getRewardHandler().addInjectedReward(new RewardInjectConfigurationSection("VoteBossBar") {
 
 			@Override
 			public String onRewardRequested(Reward arg0, com.bencodez.advancedcore.api.user.AdvancedCoreUser user,
@@ -1077,7 +1181,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 							StringParser.getInstance().replacePlaceHolder(section.getString("Message", ""),
 									placeholders),
 							section.getString("Color", "BLUE"), section.getString("Style", "SOLID"),
-							(double) UserManager.getInstance().getVotingPluginUser(user).getSitesVotedOn()
+							(double) getVotingPluginUserManager().getVotingPluginUser(user).getSitesVotedOn()
 									/ plugin.getVoteSites().size(),
 							section.getInt("Delay", 30));
 				}
@@ -1086,11 +1190,11 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		});
 
 		for (final TopVoter top : TopVoter.values()) {
-			RewardHandler.getInstance().addPlaceholder(new RewardPlaceholderHandle("Total_" + top.toString()) {
+			getRewardHandler().addPlaceholder(new RewardPlaceholderHandle("Total_" + top.toString()) {
 
 				@Override
 				public String getValue(Reward reward, com.bencodez.advancedcore.api.user.AdvancedCoreUser user) {
-					VotingPluginUser vUser = UserManager.getInstance().getVotingPluginUser(user);
+					VotingPluginUser vUser = getVotingPluginUserManager().getVotingPluginUser(user);
 					return "" + vUser.getTotal(top);
 				}
 			});
@@ -1107,7 +1211,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					"Using dev build, this is not a stable build, use at your own risk. Build number: " + buildNumber);
 		}
 
-		boolean hasRewards = RewardHandler.getInstance().hasRewards(getConfigVoteSites().getData(),
+		boolean hasRewards = getRewardHandler().hasRewards(getConfigVoteSites().getData(),
 				getConfigVoteSites().getEverySiteRewardPath());
 
 		boolean issues = true;
@@ -1133,18 +1237,29 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		}
 
 		if (!issues) {
-			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+			plugin.getBukkitScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
 
 				@Override
 				public void run() {
 					plugin.getLogger().warning(
 							"Detected an issue with voting sites, check the server startup log for more details: https://github.com/BenCodez/VotingPlugin/wiki/Votifier-Troubleshooting");
 				}
-			}, 30l);
+			}, 5);
+
+			plugin.getBukkitScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					serviceSiteHandler = new ServiceSiteHandler(plugin);
+				}
+			}, 10);
 		}
 
 	}
 
+	@Getter
+	private ServiceSiteHandler serviceSiteHandler;
+
 	/*
 	 * (non-Javadoc)
 	 *
@@ -1171,7 +1286,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		loadVoteSites();
 
-		votingPluginUserManager = UserManager.getInstance();
+		votingPluginUserManager = new UserManager(this);
 		votingPluginUserManager.addCachingKeys();
 
 		setJenkinsSite("bencodez.com");
@@ -1186,8 +1301,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	 */
 	@Override
 	public void onUnLoad() {
-		getSigns().storeSigns();
-		HandlerList.unregisterAll(plugin);
 		if (bungeeSettings.isUseBungeecoord()) {
 			try {
 				getBungeeHandler().close();
@@ -1195,6 +1308,18 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 				debug(e);
 			}
 		}
+		voteTimer.shutdown();
+		try {
+			voteTimer.awaitTermination(1, TimeUnit.SECONDS);
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+		voteTimer.shutdownNow();
+		if (timeQueueHandler != null) {
+			timeQueueHandler.save();
+		}
+		getSigns().storeSigns();
+		HandlerList.unregisterAll(plugin);
 		plugin = null;
 	}
 
@@ -1222,7 +1347,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		Permission perm = Bukkit.getPluginManager().getPermission("VotingPlugin.Player");
 		if (perm != null) {
-			if (configFile.getGiveDefaultPermission()) {
+			if (configFile.isGiveDefaultPermission()) {
 				perm.setDefault(PermissionDefault.TRUE);
 				getLogger().info("Giving VotingPlugin.Player permission by default, can be disabled in the config");
 			} else {
@@ -1251,6 +1376,10 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			pm.registerEvents(new PlayerInteract(this), this);
 		}
 
+		if (timeQueueHandler != null) {
+			pm.registerEvents(timeQueueHandler, plugin);
+		}
+
 		pm.registerEvents(new VotingPluginUpdateEvent(this), this);
 		/*
 		 * if (!NMSManager.getInstance().isVersion("1.12")) { pm.registerEvents(new
@@ -1276,8 +1405,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	}
 
 	private void reloadPlugin(boolean userStorage) {
-		setUpdate(true);
-
 		configFile.reloadData();
 		configFile.loadValues();
 
@@ -1288,31 +1415,48 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		gui.reloadData();
 
 		bungeeSettings.reloadData();
+
+		if (bungeeSettings.isUseBungeecoord()) {
+			if (getBungeeHandler() == null) {
+				loadBungeeHandler();
+			}
+			if (userStorage) {
+				getBungeeHandler().loadGlobalMysql();
+			}
+		}
 		checkYMLError();
 
 		if (broadcastHandler != null) {
-			broadcastHandler.schelude(getConfigFile().getFormatAlternateBroadcastDelay());
+			broadcastHandler.schedule(getConfigFile().getFormatAlternateBroadcastDelay());
 		}
 
 		updateAdvancedCoreHook();
 		plugin.loadVoteSites();
-		loadDirectlyDefined();
+
 		reloadAdvancedCore(userStorage);
 		getOptions().setServer(bungeeSettings.getServer());
 		if (userStorage) {
 			placeholders.load();
+			placeholders.reload();
+			getCoolDownCheck().getTimer().schedule(new Runnable() {
+
+				@Override
+				public void run() {
+					for (VoteSite site : plugin.getVoteSites()) {
+						if (site.isVoteDelayDaily()) {
+							getCoolDownCheck().checkAllVoteSite(site);
+						}
+					}
+				}
+			}, 5, TimeUnit.SECONDS);
+
 		}
 
 		voteReminding.loadRemindChecking();
 		coolDownCheck.checkEnabled();
+		loadDirectlyDefined();
 
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				update();
-			}
-		});
+		setUpdate(true);
 	}
 
 	private void setupFiles() {
@@ -1338,6 +1482,9 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		plugin.debug("Loaded Files");
 	}
 
+	@Getter
+	private long lastBackgroundTaskTimeTaken = -1;
+
 	public void update() {
 		if (update || configFile.isAlwaysUpdate()) {
 			if (!updateStarted && plugin != null) {
@@ -1346,114 +1493,130 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					update = false;
 
 					synchronized (plugin) {
-						getUserManager().getDataManager().clearCacheBasic();
+						if (plugin != null && plugin.isEnabled()) {
+							getUserManager().getDataManager().clearCacheBasic();
 
-						plugin.debug("Starting background task, current cached users: "
-								+ plugin.getUserManager().getDataManager().getUserDataCache().keySet().size());
-						
-						placeholders.onUpdate();
-
-						int dataLoadLimit = getConfigFile().getPlayerDataLoadLimit();
-						try {
-							boolean extraBackgroundUpdate = configFile.isExtraBackgroundUpdate();
-							long startTime = System.currentTimeMillis();
-
-							LinkedHashMap<TopVoterPlayer, HashMap<VoteSite, LocalDateTime>> voteToday = new LinkedHashMap<TopVoterPlayer, HashMap<VoteSite, LocalDateTime>>();
-							LinkedHashMap<TopVoter, LinkedHashMap<TopVoterPlayer, Integer>> tempTopVoter = new LinkedHashMap<TopVoter, LinkedHashMap<TopVoterPlayer, Integer>>();
-
-							ArrayList<TopVoter> topVotersToCheck = new ArrayList<TopVoter>();
-							for (TopVoter top : TopVoter.values()) {
-								if (plugin.getConfigFile().getLoadTopVoter(top)) {
-									topVotersToCheck.add(top);
-									tempTopVoter.put(top, new LinkedHashMap<TopVoterPlayer, Integer>());
-								}
-							}
-							boolean topVoterIgnorePermissionUse = plugin.getConfigFile().getTopVoterIgnorePermission();
-							ArrayList<String> blackList = plugin.getConfigFile().getBlackList();
-
-							ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
-							int currentDay = LocalDateTime.now().getDayOfMonth();
-							int currentDataLoad = 0;
-							for (String uuid : uuids) {
-								if (uuid != null && !uuid.isEmpty()) {
-									VotingPluginUser user = UserManager.getInstance()
-											.getVotingPluginUser(UUID.fromString(uuid), false);
-									user.dontCache();
-									user.tempCache();
-									user.getUserData().updateCacheWithTemp();
-									if (!user.isBanned() && !blackList.contains(user.getPlayerName())) {
-
-										if (!topVoterIgnorePermissionUse || !user.isTopVoterIgnore()) {
-											for (TopVoter top : topVotersToCheck) {
-												int total = user.getTotal(top);
-												if (total > 0) {
-													tempTopVoter.get(top).put(user.getTopVoterPlayer(), total);
-												}
-											}
-										}
-
-										HashMap<VoteSite, LocalDateTime> times = new HashMap<VoteSite, LocalDateTime>();
-										for (Entry<VoteSite, Long> entry : user.getLastVotes().entrySet()) {
-											if (entry.getKey().isEnabled() && !entry.getKey().isHidden()) {
-												long time = entry.getValue();
-												if ((currentDay == MiscUtils.getInstance().getDayFromMili(time))
-														&& (LocalDateTime.now().getMonthValue() == MiscUtils
-																.getInstance().getMonthFromMili(time))
-														&& (LocalDateTime.now().getYear() == MiscUtils.getInstance()
-																.getYearFromMili(time))) {
-
-													times.put(entry.getKey(), LocalDateTime.ofInstant(
-															Instant.ofEpochMilli(time), ZoneId.systemDefault()));
-												}
-											}
-										}
-										if (times.keySet().size() > 0) {
-											voteToday.put(user.getTopVoterPlayer(), times);
-										}
-									}
-									if (!extraBackgroundUpdate) {
-										if (user.isOnline()) {
-											user.offVote();
-										}
-									}
-									plugin.getPlaceholders().onUpdate(user);
-									user.clearTempCache();
-									user = null;
-									if (dataLoadLimit > 0) {
-										currentDataLoad++;
-										if (currentDataLoad >= dataLoadLimit) {
-											currentDataLoad -= dataLoadLimit;
-											Thread.sleep(1000);
-										}
-									}
-								}
-							}
-							update = false;
-							long time1 = ((System.currentTimeMillis() - startTime) / 1000);
-							plugin.debug("Finished loading player data in " + time1 + " seconds, " + uuids.size()
-									+ " users, " + plugin.getStorageType().toString() + ", data load limit: "
-									+ dataLoadLimit);
-							time1 = System.currentTimeMillis();
-
-							topVoterHandler.updateTopVoters(tempTopVoter);
-							setVoteToday(voteToday);
-							serverData.updateValues();
-							getSigns().updateSigns();
-
-							tempTopVoter = null;
-
-							
-
-							time1 = ((System.currentTimeMillis() - time1) / 1000);
-							long totalTime = ((System.currentTimeMillis() - startTime) / 1000);
-							plugin.debug("Background task finished. Final processing took " + time1
-									+ " seconds. Total time: " + totalTime + " seconds");
-							plugin.extraDebug("Current cached users: "
+							plugin.debug("Starting background task, current cached users: "
 									+ plugin.getUserManager().getDataManager().getUserDataCache().keySet().size());
-							checkFirstTimeLoaded();
-						} catch (Exception ex) {
-							plugin.getLogger().info("Looks like something went wrong");
-							ex.printStackTrace();
+
+							try {
+								boolean extraBackgroundUpdate = configFile.isExtraBackgroundUpdate();
+								long startTime = System.currentTimeMillis();
+
+								LinkedHashMap<TopVoterPlayer, HashMap<VoteSite, LocalDateTime>> voteToday = new LinkedHashMap<TopVoterPlayer, HashMap<VoteSite, LocalDateTime>>();
+								LinkedHashMap<TopVoter, LinkedHashMap<TopVoterPlayer, Integer>> tempTopVoter = new LinkedHashMap<TopVoter, LinkedHashMap<TopVoterPlayer, Integer>>();
+
+								ArrayList<TopVoter> topVotersToCheck = new ArrayList<TopVoter>();
+								for (TopVoter top : TopVoter.values()) {
+									if (plugin == null) {
+										return;
+									}
+									if (plugin.getConfigFile().getLoadTopVoter(top)) {
+										topVotersToCheck.add(top);
+										tempTopVoter.put(top, new LinkedHashMap<TopVoterPlayer, Integer>());
+									}
+								}
+								boolean topVoterIgnorePermissionUse = plugin.getConfigFile()
+										.isTopVoterIgnorePermission();
+								ArrayList<String> blackList = plugin.getConfigFile().getBlackList();
+
+								// ArrayList<String> uuids = getVotingPluginUserManager().getAllUUIDs();
+								int currentDay = LocalDateTime.now().getDayOfMonth();
+								HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+								long time1 = ((System.currentTimeMillis() - startTime) / 1000);
+								plugin.debug("Finished getting player data in " + time1 + " seconds, " + cols.size()
+										+ " users, " + plugin.getStorageType().toString());
+								time1 = System.currentTimeMillis();
+								for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
+
+									String uuid = playerData.getKey().toString();
+									if (plugin != null && plugin.isEnabled()) {
+										if (uuid != null && !uuid.isEmpty()) {
+											VotingPluginUser user = getVotingPluginUserManager()
+													.getVotingPluginUser(UUID.fromString(uuid), false);
+											user.dontCache();
+											user.updateTempCacheWithColumns(playerData.getValue());
+											cols.put(playerData.getKey(), null);
+											if (!user.isBanned() && !blackList.contains(user.getPlayerName())) {
+
+												if (!topVoterIgnorePermissionUse || !user.isTopVoterIgnore()) {
+													for (TopVoter top : topVotersToCheck) {
+														int total = user.getTotal(top);
+														if (total > 0) {
+															tempTopVoter.get(top).put(user.getTopVoterPlayer(), total);
+														}
+													}
+												}
+
+												HashMap<VoteSite, LocalDateTime> times = new HashMap<VoteSite, LocalDateTime>();
+												for (Entry<VoteSite, Long> entry : user.getLastVotes().entrySet()) {
+													if (entry.getKey().isEnabled() && !entry.getKey().isHidden()) {
+														long time = entry.getValue();
+														if ((currentDay == MiscUtils.getInstance().getDayFromMili(time))
+																&& (LocalDateTime.now().getMonthValue() == MiscUtils
+																		.getInstance().getMonthFromMili(time))
+																&& (LocalDateTime.now().getYear() == MiscUtils
+																		.getInstance().getYearFromMili(time))) {
+
+															times.put(entry.getKey(),
+																	LocalDateTime.ofInstant(Instant.ofEpochMilli(time),
+																			ZoneId.systemDefault()));
+														}
+													}
+												}
+												if (times.keySet().size() > 0) {
+													voteToday.put(user.getTopVoterPlayer(), times);
+												}
+											}
+											if (extraBackgroundUpdate) {
+												if (user.isOnline()) {
+													user.offVote();
+												}
+											}
+											if (plugin != null) {
+												if (!plugin.getPlaceholders().getCacheLevel().onlineOnly()
+														|| user.isOnline()) {
+													plugin.getPlaceholders().onUpdate(user, false);
+												}
+											}
+											user.clearTempCache();
+											user = null;
+										}
+									} else {
+										return;
+									}
+								}
+								cols.clear();
+								cols = null;
+
+								topVoterHandler.updateTopVoters(tempTopVoter);
+								placeholders.onUpdate();
+								setVoteToday(voteToday);
+								serverData.updateValues();
+								getSigns().updateSigns();
+
+								checkFirstTimeLoaded();
+
+								plugin.getUserManager().getDataManager().clearNonNeededCachedUsers();
+								plugin.extraDebug("Current cached users: "
+										+ plugin.getUserManager().getDataManager().getUserDataCache().keySet().size());
+
+								update = false;
+
+								tempTopVoter = null;
+
+								time1 = ((System.currentTimeMillis() - time1) / 1000);
+								long totalTime = ((System.currentTimeMillis() - startTime) / 1000);
+								lastBackgroundTaskTimeTaken = totalTime;
+								plugin.debug("Background task finished. Final processing took " + time1
+										+ " seconds. Total time: " + totalTime + " seconds");
+
+							} catch (Exception ex) {
+								if (plugin != null) {
+									plugin.getLogger().info("Looks like something went wrong");
+								}
+								ex.printStackTrace();
+							}
 						}
 					}
 
@@ -1467,6 +1630,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	public void checkFirstTimeLoaded() {
 		if (!firstTimeLoaded) {
+
 			if (getGui().isChestVoteTopUseSkull()) {
 				int maxToLoad = 200;
 				for (TopVoter top : topVoter.keySet()) {
@@ -1487,7 +1651,23 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	public void updateAdvancedCoreHook() {
 		getJavascriptEngine().put("VotingPlugin", this);
 		allowDownloadingFromSpigot(15358);
-		setConfigData(configFile.getData());
+		setConfigData(new YMLConfig(this, configFile.getData()) {
+
+			@Override
+			public void setValue(String path, Object value) {
+				configFile.setValue(path, value);
+			}
+
+			@Override
+			public void saveData() {
+				configFile.saveData();
+			}
+
+			@Override
+			public void createSection(String key) {
+				configFile.createSection(key);
+			}
+		});
 		if (bungeeSettings.isUseBungeecoord()) {
 			getOptions().setPerServerRewards(getBungeeSettings().isPerServerRewards());
 		}

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

@@ -3,8 +3,6 @@ package com.bencodez.votingplugin;
 import java.util.concurrent.Callable;
 
 import com.bencodez.advancedcore.api.metrics.BStatsMetrics;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
-import com.bencodez.votingplugin.user.UserManager;
 
 public class VotingPluginMetrics {
 
@@ -15,7 +13,7 @@ public class VotingPluginMetrics {
 
 			@Override
 			public String call() throws Exception {
-				if (RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+				if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 						plugin.getSpecialRewardsConfig().getFirstVoteRewardsPath())) {
 					return "True";
 				} else {
@@ -27,7 +25,7 @@ public class VotingPluginMetrics {
 
 			@Override
 			public String call() throws Exception {
-				if (RewardHandler.getInstance().hasRewards(plugin.getConfigVoteSites().getData(),
+				if (plugin.getRewardHandler().hasRewards(plugin.getConfigVoteSites().getData(),
 						plugin.getConfigVoteSites().getEverySiteRewardPath())) {
 					return "True";
 				} else {
@@ -39,7 +37,7 @@ public class VotingPluginMetrics {
 
 			@Override
 			public String call() throws Exception {
-				if (RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+				if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 						plugin.getSpecialRewardsConfig().getAllSitesRewardPath())) {
 					return "True";
 				} else {
@@ -67,13 +65,20 @@ public class VotingPluginMetrics {
 
 			@Override
 			public String call() throws Exception {
-				if (!plugin.getSpecialRewardsConfig().getVotePartyEnabled()) {
+				if (!plugin.getSpecialRewardsConfig().isVotePartyEnabled()) {
 					return "False";
 				} else {
 					return "True";
 				}
 			}
 		}));
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("placeholder_cache_level", new Callable<String>() {
+
+			@Override
+			public String call() throws Exception {
+				return plugin.getPlaceholders().getCacheLevel().toString();
+			}
+		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_milestone", new Callable<String>() {
 
 			@Override
@@ -94,7 +99,7 @@ public class VotingPluginMetrics {
 
 			@Override
 			public String call() throws Exception {
-				if (RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+				if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 						plugin.getSpecialRewardsConfig().getAnySiteRewardsPath())) {
 					return "True";
 				} else {
@@ -109,7 +114,7 @@ public class VotingPluginMetrics {
 				for (String s : plugin.getSpecialRewardsConfig().getVoteStreakVotes("Day")) {
 
 					if (plugin.getSpecialRewardsConfig().getVoteStreakRewardEnabled("Day", s)
-							&& RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 									plugin.getSpecialRewardsConfig().getVoteStreakRewardsPath("Day", s))) {
 						return "True";
 					}
@@ -126,7 +131,7 @@ public class VotingPluginMetrics {
 				for (String s : plugin.getSpecialRewardsConfig().getVoteStreakVotes("Week")) {
 
 					if (plugin.getSpecialRewardsConfig().getVoteStreakRewardEnabled("Week", s)
-							&& RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 									plugin.getSpecialRewardsConfig().getVoteStreakRewardsPath("Week", s))) {
 						return "True";
 					}
@@ -143,7 +148,7 @@ public class VotingPluginMetrics {
 				for (String s : plugin.getSpecialRewardsConfig().getVoteStreakVotes("Month")) {
 
 					if (plugin.getSpecialRewardsConfig().getVoteStreakRewardEnabled("Month", s)
-							&& RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 									plugin.getSpecialRewardsConfig().getVoteStreakRewardsPath("Month", s))) {
 						return "True";
 					}
@@ -156,14 +161,14 @@ public class VotingPluginMetrics {
 
 			@Override
 			public String call() throws Exception {
-				return "" + plugin.getVoteSites().size();
+				return "" + plugin.getVoteSitesEnabled().size();
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("numberofrewards", new Callable<String>() {
 
 			@Override
 			public String call() throws Exception {
-				return "" + RewardHandler.getInstance().getRewards().size();
+				return "" + plugin.getRewardHandler().getRewards().size();
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("autocreatevotesites", new Callable<String>() {
@@ -178,38 +183,30 @@ public class VotingPluginMetrics {
 
 			@Override
 			public String call() throws Exception {
-				int total = UserManager.getInstance().getAllUUIDs().size();
-				if (total < 1000) {
-					return "<1000";
+				int total = plugin.getUserManager().getAllUUIDs().size();
+				if (total > 800000) {
+					return ">800000";
+				} else if (total > 700000) {
+					return "700000-800000";
+				} else if (total > 600000) {
+					return "600000-700000";
+				} else if (total > 500000) {
+					return "500000-600000";
+				} else if (total > 400000) {
+					return "400000-500000";
+				} else if (total > 300000) {
+					return "300000-400000";
+				} else if (total > 200000) {
+					return "200000-300000";
+				} else if (total > 100000) {
+					return "100000-200000";
 				} else if (total > 10000) {
-					return ">10000";
-				} else {
-					return "1000-10000";
+					return ">10000-100000";
 				}
+				return "<10000";
 			}
 		}));
 
-		int users = UserManager.getInstance().getAllUUIDs().size();
-		if (users > 1000) {
-			metrics.addCustomChart(new BStatsMetrics.SimplePie("number_of_users_in_thousands", new Callable<String>() {
-
-				@Override
-				public String call() throws Exception {
-					int total = UserManager.getInstance().getAllUUIDs().size() / 1000;
-					return "" + total;
-				}
-			}));
-		}
-		if (users > 10000) {
-			metrics.addCustomChart(new BStatsMetrics.SimplePie("number_of_users_in_thousands_plus_10", new Callable<String>() {
-
-				@Override
-				public String call() throws Exception {
-					int total = UserManager.getInstance().getAllUUIDs().size() / 1000;
-					return "" + total;
-				}
-			}));
-		}
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("data_storage", new Callable<String>() {
 
 			@Override
@@ -228,28 +225,28 @@ public class VotingPluginMetrics {
 
 			@Override
 			public String call() throws Exception {
-				return "" + plugin.getConfigFile().getVoteRemindingEnabled();
+				return "" + plugin.getConfigFile().isVoteRemindingEnabled();
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("LoadTopVoter_Monthly", new Callable<String>() {
 
 			@Override
 			public String call() throws Exception {
-				return "" + plugin.getConfigFile().getLoadTopVoterMonthly();
+				return "" + plugin.getConfigFile().isLoadTopVoterMonthly();
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("LoadTopVoter_Weekly", new Callable<String>() {
 
 			@Override
 			public String call() throws Exception {
-				return "" + plugin.getConfigFile().getLoadTopVoterWeekly();
+				return "" + plugin.getConfigFile().isLoadTopVoterWeekly();
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("LoadTopVoter_Daily", new Callable<String>() {
 
 			@Override
 			public String call() throws Exception {
-				return "" + plugin.getConfigFile().getLoadTopVoterDaily();
+				return "" + plugin.getConfigFile().isLoadTopVoterDaily();
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("bungeemethod", new Callable<String>() {
@@ -300,13 +297,38 @@ public class VotingPluginMetrics {
 					return "" + plugin.getBungeeSettings().isTriggerVotifierEvent();
 				}
 			}));
+
+			metrics.addCustomChart(new BStatsMetrics.SimplePie("globaldata_enabled", new Callable<String>() {
+
+				@Override
+				public String call() throws Exception {
+					return "" + plugin.getBungeeSettings().isGloblalDataEnabled();
+				}
+			}));
+			if (plugin.getBungeeSettings().isGloblalDataEnabled()) {
+				metrics.addCustomChart(new BStatsMetrics.SimplePie("globaldata_usemainmysql", new Callable<String>() {
+
+					@Override
+					public String call() throws Exception {
+						return "" + plugin.getBungeeSettings().isGloblalDataUseMainMySQL();
+					}
+				}));
+			}
 		}
 
-		metrics.addCustomChart(new BStatsMetrics.SimplePie("geyserprefixsupport", new Callable<String>() {
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("persitecooldownevents", new Callable<String>() {
 
 			@Override
 			public String call() throws Exception {
-				return "" + plugin.getOptions().isGeyserPrefixSupport();
+				return "" + plugin.getConfigFile().isPerSiteCoolDownEvents();
+			}
+		}));
+
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("bedrockplayerprefix", new Callable<String>() {
+
+			@Override
+			public String call() throws Exception {
+				return "" + plugin.getOptions().getBedrockPlayerPrefix();
 			}
 		}));
 
@@ -330,11 +352,19 @@ public class VotingPluginMetrics {
 
 			@Override
 			public String call() throws Exception {
-				return "" + (!plugin.getConfigFile().isDisableCoolDownCheck() && RewardHandler.getInstance()
+				return "" + (!plugin.getConfigFile().isDisableCoolDownCheck() && plugin.getRewardHandler()
 						.hasRewards(plugin.getSpecialRewardsConfig().getData(), "VoteCoolDownEndedReward"));
 			}
 		}));
 
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("background_task_time_taken", new Callable<String>() {
+
+			@Override
+			public String call() throws Exception {
+				return "" + plugin.getLastBackgroundTaskTimeTaken();
+			}
+		}));
+
 		if (!plugin.getBuildNumber().equals("NOTSET")) {
 			metrics.addCustomChart(new BStatsMetrics.SimplePie("dev_build_number", new Callable<String>() {
 

VotingPlugin/src/com/bencodez/votingplugin/broadcast/BroadcastHandler.java

@@ -2,9 +2,10 @@ package com.bencodez.votingplugin.broadcast;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -12,16 +13,15 @@ import org.bukkit.entity.Player;
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.user.UserManager;
 
 public class BroadcastHandler {
 	private VotingPluginMain plugin;
-	private Timer timer;
+	private ScheduledExecutorService timer;
 	ConcurrentLinkedQueue<String> votedPlayers = new ConcurrentLinkedQueue<String>();
 
 	public BroadcastHandler(VotingPluginMain plugin, int delay) {
 		this.plugin = plugin;
-		schelude(delay);
+		schedule(delay);
 	}
 
 	public void check() {
@@ -32,12 +32,20 @@ public class BroadcastHandler {
 			}
 			String bc = StringParser.getInstance()
 					.colorize(plugin.getConfigFile().getFormatAlternateBroadcastBroadcast());
+			String playersText = "";
+			while (!votedPlayers.isEmpty()) {
+				playersText += votedPlayers.remove();
+				if (!votedPlayers.isEmpty()) {
+					playersText += ", ";
+				}
+			}
 			HashMap<String, String> placeholders = new HashMap<String, String>();
 			placeholders.put("numberofplayers", "" + size);
+			placeholders.put("players", playersText);
 			bc = StringParser.getInstance().replacePlaceHolder(bc, placeholders);
 			ArrayList<Player> players = new ArrayList<Player>();
 			for (Player p : Bukkit.getOnlinePlayers()) {
-				if (!UserManager.getInstance().getVotingPluginUser(p).getDisableBroadcast()) {
+				if (!plugin.getVotingPluginUserManager().getVotingPluginUser(p).getDisableBroadcast()) {
 					players.add(p);
 				}
 			}
@@ -50,19 +58,19 @@ public class BroadcastHandler {
 		votedPlayers.add(player);
 	}
 
-	public void schelude(int delay) {
+	public void schedule(int delay) {
 		if (timer != null) {
-			timer.cancel();
-			timer = new Timer();
+			timer.shutdownNow();
+			timer = Executors.newScheduledThreadPool(1);
 		} else {
-			timer = new Timer();
+			timer = Executors.newScheduledThreadPool(1);
 		}
-		timer.schedule(new TimerTask() {
+		timer.scheduleWithFixedDelay(new Runnable() {
 
 			@Override
 			public void run() {
 				check();
 			}
-		}, 1000 * 60, 1000 * 60 * delay);
+		}, 60, 60 * delay, TimeUnit.SECONDS);
 	}
 }

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

@@ -3,6 +3,7 @@ package com.bencodez.votingplugin.bungee;
 import java.util.regex.Pattern;
 
 import lombok.Getter;
+import lombok.Setter;
 
 public class BungeeMessageData {
 
@@ -10,20 +11,28 @@ public class BungeeMessageData {
 	// alltimetotal//monthtotal//weeklytotal//dailytotal//points//milestonecount//votepartycurrent//votepartyrequired
 
 	@Getter
+	@Setter
 	private int allTimeTotal = 0;
 	@Getter
+	@Setter
 	private int dailyTotal = 0;
 	@Getter
+	@Setter
 	private int milestoneCount = 0;
 	@Getter
+	@Setter
 	private int monthTotal = 0;
 	@Getter
+	@Setter
 	private int points = 0;
 	@Getter
+	@Setter
 	private int weeklyTotal = 0;
 	@Getter
+	@Setter
 	private int votePartyCurrent = 0;
 	@Getter
+	@Setter
 	private int votePartyRequired = 0;
 
 	public BungeeMessageData(int allTimeTotal, int monthTotal, int weeklyTotal, int dailyTotal, int points,

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

@@ -1,7 +1,7 @@
 package com.bencodez.votingplugin.bungee;
 
 public enum BungeeMethod {
-	MYSQL, PLUGINMESSAGING, SOCKETS;
+	MYSQL, PLUGINMESSAGING, SOCKETS, REDIS;
 
 	public static BungeeMethod getByName(String str) {
 		for (BungeeMethod method : values()) {
@@ -9,6 +9,6 @@ public enum BungeeMethod {
 				return method;
 			}
 		}
-		return SOCKETS;
+		return PLUGINMESSAGING;
 	}
 }

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

@@ -21,6 +21,26 @@ public class Config {
 		this.bungee = bungee;
 	}
 
+	public String getRedisHost() {
+		return getData().getString("Redis.Host", "");
+	}
+
+	public int getRedisPort() {
+		return getData().getInt("Redis.Port", 6379);
+	}
+
+	public String getRedisUsername() {
+		return getData().getString("Redis.Username", "");
+	}
+
+	public String getRedisPrefix() {
+		return getData().getString("Redis.Prefix", "");
+	}
+
+	public String getRedisPassword() {
+		return getData().getString("Redis.Password", "");
+	}
+
 	public boolean getAllowUnJoined() {
 		return getData().getBoolean("AllowUnJoined", false);
 	}
@@ -29,12 +49,28 @@ public class Config {
 		return getData().getStringList("BlockedServers");
 	}
 
+	public List<String> getWhiteListedServers() {
+		return getData().getStringList("WhiteListedServers");
+	}
+
 	public boolean getBroadcast() {
 		return getData().getBoolean("Broadcast", false);
 	}
 
-	public boolean getRedisSupport() {
-		return getData().getBoolean("RedisSupport", false);
+	public String getBedrockPlayerPrefix() {
+		return getData().getString("BedrockPlayerPrefix", ".");
+	}
+
+	public boolean getOnlineMode() {
+		return getData().getBoolean("OnlineMode", true);
+	}
+
+	public boolean getGlobalDataEnabled() {
+		return getData().getBoolean("GlobalData.Enabled", false);
+	}
+
+	public boolean getGlobalDataUseMainMySQL() {
+		return getData().getBoolean("GlobalData.UseMainMySQL", true);
 	}
 
 	public String getBungeeHost() {
@@ -57,6 +93,38 @@ public class Config {
 		return getData().getBoolean("Debug", false);
 	}
 
+	public boolean getMultiProxySupport() {
+		return getData().getBoolean("MultiProxySupport", false);
+	}
+
+	public int getMaxAmountOfVotesPerDay() {
+		return getData().getInt("MaxAmountOfVotesPerDay", -1);
+	}
+
+	public int getMultiProxySocketHostPort() {
+		return getData().getInt("MultiProxySocketHost.Port", 1297);
+	}
+
+	public String getMultiProxySocketHostHost() {
+		return getData().getString("MultiProxySocketHost.Host", "");
+	}
+
+	public boolean getMultiProxyOneGlobalReward() {
+		return getData().getBoolean("MultiProxyOneGlobalReward", false);
+	}
+
+	public Configuration getMultiProxyServersConfiguration(String s) {
+		return getData().getSection("MultiProxyServers." + s);
+	}
+
+	public Collection<String> getMultiProxyServers() {
+		return getData().getSection("MultiProxyServers").getKeys();
+	}
+
+	public boolean getPrimaryServer() {
+		return getData().getBoolean("PrimaryServer", false);
+	}
+
 	public String getFallBack() {
 		return getData().getString("FallBackServer", "");
 	}
@@ -97,10 +165,30 @@ public class Config {
 		return getData().getInt("VoteParty.IncreaseVotesRequired", 0);
 	}
 
+	public int getVoteCacheTime() {
+		return getData().getInt("VoteCacheTime", -1);
+	}
+
 	public String getVotePartyBroadcast() {
 		return getData().getString("VoteParty.Broadcast", "");
 	}
 
+	public String getMultiProxyMethod() {
+		return getData().getString("MultiProxyMethod", "SOCKET");
+	}
+
+	public String getProxyServerName() {
+		return getData().getString("ProxyServerName", "SOCKET");
+	}
+
+	public List<String> getProxyServers() {
+		return getData().getStringList("ProxyServers");
+	}
+
+	public boolean getMultiProxyRedisUseExistingConnection() {
+		return getData().getBoolean("MultiProxyRedis.UseExistingConnection", false);
+	}
+
 	public List<String> getVotePartyServersToSend() {
 		return getData().getStringList("VoteParty.ServersToSend");
 	}
@@ -109,6 +197,22 @@ public class Config {
 		return getData().getStringList("VoteParty.BungeeCommands");
 	}
 
+	public String getMultiProxyRedisHost() {
+		return getData().getString("MultiProxyRedis.Host", "");
+	}
+
+	public int getMultiProxyRedisPort() {
+		return getData().getInt("MultiProxyRedis.Port", 6379);
+	}
+
+	public String getMultiProxyRedisUsername() {
+		return getData().getString("MultiProxyRedis.Username", "");
+	}
+
+	public String getMultiProxyRedisPassword() {
+		return getData().getString("MultiProxyRedis.Password", "");
+	}
+
 	public void load() {
 		if (!bungee.getDataFolder().exists()) {
 			bungee.getDataFolder().mkdir();

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

@@ -7,6 +7,7 @@ import lombok.Getter;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.config.ConfigurationProvider;
+import net.md_5.bungee.config.JsonConfiguration;
 import net.md_5.bungee.config.YamlConfiguration;
 
 public class NonVotedPlayersCache {
@@ -24,9 +25,16 @@ public class NonVotedPlayersCache {
 		}
 	}
 
-	private void addPlayer(String uuid, String playerName) {
+	public void addPlayer(String uuid, String playerName) {
 		getData().set("NonVotedPlayers." + playerName + ".UUID", uuid);
 		getData().set("NonVotedPlayers." + playerName + ".LastTime", System.currentTimeMillis());
+		save();
+	}
+
+	public void addPlayerCheck(String uuid, String playerName) {
+		if (!bungee.getMysql().containsKeyQuery(uuid)) {
+			addPlayer(uuid, playerName);
+		}
 	}
 
 	public void check() {
@@ -53,7 +61,8 @@ public class NonVotedPlayersCache {
 			bungee.getDataFolder().mkdir();
 		}
 
-		File file = new File(bungee.getDataFolder(), "nonvotedplayerscache.yml");
+		File yamlFile = new File(bungee.getDataFolder(), "nonvotedplayerscache.yml");
+		File file = new File(bungee.getDataFolder(), "nonvotedplayerscache.json");
 
 		if (!file.exists()) {
 			try {
@@ -62,9 +71,24 @@ public class NonVotedPlayersCache {
 				e.printStackTrace();
 			}
 		}
+
+		if (yamlFile.exists()) {
+			try {
+				data = ConfigurationProvider.getProvider(YamlConfiguration.class)
+						.load(new File(bungee.getDataFolder(), "nonvotedplayerscache.yml"));
+				yamlFile.renameTo(new File(bungee.getDataFolder(), "oldnonvotedplayerscache.yml"));
+				ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
+						new File(bungee.getDataFolder(), "oldnonvotedplayerscache.yml"));
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+
+			save();
+		}
+
 		try {
-			data = ConfigurationProvider.getProvider(YamlConfiguration.class)
-					.load(new File(bungee.getDataFolder(), "nonvotedplayerscache.yml"));
+			data = ConfigurationProvider.getProvider(JsonConfiguration.class)
+					.load(new File(bungee.getDataFolder(), "nonvotedplayerscache.json"));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
@@ -84,8 +108,8 @@ public class NonVotedPlayersCache {
 
 	public void save() {
 		try {
-			ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
-					new File(bungee.getDataFolder(), "nonvotedplayerscache.yml"));
+			ConfigurationProvider.getProvider(JsonConfiguration.class).save(data,
+					new File(bungee.getDataFolder(), "nonvotedplayerscache.json"));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}

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

@@ -1,48 +0,0 @@
-package com.bencodez.votingplugin.bungee;
-
-import com.imaginarycode.minecraft.redisbungee.RedisBungeeAPI;
-import com.imaginarycode.minecraft.redisbungee.events.PlayerChangedServerNetworkEvent;
-import com.imaginarycode.minecraft.redisbungee.events.PlayerJoinedNetworkEvent;
-
-import lombok.Getter;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.api.plugin.Listener;
-import net.md_5.bungee.event.EventHandler;
-
-public class RedisBungee implements Listener {
-	@Getter
-	private boolean enabled;
-	private VotingPluginBungee plugin;
-
-	public RedisBungee(VotingPluginBungee plugin) {
-		this.plugin = plugin;
-		if (plugin.getConfig().getRedisSupport()) {
-			plugin.getProxy().getPluginManager().registerListener(plugin, this);
-			plugin.getLogger().info("Loaded expiremental redis support");
-			enabled = true;
-		} else {
-			enabled = false;
-		}
-	}
-
-	@EventHandler
-	public void playerJoinedNetworkEvent(PlayerJoinedNetworkEvent event) {
-		plugin.login(plugin.getProxy().getPlayer(event.getUuid()));
-	}
-
-	@EventHandler
-	public void playerChangedServerNetworkEventt(PlayerChangedServerNetworkEvent event) {
-		plugin.login(plugin.getProxy().getPlayer(event.getUuid()));
-	}
-
-	public boolean isOnline(ProxiedPlayer p) {
-		return RedisBungeeAPI.getRedisBungeeApi().isPlayerOnline(p.getUniqueId());
-	}
-
-	public void destroy() {
-		if (!enabled) {
-			return;
-		}
-		plugin.getProxy().getPluginManager().unregisterListener(this);
-	}
-}

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

@@ -1,24 +0,0 @@
-package com.bencodez.votingplugin.bungee;
-
-import lombok.Getter;
-import lombok.Setter;
-
-public abstract class TimeHandle {
-	@Getter
-	@Setter
-	private String month;
-	@Getter
-	@Setter
-	private int day;
-	@Getter
-	@Setter
-	private int week;
-
-	public TimeHandle(String month, int day, int week) {
-		this.month = month;
-		this.day = day;
-		this.week = week;
-	}
-
-	public abstract void save();
-}

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

@@ -4,9 +4,12 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
 
+import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
+
 import lombok.Getter;
 import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.config.ConfigurationProvider;
+import net.md_5.bungee.config.JsonConfiguration;
 import net.md_5.bungee.config.YamlConfiguration;
 
 public class VoteCache {
@@ -52,6 +55,13 @@ public class VoteCache {
 		section.set("Text", voteData.getText());
 	}
 
+	public void addTimedVote(int num, VoteTimeQueue voteTimedQueue) {
+		Configuration section = getData().getSection("TimedVoteCache." + num);
+		section.set("Name", voteTimedQueue.getName());
+		section.set("Service", voteTimedQueue.getService());
+		section.set("Time", voteTimedQueue.getTime());
+	}
+
 	public void addVoteOnline(String player, int num, OfflineBungeeVote voteData) {
 		Configuration section = getData().getSection("OnlineCache." + player + "." + num);
 		section.set("Name", voteData.getPlayerName());
@@ -84,6 +94,14 @@ public class VoteCache {
 		return getData().getSection("VoteCache").getKeys();
 	}
 
+	public Configuration getTimedVoteCache(String key) {
+		return getData().getSection("TimedVoteCache." + key);
+	}
+
+	public Collection<String> getTimedVoteCache() {
+		return getData().getSection("TimedVoteCache").getKeys();
+	}
+
 	public Collection<String> getServerVotes(String server) {
 		return getData().getSection("VoteCache." + server).getKeys();
 	}
@@ -97,7 +115,9 @@ public class VoteCache {
 			bungee.getDataFolder().mkdir();
 		}
 
-		File file = new File(bungee.getDataFolder(), "votecache.yml");
+		File yamlFile = new File(bungee.getDataFolder(), "votecache.yml");
+		
+		File file = new File(bungee.getDataFolder(), "votecache.json");
 
 		if (!file.exists()) {
 			try {
@@ -106,9 +126,23 @@ public class VoteCache {
 				e.printStackTrace();
 			}
 		}
+		if (yamlFile.exists()) {
+			try {
+				data = ConfigurationProvider.getProvider(YamlConfiguration.class)
+						.load(new File(bungee.getDataFolder(), "votecache.yml"));
+				yamlFile.renameTo(new File(bungee.getDataFolder(), "oldvotecache.yml"));
+				ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
+						new File(bungee.getDataFolder(), "oldvotecache.yml"));
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+			
+			save();
+		}
+		
 		try {
-			data = ConfigurationProvider.getProvider(YamlConfiguration.class)
-					.load(new File(bungee.getDataFolder(), "votecache.yml"));
+			data = ConfigurationProvider.getProvider(JsonConfiguration.class)
+					.load(new File(bungee.getDataFolder(), "votecache.json"));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
@@ -116,8 +150,8 @@ public class VoteCache {
 
 	public void save() {
 		try {
-			ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
-					new File(bungee.getDataFolder(), "votecache.yml"));
+			ConfigurationProvider.getProvider(JsonConfiguration.class).save(data,
+					new File(bungee.getDataFolder(), "votecache.json"));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}

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

@@ -16,6 +16,7 @@ public class VoteEventBungee implements net.md_5.bungee.api.plugin.Listener {
 	public void onVote(VotifierEvent event) {
 		plugin.getProxy().getScheduler().runAsync(plugin, new Runnable() {
 
+			@SuppressWarnings("deprecation")
 			@Override
 			public void run() {
 				Vote vote = event.getVote();
@@ -24,11 +25,13 @@ public class VoteEventBungee implements net.md_5.bungee.api.plugin.Listener {
 
 				if (serviceSite.isEmpty()) {
 					serviceSite = "Empty";
+					vote.setServiceName(serviceSite);
 				}
 
-				plugin.vote(vote.getUsername(), serviceSite, true);
+				plugin.vote(vote.getUsername(), serviceSite, true, true, 0, null, null);
 			}
 		});
 
 	}
+
 }

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

@@ -1,5 +1,7 @@
 package com.bencodez.votingplugin.bungee;
 
+import com.bencodez.advancedcore.api.time.TimeType;
+
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.plugin.Command;
@@ -18,20 +20,26 @@ public class VotingPluginBungeeCommand extends Command {
 			if (args.length > 0) {
 				if (args[0].equalsIgnoreCase("reload")) {
 					bungee.reload(false);
-					sender.sendMessage(new TextComponent("&aReloading VotingPluginBungee"));
+					sender.sendMessage(new TextComponent("Reloading VotingPluginBungee"));
 				}
 				if (args[0].equalsIgnoreCase("reloadmysql")) {
 					bungee.reload(true);
-					sender.sendMessage(new TextComponent("&aReloading VotingPluginBungee with MySQL"));
+					sender.sendMessage(new TextComponent("Reloading VotingPluginBungee with MySQL"));
 				}
 				if (args[0].equalsIgnoreCase("vote")) {
 					if (args.length >= 2) {
 						String user = args[1];
 						String site = args[2];
-						bungee.vote(user, site, false);
+						bungee.vote(user, site, false, true, 0, null, null);
 						sender.sendMessage(new TextComponent("Sending vote"));
 					}
 				}
+				if (args[0].equalsIgnoreCase("forcetimechange")) {
+					if (args.length >= 2) {
+						bungee.getBungeeTimeChecker().forceChanged(TimeType.getTimeType(args[1]));
+						sender.sendMessage(new TextComponent("Triggering time change: " + args[1]));
+					}
+				}
 				if (args[0].equalsIgnoreCase("status")) {
 					if (bungee.getMethod().equals(BungeeMethod.SOCKETS)) {
 						sender.sendMessage(new TextComponent(
@@ -41,22 +49,67 @@ public class VotingPluginBungeeCommand extends Command {
 						sender.sendMessage(new TextComponent(
 								"&aChecking status, waiting for response, check console, method: plugin messaging"));
 						bungee.status(sender);
+						bungee.sendServerNameMessage();
+					} else if (bungee.getMethod().equals(BungeeMethod.REDIS)) {
+						sender.sendMessage(new TextComponent(
+								"&aChecking status, waiting for response, check console, method: redis"));
+						bungee.status(sender);
+						bungee.sendServerNameMessage();
 					} else {
 						sender.sendMessage(
-								new TextComponent("&aNot using socket/pluginmessage method, command unavailable"));
+								new TextComponent("&aNot using socket/pluginmessage/redis method, command unavailable"));
 					}
 				}
+				if (args[0].equalsIgnoreCase("multiproxystatus")) {
+					bungee.getMultiProxyHandler().sendMultiProxyServerMessage("Status");
+					sender.sendMessage(new TextComponent("Sending status message"));
+				}
 				if (args[0].equalsIgnoreCase("help")) {
-					TextComponent[] msg = new TextComponent[4];
+					TextComponent[] msg = new TextComponent[7];
 					msg[0] = new TextComponent("&avotingpluginbungee reload - Reload plugin");
 					msg[1] = new TextComponent("&avotingpluginbungee reloadmysql - Reload plugin including mysql");
 					msg[2] = new TextComponent("&avotingpluginbungee vote (player) (servicesite) - Send bungee vote");
 					msg[3] = new TextComponent("&avotingpluginbungee status - Check socket connection status");
+					msg[4] = new TextComponent("&avotingpluginbungee forcetimechange (timetype) - Force a time change");
+					msg[5] = new TextComponent("&avotingpluginbungee voteparty force - Force a vote party");
+					msg[6] = new TextComponent(
+							"&avotingpluginbungee voteparty setvotecount (number) - Set current vote party votes");
 					sender.sendMessage(msg);
 				}
+				if (args[0].equalsIgnoreCase("voteparty")) {
+					if (args.length > 1) {
+						if (args[1].equalsIgnoreCase("Force")) {
+							bungee.setCurrentVotePartyVotes(bungee.getCurrentVotePartyVotesRequired());
+							bungee.checkVoteParty();
+							sender.sendMessage(new TextComponent("Vote party forced"));
+						}
+						if (args.length > 2) {
+							if (args[1].equalsIgnoreCase("SetVoteCount")) {
+								if (isInt(args[2])) {
+									bungee.setCurrentVotePartyVotes(Integer.parseInt(args[2]));
+									sender.sendMessage(new TextComponent("Set current vote party votes to " + args[2]));
+								}
+							}
+						}
+					}
+				}
 			}
 		} else {
 			sender.sendMessage(new TextComponent("&cYou do not have permission to do this!"));
 		}
 	}
+
+	public boolean isInt(String st) {
+		if (st == null) {
+			return false;
+		}
+		try {
+			@SuppressWarnings("unused")
+			int num = Integer.parseInt(st);
+			return true;
+
+		} catch (NumberFormatException ex) {
+			return false;
+		}
+	}
 }

VotingPlugin/src/com/bencodez/votingplugin/bungee/global/multiproxy/MultiProxyHandler.java

@@ -0,0 +1,229 @@
+package com.bencodez.votingplugin.bungee.global.multiproxy;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+
+import com.bencodez.advancedcore.api.misc.encryption.EncryptionHandler;
+import com.bencodez.advancedcore.bungeeapi.redis.RedisHandler;
+import com.bencodez.advancedcore.bungeeapi.redis.RedisListener;
+import com.bencodez.advancedcore.bungeeapi.sockets.ClientHandler;
+import com.bencodez.advancedcore.bungeeapi.sockets.SocketHandler;
+import com.bencodez.advancedcore.bungeeapi.sockets.SocketReceiver;
+import com.bencodez.votingplugin.bungee.BungeeMessageData;
+
+import lombok.Getter;
+
+public abstract class MultiProxyHandler {
+	public abstract boolean getMultiProxySupportEnabled();
+
+	public abstract EncryptionHandler getEncryptionHandler();
+
+	public abstract File getPluginDataFolder();
+
+	public abstract void setEncryptionHandler(EncryptionHandler encryptionHandler);
+
+	public abstract void logInfo(String msg);
+
+	public abstract boolean getDebug();
+
+	public abstract String getVersion();
+
+	private HashMap<String, ClientHandler> multiproxyClientHandles;
+
+	private SocketHandler multiproxySocketHandler;
+
+	@Getter
+	private RedisHandler multiProxyRedis;
+
+	public MultiProxyHandler() {
+
+	}
+
+	public void sendMultiProxyServerMessage(String... messageData) {
+		if (getMultiProxyMethod().equals(MultiProxyMethod.SOCKETS)) {
+			for (ClientHandler h : multiproxyClientHandles.values()) {
+				h.sendMessage(messageData);
+			}
+		} else if (getMultiProxyMethod().equals(MultiProxyMethod.REDIS)) {
+			for (String server : getProxyServers()) {
+				multiProxyRedis.sendMessage("VotingPluginProxy_" + server, messageData);
+			}
+		}
+	}
+
+	public abstract List<String> getProxyServers();
+
+	public void close() {
+		if (multiproxySocketHandler != null) {
+			multiproxySocketHandler.closeConnection();
+			multiproxySocketHandler = null;
+		}
+		if (multiProxyRedis != null && !getMultiProxyRedisUseExistingConnection()) {
+			multiProxyRedis.close();
+		}
+	}
+
+	public void loadMultiProxySupport() {
+		if (getMultiProxySupportEnabled()) {
+			if (getMultiProxyMethod().equals(MultiProxyMethod.SOCKETS)) {
+				if (getEncryptionHandler() == null) {
+					setEncryptionHandler(new EncryptionHandler(new File(getPluginDataFolder(), "secretkey.key")));
+				}
+
+				if (multiproxySocketHandler != null) {
+					multiproxySocketHandler.closeConnection();
+					multiproxySocketHandler = null;
+				}
+				multiproxySocketHandler = new SocketHandler(getVersion(), getMultiProxySocketHostHost(),
+						getMultiProxySocketHostPort(), getEncryptionHandler(), getDebug()) {
+
+					@Override
+					public void log(String str) {
+						logInfo(str);
+					}
+				};
+
+				multiproxySocketHandler.add(new SocketReceiver() {
+
+					@Override
+					public void onReceive(String[] data) {
+						if (data.length > 0) {
+							if (data[0].equalsIgnoreCase("Status")) {
+								logInfo("Multi-proxy status message received");
+							} else if (data[0].equalsIgnoreCase("ClearVote")) {
+								clearVote(data[2]);
+								if (getPrimaryServer()) {
+									sendMultiProxyServerMessage("ClearVotePrimary", data[1], data[2]);
+								}
+							} else if (data[0].equalsIgnoreCase("ClearVotePrimary")) {
+								clearVote(data[2]);
+							} else if (data[0].equalsIgnoreCase("login")) {
+								addNonVotedPlayerCache(data[1], data[2]);
+								// nonVotedPlayersCache.addPlayer(data[1], data[2]);
+							}
+						}
+						if (data.length > 8) {
+							if (data[0].equalsIgnoreCase("Vote")) {
+								triggerVote(data[2], data[3], Boolean.valueOf(data[7]), true, 0,
+										new BungeeMessageData(data[8]), data[1]);
+							} else if (data[0].equalsIgnoreCase("VoteOnline")) {
+								triggerVote(data[2], data[3], Boolean.valueOf(data[7]), true, 0,
+										new BungeeMessageData(data[8]), data[1]);
+							}
+						}
+
+					}
+				});
+
+				multiproxyClientHandles = new HashMap<String, ClientHandler>();
+				for (String s : getMultiProxyServers()) {
+					MultiProxyServerSocketConfiguration d = getMultiProxyServersConfiguration(s);
+					multiproxyClientHandles.put(s,
+							new ClientHandler(d.getHost(), d.getPort(), getEncryptionHandler(), getDebug()));
+				}
+
+			} else {
+				if (getMultiProxyRedisUseExistingConnection() && getRedisHandler() != null) {
+					multiProxyRedis = getRedisHandler();
+				} else {
+					multiProxyRedis = new RedisHandler(getMultiProxyRedisHost(), getMultiProxyRedisPort(),
+							getMultiProxyUsername(), getMultiProxyPassword()) {
+
+						@Override
+						public void onMessage(String channel, String[] data) {
+							if (data.length > 0) {
+								if (data[0].equalsIgnoreCase("Status")) {
+									logInfo("Multi-proxy status message received");
+								} else if (data[0].equalsIgnoreCase("ClearVote")) {
+									clearVote(data[2]);
+									if (getPrimaryServer()) {
+										sendMultiProxyServerMessage("ClearVotePrimary", data[1], data[2]);
+									}
+								} else if (data[0].equalsIgnoreCase("ClearVotePrimary")) {
+									clearVote(data[2]);
+								} else if (data[0].equalsIgnoreCase("login")) {
+									addNonVotedPlayerCache(data[1], data[2]);
+									// nonVotedPlayersCache.addPlayer(data[1], data[2]);
+								}
+							}
+							if (data.length > 8) {
+								if (data[0].equalsIgnoreCase("Vote")) {
+									triggerVote(data[2], data[3], Boolean.valueOf(data[7]), true, 0,
+											new BungeeMessageData(data[8]), data[1]);
+								} else if (data[0].equalsIgnoreCase("VoteOnline")) {
+									triggerVote(data[2], data[3], Boolean.valueOf(data[7]), true, 0,
+											new BungeeMessageData(data[8]), data[1]);
+								}
+							}
+						}
+
+						@Override
+						public void debug(String message) {
+							if (getDebug()) {
+								logInfo("MultiProxyRedis: " + message);
+							}
+						}
+					};
+				}
+
+				runAsnc(new Runnable() {
+
+					@Override
+					public void run() {
+						multiProxyRedis.loadListener(
+								new RedisListener(multiProxyRedis, "VotingPluginProxy_" + getMultiProxyServerName()));
+					}
+				});
+
+			}
+			logInfo("Loaded multi-proxy support: " + getMultiProxyMethod().toString());
+		}
+	}
+
+	public abstract void runAsnc(Runnable runnable);
+
+	public abstract MultiProxyMethod getMultiProxyMethod();
+
+	public abstract RedisHandler getRedisHandler();
+
+	public abstract boolean getMultiProxyRedisUseExistingConnection();
+
+	public abstract String getMultiProxyPassword();
+
+	public abstract String getMultiProxyUsername();
+
+	public abstract String getMultiProxyServerName();
+
+	public abstract int getMultiProxyRedisPort();
+
+	public abstract String getMultiProxyRedisHost();
+
+	public abstract boolean getPrimaryServer();
+
+	public void login(String uuid, String playerName) {
+		if (!getMultiProxySupportEnabled()) {
+			return;
+		}
+		if (getPrimaryServer()) {
+			return;
+		}
+		sendMultiProxyServerMessage("Login", uuid, playerName);
+	}
+
+	public abstract int getMultiProxySocketHostPort();
+
+	public abstract String getMultiProxySocketHostHost();
+
+	public abstract MultiProxyServerSocketConfiguration getMultiProxyServersConfiguration(String s);
+
+	public abstract Collection<String> getMultiProxyServers();
+
+	public abstract void triggerVote(String player, String service, boolean realVote, boolean timeQueue, long queueTime,
+			BungeeMessageData text, String uuid);
+
+	public abstract void addNonVotedPlayerCache(String string, String string2);
+
+	public abstract void clearVote(String string);
+}

VotingPlugin/src/com/bencodez/votingplugin/bungee/global/multiproxy/MultiProxyMethod.java

@@ -0,0 +1,14 @@
+package com.bencodez.votingplugin.bungee.global.multiproxy;
+
+public enum MultiProxyMethod {
+	SOCKETS, REDIS;
+
+	public static MultiProxyMethod getByName(String str) {
+		for (MultiProxyMethod method : values()) {
+			if (method.toString().equalsIgnoreCase(str)) {
+				return method;
+			}
+		}
+		return MultiProxyMethod.SOCKETS;
+	}
+}

VotingPlugin/src/com/bencodez/votingplugin/bungee/global/multiproxy/MultiProxyServerSocketConfiguration.java

@@ -0,0 +1,9 @@
+package com.bencodez.votingplugin.bungee.global.multiproxy;
+
+public interface MultiProxyServerSocketConfiguration {
+	String getServerName();
+
+	String getHost();
+
+	int getPort();
+}

VotingPlugin/src/com/bencodez/votingplugin/bungee/global/multiproxy/MultiProxyServerSocketConfigurationBungee.java

@@ -0,0 +1,31 @@
+package com.bencodez.votingplugin.bungee.global.multiproxy;
+
+import net.md_5.bungee.config.Configuration;
+
+public class MultiProxyServerSocketConfigurationBungee implements MultiProxyServerSocketConfiguration {
+	private String server;
+	private String host;
+	private int port;
+
+	public MultiProxyServerSocketConfigurationBungee(String s, Configuration config) {
+		server = s;
+		host = config.getString("Host", "");
+		port = config.getInt("Port", 1234);
+	}
+
+	@Override
+	public String getServerName() {
+		return server;
+	}
+
+	@Override
+	public String getHost() {
+		return host;
+	}
+
+	@Override
+	public int getPort() {
+		return port;
+	}
+
+}

VotingPlugin/src/com/bencodez/votingplugin/bungee/global/multiproxy/MultiProxyServerSocketConfigurationVelocity.java

@@ -0,0 +1,33 @@
+package com.bencodez.votingplugin.bungee.global.multiproxy;
+
+import ninja.leaping.configurate.ConfigurationNode;
+
+public class MultiProxyServerSocketConfigurationVelocity implements MultiProxyServerSocketConfiguration {
+
+	private String server;
+	private String host;
+	private int port;
+
+	public MultiProxyServerSocketConfigurationVelocity(String s, ConfigurationNode config) {
+		server = s;
+		host = config.getNode("Host").getString("0.0.0.0");
+		port = config.getNode("Port").getInt(1298);
+
+	}
+
+	@Override
+	public String getServerName() {
+		return server;
+	}
+
+	@Override
+	public String getHost() {
+		return host;
+	}
+
+	@Override
+	public int getPort() {
+		return port;
+	}
+
+}

VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/Config.java

@@ -25,12 +25,24 @@ public class Config extends VelocityYMLFile {
 		return getStringList(getNode("BlockedServers"), new ArrayList<String>());
 	}
 
+	public List<String> getWhiteListedServers() {
+		return getStringList(getNode("WhiteListedServers"), new ArrayList<String>());
+	}
+
 	public boolean getBroadcast() {
 		return getBoolean(getNode("Broadcast"), false);
 	}
 
-	public String getBungeeHost() {
-		return getString(getNode("BungeeServer", "Host"), "");
+	public boolean getOnlineMode() {
+		return getBoolean(getNode("OnlineMode"), true);
+	}
+
+	public boolean getGlobalDataEnabled() {
+		return getBoolean(getNode("GlobalData", "Enabled"), false);
+	}
+
+	public boolean getGlobalDataUseMainMySQL() {
+		return getBoolean(getNode("GlobalData", "UseMainMySQL"), true);
 	}
 
 	public boolean getBungeeManageTotals() {
@@ -41,10 +53,42 @@ public class Config extends VelocityYMLFile {
 		return getString(getNode("BungeeMethod"), "PLUGINMESSAGING");
 	}
 
+	public String getRedisHost() {
+		return getString(getNode("Redis", "Host"), "");
+	}
+
+	public int getRedisPort() {
+		return getInt(getNode("Redis", "Port"), 6379);
+	}
+
+	public String getRedisUsername() {
+		return getString(getNode("Redis", "Username"), "");
+	}
+
+	public String getRedisPrefix() {
+		return getString(getNode("Redis", "Prefix"), "");
+	}
+
+	public String getRedisPassword() {
+		return getString(getNode("Redis", "Password"), "");
+	}
+
+	public String getBungeeHost() {
+		return getString(getNode("BungeeServer", "Host"), "");
+	}
+
 	public int getBungeePort() {
 		return getInt(getNode("BungeeServer", "Port"), 1297);
 	}
 
+	public int getMaxAmountOfVotesPerDay() {
+		return getInt(getNode("MaxAmountOfVotesPerDay"), -1);
+	}
+
+	public int getVoteCacheTime() {
+		return getInt(getNode("VoteCacheTime"), -1);
+	}
+
 	public boolean getDebug() {
 		return getBoolean(getNode("Debug"), false);
 	}
@@ -108,4 +152,69 @@ public class Config extends VelocityYMLFile {
 	public boolean getWaitForUserOnline() {
 		return getBoolean(getNode("WaitForUserOnline"), false);
 	}
+
+	public boolean getMultiProxySupport() {
+		return getBoolean(getNode("MultiProxySupport"), false);
+	}
+
+	public boolean getMultiProxyOneGlobalReward() {
+		return getBoolean(getNode("MultiProxyOneGlobalReward"), false);
+	}
+
+	public boolean getPrimaryServer() {
+		return getBoolean(getNode("PrimaryServer"), false);
+	}
+
+	public String getBedrockPlayerPrefix() {
+		return getString(getNode("BedrockPlayerPrefix"), ".");
+	}
+
+	public ConfigurationNode getMultiProxyServers(String s) {
+		return getNode("MultiProxyServers", s);
+	}
+
+	public @NonNull Collection<? extends ConfigurationNode> getMultiProxyServers() {
+		return getNode("MultiProxyServers").getChildrenMap().values();
+	}
+
+	public String getMultiProxySocketHostHost() {
+		return getString(getNode("MultiProxySocketHost", "Host"), "");
+	}
+
+	public int getMultiProxySocketHostPort() {
+		return getInt(getNode("MultiProxySocketHost", "Port"), 1297);
+	}
+
+	public String getMultiProxyMethod() {
+		return getString(getNode("MultiProxyMethod"), "SOCKET");
+	}
+
+	public String getProxyServerName() {
+		return getString(getNode("ProxyServerName"), "SOCKET");
+	}
+
+	public List<String> getProxyServers() {
+		return getStringList(getNode("ProxyServers"), new ArrayList<String>());
+	}
+
+	public boolean getMultiProxyRedisUseExistingConnection() {
+		return getBoolean(getNode("MultiProxyRedis", "UseExistingConnection"), false);
+	}
+
+	public String getMultiProxyRedisHost() {
+		return getString(getNode("MultiProxyRedis", "Host"), "");
+	}
+
+	public int getMultiProxyRedisPort() {
+		return getInt(getNode("MultiProxyRedis", "Port"), 6379);
+	}
+
+	public String getMultiProxyRedisUsername() {
+		return getString(getNode("MultiProxyRedis", "Username"), "");
+	}
+
+	public String getMultiProxyRedisPassword() {
+		return getString(getNode("MultiProxyRedis", "Password"), "");
+	}
+
 }

VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/NonVotedPlayersCache.java

@@ -2,10 +2,10 @@ package com.bencodez.votingplugin.bungee.velocity;
 
 import java.io.File;
 
-import com.bencodez.advancedcore.bungeeapi.velocity.VelocityYMLFile;
+import com.bencodez.advancedcore.bungeeapi.velocity.VelocityJSONFile;
 import com.velocitypowered.api.proxy.Player;
 
-public class NonVotedPlayersCache extends VelocityYMLFile {
+public class NonVotedPlayersCache extends VelocityJSONFile {
 
 	private VotingPluginVelocity plugin;
 
@@ -20,12 +20,18 @@ public class NonVotedPlayersCache extends VelocityYMLFile {
 		}
 	}
 
-	private void addPlayer(String uuid, String playerName) {
+	public void addPlayer(String uuid, String playerName) {
 		getNode("NonVotedPlayers", playerName, "UUID").setValue(uuid);
 		getNode("NonVotedPlayers", playerName, "LastTime").setValue(System.currentTimeMillis());
 		save();
 	}
 
+	public void addPlayerCheck(String uuid, String playerName) {
+		if (!plugin.getMysql().containsKeyQuery(uuid)) {
+			addPlayer(uuid, playerName);
+		}
+	}
+
 	public void check() {
 		for (String player : getKeys(getNode("NonVotedPlayers"))) {
 			long time = getNode("NonVotedPlayers", player, "LastTime").getLong(0);

VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/VoteCache.java

@@ -3,12 +3,13 @@ package com.bencodez.votingplugin.bungee.velocity;
 import java.io.File;
 import java.util.Collection;
 
-import com.bencodez.advancedcore.bungeeapi.velocity.VelocityYMLFile;
+import com.bencodez.advancedcore.bungeeapi.velocity.VelocityJSONFile;
 import com.bencodez.votingplugin.bungee.OfflineBungeeVote;
+import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
 
 import ninja.leaping.configurate.ConfigurationNode;
 
-public class VoteCache extends VelocityYMLFile {
+public class VoteCache extends VelocityJSONFile {
 
 	public VoteCache(File file) {
 		super(file);
@@ -49,6 +50,13 @@ public class VoteCache extends VelocityYMLFile {
 		getNode(path, "Text").setValue(voteData.getText());
 	}
 
+	public void addTimedVote(int num, VoteTimeQueue voteTimedQueue) {
+		String[] path = new String[] { "TimedVoteCache", "" + num };
+		getNode(path, "Name").setValue(voteTimedQueue.getName());
+		getNode(path, "Service").setValue(voteTimedQueue.getService());
+		getNode(path, "Time").setValue(voteTimedQueue.getTime());
+	}
+
 	public void addVoteOnline(String player, int num, OfflineBungeeVote voteData) {
 		String[] path = new String[] { "OnlineCache", player, "" + num };
 
@@ -70,6 +78,10 @@ public class VoteCache extends VelocityYMLFile {
 		return getKeys(getNode("OnlineCache", name));
 	}
 
+	public ConfigurationNode getTimedVoteCache(String name) {
+		return getNode("TimedVoteCache", name);
+	}
+
 	public ConfigurationNode getOnlineVotes(String name, String num) {
 		return getNode("OnlineCache", name, num);
 	}
@@ -82,6 +94,10 @@ public class VoteCache extends VelocityYMLFile {
 		return getKeys(getNode("VoteCache"));
 	}
 
+	public Collection<String> getTimedVoteCache() {
+		return getKeys(getNode("TimedVoteCache"));
+	}
+
 	public Collection<String> getServerVotes(String server) {
 		return getKeys(getNode("OnlineCache", server));
 	}

VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/VoteEventVelocity.java

@@ -0,0 +1,32 @@
+package com.bencodez.votingplugin.bungee.velocity;
+
+import com.velocitypowered.api.event.Subscribe;
+import com.vexsoftware.votifier.velocity.event.VotifierEvent;
+
+public class VoteEventVelocity {
+	private VotingPluginVelocity plugin;
+
+	public VoteEventVelocity(VotingPluginVelocity plugin) {
+		this.plugin = plugin;
+	}
+	
+	@Subscribe
+	public void onVotifierEvent(VotifierEvent event) {
+		final String serviceSiteVote = event.getVote().getServiceName();
+		final String name = event.getVote().getUsername();
+		plugin.getTimer().execute(new Runnable() {
+
+			@Override
+			public void run() {
+				String serviceSite = serviceSiteVote;
+				plugin.getLogger().info("Vote received " + name + " from service site " + serviceSite);
+				if (serviceSite.isEmpty()) {
+					serviceSite = "Empty";
+				}
+
+				plugin.vote(name, serviceSite, true, false, 0, null, null);
+			}
+		});
+
+	}
+}

VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/VotingPluginVelocityCommand.java

@@ -1,5 +1,6 @@
 package com.bencodez.votingplugin.bungee.velocity;
 
+import com.bencodez.advancedcore.api.time.TimeType;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.command.SimpleCommand;
@@ -33,10 +34,16 @@ public class VotingPluginVelocityCommand implements SimpleCommand {
 				if (args.length >= 2) {
 					String user = args[1];
 					String site = args[2];
-					plugin.vote(user, site, false);
+					plugin.vote(user, site, false, true, 0, null, null);
 					source.sendMessage(Component.text("Sending vote").color(NamedTextColor.AQUA));
 				}
 			}
+			if (args[0].equalsIgnoreCase("forcetimechange")) {
+				if (args.length >= 2) {
+					plugin.getBungeeTimeChecker().forceChanged(TimeType.getTimeType(args[1]));
+					source.sendMessage(Component.text("Triggering time change: " + args[1]).color(NamedTextColor.AQUA));
+				}
+			}
 			if (args[0].equalsIgnoreCase("status")) {
 				if (plugin.getMethod().equals(BungeeMethod.SOCKETS)) {
 					source.sendMessage(
@@ -48,22 +55,68 @@ public class VotingPluginVelocityCommand implements SimpleCommand {
 							.text("Checking status, waiting for response, check console, method: pluginmessaging")
 							.color(NamedTextColor.AQUA));
 					plugin.status();
+					plugin.sendServerNameMessage();
+				} else if (plugin.getMethod().equals(BungeeMethod.REDIS)) {
+					source.sendMessage(
+							Component.text("Checking status, waiting for response, check console, method: redis")
+									.color(NamedTextColor.AQUA));
+					plugin.status();
+					plugin.sendServerNameMessage();
 				} else {
 					source.sendMessage(Component.text("Not using socket/pluginmessage method, command unavailable")
 							.color(NamedTextColor.AQUA));
 				}
 			}
+			if (args[0].equalsIgnoreCase("multiproxystatus")) {
+				plugin.getMultiProxyHandler().sendMultiProxyServerMessage("Status");
+
+				source.sendMessage(Component.text("Sending status message").color(NamedTextColor.AQUA));
+			}
 			if (args[0].equalsIgnoreCase("help")) {
-				String[] msg = new String[4];
+				String[] msg = new String[7];
 				msg[0] = "votingpluginbungee reload - Reload plugin";
 				msg[1] = "votingpluginbungee reloadmysql - Reload plugin including mysql";
 				msg[2] = "votingpluginbungee vote (player) (servicesite) - Send bungee vote";
 				msg[3] = "votingpluginbungee status - Check socket connection status";
+				msg[4] = "&avotingpluginbungee forcetimechange (timetype) - Force a time change";
+				msg[5] = "&avotingpluginbungee voteparty force - Force a vote party";
+				msg[6] = "&avotingpluginbungee voteparty setvotecount (number) - Set current vote party votes";
 				for (String m : msg) {
 					source.sendMessage(Component.text(m).color(NamedTextColor.AQUA));
 				}
-
 			}
+			if (args[0].equalsIgnoreCase("voteparty")) {
+				if (args.length > 1) {
+					if (args[1].equalsIgnoreCase("Force")) {
+						plugin.setCurrentVotePartyVotes(plugin.getCurrentVotePartyVotesRequired());
+						plugin.checkVoteParty();
+						source.sendMessage(Component.text("Vote party forced").color(NamedTextColor.AQUA));
+					}
+					if (args.length > 2) {
+						if (args[1].equalsIgnoreCase("SetVoteCount")) {
+							if (isInt(args[2])) {
+								plugin.setCurrentVotePartyVotes(Integer.parseInt(args[2]));
+								source.sendMessage(Component.text("Set current vote party votes to " + args[2])
+										.color(NamedTextColor.AQUA));
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	public boolean isInt(String st) {
+		if (st == null) {
+			return false;
+		}
+		try {
+			@SuppressWarnings("unused")
+			int num = Integer.parseInt(st);
+			return true;
+
+		} catch (NumberFormatException ex) {
+			return false;
 		}
 	}
 

VotingPlugin/src/com/bencodez/votingplugin/commands/executers/CommandAdminVote.java

@@ -1,11 +1,11 @@
 package com.bencodez.votingplugin.commands.executers;
 
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
 import com.bencodez.advancedcore.api.command.CommandHandler;
+import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 // TODO: Auto-generated Javadoc
@@ -36,7 +36,7 @@ public class CommandAdminVote implements CommandExecutor {
 		}
 
 		// invalid command
-		sender.sendMessage(ChatColor.RED + "No valid arguments, see /adminvote help!");
+		sender.sendMessage(StringParser.getInstance().colorize(plugin.getConfigFile().getFormatInvalidCommandAdminVote()));
 
 		return true;
 	}

VotingPlugin/src/com/bencodez/votingplugin/commands/executers/CommandAliases.java

@@ -2,12 +2,12 @@ package com.bencodez.votingplugin.commands.executers;
 
 import java.util.ArrayList;
 
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
 import com.bencodez.advancedcore.api.command.CommandHandler;
+import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 
@@ -91,9 +91,11 @@ public class CommandAliases implements CommandExecutor {
 
 		// invalid command
 		if (adminCommand) {
-			sender.sendMessage(ChatColor.RED + "No valid arguments, see /adminvote help!");
+			sender.sendMessage(
+					StringParser.getInstance().colorize(plugin.getConfigFile().getFormatInvalidCommandAdminVote()));
 		} else {
-			sender.sendMessage(ChatColor.RED + "No valid arguments, see /vote help!");
+			sender.sendMessage(
+					StringParser.getInstance().colorize(plugin.getConfigFile().getFormatInvalidCommandVote()));
 		}
 		return true;
 	}

VotingPlugin/src/com/bencodez/votingplugin/commands/executers/CommandVote.java

@@ -1,11 +1,11 @@
 package com.bencodez.votingplugin.commands.executers;
 
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
 import com.bencodez.advancedcore.api.command.CommandHandler;
+import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 // TODO: Auto-generated Javadoc
@@ -61,7 +61,7 @@ public class CommandVote implements CommandExecutor {
 		}
 
 		// invalid command
-		sender.sendMessage(ChatColor.RED + "No valid arguments, see /vote help!");
+		sender.sendMessage(StringParser.getInstance().colorize(plugin.getConfigFile().getFormatInvalidCommandVote()));
 		return true;
 	}
 

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

@@ -21,14 +21,13 @@ import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueSt
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.PlayerUtils;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.valuerequest.InputMethod;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
 import com.bencodez.advancedcore.api.valuerequest.listeners.StringListener;
+import com.bencodez.advancedcore.api.yml.editor.ConfigEditor;
 import com.bencodez.advancedcore.command.gui.RewardEditGUI;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.commands.gui.admin.AdminVoteBungeeSettings;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVoteVoteParty;
 import com.bencodez.votingplugin.commands.gui.admin.cumulative.AdminVoteCumulative;
 import com.bencodez.votingplugin.commands.gui.admin.milestones.AdminVoteMilestones;
@@ -66,6 +65,7 @@ public class AdminGUI {
 							plugin.getConfigVoteSites().generateVoteSite(value);
 							player.sendMessage("Generated site");
 							plugin.reload();
+							openAdminGUIVoteSiteSite(player, plugin.getVoteSite(value, true));
 						}
 					});
 				} else {
@@ -110,7 +110,7 @@ public class AdminGUI {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("FirstVote"));
+						plugin.getRewardHandler().getDirectlyDefined("FirstVote"));
 			}
 		});
 		buttons.add(new BInventoryButton(new ItemBuilder(Material.STONE, 1).setName("&cEdit FirstVoteToday reward")) {
@@ -118,7 +118,7 @@ public class AdminGUI {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("FirstVoteToday"));
+						plugin.getRewardHandler().getDirectlyDefined("FirstVoteToday"));
 			}
 		});
 
@@ -127,7 +127,16 @@ public class AdminGUI {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("AllSites"));
+						plugin.getRewardHandler().getDirectlyDefined("AllSites"));
+			}
+		});
+
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.STONE, 1).setName("&cEdit AlmostAllSites reward")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+						plugin.getRewardHandler().getDirectlyDefined("AlmostAllSites"));
 			}
 		});
 
@@ -136,7 +145,7 @@ public class AdminGUI {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("AnySiteRewards"));
+						plugin.getRewardHandler().getDirectlyDefined("AnySiteRewards"));
 			}
 		});
 
@@ -145,7 +154,7 @@ public class AdminGUI {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("EverySiteReward"));
+						plugin.getRewardHandler().getDirectlyDefined("EverySiteReward"));
 			}
 		});
 
@@ -154,15 +163,44 @@ public class AdminGUI {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("BungeeVotePartyRewards"));
+						plugin.getRewardHandler().getDirectlyDefined("BungeeVotePartyRewards"));
 			}
 		});
 
-		buttons.add(new BInventoryButton(new ItemBuilder("GRASS_BLOCK").setName("&cEdit BungeeSettings.yml")) {
+		buttons.add(new BInventoryButton(
+				new ItemBuilder("GRASS_BLOCK").setName("&cEdit BungeeSettings.yml").addLoreLine("&aCurrently WIP")) {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				new AdminVoteBungeeSettings(plugin, clickEvent.getPlayer()).open();
+				new ConfigEditor(plugin, plugin.getBungeeSettings()).open(clickEvent.getPlayer());
+			}
+		});
+
+		buttons.add(new BInventoryButton(
+				new ItemBuilder("GRASS_BLOCK").setName("&cEdit Config.yml").addLoreLine("&aCurrently WIP")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new ConfigEditor(plugin, plugin.getConfigFile(), plugin.getOptions().getYmlConfig(),
+						plugin.getOptions().getClass()).open(clickEvent.getPlayer());
+			}
+		});
+
+		buttons.add(new BInventoryButton(
+				new ItemBuilder(Material.CHEST).setName("&cEdit GUI.yml").addLoreLine("&aCurrently WIP")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new ConfigEditor(plugin, plugin.getGui()).open(clickEvent.getPlayer());
+			}
+		});
+
+		buttons.add(new BInventoryButton(
+				new ItemBuilder("GRASS_BLOCK").setName("&cEdit SpecialRewards.yml").addLoreLine("&aCurrently WIP")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new ConfigEditor(plugin, plugin.getSpecialRewardsConfig()).open(clickEvent.getPlayer());
 			}
 		});
 
@@ -174,6 +212,17 @@ public class AdminGUI {
 			}
 
 		});
+
+		buttons.add(new BInventoryButton(
+				new ItemBuilder(Material.STONE, 1).setName("&cBackground task time").addLoreLine("&aClick to see")) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				event.getPlayer().sendMessage("Last background task time: " + plugin.getLastBackgroundTaskTimeTaken());
+			}
+
+		});
+
 		return buttons;
 	}
 
@@ -193,7 +242,9 @@ public class AdminGUI {
 		int count = 0;
 		for (VoteSite voteSite : plugin.getVoteSites()) {
 			ArrayList<String> lore = new ArrayList<String>();
+			lore.add("Enabled: " + voteSite.isEnabled());
 			lore.add("Priority: " + voteSite.getPriority());
+
 			lore.add("Name: " + voteSite.getDisplayName());
 			lore.add("ServiceSite: " + voteSite.getServiceSite());
 			lore.add("VoteURL: " + voteSite.getVoteURL());
@@ -242,7 +293,13 @@ public class AdminGUI {
 						if (ob != null) {
 							VoteSite site = (VoteSite) ob;
 							PlayerVoteEvent voteEvent = new PlayerVoteEvent(site, value, site.getServiceSite(), false);
-							plugin.getServer().getPluginManager().callEvent(voteEvent);
+							plugin.getVoteTimer().submit(new Runnable() {
+
+								@Override
+								public void run() {
+									plugin.getServer().getPluginManager().callEvent(voteEvent);
+								}
+							});
 						}
 					}
 				}, ArrayUtils.getInstance().convert(playerNames)).usingMethod(InputMethod.INVENTORY)
@@ -314,6 +371,17 @@ public class AdminGUI {
 			}
 		}));
 
+		inv.addButton(new EditGUIButton(new EditGUIValueNumber("VoteDelayDailyHour", voteSite.getVoteDelayDailyHour()) {
+
+			@Override
+			public void setValue(Player player, Number num) {
+				VoteSite voteSite = (VoteSite) getInv().getMeta(player, "VoteSite");
+				String siteName = voteSite.getKey();
+				plugin.getConfigVoteSites().setVoteDelay(siteName, num.intValue());
+				plugin.reload();
+			}
+		}));
+
 		inv.addButton(new EditGUIButton(new EditGUIValueBoolean("Enabled", voteSite.isEnabled()) {
 
 			@Override
@@ -364,12 +432,35 @@ public class AdminGUI {
 
 				@Override
 				public void onClick(ClickEvent clickEvent) {
-					RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(), RewardHandler.getInstance()
+					RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(), plugin.getRewardHandler()
 							.getDirectlyDefined("VoteSites." + voteSite.getKey() + ".Rewards"));
 				}
 			});
 		}
 
+		if (voteSite.getSiteData().isList("CoolDownEndRewards")) {
+
+			inv.addButton(new EditGUIButton(new EditGUIValueList("CoolDownEndRewards",
+					voteSite.getSiteData().getStringList("CoolDownEndRewards")) {
+
+				@Override
+				public void setValue(Player p, ArrayList<String> rewards) {
+					VoteSite voteSite = (VoteSite) getInv().getMeta(player, "VoteSite");
+					plugin.getConfigVoteSites().set(voteSite.getKey(), "CoolDownEndRewards", rewards);
+					plugin.reload();
+				}
+			}));
+		} else {
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.DISPENSER, 1).setName("&cCoolDownEndRewards")) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(), plugin.getRewardHandler()
+							.getDirectlyDefined("VoteSites." + voteSite.getKey() + ".CoolDownEndRewards"));
+				}
+			});
+		}
+
 		inv.openInventory(player);
 	}
 }

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

@@ -1,147 +0,0 @@
-package com.bencodez.votingplugin.commands.gui.admin;
-
-import java.util.ArrayList;
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.bencodez.advancedcore.api.gui.GUIHandler;
-import com.bencodez.advancedcore.api.gui.GUIMethod;
-import com.bencodez.advancedcore.api.inventory.editgui.EditGUI;
-import com.bencodez.advancedcore.api.inventory.editgui.EditGUIButton;
-import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueBoolean;
-import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueString;
-import com.bencodez.votingplugin.VotingPluginMain;
-
-public class AdminVoteBungeeSettings extends GUIHandler {
-
-	private VotingPluginMain plugin;
-
-	public AdminVoteBungeeSettings(VotingPluginMain plugin, CommandSender player) {
-		super(plugin, player);
-		this.plugin = plugin;
-	}
-
-	@Override
-	public ArrayList<String> getChat(CommandSender sender) {
-		return null;
-	}
-
-	@Override
-	public void onBook(Player player) {
-	}
-
-	@Override
-	public void onChat(CommandSender sender) {
-
-	}
-
-	@Override
-	public void onChest(Player player) {
-		EditGUI inv = new EditGUI("Edit BungeeSettings");
-		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.BungeeSettings");
-
-		inv.addButton(new EditGUIButton(
-				new EditGUIValueBoolean("UseBungeecord", plugin.getBungeeSettings().isUseBungeecoord()) {
-
-					@Override
-					public void setValue(Player player, boolean value) {
-						setPathData(getKey(), value);
-					}
-				}));
-
-		inv.addButton(
-				new EditGUIButton(new EditGUIValueString("BungeeMethod", plugin.getBungeeSettings().getBungeeMethod()) {
-
-					@Override
-					public void setValue(Player player, String value) {
-						setPathData(getKey(), value);
-					}
-				}).addOptions("PLUGINMESSAGING", "SOCKETS", "MYSQL"));
-
-		inv.addButton(
-				new EditGUIButton(new EditGUIValueBoolean("BungeeDebug", plugin.getBungeeSettings().isBungeeDebug()) {
-
-					@Override
-					public void setValue(Player player, boolean value) {
-						setPathData(getKey(), value);
-					}
-				}));
-
-		inv.addButton(new EditGUIButton(
-				new EditGUIValueBoolean("BungeeBroadcast", plugin.getBungeeSettings().isBungeeBroadcast()) {
-
-					@Override
-					public void setValue(Player player, boolean value) {
-						setPathData(getKey(), value);
-					}
-				}.addLore("Triggers a broadcast for the entire network, most cases it is best for this to be false")));
-
-		inv.addButton(new EditGUIButton(
-				new EditGUIValueBoolean("BungeeBroadcastAlways", plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
-
-					@Override
-					public void setValue(Player player, boolean value) {
-						setPathData(getKey(), value);
-					}
-				}.addLore("Whether or not to broadcast on cached votes").addLore("PLUGINMESSAGING ONLY")));
-
-		inv.addButton(new EditGUIButton(
-				new EditGUIValueBoolean("PerServerRewards", plugin.getBungeeSettings().isPerServerRewards()) {
-
-					@Override
-					public void setValue(Player player, boolean value) {
-						setPathData(getKey(), value);
-					}
-				}));
-
-		inv.addButton(new EditGUIButton(
-				new EditGUIValueBoolean("PerServerMilestones", plugin.getBungeeSettings().isPerServerMilestones()) {
-
-					@Override
-					public void setValue(Player player, boolean value) {
-						setPathData(getKey(), value);
-					}
-				}));
-
-		inv.addButton(new EditGUIButton(
-				new EditGUIValueBoolean("PerServerPoints", plugin.getBungeeSettings().isPerServerPoints()) {
-
-					@Override
-					public void setValue(Player player, boolean value) {
-						setPathData(getKey(), value);
-					}
-				}));
-
-		inv.addButton(new EditGUIButton(
-				new EditGUIValueBoolean("TriggerVotifierEvent", plugin.getBungeeSettings().isTriggerVotifierEvent()) {
-
-					@Override
-					public void setValue(Player player, boolean value) {
-						setPathData(getKey(), value);
-					}
-				}));
-
-		inv.addButton(new EditGUIButton(new EditGUIValueString("Server", plugin.getBungeeSettings().getServer()) {
-
-			@Override
-			public void setValue(Player player, String value) {
-				setPathData(getKey(), value);
-			}
-		}.addLore("Server name as stated in proxy")));
-
-		inv.openInventory(player);
-	}
-
-	@Override
-	public void open() {
-		open(GUIMethod.CHEST);
-	}
-
-	private void setPathData(String path, Object value) {
-		plugin.getBungeeSettings().getData().set(path, value);
-		plugin.getBungeeSettings().saveData();
-		plugin.reload();
-	}
-
-}

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

@@ -64,7 +64,7 @@ public class AdminVoteHelp extends GUIHandler {
 		ArrayList<TextComponent> msg = new ArrayList<TextComponent>();
 		HashMap<String, TextComponent> unsorted = new HashMap<String, TextComponent>();
 
-		boolean requirePerms = plugin.getConfigFile().getFormatCommandsVoteHelpRequirePermission();
+		boolean requirePerms = plugin.getConfigFile().isFormatCommandsVoteHelpRequirePermission();
 
 		for (CommandHandler cmdHandle : plugin.getAdminVoteCommand()) {
 			if (!requirePerms || cmdHandle.hasPerm(sender)) {

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

@@ -38,14 +38,14 @@ public class AdminVotePlaceholders extends GUIHandler {
 
 		for (PlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getPlaceholders()) {
 			String msg = "";
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "#";
 			}
 			if (placeholder.hasDescription()) {
-				msg = "VotingPlugin_" + identifier + " - " + placeholder.getDescription();
+				msg = "votingplugin_" + identifier + " - " + placeholder.getDescription();
 			} else {
-				msg = "VotingPlugin_" + identifier + "";
+				msg = "votingplugin_" + identifier + "";
 			}
 
 			Layout layout = new Layout(new ArrayList<String>(Arrays.asList("[Json]")));
@@ -56,14 +56,14 @@ public class AdminVotePlaceholders extends GUIHandler {
 
 		for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getNonPlayerPlaceholders()) {
 			String msg = "";
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "#";
 			}
 			if (placeholder.hasDescription()) {
-				msg = "VotingPlugin_" + identifier + " - " + placeholder.getDescription();
+				msg = "votingplugin_" + identifier + " - " + placeholder.getDescription();
 			} else {
-				msg = "VotingPlugin_" + identifier + "";
+				msg = "votingplugin_" + identifier + "";
 			}
 
 			Layout layout = new Layout(new ArrayList<String>(Arrays.asList("[Json]")));
@@ -82,26 +82,26 @@ public class AdminVotePlaceholders extends GUIHandler {
 		ArrayList<String> msg = new ArrayList<String>();
 		msg.add("&cPlaceholders:");
 		for (PlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getPlaceholders()) {
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "#";
 			}
 			if (placeholder.hasDescription()) {
-				msg.add("VotingPlugin_" + identifier + " - " + placeholder.getDescription());
+				msg.add("votingplugin_" + identifier + " - " + placeholder.getDescription());
 			} else {
-				msg.add("VotingPlugin_" + identifier + "");
+				msg.add("votingplugin_" + identifier + "");
 			}
 		}
 
 		for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getNonPlayerPlaceholders()) {
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "#";
 			}
 			if (placeholder.hasDescription()) {
-				msg.add("VotingPlugin_" + identifier + " - " + placeholder.getDescription());
+				msg.add("votingplugin_" + identifier + " - " + placeholder.getDescription());
 			} else {
-				msg.add("VotingPlugin_" + identifier + "");
+				msg.add("votingplugin_" + identifier + "");
 			}
 		}
 

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

@@ -14,7 +14,6 @@ import com.bencodez.advancedcore.api.gui.GUIMethod;
 import com.bencodez.advancedcore.api.placeholder.NonPlayerPlaceHolder;
 import com.bencodez.advancedcore.api.placeholder.PlaceHolder;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 import xyz.upperlevel.spigot.book.BookUtil;
@@ -40,7 +39,7 @@ public class AdminVotePlaceholdersPlayer extends GUIHandler {
 		BookWrapper book = new BookWrapper("Placeholders");
 
 		for (PlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getPlaceholders()) {
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "1";
 			}
@@ -54,7 +53,7 @@ public class AdminVotePlaceholdersPlayer extends GUIHandler {
 
 		for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getNonPlayerPlaceholders()) {
 
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "1";
 			}
@@ -75,23 +74,23 @@ public class AdminVotePlaceholdersPlayer extends GUIHandler {
 		msg.add("&cPlaceholders:");
 		VotingPluginUser placeholderUser = user;
 		if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders() && user.hasPrimaryAccount()) {
-			placeholderUser = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
+			placeholderUser = plugin.getVotingPluginUserManager().getVotingPluginUser(user.getPrimaryAccount());
 		}
 		for (PlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getPlaceholders()) {
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "1";
 			}
-			msg.add("VotingPlugin_" + identifier + " = " + placeholder.placeholderRequest(placeholderUser, identifier));
+			msg.add("votingplugin_" + identifier + " = " + placeholder.placeholderRequest(placeholderUser, identifier));
 		}
 
 		for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getNonPlayerPlaceholders()) {
-			String identifier = placeholder.getIdentifier();
+			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {
 				identifier += "1";
 			}
 
-			msg.add("VotingPlugin_" + identifier + " = " + placeholder.placeholderRequest(identifier));
+			msg.add("votingplugin_" + identifier + " = " + placeholder.placeholderRequest(identifier));
 		}
 		sendMessage(msg);
 	}

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

@@ -17,7 +17,6 @@ import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueLi
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueNumber;
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueString;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
 import com.bencodez.advancedcore.api.valuerequest.listeners.NumberListener;
 import com.bencodez.advancedcore.command.gui.RewardEditGUI;
@@ -53,7 +52,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 
 		// to add
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
-				new EditGUIValueBoolean("Enabled", plugin.getSpecialRewardsConfig().getVotePartyEnabled()) {
+				new EditGUIValueBoolean("Enabled", plugin.getSpecialRewardsConfig().isVotePartyEnabled()) {
 
 					@Override
 					public void setValue(Player player, boolean name) {
@@ -71,7 +70,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 				}));
 
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.LADDER, 1), new EditGUIValueNumber(
-				"IncreaseVotesRquired", plugin.getSpecialRewardsConfig().getVotePartyIncreaseVotesRquired()) {
+				"IncreaseVotesRquired", plugin.getSpecialRewardsConfig().getVotePartyIncreaseVotesRequired()) {
 
 			@Override
 			public void setValue(Player player, Number num) {
@@ -107,7 +106,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 		}));
 
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean("GiveAllPlayers",
-				plugin.getSpecialRewardsConfig().getVotePartyGiveAllPlayers()) {
+				plugin.getSpecialRewardsConfig().isVotePartyGiveAllPlayers()) {
 
 			@Override
 			public void setValue(Player player, boolean name) {
@@ -125,7 +124,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 		}));
 
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
-				new EditGUIValueBoolean("ResetEachDay", plugin.getSpecialRewardsConfig().getVotePartyResetEachDay()) {
+				new EditGUIValueBoolean("ResetEachDay", plugin.getSpecialRewardsConfig().isVotePartyResetEachDay()) {
 
 					@Override
 					public void setValue(Player player, boolean name) {
@@ -134,7 +133,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 				}));
 
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
-				new EditGUIValueBoolean("ResetWeekly", plugin.getSpecialRewardsConfig().getVotePartyResetWeekly()) {
+				new EditGUIValueBoolean("ResetWeekly", plugin.getSpecialRewardsConfig().isVotePartyResetWeekly()) {
 
 					@Override
 					public void setValue(Player player, boolean name) {
@@ -143,7 +142,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 				}));
 
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
-				new EditGUIValueBoolean("ResetMonthly", plugin.getSpecialRewardsConfig().getVotePartyResetMontly()) {
+				new EditGUIValueBoolean("ResetMonthly", plugin.getSpecialRewardsConfig().isVotePartyResetMonthly()) {
 
 					@Override
 					public void setValue(Player player, boolean name) {
@@ -152,7 +151,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 				}));
 
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean("OnlyOncePerDay",
-				plugin.getSpecialRewardsConfig().getVotePartyOnlyOncePerDay()) {
+				plugin.getSpecialRewardsConfig().isVotePartyOnlyOncePerDay()) {
 
 			@Override
 			public void setValue(Player player, boolean name) {
@@ -170,7 +169,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 		}));
 
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean("CountFakeVotes",
-				plugin.getSpecialRewardsConfig().getVotePartyCountFakeVotes()) {
+				plugin.getSpecialRewardsConfig().isVotePartyCountFakeVotes()) {
 
 			@Override
 			public void setValue(Player player, boolean name) {
@@ -179,7 +178,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 		}));
 
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean("CountOfflineVotes",
-				plugin.getSpecialRewardsConfig().getVotePartyCountOfflineVotes()) {
+				plugin.getSpecialRewardsConfig().isVotePartyCountOfflineVotes()) {
 
 			@Override
 			public void setValue(Player player, boolean name) {
@@ -197,7 +196,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 				}));
 
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
-				new EditGUIValueList("Commands", plugin.getSpecialRewardsConfig().getVotePartyCommands()) {
+				new EditGUIValueList("Commands", plugin.getSpecialRewardsConfig().getVotePartyGlobalCommands()) {
 
 					@Override
 					public void setValue(Player player, ArrayList<String> value) {
@@ -212,7 +211,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("VoteParty.Rewards"));
+						plugin.getRewardHandler().getDirectlyDefined("VoteParty.Rewards"));
 			}
 		});
 

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

@@ -44,7 +44,7 @@ public class AdminVoteVotePlayer extends GUIHandler {
 		EditGUI inv = new EditGUI("Trigger vote for " + playerName);
 		inv.requirePermission("VotingPlugin.Commands.AdminVote.Vote|VotingPlugin.Admin");
 
-		for (VoteSite site : plugin.getVoteSites()) {
+		for (VoteSite site : plugin.getVoteSitesEnabled()) {
 			inv.addButton(new BInventoryButton(site.getItem().setName(site.getKey())) {
 
 				@Override

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

@@ -13,7 +13,6 @@ import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.valuerequest.InputMethod;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
@@ -68,7 +67,7 @@ public class AdminVoteCumulative extends GUIHandler {
 							@Override
 							public void onInput(Player player, Number value) {
 								RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-										RewardHandler.getInstance()
+										plugin.getRewardHandler()
 												.getDirectlyDefined("Cumulative." + value.intValue() + ".Rewards"));
 							}
 						}, options).allowCustomOption(false).usingMethod(InputMethod.INVENTORY)

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

@@ -13,7 +13,6 @@ import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.valuerequest.InputMethod;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
@@ -68,7 +67,7 @@ public class AdminVoteMilestones extends GUIHandler {
 							@Override
 							public void onInput(Player player, Number value) {
 								RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-										RewardHandler.getInstance()
+										plugin.getRewardHandler()
 												.getDirectlyDefined("MileStones." + value.intValue() + ".Rewards"));
 							}
 						}, options).allowCustomOption(false).usingMethod(InputMethod.INVENTORY)

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

@@ -1,6 +1,8 @@
 package com.bencodez.votingplugin.commands.gui.admin.voteshop;
 
 import java.util.ArrayList;
+import java.util.Map;
+import java.util.Map.Entry;
 
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
@@ -17,7 +19,6 @@ import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueLi
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueNumber;
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueString;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.command.gui.RewardEditGUI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
@@ -86,7 +87,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 
 		// display item
 		ConfigurationSection displayItemData = plugin.getGui().getChestShopIdentifierSection(identifier);
-		inv.addButton(new EditGUIButton(new ItemBuilder(Material.valueOf(displayItemData.getString("Material")), 1),
+		inv.addButton(new EditGUIButton(new ItemBuilder(displayItemData.getString("Material")).setAmount(1),
 				new EditGUIValueString("Material", displayItemData.getString("Material")) {
 
 					@Override
@@ -110,12 +111,37 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 						setPathData(getKey(), value);
 					}
 				}));
+		inv.addButton(new BInventoryButton(
+				new ItemBuilder(player.getInventory().getItemInMainHand().clone()).addLoreLine("&cClick to add")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				ItemBuilder item = new ItemBuilder(clickEvent.getPlayer().getInventory().getItemInMainHand().clone());
+				Map<String, Object> map = item.getConfiguration(false);
+				for (Entry<String, Object> entry : map.entrySet()) {
+					setPathData(entry.getKey(), entry.getValue());
+				}
+			}
+		});
+		inv.addButton(new BInventoryButton(new ItemBuilder(player.getInventory().getItemInMainHand().clone())
+				.addLoreLine("&cClick to add with exact data")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				ItemBuilder item = new ItemBuilder(clickEvent.getPlayer().getInventory().getItemInMainHand().clone());
+				Map<String, Object> map = item.getConfiguration(true);
+				for (Entry<String, Object> entry : map.entrySet()) {
+					setPathData("ItemStack." + entry.getKey(), entry.getValue());
+				}
+			}
+		});
+
 		inv.addButton(new BInventoryButton(new ItemBuilder(Material.DISPENSER, 1).setName("&cRewards")) {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						RewardHandler.getInstance().getDirectlyDefined("CHEST.Shop." + identifier + ".Rewards"));
+						plugin.getRewardHandler().getDirectlyDefined("CHEST.Shop." + identifier + ".Rewards"));
 			}
 		});
 

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

@@ -13,6 +13,7 @@ import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
@@ -91,6 +92,22 @@ public class VoteBest extends GUIHandler {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 
+		String guiPath = "VoteBest";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
 		inv.openInventory(player);
 	}
 

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

@@ -9,14 +9,14 @@ import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
 import com.bencodez.advancedcore.api.inventory.BInventory;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.topvoter.TopVoter;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class VoteGUI extends GUIHandler {
@@ -43,15 +43,15 @@ public class VoteGUI extends GUIHandler {
 
 		String str = plugin.getConfigFile().getVoteTopDefault();
 		if (lore.length == 0) {
-			if (slot.equalsIgnoreCase("url")) {
+			if (StringParser.getInstance().startsWithIgnoreCase(slot, "url")) {
 				lore = new String[] { "&aClick me" };
-			} else if (slot.equalsIgnoreCase("next")) {
+			} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "next")) {
 				lore = ArrayUtils.getInstance().convert(new VoteNext(plugin, player, user).getChat(player));
-			} else if (slot.equalsIgnoreCase("last")) {
+			} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "last")) {
 				lore = ArrayUtils.getInstance().convert(new VoteLast(plugin, player, user).getChat(player));
-			} else if (slot.equalsIgnoreCase("total")) {
+			} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "total")) {
 				lore = ArrayUtils.getInstance().convert(new VoteTotal(plugin, player, user).getChat(player));
-			} else if (slot.equalsIgnoreCase("top")) {
+			} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "top")) {
 
 				if (str.equalsIgnoreCase("monthly")) {
 					lore = plugin.getTopVoterHandler().topVoterMonthly(1);
@@ -121,7 +121,7 @@ public class VoteGUI extends GUIHandler {
 	@Override
 	public void onChest(Player player) {
 		if (this.user == null) {
-			user = UserManager.getInstance().getVotingPluginUser(player);
+			user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
 		}
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteGUIName());
 		if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
@@ -137,11 +137,12 @@ public class VoteGUI extends GUIHandler {
 		inv.addPlaceholder("points", "" + user.getPoints());
 		inv.addPlaceholder("player", user.getPlayerName());
 		inv.addPlaceholder("top", plugin.getConfigFile().getVoteTopDefault());
+		inv.addPlaceholder("sitesavailable", "" + user.getSitesNotVotedOn());
 
-		for (String slot : plugin.getGui().getChestVoteGUISlots()) {
+		for (final String slot : plugin.getGui().getChestVoteGUISlots()) {
 			ItemBuilder builder = getItemSlot(slot, player);
 
-			inv.addButton(new UpdatingBInventoryButton(builder, 1000, 1000) {
+			inv.addButton(new UpdatingBInventoryButton(plugin, builder, 1000, 1000) {
 
 				@Override
 				public void onClick(ClickEvent event) {
@@ -159,35 +160,21 @@ public class VoteGUI extends GUIHandler {
 							}
 						});
 					} else {
-						if (slot.equalsIgnoreCase("url")) {
-							new VoteURL(plugin, player, user, true).open();
-						} else if (slot.equalsIgnoreCase("next")) {
-							new VoteNext(plugin, player, user).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("last")) {
-							new VoteLast(plugin, player, user).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("total")) {
-							new VoteTotal(plugin, player, user).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("top")) {
-							new VoteTopVoter(plugin, player, user, TopVoter.getDefault(), 1).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("today")) {
-							new VoteToday(plugin, player, user, 1).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("help")) {
-							player.performCommand("vote help");
-						} else if (slot.equalsIgnoreCase("shop")) {
-							new VoteShop(plugin, player, user).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("lastmonth")) {
-							new VoteTopVoterLastMonth(plugin, player, user).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("best")) {
-							new VoteBest(plugin, player, user).open(GUIMethod.CHEST);
-						} else if (slot.equalsIgnoreCase("streak")) {
-							new VoteStreak(plugin, player, user).open(GUIMethod.CHEST);
-						}
+						plugin.getCommandLoader().processSlotClick(player, user, slot);
+					}
+					String prefix = "";
+					if (event.getButton().getBuilder().isConditional()) {
+						prefix = "Item.";
 					}
 
-					if (RewardHandler.getInstance().hasRewards(plugin.getGui().getData(),
-							plugin.getGui().getChestVoteGUISlotRewardsPath(slot))) {
-						RewardHandler.getInstance().giveReward(UserManager.getInstance().getVotingPluginUser(player),
-								plugin.getGui().getData(), plugin.getGui().getChestVoteGUISlotRewardsPath(slot),
+					if (plugin.getRewardHandler().hasRewards(plugin.getGui().getData(),
+							plugin.getGui().getChestVoteGUISlotRewardsPath(slot,
+									prefix + event.getButton().getLastRewardsPath(player)))) {
+						plugin.getRewardHandler().giveReward(
+								plugin.getVotingPluginUserManager().getVotingPluginUser(player),
+								plugin.getGui().getData(),
+								plugin.getGui().getChestVoteGUISlotRewardsPath(slot,
+										prefix + event.getButton().getLastRewardsPath(player)),
 								new RewardOptions().addPlaceholder("identifier", slot));
 					}
 				}
@@ -195,16 +182,33 @@ public class VoteGUI extends GUIHandler {
 				@Override
 				public ItemBuilder onUpdate(Player player) {
 					ItemBuilder item = getItemSlot(slot, player);
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
+					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
 					item.addPlaceholder("points", "" + user.getPoints());
 					item.addPlaceholder("player", user.getPlayerName());
 					item.addPlaceholder("top", plugin.getConfigFile().getVoteTopDefault());
+					item.addPlaceholder("sitesavailable", "" + user.getSitesNotVotedOn());
 					return item;
 				}
 
 			});
 		}
 
+		String guiPath = "VoteGUI";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
 		inv.openInventory(player);
 	}
 

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

@@ -11,6 +11,7 @@ import com.bencodez.advancedcore.api.command.CommandHandler;
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
 import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.nms.NMSManager;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 import net.md_5.bungee.api.ChatColor;
@@ -36,7 +37,7 @@ public class VoteHelp extends GUIHandler {
 		ArrayList<TextComponent> msg = new ArrayList<TextComponent>();
 		HashMap<String, TextComponent> unsorted = new HashMap<String, TextComponent>();
 
-		boolean requirePerms = plugin.getConfigFile().getFormatCommandsVoteHelpRequirePermission();
+		boolean requirePerms = plugin.getConfigFile().isFormatCommandsVoteHelpRequirePermission();
 
 		String colorStr = plugin.getConfigFile().getFormatCommandsVoteHelpHoverColor();
 		ChatColor hoverColor = null;
@@ -63,6 +64,28 @@ public class VoteHelp extends GUIHandler {
 		return msg;
 	}
 
+	public ArrayList<TextComponent> helpTextLegacy(CommandSender sender) {
+		ArrayList<TextComponent> msg = new ArrayList<TextComponent>();
+		HashMap<String, TextComponent> unsorted = new HashMap<String, TextComponent>();
+
+		boolean requirePerms = plugin.getConfigFile().isFormatCommandsVoteHelpRequirePermission();
+
+		for (CommandHandler cmdHandle : plugin.getVoteCommand()) {
+			if (!requirePerms || cmdHandle.hasPerm(sender)) {
+				unsorted.put(cmdHandle.getHelpLineCommand("/vote"),
+						cmdHandle.getHelpLine("/vote", plugin.getConfigFile().getFormatCommandsVoteHelpLine()));
+			}
+		}
+		ArrayList<String> unsortedList = new ArrayList<String>();
+		unsortedList.addAll(unsorted.keySet());
+		Collections.sort(unsortedList, String.CASE_INSENSITIVE_ORDER);
+		for (String cmd : unsortedList) {
+			msg.add(unsorted.get(cmd));
+		}
+
+		return msg;
+	}
+
 	@Override
 	public void onBook(Player player) {
 
@@ -86,7 +109,12 @@ public class VoteHelp extends GUIHandler {
 	public ArrayList<TextComponent> voteHelpText(CommandSender sender) {
 		int pagesize = plugin.getConfigFile().getFormatPageSize();
 		ArrayList<TextComponent> msg = new ArrayList<TextComponent>();
-		ArrayList<TextComponent> text = helpText(sender);
+		ArrayList<TextComponent> text = new ArrayList<TextComponent>();
+		if (NMSManager.getInstance().isVersion("1.12")) {
+			text = helpTextLegacy(sender);
+		} else {
+			text = helpText(sender);
+		}
 
 		int maxPage = text.size() / pagesize;
 		if ((text.size() % pagesize) != 0) {

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

@@ -9,10 +9,12 @@ import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
 import com.bencodez.advancedcore.api.inventory.BInventory;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.user.VotingPluginUser;
@@ -37,7 +39,7 @@ public class VoteLast extends GUIHandler {
 		msg.add(StringParser.getInstance().replaceIgnoreCase(plugin.getConfigFile().getFormatCommandsVoteLastTitle(),
 				"%player%", playerName));
 
-		for (VoteSite voteSite : plugin.getVoteSites()) {
+		for (VoteSite voteSite : plugin.getVoteSitesEnabled()) {
 			if (!voteSite.isHidden()) {
 				msg.add(user.voteCommandLastLine(voteSite));
 			}
@@ -60,15 +62,31 @@ public class VoteLast extends GUIHandler {
 	public void onChest(Player player) {
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteLastName());
 		inv.addPlaceholder("player", user.getPlayerName());
-		for (VoteSite site : plugin.getVoteSites()) {
+		for (VoteSite site : plugin.getVoteSitesEnabled()) {
 			if (!site.isHidden()) {
 				inv.addButton(inv.getNextSlot(),
-						new UpdatingBInventoryButton(site.getItem().setName(site.getDisplayName())
+						new UpdatingBInventoryButton(plugin, site.getItem().setName(site.getDisplayName())
 								.setLore(user.voteCommandLastGUILine(site)).setAmountNone(1), 1000, 1000) {
 
 							@Override
-							public void onClick(ClickEvent clickEvent) {
+							public void onClick(ClickEvent event) {
+								if (plugin.getGui().isChestVoteLastClickableLinks()) {
+									Player player = event.getPlayer();
+									if (player != null) {
+										VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
+										user.sendMessage(
+												StringParser.getInstance()
+														.replacePlaceHolder(
+																StringParser.getInstance().replacePlaceHolder(
+																		StringParser.getInstance()
+																				.replacePlaceHolder(plugin.getGui()
+																						.getChestVoteURLURLText(),
+																						"voteurl", site.getVoteURL()),
+																		"sitename", site.getDisplayName()),
+																"player", player.getName()));
 
+									}
+								}
 							}
 
 							@Override
@@ -80,7 +98,23 @@ public class VoteLast extends GUIHandler {
 			}
 		}
 
-		if (plugin.getGui().getChestVoteLastBackButton()) {
+		String guiPath = "VoteLast";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
+		if (plugin.getGui().isChestVoteLastBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 

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

@@ -11,10 +11,12 @@ import com.bencodez.advancedcore.api.bookgui.Layout;
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
 import com.bencodez.advancedcore.api.inventory.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.user.VotingPluginUser;
@@ -41,7 +43,7 @@ public class VoteNext extends GUIHandler {
 		msg.add(StringParser.getInstance().colorize(StringParser.getInstance()
 				.replaceIgnoreCase(plugin.getConfigFile().getFormatCommandsVoteNextTitle(), "%player%", playerName)));
 
-		for (VoteSite voteSite : plugin.getVoteSites()) {
+		for (VoteSite voteSite : plugin.getVoteSitesEnabled()) {
 			if (!voteSite.isHidden()) {
 				String msgLine = plugin.getConfigFile().getFormatCommandsVoteNextLayout();
 
@@ -61,7 +63,7 @@ public class VoteNext extends GUIHandler {
 		BookWrapper book = new BookWrapper(plugin.getGui().getBookVoteURLBookGUITitle());
 
 		// add colors/config options
-		for (VoteSite site : plugin.getVoteSites()) {
+		for (VoteSite site : plugin.getVoteSitesEnabled()) {
 			if (!site.isHidden()) {
 				Layout nextLayout = new Layout(new ArrayList<String>(Arrays.asList("[Json]")));
 				nextLayout.replaceTextComponent("[Json]",
@@ -85,11 +87,17 @@ public class VoteNext extends GUIHandler {
 	public void onChest(Player player) {
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteNextName());
 		inv.addPlaceholder("player", user.getPlayerName());
-		for (VoteSite site : plugin.getVoteSites()) {
+		for (VoteSite site : plugin.getVoteSitesEnabled()) {
 			if (!site.isHidden()) {
+				String siteNameDisplay = plugin.getGui().getChestVoteNextCustomSiteNamesDisplays(site.getKey());
+				if (siteNameDisplay.isEmpty()) {
+					siteNameDisplay = site.getDisplayName();
+				}
 				inv.addButton(inv.getNextSlot(),
-						new UpdatingBInventoryButton(site.getItem().setName(site.getDisplayName())
-								.setLore(user.voteCommandNextInfo(site)).setAmountNone(1), 1000, 1000) {
+						new UpdatingBInventoryButton(plugin, site.getItem().setName(siteNameDisplay)
+								.setLore(StringParser.getInstance().replacePlaceHolder(
+										plugin.getGui().getChestVoteNextLine(), "time", user.voteCommandNextInfo(site)))
+								.setAmountNone(1), 1000, 1000) {
 
 							@Override
 							public void onClick(ClickEvent clickEvent) {
@@ -106,7 +114,23 @@ public class VoteNext extends GUIHandler {
 			}
 		}
 
-		if (plugin.getGui().getChestVoteNextBackButton()) {
+		String guiPath = "VoteNext";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
+		if (plugin.getGui().isChestVoteNextBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 		inv.openInventory(player);

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

@@ -13,10 +13,9 @@ import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class VoteShop extends GUIHandler {
@@ -46,7 +45,7 @@ public class VoteShop extends GUIHandler {
 
 	@Override
 	public void onChest(Player player) {
-		if (!plugin.getGui().getChestVoteShopEnabled()) {
+		if (!plugin.getGui().isChestVoteShopEnabled()) {
 			player.sendMessage(StringParser.getInstance().colorize(plugin.getGui().getChestVoteShopDisabled()));
 			return;
 		}
@@ -54,8 +53,13 @@ public class VoteShop extends GUIHandler {
 		if (this.user == null) {
 			user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
 		}
+		VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
+		/*
+		 * if (!plugin.getConfigFile().isExtraVoteShopCheck()) { user.cacheAsync(); }
+		 */
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteShopName());
 		inv.addPlaceholder("points", "" + user.getPoints());
+		inv.addPlaceholder("sitesavailable", "" + user.getSitesNotVotedOn());
 		inv.dontClose();
 
 		for (final String identifier : plugin.getGui().getChestShopIdentifiers()) {
@@ -65,7 +69,11 @@ public class VoteShop extends GUIHandler {
 			if (perm.isEmpty()) {
 				hasPerm = true;
 			} else {
-				hasPerm = player.hasPermission(perm);
+				if (perm.startsWith("!")) {
+					hasPerm = !player.hasPermission(perm.substring(1));
+				} else {
+					hasPerm = player.hasPermission(perm);
+				}
 			}
 
 			int limit = plugin.getGui().getChestShopIdentifierLimit(identifier);
@@ -78,7 +86,8 @@ public class VoteShop extends GUIHandler {
 			}
 
 			if (!plugin.getGui().getChestVoteShopNotBuyable(identifier)) {
-				if (hasPerm && (limitPass || !plugin.getGui().isChestVoteShopHideLimitedReached())) {
+				if ((hasPerm || !plugin.getGui().getChestVoteShopHideOnNoPermission(identifier))
+						&& (limitPass || !plugin.getGui().isChestVoteShopHideLimitedReached())) {
 					ItemBuilder builder = new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier));
 
 					inv.addButton(new BInventoryButton(builder) {
@@ -87,16 +96,18 @@ public class VoteShop extends GUIHandler {
 						public void onClick(ClickEvent event) {
 							Player player = event.getWhoClicked();
 
-							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
-							user.clearCache();
+							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
+							if (plugin.getConfigFile().isExtraVoteShopCheck()) {
+								user.cache();
+							}
 
 							String identifier = (String) getData("identifier");
 							int limit = (int) getData("Limit");
 							int points = plugin.getGui().getChestShopIdentifierCost(identifier);
 							if (identifier != null) {
-								if (plugin.getGui().getChestVoteShopCloseGUI(identifier)) {
-									event.getButton().getInv().closeInv(player, null);
-								}
+								// if (plugin.getGui().getChestVoteShopCloseGUI(identifier)) {
+								// event.closeInventory();
+								// }
 
 								// limit fail-safe, should never be needed, except in rare cases
 								boolean limitPass = true;
@@ -113,11 +124,14 @@ public class VoteShop extends GUIHandler {
 												plugin.getGui().getChestShopIdentifierIdentifierName(identifier));
 										placeholders.put("points", "" + points);
 										placeholders.put("limit", "" + limit);
-										if (user.removePoints(points)) {
+										if (user.removePoints(points, true)) {
 											plugin.getLogger().info("VoteShop: " + user.getPlayerName() + "/"
 													+ user.getUUID() + " bought " + identifier + " for " + points);
+											if (plugin.getConfigFile().isTrackShopPurchases()) {
+												plugin.getServerData().addVoteShopPurchase(identifier);
+											}
 
-											RewardHandler.getInstance().giveReward(user, plugin.getGui().getData(),
+											plugin.getRewardHandler().giveReward(user, plugin.getGui().getData(),
 													plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
 													new RewardOptions().setPlaceholders(placeholders));
 
@@ -133,12 +147,23 @@ public class VoteShop extends GUIHandler {
 													plugin.getConfigFile().getFormatShopFailedMsg(), placeholders));
 										}
 									} else {
-										new VoteShopConfirm(plugin, player, user, identifier).open(GUIMethod.CHEST);
+										plugin.getBukkitScheduler().runTask(plugin, new Runnable() {
+
+											@Override
+											public void run() {
+												new VoteShopConfirm(plugin, player, user, identifier)
+														.open(GUIMethod.CHEST);
+											}
+										});
 
 									}
 								} else {
 									user.sendMessage(plugin.getGui().getChestVoteShopLimitReached());
 								}
+								plugin.getCommandLoader().processSlotClick(player, user, identifier);
+								if (plugin.getGui().isChestVoteShopReopenGUIOnPurchase()) {
+									plugin.getCommandLoader().processSlotClick(player, user, "shop");
+								}
 							}
 						}
 
@@ -151,15 +176,28 @@ public class VoteShop extends GUIHandler {
 
 						@Override
 						public void onClick(ClickEvent event) {
-
+							user.sendMessage(plugin.getConfigFile().getFormatShopNotPurchasable());
 						}
 
-					}.dontClose().addData("identifier", identifier).addData("Limit", limit));
+					}.addData("identifier", identifier).addData("Limit", limit));
 				}
 			}
 		}
 
-		if (plugin.getGui().getChestVoteShopBackButton()) {
+		for (final String str : plugin.getGui().getChestGUIVoteShopExtraItems()) {
+			inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIVoteShopExtraItems(str))) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					plugin.getCommandLoader().processSlotClick(player, user, str);
+					new RewardBuilder(plugin.getGui().getData(),
+							"CHEST.VoteShopExtraItems." + str + "." + clickEvent.getButton().getLastRewardsPath(player))
+							.setGiveOffline(false).send(clickEvent.getPlayer());
+				}
+			});
+		}
+
+		if (plugin.getGui().isChestVoteShopBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 

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

@@ -14,7 +14,6 @@ import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.PlayerUtils;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;
@@ -54,18 +53,21 @@ public class VoteShopConfirm extends GUIHandler {
 
 			@Override
 			public void onClick(ClickEvent event) {
-				user.clearCache();
+				user.cache();
 				int points = plugin.getGui().getChestShopIdentifierCost(identifier);
 				int limit = plugin.getGui().getChestShopIdentifierLimit(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)) {
+				if (user.removePoints(points, true)) {
 					plugin.getLogger().info("VoteShop: " + user.getPlayerName() + "/" + user.getUUID() + " bought "
 							+ identifier + " for " + points);
+					if (plugin.getConfigFile().isTrackShopPurchases()) {
+						plugin.getServerData().addVoteShopPurchase(identifier);
+					}
 
-					RewardHandler.getInstance().giveReward(user, plugin.getGui().getData(),
+					plugin.getRewardHandler().giveReward(user, plugin.getGui().getData(),
 							plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
 							new RewardOptions().setPlaceholders(placeholders));
 

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

@@ -13,6 +13,7 @@ import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
@@ -119,7 +120,23 @@ public class VoteStreak extends GUIHandler {
 			}
 		});
 
-		if (plugin.getGui().getChestVoteStreakBackButton()) {
+		String guiPath = "VoteStreak";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
+		if (plugin.getGui().isChestVoteStreakBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 

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

@@ -18,11 +18,11 @@ import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.nms.NMSManager;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class VoteToday extends GUIHandler {
@@ -109,15 +109,31 @@ public class VoteToday extends GUIHandler {
 
 					@Override
 					public void onClick(ClickEvent clickEvent) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(uuid);
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid);
 						new VoteGUI(plugin, player, user)
 								.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
 					}
 				});
 			}
 		}
+		
+		String guiPath = "VoteToday";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
 
-		if (plugin.getGui().getChestVoteTodayBackButton()) {
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
+		if (plugin.getGui().isChestVoteTodayBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 		inv.openInventory(player);

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

@@ -2,11 +2,15 @@ package com.bencodez.votingplugin.commands.gui.player;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map.Entry;
+import java.util.Queue;
 import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 
@@ -17,6 +21,7 @@ import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
@@ -78,6 +83,15 @@ public class VoteTopVoter extends GUIHandler {
 					.getTopVoter(top).clone();
 			users = topVotes.entrySet();
 
+			ConfigurationSection customization = plugin.getGui().getChestVoteTopCustomization();
+			boolean customzationEnabled = false;
+			Queue<Integer> playerSlots = new ConcurrentLinkedQueue<Integer>();
+			if (customization != null) {
+				customzationEnabled = customization.getBoolean("Enabled");
+				List<Integer> customizationPlayerSlots = customization.getIntegerList("PlayerSlots");
+				playerSlots.addAll(customizationPlayerSlots);
+			}
+
 			BInventory inv = new BInventory(plugin.getGui().getChestVoteTopName());
 			inv.addPlaceholder("topvoter", topVoter);
 			if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
@@ -86,7 +100,8 @@ public class VoteTopVoter extends GUIHandler {
 
 			int pos = 1;
 			for (Entry<TopVoterPlayer, Integer> entry : users) {
-				ItemBuilder playerItem;
+
+				ItemBuilder playerItem = new ItemBuilder(Material.PAPER);
 
 				if (plugin.getGui().isChestVoteTopUseSkull()) {
 					playerItem = new ItemBuilder(entry.getKey().getPlayerHead());
@@ -96,44 +111,97 @@ public class VoteTopVoter extends GUIHandler {
 
 				playerItem.setLore(new ArrayList<String>());
 
-				inv.addButton(new BInventoryButton(playerItem.setName(plugin.getGui().getChestVoteTopItemName())
+				BInventoryButton button = new BInventoryButton(playerItem
+						.setName(plugin.getGui().getChestVoteTopItemName())
 						.addLoreLine(plugin.getGui().getChestVoteTopItemLore()).addPlaceholder("position", "" + pos)
 						.addPlaceholder("player", entry.getKey().getPlayerName())
 						.addPlaceholder("votes", "" + entry.getValue())) {
 
 					@Override
 					public void onClick(ClickEvent clickEvent) {
-						if (plugin.getGui().getChestVoteTopOpenMainGUIOnClick()) {
+						if (plugin.getGui().isChestVoteTopOpenMainGUIOnClick()) {
 							TopVoterPlayer user = (TopVoterPlayer) getData("User");
 							new VoteGUI(plugin, player, user.getUser())
 									.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
-						} else {
-							getInv().forceClose(clickEvent.getPlayer());
 						}
 					}
-				}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey()));
+				}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey());
+
+				if (customzationEnabled && !playerSlots.isEmpty()) {
+					button.setSlot(playerSlots.remove());
+				}
+
+				inv.setCloseInv(plugin.getGui().isChestVoteTopCloseGUIOnClick());
+
+				inv.addButton(button);
 				pos++;
 			}
 
-			final TopVoter cur = top;
-			inv.getPageButtons().add(new BInventoryButton(
-					new ItemBuilder(plugin.getGui().getChestVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
-
-				@Override
-				public void onClick(ClickEvent clickEvent) {
-					if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
-						new VoteTopVoter(plugin, player, user, cur.next(), 0).open(GUIMethod.CHEST);
-					} else {
-						new VoteTopVoter(plugin, player, user, cur.prev(), 0).open(GUIMethod.CHEST);
-					}
+			TopVoter newTops = top;
+			ArrayList<String> tops = plugin.getGui().getChestVoteTopSwitchItemTopVoters();
+			if (!tops.isEmpty()) {
+				for (String name : tops) {
+					newTops.getSwitchItems().add(TopVoter.getTopVoter(name));
 				}
-			});
-
-			if (plugin.getGui().getChestVoteTopBackButton()) {
-				inv.getPageButtons().add(plugin.getCommandLoader().getBackButton(user).setSlot(1));
 			}
 
-			inv.setPages(true);
+			final TopVoter cur = newTops;
+			if (!customzationEnabled) {
+				inv.getPageButtons().add(new BInventoryButton(
+						new ItemBuilder(plugin.getGui().getChestVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
+							new VoteTopVoter(plugin, player, user, cur.next(), 0).open(GUIMethod.CHEST);
+						} else {
+							new VoteTopVoter(plugin, player, user, cur.prev(), 0).open(GUIMethod.CHEST);
+						}
+					}
+				});
+			} else {
+				inv.addButton(new BInventoryButton(
+						new ItemBuilder(plugin.getGui().getChestVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
+							new VoteTopVoter(plugin, player, user, cur.next(), 0).open(GUIMethod.CHEST);
+						} else {
+							new VoteTopVoter(plugin, player, user, cur.prev(), 0).open(GUIMethod.CHEST);
+						}
+					}
+				});
+			}
+
+			if (plugin.getGui().isChestVoteTopBackButton()) {
+				if (customzationEnabled) {
+					inv.addButton(plugin.getCommandLoader().getBackButton(user)
+							.setSlot(customization.getInt("BackButtonSlot", 0)));
+				} else {
+					inv.getPageButtons().add(plugin.getCommandLoader().getBackButton(user).setSlot(1));
+				}
+			}
+
+			String guiPath = "VoteTop.Customization";
+			for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+				inv.addButton(
+						new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+							@Override
+							public void onClick(ClickEvent clickEvent) {
+								plugin.getCommandLoader().processSlotClick(player, user, str);
+								new RewardBuilder(plugin.getGui().getData(),
+										"CHEST." + guiPath + ".ExtraItems." + str + ".Rewards").setGiveOffline(false)
+										.send(clickEvent.getPlayer());
+
+							}
+						});
+			}
+
+			if (customization == null || !customzationEnabled || !customization.getBoolean("RemoveBottomBar")) {
+				inv.setPages(true);
+			}
 			inv.setMaxInvSize(plugin.getGui().getChestVoteTopSize());
 			inv.openInventory(player);
 		} catch (Exception e) {

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

@@ -82,7 +82,7 @@ public class VoteTopVoterLastMonth extends GUIHandler {
 			pos++;
 		}
 
-		if (plugin.getGui().getChestVoteTopBackButton()) {
+		if (plugin.getGui().isChestVoteTopBackButton()) {
 			inv.getPageButtons().add(plugin.getCommandLoader().getBackButton(user).setSlot(1));
 		}
 

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

@@ -8,11 +8,13 @@ import org.bukkit.entity.Player;
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
 import com.bencodez.advancedcore.api.inventory.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.user.VotingPluginUser;
@@ -65,7 +67,7 @@ public class VoteTotal extends GUIHandler {
 		inv.addPlaceholder("player", user.getPlayerName());
 
 		for (final TopVoter top : TopVoter.values()) {
-			inv.addButton(new UpdatingBInventoryButton(
+			inv.addButton(new UpdatingBInventoryButton(plugin,
 					new ItemBuilder(plugin.getGui().getChestVoteTotalItem(top))
 							.addPlaceholder("Total", "" + user.getTotal(top)).addPlaceholder("topvoter", top.getName()),
 					1000, 1000) {
@@ -84,7 +86,23 @@ public class VoteTotal extends GUIHandler {
 			});
 		}
 
-		if (plugin.getGui().getChestVoteTotalBackButton()) {
+		String guiPath = "VoteTotal";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
+		if (plugin.getGui().isChestVoteTotalBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 		inv.openInventory(player);

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

@@ -24,7 +24,6 @@ import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.topvoter.TopVoter;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 import xyz.upperlevel.spigot.book.BookUtil;
@@ -41,11 +40,11 @@ public class VoteURL extends GUIHandler {
 		this.user = user;
 		this.json = json;
 		if (user == null && player instanceof Player) {
-			this.user = UserManager.getInstance().getVotingPluginUser((Player) player);
+			this.user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) player);
 		}
 		if (player != null && user != null && player.getName().equals(user.getPlayerName())) {
 			if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders() && user.hasPrimaryAccount()) {
-				user = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
+				user = plugin.getVotingPluginUserManager().getVotingPluginUser(user.getPrimaryAccount());
 			}
 		}
 	}
@@ -58,9 +57,9 @@ public class VoteURL extends GUIHandler {
 		if (title != null) {
 			sites.addAll(title);
 		}
-		if (plugin.getConfigFile().getFormatCommandsVoteAutoInputSites()) {
+		if (plugin.getConfigFile().isFormatCommandsVoteAutoInputSites()) {
 			int counter = 0;
-			for (VoteSite voteSite : plugin.getVoteSites()) {
+			for (VoteSite voteSite : plugin.getVoteSitesEnabled()) {
 				if (!voteSite.isHidden()) {
 					counter++;
 					String voteURL = voteSite.getVoteURL(json);
@@ -118,13 +117,16 @@ public class VoteURL extends GUIHandler {
 
 		if (user.canVoteSite(voteSite)) {
 			builder = new ItemBuilder(plugin.getGui().getChestVoteURLCanVoteItemSection());
-			builder.setName(
-					plugin.getGui().getChestVoteURLGUISiteNameCanVote().replace("%Name%", voteSite.getDisplayName()));
+			builder.setName(plugin.getGui().getChestVoteURLGUISiteNameCanVote());
 		} else {
-			builder.setName(plugin.getGui().getChestVoteURLGUISiteName().replace("%Name%", voteSite.getDisplayName()));
-			builder.addLoreLine(
-					plugin.getGui().getChestVoteURLNextVote().replace("%Info%", user.voteCommandNextInfo(voteSite)));
+			builder.setName(plugin.getGui().getChestVoteURLGUISiteName());
+			builder.addLoreLine(plugin.getGui().getChestVoteURLNextVote());
 		}
+		builder.addPlaceholder("ServiceSite", voteSite.getServiceSite());
+		builder.addPlaceholder("Name", voteSite.getDisplayName());
+		builder.addPlaceholder("VoteDelay", "" + voteSite.getVoteDelay());
+		builder.addPlaceholder("VoteHour", "" + voteSite.getVoteDelayDailyHour());
+		builder.addPlaceholder("Info", user.voteCommandNextInfo(voteSite));
 
 		return builder;
 	}
@@ -133,7 +135,12 @@ public class VoteURL extends GUIHandler {
 	public void onBook(Player player) {
 		BookWrapper book = new BookWrapper(plugin.getGui().getBookVoteURLBookGUITitle());
 
-		for (VoteSite site : plugin.getVoteSites()) {
+		if (plugin.getGui().isBookVoteURLBookGUIManual()) {
+			Layout layout = new Layout(plugin.getGui().getBookVoteURLBookGUITopLayout());
+			book.addLayout(layout);
+		}
+		int i = 1;
+		for (VoteSite site : plugin.getVoteSitesEnabled()) {
 			Layout layout = new Layout(plugin.getGui().getBookVoteURLBookGUILayout()).addPlaceholder("sitename",
 					site.getDisplayName());
 			String text = plugin.getGui().getBookVoteURLBookGUIAlreadyVotedText();
@@ -142,12 +149,12 @@ public class VoteURL extends GUIHandler {
 				color = ChatColor.valueOf(plugin.getGui().getBookVoteURLBookGUICanVoteColor());
 				text = plugin.getGui().getBookVoteURLBookGUICanVoteText();
 			}
-			String url = StringParser.getInstance().replacePlaceHolder(site.getVoteURLJsonStrip(), "player",
-					user.getPlayerName());
+			String url = StringParser.getInstance().replacePlaceHolder(StringParser.getInstance()
+					.replacePlaceHolder(site.getVoteURLJsonStrip(), "player", user.getPlayerName()), "num", "" + i);
 			layout.replaceTextComponent("[UrlText]", BookUtil.TextBuilder.of(text).color(color)
 					.onClick(BookUtil.ClickAction.openUrl(url)).onHover(BookUtil.HoverAction.showText(url)).build());
 			book.addLayout(layout);
-
+			i++;
 		}
 
 		book.open(player);
@@ -162,14 +169,14 @@ public class VoteURL extends GUIHandler {
 	public void onChest(Player player) {
 		// normal GUI
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteURLName());
-		if (plugin.getGui().getChestVoteURLViewAllUrlsButtonEnabled()) {
+		if (plugin.getGui().isChestVoteURLViewAllUrlsButtonEnabled()) {
 			ItemBuilder builderAll = getItemAll();
 
-			inv.addButton(new UpdatingBInventoryButton(builderAll, 5000, 5000) {
+			inv.addButton(new UpdatingBInventoryButton(plugin, builderAll, 5000, 5000) {
 
 				@Override
 				public void onClick(ClickEvent event) {
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(event.getPlayer());
+					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(event.getPlayer());
 					json = true;
 					user.sendMessage(getChat(player));
 				}
@@ -182,7 +189,7 @@ public class VoteURL extends GUIHandler {
 		}
 
 		int startSlot = plugin.getGui().getChestVoteURLAllUrlsButtonStartSlot();
-		for (final VoteSite voteSite : plugin.getVoteSites()) {
+		for (final VoteSite voteSite : plugin.getVoteSitesEnabled()) {
 			if (!voteSite.isHidden()) {
 				ItemBuilder builder = getItemVoteSite(voteSite);
 				if (startSlot >= 0) {
@@ -190,18 +197,21 @@ public class VoteURL extends GUIHandler {
 					startSlot++;
 				}
 
-				inv.addButton(new UpdatingBInventoryButton(builder, 5000, 5000) {
+				inv.addButton(new UpdatingBInventoryButton(plugin, builder, 5000, 5000) {
 
 					@Override
 					public void onClick(ClickEvent event) {
 						Player player = event.getPlayer();
 						if (player != null) {
-							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
-							user.sendMessage(StringParser.getInstance().replacePlaceHolder(StringParser.getInstance()
-									.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
-											plugin.getGui().getChestVoteURLURLText(), "voteurl", voteSite.getVoteURL()),
-											"sitename", voteSite.getDisplayName()),
-									"player", player.getName()));
+							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
+							HashMap<String, String> placeholders = new HashMap<String, String>();
+							placeholders.put("voteurl", voteSite.getVoteURL());
+							placeholders.put("sitename", voteSite.getDisplayName());
+							placeholders.put("player", player.getName());
+							placeholders.put("servicesite", voteSite.getServiceSite());
+							placeholders.put("VoteDelay", "" + voteSite.getVoteDelay());
+							placeholders.put("VoteHour", "" + voteSite.getVoteDelayDailyHour());
+							user.sendMessage(plugin.getGui().getChestVoteURLURLText(), placeholders);
 
 						}
 
@@ -221,14 +231,15 @@ public class VoteURL extends GUIHandler {
 
 				@Override
 				public void onClick(ClickEvent clickEvent) {
-					new RewardBuilder(plugin.getGui().getData(), "CHEST.VoteURL.ExtraItems." + str + ".Rewards")
+					new RewardBuilder(plugin.getGui().getData(),
+							"CHEST.VoteURL.ExtraItems." + str + "." + clickEvent.getButton().getLastRewardsPath(player))
 							.setGiveOffline(false).send(clickEvent.getPlayer());
 
 				}
 			});
 		}
 
-		if (plugin.getGui().getChestVoteURLBackButton()) {
+		if (plugin.getGui().isChestVoteURLBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 

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

@@ -69,7 +69,7 @@ public class VoteURLVoteSite extends GUIHandler {
 					}
 				});
 
-		inv.addButton(new UpdatingBInventoryButton(
+		inv.addButton(new UpdatingBInventoryButton(plugin,
 				new ItemBuilder(Material.COMPASS).setName("&4Next Vote").addLoreLine(user.voteCommandNextInfo(site)),
 				1000, 1000) {
 
@@ -94,7 +94,7 @@ public class VoteURLVoteSite extends GUIHandler {
 			}
 		});
 
-		if (plugin.getGui().getChestVoteURLBackButton()) {
+		if (plugin.getGui().isChestVoteURLBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 		inv.openInventory(player);

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

@@ -1,11 +1,13 @@
 package com.bencodez.votingplugin.config;
 
 import java.io.File;
+import java.util.ArrayList;
 
 import com.bencodez.advancedcore.api.yml.YMLFile;
 import com.bencodez.advancedcore.api.yml.annotation.AnnotationHandler;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataBoolean;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataInt;
+import com.bencodez.advancedcore.api.yml.annotation.ConfigDataListString;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataString;
 import com.bencodez.votingplugin.VotingPluginMain;
 
@@ -29,6 +31,26 @@ public class BungeeSettings extends YMLFile {
 	@Getter
 	private String bungeeMethod = "PLUGINMESSAGING";
 
+	@ConfigDataString(path = "Redis.Host")
+	@Getter
+	private String RedisHost = "";
+
+	@ConfigDataString(path = "Redis.Username")
+	@Getter
+	private String RedisUsername = "";
+
+	@ConfigDataString(path = "Redis.Prefix")
+	@Getter
+	private String RedisPrefix = "";
+
+	@ConfigDataString(path = "Redis.Password")
+	@Getter
+	private String RedisPassword = "";
+
+	@ConfigDataInt(path = "Redis.Port")
+	@Getter
+	private int RedisPort = 6379;
+
 	@ConfigDataString(path = "BungeeServer.Host")
 	@Getter
 	private String bungeeServerHost = "";
@@ -45,6 +67,10 @@ public class BungeeSettings extends YMLFile {
 	@Getter
 	private boolean perServerMilestones = false;
 
+	@ConfigDataBoolean(path = "GiveExtraAllSitesRewards")
+	@Getter
+	private boolean giveExtraAllSitesRewards = false;
+
 	@ConfigDataBoolean(path = "PerServerRewards")
 	@Getter
 	private boolean perServerRewards = false;
@@ -81,6 +107,18 @@ public class BungeeSettings extends YMLFile {
 	@Getter
 	private boolean disableBroadcast = false;
 
+	@ConfigDataBoolean(path = "GlobalData.UseMainMySQL")
+	@Getter
+	private boolean globlalDataUseMainMySQL = true;
+
+	@ConfigDataBoolean(path = "GlobalData.Enabled")
+	@Getter
+	private boolean globlalDataEnabled = false;
+
+	@ConfigDataListString(path = "BungeeVotePartyGlobalCommands")
+	@Getter
+	private ArrayList<String> bungeeVotePartyGlobalCommands = new ArrayList<String>();
+
 	public BungeeSettings(VotingPluginMain plugin) {
 		super(plugin, new File(plugin.getDataFolder(), "BungeeSettings.yml"));
 	}

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

@@ -12,9 +12,11 @@ import com.bencodez.advancedcore.api.yml.YMLFile;
 import com.bencodez.advancedcore.api.yml.annotation.AnnotationHandler;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataBoolean;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataInt;
+import com.bencodez.advancedcore.api.yml.annotation.ConfigDataKeys;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataListString;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataString;
 import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.placeholders.PlaceholderCacheLevel;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 
 import lombok.Getter;
@@ -33,6 +35,22 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean addTotals = true;
 
+	@ConfigDataBoolean(path = "AddTotalsOffline")
+	@Getter
+	private boolean addTotalsOffline = true;
+
+	@ConfigDataBoolean(path = "PerSiteCoolDownEvents")
+	@Getter
+	private boolean perSiteCoolDownEvents = false;
+
+	@ConfigDataBoolean(path = "QueueVotesDuringTimeChange")
+	@Getter
+	private boolean queueVotesDuringTimeChange = false;
+
+	@ConfigDataBoolean(path = "AdvancedServiceSiteHandling")
+	@Getter
+	private boolean advancedServiceSiteHandling = false;
+
 	@ConfigDataBoolean(path = "AllowUnjoined")
 	@Getter
 	private boolean allowUnjoined = false;
@@ -45,10 +63,6 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean allowUnJoinedCheckServer = true;
 
-	@ConfigDataInt(path = "PlayerDataLoadLimit")
-	@Getter
-	private int playerDataLoadLimit = -1;
-
 	@ConfigDataBoolean(path = "AllowVotePointTransfers")
 	@Getter
 	private boolean allowVotePointTransfers = false;
@@ -61,14 +75,18 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean alwaysCloseInventory = false;
 
+	@ConfigDataBoolean(path = "ExtraVoteShopCheck")
+	@Getter
+	private boolean extraVoteShopCheck = true;
+
+	@ConfigDataBoolean(path = "TrackShopPurchases")
+	@Getter
+	private boolean trackShopPurchases = false;
+
 	@ConfigDataBoolean(path = "AlwaysUpdate")
 	@Getter
 	private boolean alwaysUpdate = false;
 
-	@ConfigDataBoolean(path = "AlwaysWaitForCachePlaceholders")
-	@Getter
-	private boolean alwaysWaitForCachePlaceholders = false;
-
 	@ConfigDataBoolean(path = "AutoCreateVoteSites")
 	@Getter
 	private boolean autoCreateVoteSites = true;
@@ -85,10 +103,6 @@ public class Config extends YMLFile {
 	@Getter
 	private int delayBetweenUpdates = 3;
 
-	@ConfigDataInt(path = "DelayLoginEvent")
-	@Getter
-	private int delayLoginEvent = 0;
-
 	@ConfigDataBoolean(path = "DisableAdvancedTab")
 	@Getter
 	private boolean disableAdvancedTab = false;
@@ -145,6 +159,14 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean formatAlternateBroadcastEnabled = false;
 
+	@ConfigDataBoolean(path = "Format.OnlyOneOfflineBroadcast")
+	@Getter
+	private boolean formatOnlyOneOfflineBroadcast = false;
+
+	@ConfigDataString(path = "Format.OfflineBroadcast")
+	@Getter
+	private String formatOfflineBroadcast = "&6[&4Broadcast&6] &2Thanks &c%player% &2for voting on %numberofvotes% times!";
+
 	@ConfigDataBoolean(path = "Format.Commands.Vote.ForceLinks")
 	@Getter
 	private boolean formatCommandsVoteForceLinks = true;
@@ -153,6 +175,26 @@ public class Config extends YMLFile {
 	@Getter
 	private String formatCommandsVoteLastLastVoted = "%times% ago";
 
+	@ConfigDataString(path = "Format.Commands.Vote.GivePoints.NotEnoughPoints")
+	@Getter
+	private String formatCommandsVoteGivePointsNotEnoughPoints = "&cNot enough points";
+
+	@ConfigDataString(path = "Format.Commands.Vote.GivePoints.NotJoinedServer")
+	@Getter
+	private String formatCommandsVoteGivePointsNotJoinedServer = "&c%player% has not joined the server";
+
+	@ConfigDataString(path = "Format.Commands.Vote.GivePoints.NumberLowerThanZero")
+	@Getter
+	private String formatCommandsVoteGivePointsNumberLowerThanZero = "&cNumber of points needs to be greater than 0";
+
+	@ConfigDataString(path = "Format.Commands.Vote.GivePoints.TransferFrom")
+	@Getter
+	private String formatCommandsVoteGivePointsTransferFrom = "&c%transfer% points given to %touser%";
+
+	@ConfigDataString(path = "Format.Commands.Vote.GivePoints.TransferTo")
+	@Getter
+	private String formatCommandsVoteGivePointsTransferTo = "&cYou received %transfer points from %fromuser%";
+
 	@ConfigDataString(path = "Format.Commands.Vote.Last.Line", defaultValue = "&3%SiteName%: &6%timeSince% ago")
 	@Getter
 	private String formatCommandsVoteLastLine;
@@ -161,6 +203,10 @@ public class Config extends YMLFile {
 	@Getter
 	private String formatCommandsVoteLastNeverVoted;
 
+	@ConfigDataBoolean(path = "Format.Commands.Vote.Last.IncludeSeconds")
+	@Getter
+	private boolean formatCommandsVoteLastIncludeSeconds = true;
+
 	@ConfigDataString(path = "Format.Commands.Vote.Last.TimeFormat", defaultValue = "%amount% %TimeType%")
 	@Getter
 	private String formatCommandsVoteLastTimeFormat;
@@ -249,6 +295,14 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean preventRepeatMilestones = false;
 
+	@ConfigDataBoolean(path = "OfflineVotesLimit.Enabled")
+	@Getter
+	private boolean offlineVotesLimitEnabled = false;
+
+	@ConfigDataInt(path = "OfflineVotesLimit.Amount")
+	@Getter
+	private int offlineVotesLimitAmount = 5;
+
 	@ConfigDataBoolean(path = "UpdateWithPlayersOnlineOnly")
 	@Getter
 	private boolean updateWithPlayersOnlineOnly = false;
@@ -291,149 +345,101 @@ public class Config extends YMLFile {
 		return (ArrayList<String>) getData().getList("BlackList", new ArrayList<String>());
 	}
 
-	public Set<String> getCustomCommands() {
-		Set<String> str = getData().getConfigurationSection("CustomCommands").getKeys(false);
+	@ConfigDataKeys(path = "CustomCommands")
+	@Getter
+	private Set<String> customCommands = new HashSet<String>();
+
+	@ConfigDataKeys(path = "CustomPlaceholderReturns")
+	@Getter
+	private Set<String> customPlaceholderReturns = new HashSet<String>();
+
+	public Set<String> getCustomPlaceholderReturns(String placeholder) {
+		Set<String> str = getData().getConfigurationSection("CustomPlaceholderReturns." + placeholder).getKeys(false);
 		if (str == null) {
 			str = new HashSet<String>();
 		}
 		return str;
 	}
 
+	public String getCustomPlaceholderReturns(String placeholder, String returnString) {
+		return getData().getString("CustomPlaceholderReturns." + placeholder + "." + returnString, "");
+	}
+
 	public ConfigurationSection getCustomCommands(String ident) {
 		return getData().getConfigurationSection("CustomCommands." + ident);
 	}
 
-	/**
-	 * Gets the broad cast msg.
-	 *
-	 * @return the broad cast msg
-	 */
-	public String getFormatBroadCastMsg() {
-		return getData().getString("Format.BroadcastMsg",
-				"&6[&4Broadcast&6] &2Thanks &c%player% &2for voting on %SiteName%");
+	@ConfigDataString(path = "Format.BroadcastMsg")
+	@Getter
+	private String formatBroadCastMsg = "&6[&4Broadcast&6] &2Thanks &c%player% &2for voting on %SiteName%";
 
+	@ConfigDataBoolean(path = "Format.BroadcastWhenOnline")
+	@Getter
+	private boolean formatBroadcastWhenOnline = false;
+
+	@ConfigDataBoolean(path = "Format.Commands.Vote.AutoInputSites")
+	@Getter
+	private boolean formatCommandsVoteAutoInputSites = true;
+
+	@ConfigDataListString(path = "Format.Commands.Vote.Best.Lines")
+	@Getter
+	private ArrayList<String> formatCommandsVoteBestLines = new ArrayList<String>();
+
+	@ConfigDataString(path = "Format.Commands.Vote.Best.Title")
+	@Getter
+	private String formatCommandsVoteBestTitle = "&3&l%player% Best Votes";
+
+	@ConfigDataString(path = "Format.Commands.Vote.Help.HoverColor")
+	@Getter
+	private String formatCommandsVoteHelpHoverColor = "AQUA";
+
+	@ConfigDataString(path = "Format.Commands.Vote.Help.Line")
+	@Getter
+	private String formatCommandsVoteHelpLine = "&6%Command% - &6%HelpMessage%";
+
+	@ConfigDataBoolean(path = "Format.Commands.Vote.Help.RequirePermission")
+	@Getter
+	private boolean formatCommandsVoteHelpRequirePermission = false;
+
+	@ConfigDataString(path = "Format.Commands.Vote.Help.Title")
+	@Getter
+	private String formatCommandsVoteHelpTitle = "&6Voting Player Help";
+
+	@ConfigDataString(path = "Format.Commands.Vote.Last.Title")
+	@Getter
+	private String formatCommandsVoteLastTitle = "&3&l%player% Last Vote Times:";
+
+	@ConfigDataString(path = "Format.Commands.Vote.Next.Info.CanVote")
+	@Getter
+	private String formatCommandsVoteNextInfoCanVote = "Go Vote!";
+
+	@ConfigDataString(path = "Format.Commands.Vote.Next.Info.Error")
+	@Getter
+	private String formatCommandsVoteNextInfoError = "";
+
+	@ConfigDataString(path = "Format.Commands.Vote.Next.Info.TimeUntilVote")
+	@Getter
+	private String formatCommandsVoteNextInfoTime = "&cCould not caculate time until next vote!";
+
+	@ConfigDataString(path = "Format.Commands.Vote.Next.Info.VoteDelayDaily")
+	@Getter
+	private String formatCommandsVoteNextInfoVoteDelayDaily = "%hours% Hours and %minutes% Minutes";
+
+	@ConfigDataString(path = "PlaceholderCacheLevel", options = { "AUTO", "SPECIFIC", "NONE" })
+	@Getter
+	private String placeholderCacheLevelString = "AUTO";
+
+	public PlaceholderCacheLevel getPlaceholderCacheLevel() {
+		return PlaceholderCacheLevel.getCache(getPlaceholderCacheLevelString());
 	}
 
-	/**
-	 * Gets the broadcast when online.
-	 *
-	 * @return the broadcast when online
-	 */
-	public boolean getFormatBroadcastWhenOnline() {
-		return getData().getBoolean("Format.BroadcastWhenOnline");
-	}
+	@ConfigDataString(path = "Format.Commands.Vote.Next.Layout")
+	@Getter
+	private String formatCommandsVoteNextLayout = "&3%SiteName%: &6%info%";
 
-	/**
-	 * Gets the commands vote auto input sites.
-	 *
-	 * @return the commands vote auto input sites
-	 */
-	public boolean getFormatCommandsVoteAutoInputSites() {
-		return getData().getBoolean("Format.Commands.Vote.AutoInputSites");
-	}
-
-	@SuppressWarnings("unchecked")
-	public ArrayList<String> getFormatCommandsVoteBestLines() {
-		return (ArrayList<String>) getData().getList("Format.Commands.Vote.Best.Lines", new ArrayList<String>());
-	}
-
-	public String getFormatCommandsVoteBestTitle() {
-		return getData().getString("Format.Commands.Vote.Best.Title", "&3&l%player% Best Votes");
-	}
-
-	public String getFormatCommandsVoteHelpHoverColor() {
-		return getData().getString("Format.Commands.Vote.Help.HoverColor", "AQUA");
-	}
-
-	/**
-	 * Gets the commands vote help line.
-	 *
-	 * @return the commands vote help line
-	 */
-	public String getFormatCommandsVoteHelpLine() {
-		return getData().getString("Format.Commands.Vote.Help.Line", "&6%Command% - &6%HelpMessage%");
-	}
-
-	/**
-	 * Gets the commands vote help require permission.
-	 *
-	 * @return the commands vote help require permission
-	 */
-	public boolean getFormatCommandsVoteHelpRequirePermission() {
-		return getData().getBoolean("Format.Commands.Vote.Help.RequirePermission");
-	}
-
-	/**
-	 * Gets the commands vote help title.
-	 *
-	 * @return the commands vote help title
-	 */
-	public String getFormatCommandsVoteHelpTitle() {
-		return getData().getString("Format.Commands.Vote.Help.Title", "&6Voting Player Help");
-
-	}
-
-	/**
-	 * Gets the commands vote last title.
-	 *
-	 * @return the commands vote last title
-	 */
-	public String getFormatCommandsVoteLastTitle() {
-		return getData().getString("Format.Commands.Vote.Last.Title", "&3&l%player% Last Vote Times:");
-
-	}
-
-	/**
-	 * Gets the commands vote next info can vote.
-	 *
-	 * @return the commands vote next info can vote
-	 */
-	public String getFormatCommandsVoteNextInfoCanVote() {
-		return getData().getString("Format.Commands.Vote.Next.Info.CanVote", "Go Vote!");
-	}
-
-	/**
-	 * Gets the commands vote next info error.
-	 *
-	 * @return the commands vote next info error
-	 */
-	public String getFormatCommandsVoteNextInfoError() {
-		return getData().getString("Format.Commands.Vote.Next.Info.Error", "");
-	}
-
-	/**
-	 * Gets the commands vote next info time.
-	 *
-	 * @return the commands vote next info time
-	 */
-	public String getFormatCommandsVoteNextInfoTime() {
-		return getData().getString("Format.Commands.Vote.Next.Info.TimeUntilVote",
-				"&cCould not caculate time until next vote!");
-	}
-
-	public String getFormatCommandsVoteNextInfoVoteDelayDaily() {
-		return getData().getString("Format.Commands.Vote.Next.Info.VoteDelayDaily",
-				"%hours% Hours and %minutes% Minutes");
-	}
-
-	/**
-	 * Gets the commands vote next layout.
-	 *
-	 * @return the commands vote next layout
-	 */
-	public String getFormatCommandsVoteNextLayout() {
-		return getData().getString("Format.Commands.Vote.Next.Layout", "&3%SiteName%: &6%info%");
-	}
-
-	/**
-	 * Gets the commands vote next title.
-	 *
-	 * @return the commands vote next title
-	 */
-	public String getFormatCommandsVoteNextTitle() {
-		return getData().getString("Format.Commands.Vote.Next.Title", "&3&l%player% Next Votes:");
-
-	}
+	@ConfigDataString(path = "Format.Commands.Vote.Next.Title")
+	@Getter
+	private String formatCommandsVoteNextTitle = "&3&l%player% Next Votes:";
 
 	/**
 	 * Gets the commands vote party.
@@ -453,9 +459,9 @@ public class Config extends YMLFile {
 		return (ArrayList<String>) getData().getList("Format.Commands.Vote.Streak.Lines", new ArrayList<String>());
 	}
 
-	public String getFormatCommandsVoteStreakTitle() {
-		return getData().getString("Format.Commands.Vote.Streak.Title", "&3&l%player% Vote Streak");
-	}
+	@ConfigDataString(path = "Format.Commands.Vote.Streak.Title")
+	@Getter
+	private String formatCommandsVoteStreakTitle = "&3&l%player% Vote Streak";
 
 	/**
 	 * Gets the commands vote text.
@@ -498,167 +504,103 @@ public class Config extends YMLFile {
 		return list;
 	}
 
-	/**
-	 * Gets the commands vote URLS.
-	 *
-	 * @return the commands vote URLS
-	 */
-	public String getFormatCommandsVoteURLS() {
-		return getData().getString("Format.Commands.Vote.Sites", "&4%num%: &c&l%SiteName% - &c%url%");
-	}
+	@ConfigDataString(path = "Format.Commands.Vote.Sites")
+	@Getter
+	private String formatCommandsVoteURLS = "&4%num%: &c&l%SiteName% - &c%url%";
 
-	/**
-	 * Gets the command vote points.
-	 *
-	 * @return the command vote points
-	 */
-	public String getFormatCommandVotePoints() {
-		return getData().getString("Format.Commands.Vote.Points", "&a%Player% currently has &a&l%Points%&a Points!");
+	@ConfigDataString(path = "Format.Commands.Vote.Points")
+	@Getter
+	private String formatCommandsVotePoints = "&a%Player% currently has &a&l%Points%&a Points!";
 
-	}
+	@ConfigDataString(path = "Format.Commands.Vote.Top.Line")
+	@Getter
+	private String formatCommandsVoteTopLine = "&c%num%: &6%player%, %votes%";
 
-	/**
-	 * Gets the command vote top line.
-	 *
-	 * @return the command vote top line
-	 */
-	public String getFormatCommandVoteTopLine() {
-		return getData().getString("Format.Commands.Vote.Top.Line", "&c%num%: &6%player%, %votes%");
-	}
+	@ConfigDataString(path = "Format.Commands.Vote.Top.Title")
+	@Getter
+	private String formatCommandVoteTopTitle = "&3Top %Top% Voters %page%/%maxpages%";
 
-	/**
-	 * Gets the command vote top title.
-	 *
-	 * @return the command vote top title
-	 */
-	public String getFormatCommandVoteTopTitle() {
-		return getData().getString("Format.Commands.Vote.Top.Title", "&3Top %Top% Voters %page%/%maxpages%");
+	@ConfigDataString(path = "Format.NextPage")
+	@Getter
+	private String formatNextPage = "&aNext Page";
 
-	}
+	@ConfigDataString(path = "Format.NoPerms")
+	@Getter
+	private String formatNoPerms = "&cYou do not have enough permission!";
 
-	public String getFormatNextPage() {
-		return getData().getString("Format.NextPage", "&aNext Page");
-	}
+	@ConfigDataString(path = "Format.NotNumber")
+	@Getter
+	private String formatNotNumber = "&cError on &6%arg%&c, number expected!";
 
-	/**
-	 * Gets the format no perms.
-	 *
-	 * @return the format no perms
-	 */
-	public String getFormatNoPerms() {
-		return getData().getString("Format.NoPerms", "&cYou do not have enough permission!");
-	}
+	@ConfigDataString(path = "Format.PrevPage")
+	@Getter
+	private String formatPrevPage = "&aPrevious Page";
 
-	public String getFormatNotNumber() {
-		return getData().getString("Format.NotNumber", "&cError on &6%arg%&c, number expected!");
-	}
+	@ConfigDataString(path = "Format.ShopFailed")
+	@Getter
+	private String formatShopFailedMsg = "&cYou do not have %Points% points to purhcase this!";
 
-	public String getFormatPrevPage() {
-		return getData().getString("Format.PrevPage", "&aPrevious Page");
-	}
+	@ConfigDataString(path = "Format.ShopNotPurchasable")
+	@Getter
+	private String formatShopNotPurchasable = "&cThis item is not buyable!";
 
-	public String getFormatShopFailedMsg() {
-		String msg = getData().getString("Format.ShopFailed", "&cYou do not have %Points% points to purhcase this!");
+	@ConfigDataString(path = "Format.ShopPurchase")
+	@Getter
+	private String formatShopPurchaseMsg = "&aYou bought the %Identifier% for %Points% Points!";
 
-		return msg;
+	@ConfigDataString(path = "Format.Signs.TopVoterSign.Line1")
+	@Getter
+	private String formatSignTopVoterSignLine1 = "TopVoter: %SiteName%";
 
-	}
+	@ConfigDataString(path = "Format.Signs.TopVoterSign.Line2")
+	@Getter
+	private String formatSignTopVoterSignLine2 = "#%position%";
+	@ConfigDataString(path = "Format.Signs.TopVoterSign.Line3")
+	@Getter
+	private String formatSignTopVoterSignLine3 = "%player%";
+	@ConfigDataString(path = "Format.Signs.TopVoterSign.Line4")
+	@Getter
+	private String formatSignTopVoterSignLine4 = "%votes% Votes";
 
-	public String getFormatShopPurchaseMsg() {
-		return getData().getString("Format.ShopPurchase", "&aYou bought the %Identifier% for %Points% Points!");
+	@ConfigDataString(path = "Format.Signs.RightClickMessage")
+	@Getter
+	private String formatSignTopVoterSignRightClickMessage = "&c&l%player% &cis &c&l%position% &cwith &c&l%votes% &cin &c&l%SiteName%";
 
-	}
+	@ConfigDataString(path = "Format.TimeFormat")
+	@Getter
+	private String formatTimeFormat = "EEE, d MMM yyyy HH:mm";
 
-	/**
-	 * Gets the sign top voter sign line 1.
-	 *
-	 * @return the sign top voter sign line 1
-	 */
-	public String getFormatSignTopVoterSignLine1() {
-		return getData().getString("Format.Signs.TopVoterSign.Line1", "TopVoter: %SiteName%");
+	@ConfigDataString(path = "Format.TopVoter.AllTime")
+	@Getter
+	private String formatTopVoterAllTime = "AllTime";
 
-	}
+	@ConfigDataString(path = "Format.TopVoter.Daily")
+	@Getter
+	private String formatTopVoterDaily = "Daily";
 
-	/**
-	 * Gets the sign top voter sign line 2.
-	 *
-	 * @return the sign top voter sign line 2
-	 */
-	public String getFormatSignTopVoterSignLine2() {
-		return getData().getString("Format.Signs.TopVoterSign.Line2", "#%position%");
-	}
+	@ConfigDataString(path = "Format.TopVoter.Monthly")
+	@Getter
+	private String formatTopVoterMonthly = "Monthly";
 
-	/**
-	 * Gets the sign top voter sign line 3.
-	 *
-	 * @return the sign top voter sign line 3
-	 */
-	public String getFormatSignTopVoterSignLine3() {
-		return getData().getString("Format.Signs.TopVoterSign.Line3", "%player%");
+	@ConfigDataString(path = "Format.TopVoterAwardMsg")
+	@Getter
+	private String formatTopVoterRewardMsg = "&aYou came in %place% in top voters of the month! Here is an award!";
 
-	}
+	@ConfigDataString(path = "Format.TopVoter.Weekly")
+	@Getter
+	private String formatTopVoterWeekly = "Weekly";
 
-	/**
-	 * Gets the sign top voter sign line 4.
-	 *
-	 * @return the sign top voter sign line 4
-	 */
-	public String getFormatSignTopVoterSignLine4() {
-		return getData().getString("Format.Signs.TopVoterSign.Line4", "%votes% Votes");
+	@ConfigDataString(path = "Format.UserNotExist")
+	@Getter
+	private String formatUserNotExist = "&cUser does not exist: %player%";
 
-	}
+	@ConfigDataString(path = "Format.InvalidCommand.Vote")
+	@Getter
+	private String formatInvalidCommandVote = "&4No valid arguments, see /vote help!";
 
-	/**
-	 * Gets the sign top voter sign right click message.
-	 *
-	 * @return the sign top voter sign right click message
-	 */
-	public String getFormatSignTopVoterSignRightClickMessage() {
-		return getData().getString("Format.Signs.RightClickMessage",
-				"&c&l%player% &cis &c&l%position% &cwith &c&l%votes% &cin &c&l%SiteName%");
-
-	}
-
-	/**
-	 * Gets the time format.
-	 *
-	 * @return the time format
-	 */
-	public String getFormatTimeFormat() {
-		return getData().getString("Format.TimeFormat", "EEE, d MMM yyyy HH:mm");
-
-	}
-
-	public String getFormatTopVoterAllTime() {
-		return getData().getString("Format.TopVoter.AllTime", "AllTime");
-	}
-
-	public String getFormatTopVoterDaily() {
-		return getData().getString("Format.TopVoter.Daily", "Daily");
-	}
-
-	public String getFormatTopVoterMonthly() {
-		return getData().getString("Format.TopVoter.Monthly", "Monthly");
-	}
-
-	/**
-	 * Gets the top voter reward msg.
-	 *
-	 * @return the top voter reward msg
-	 */
-	public String getFormatTopVoterRewardMsg() {
-		return getData().getString("Format.TopVoterAwardMsg",
-				"&aYou came in %place% in top voters of the month! Here is an award!");
-
-	}
-
-	public String getFormatTopVoterWeekly() {
-		return getData().getString("Format.TopVoter.Weekly", "Weekly");
-	}
-
-	public String getFormatUserNotExist() {
-		return getData().getString("Format.UserNotExist", "&cUser does not exist: %player%");
-	}
+	@ConfigDataString(path = "Format.InvalidCommand.AdminVote")
+	@Getter
+	private String formatInvalidCommandAdminVote = "&4No valid arguments, see /adminvote help!";
 
 	/**
 	 * Gets the vote help.
@@ -670,133 +612,92 @@ public class Config extends YMLFile {
 		return (ArrayList<String>) getData().getList("Format.Commands.Vote.Help.Lines", new ArrayList<String>());
 	}
 
-	public boolean getGiveDefaultPermission() {
-		return getData().getBoolean("GiveDefaultPermission", true);
-	}
+	@ConfigDataBoolean(path = "GiveDefaultPermission")
+	@Getter
+	private boolean giveDefaultPermission = true;
 
 	public boolean getLoadTopVoter(TopVoter top) {
 		switch (top) {
 		case AllTime:
-			return getLoadTopVoterAllTime();
+			return isLoadTopVoterAllTime();
 		case Daily:
-			return getLoadTopVoterDaily();
+			return isLoadTopVoterDaily();
 		case Monthly:
-			return getLoadTopVoterMonthly();
+			return isLoadTopVoterMonthly();
 		case Weekly:
-			return getLoadTopVoterWeekly();
+			return isLoadTopVoterWeekly();
 		default:
 			return false;
 		}
 	}
 
-	public boolean getLoadTopVoterAllTime() {
-		return getData().getBoolean("LoadTopVoter.AllTime", true);
-	}
+	@ConfigDataBoolean(path = "LoadTopVoter.AllTime")
+	@Getter
+	private boolean loadTopVoterAllTime = true;
 
-	public boolean getLoadTopVoterDaily() {
-		return getData().getBoolean("LoadTopVoter.Daily", false);
-	}
+	@ConfigDataBoolean(path = "LoadTopVoter.Monthly")
+	@Getter
+	private boolean loadTopVoterMonthly = true;
 
-	public boolean getLoadTopVoterMonthly() {
-		return getData().getBoolean("LoadTopVoter.Monthly", true);
-	}
+	@ConfigDataBoolean(path = "LoadTopVoter.Daily")
+	@Getter
+	private boolean loadTopVoterDaily = false;
 
-	public boolean getLoadTopVoterWeekly() {
-		return getData().getBoolean("LoadTopVoter.Weekly", false);
-	}
+	@ConfigDataBoolean(path = "LoadTopVoter.Weekly")
+	@Getter
+	private boolean loadTopVoterWeekly = false;
 
-	public int getPointsOnVote() {
-		return getData().getInt("PointsOnVote", 1);
-	}
+	@ConfigDataInt(path = "PointsOnVote")
+	@Getter
+	private int pointsOnVote = 1;
 
-	public int getPurgeMin() {
-		return getData().getInt("PurgeMin", 90);
-	}
+	@ConfigDataInt(path = "PurgeMin")
+	@Getter
+	private int purgeMin = 90;
 
-	public boolean getPurgeOldData() {
-		return getData().getBoolean("PurgeOldData");
-	}
+	@ConfigDataBoolean(path = "PurgeOldData")
+	@Getter
+	private boolean purgeOldData = false;
 
-	/**
-	 * Gets the request API default method.
-	 *
-	 * @return the request API default method
-	 */
-	public String getRequestAPIDefaultMethod() {
-		return getData().getString("RequestAPI.DefaultMethod", "Anvil");
-	}
+	@ConfigDataString(path = "RequestAPI.DefaultMethod")
+	@Getter
+	private String requestAPIDefaultMethod = "ANVIL";
 
-	/**
-	 * Gets the request API disabled methods.
-	 *
-	 * @return the request API disabled methods
-	 */
-	@SuppressWarnings("unchecked")
-	public ArrayList<String> getRequestAPIDisabledMethods() {
-		return (ArrayList<String>) getData().getList("RequestAPI.DisabledMethods", new ArrayList<String>());
-	}
+	@ConfigDataListString(path = "RequestAPI.DisabledMethods")
+	@Getter
+	private ArrayList<String> requestAPIDisabledMethods = new ArrayList<String>();
 
-	/**
-	 * Gets the store top voters daily.
-	 *
-	 * @return the store top voters daily
-	 */
-	public boolean getStoreTopVotersDaily() {
-		return getData().getBoolean("StoreTopVoters.Daily");
-	}
+	@ConfigDataBoolean(path = "StoreTopVoters.Daily")
+	@Getter
+	private boolean storeTopVotersDaily = false;
 
-	/**
-	 * Gets the store top voters weekly.
-	 *
-	 * @return the store top voters weekly
-	 */
-	public boolean getStoreTopVotersWeekly() {
-		return getData().getBoolean("StoreTopVoters.Weekly");
-	}
+	@ConfigDataBoolean(path = "StoreTopVoters.Weekly")
+	@Getter
+	private boolean storeTopVotersWeekly = false;
 
-	public boolean getTopVoterAwardsTies() {
-		return getData().getBoolean("TopVoterAwardsTies", true);
-	}
+	@ConfigDataBoolean(path = "TopVoterAwardsTies")
+	@Getter
+	private boolean topVoterAwardsTies = true;
 
-	public boolean getTopVoterIgnorePermission() {
-		return getData().getBoolean("TopVoterIgnorePermission");
-	}
+	@ConfigDataBoolean(path = "TopVoterIgnorePermission")
+	@Getter
+	private boolean topVoterIgnorePermission = false;
 
-	/**
-	 * Gets the enabled.
-	 *
-	 * @return the enabled
-	 */
-	public boolean getVoteRemindingEnabled() {
-		return getData().getBoolean("VoteReminding.Enabled");
-	}
+	@ConfigDataBoolean(path = "VoteReminding.Enabled")
+	@Getter
+	private boolean voteRemindingEnabled = true;
 
-	/**
-	 * Gets the remind delay.
-	 *
-	 * @return the remind delay
-	 */
-	public int getVoteRemindingRemindDelay() {
-		return getData().getInt("VoteReminding.RemindDelay", 30);
-	}
+	@ConfigDataInt(path = "VoteReminding.RemindDelay")
+	@Getter
+	private int voteRemindingRemindDelay = 30;
 
-	/**
-	 * Gets the remind on login.
-	 *
-	 * @return the remind on login
-	 */
-	public boolean getVoteRemindingRemindOnLogin() {
-		return getData().getBoolean("VoteReminding.RemindOnLogin");
-	}
+	@ConfigDataBoolean(path = "VoteReminding.RemindOnLogin")
+	@Getter
+	private boolean voteRemindingRemindOnLogin = false;
 
-	/**
-	 * Gets the remind only once.
-	 *
-	 * @return the remind only once
-	 */
-	public boolean getVoteRemindingRemindOnlyOnce() {
-		return getData().getBoolean("VoteReminding.RemindOnlyOnce");
-	}
+	@ConfigDataBoolean(path = "VoteReminding.RemindOnlyOnce")
+	@Getter
+	private boolean voteRemindingRemindOnlyOnce = false;
 
 	/**
 	 * Gets the rewards.
@@ -807,9 +708,9 @@ public class Config extends YMLFile {
 		return "VoteReminding.Rewards";
 	}
 
-	public String getVoteTopDefault() {
-		return getData().getString("VoteTopDefault", "Monthly");
-	}
+	@ConfigDataString(path = "VoteTopDefault")
+	@Getter
+	private String voteTopDefault = "Monthly";
 
 	@Override
 	public void loadValues() {

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

@@ -15,6 +15,7 @@ import org.bukkit.entity.Player;
 
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.rewards.DirectlyDefinedReward;
 import com.bencodez.advancedcore.api.yml.YMLFile;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
@@ -47,12 +48,59 @@ public class ConfigVoteSites extends YMLFile {
 			setServiceSite(siteName, org);
 			setVoteURL(siteName, "VoteURL");
 			setVoteDelay(siteName, 24);
-			set(siteName, "DisplayItem.Material", "GRASS");
+			set(siteName, "DisplayItem.Material", "STONE");
 			set(siteName, "DisplayItem.Amount", 1);
 			set(siteName, "Rewards.Messages.Player", "&aThanks for voting on %ServiceSite%!");
 
 			plugin.loadVoteSites();
 
+			plugin.addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteSites." + siteName + ".Rewards") {
+
+				@Override
+				public void createSection(String key) {
+					plugin.getConfigVoteSites().createSection(key);
+				}
+
+				@Override
+				public ConfigurationSection getFileData() {
+					return plugin.getConfigVoteSites().getData();
+				}
+
+				@Override
+				public void save() {
+					plugin.getConfigVoteSites().saveData();
+				}
+
+				@Override
+				public void setData(String path, Object value) {
+					plugin.getConfigVoteSites().setValue(path, value);
+				}
+			});
+
+			plugin.addDirectlyDefinedRewards(
+					new DirectlyDefinedReward("VoteSites." + siteName + ".CoolDownEndRewards") {
+
+						@Override
+						public void createSection(String key) {
+							plugin.getConfigVoteSites().createSection(key);
+						}
+
+						@Override
+						public ConfigurationSection getFileData() {
+							return plugin.getConfigVoteSites().getData();
+						}
+
+						@Override
+						public void save() {
+							plugin.getConfigVoteSites().saveData();
+						}
+
+						@Override
+						public void setData(String path, Object value) {
+							plugin.getConfigVoteSites().setValue(path, value);
+						}
+					});
+
 			for (Player p : Bukkit.getOnlinePlayers()) {
 				if (p.hasPermission("VotingPlugin.Admin.GenerateServiceSite") || p.isOp()) {
 					p.sendMessage(StringParser.getInstance().colorize("&cGenerating votesite for service site "
@@ -120,8 +168,8 @@ public class ConfigVoteSites extends YMLFile {
 		return getData(siteName).getString("ServiceSite");
 	}
 
-	public int getTimeOffSet(String siteName) {
-		return getData(siteName).getInt("TimeOffSet", 0);
+	public int getVoteDelayDailyHour(String siteName) {
+		return getData(siteName).getInt("VoteDelayDailyHour", 0);
 	}
 
 	/**
@@ -130,12 +178,12 @@ public class ConfigVoteSites extends YMLFile {
 	 * @param siteName the site name
 	 * @return the vote delay
 	 */
-	public int getVoteDelay(String siteName) {
-		return getData(siteName).getInt("VoteDelay", 24);
+	public double getVoteDelay(String siteName) {
+		return getData(siteName).getDouble("VoteDelay", 24);
 	}
 
-	public int getVoteDelayMin(String siteName) {
-		return getData(siteName).getInt("VoteDelayMin", 0);
+	public double getVoteDelayMin(String siteName) {
+		return getData(siteName).getDouble("VoteDelayMin", 0);
 	}
 
 	/**
@@ -199,7 +247,9 @@ public class ConfigVoteSites extends YMLFile {
 					if (!siteCheck(site)) {
 						plugin.getLogger().warning("Failed to load site " + site + ", see above");
 					} else {
-						voteSites.add(new VoteSite(plugin, site));
+						VoteSite voteSite = new VoteSite(plugin, site);
+						plugin.debug(voteSite.loadingDebug());
+						voteSites.add(voteSite);
 					}
 				}
 			}
@@ -393,7 +443,7 @@ public class ConfigVoteSites extends YMLFile {
 	 * @param siteName  the site name
 	 * @param voteDelay the vote delay
 	 */
-	public void setVoteDelay(String siteName, int voteDelay) {
+	public void setVoteDelay(String siteName, double voteDelay) {
 		set(siteName, "VoteDelay", voteDelay);
 	}
 

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

@@ -12,6 +12,8 @@ import com.bencodez.advancedcore.api.yml.YMLFile;
 import com.bencodez.advancedcore.api.yml.annotation.AnnotationHandler;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataBoolean;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataConfigurationSection;
+import com.bencodez.advancedcore.api.yml.annotation.ConfigDataInt;
+import com.bencodez.advancedcore.api.yml.annotation.ConfigDataKeys;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataListString;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataString;
 import com.bencodez.votingplugin.VotingPluginMain;
@@ -33,6 +35,10 @@ public class GUI extends YMLFile {
 	@Getter
 	private String bookVoteURLBookGUICanVoteColor = "GREEN";
 
+	@ConfigDataBoolean(path = "BOOK.VoteURLBookGUI.Manual")
+	@Getter
+	private boolean bookVoteURLBookGUIManual = false;
+
 	@ConfigDataString(path = "BOOK.VoteURLBookGUI.CanVoteText")
 	@Getter
 	private String bookVoteURLBookGUICanVoteText = "Click me";
@@ -42,6 +48,10 @@ public class GUI extends YMLFile {
 	private ArrayList<String> bookVoteURLBookGUILayout = ArrayUtils.getInstance()
 			.convert(new String[] { "&c%Sitename%", "[UrlText]" });
 
+	@ConfigDataListString(path = "BOOK.VoteURLBookGUI.TopLayout")
+	@Getter
+	private ArrayList<String> bookVoteURLBookGUITopLayout = new ArrayList<String>();
+
 	@ConfigDataString(path = "BOOK.VoteURLBookGUI.Title")
 	@Getter
 	private String bookVoteURLBookGUITitle = "&cVoteURL";
@@ -146,6 +156,10 @@ public class GUI extends YMLFile {
 	@Getter
 	private boolean lastMonthGUI = false;
 
+	@ConfigDataBoolean(path = "CHEST.VoteLast.ClickableLinks")
+	@Getter
+	private boolean chestVoteLastClickableLinks = true;
+
 	private VotingPluginMain plugin;
 
 	public GUI(VotingPluginMain plugin) {
@@ -169,9 +183,9 @@ public class GUI extends YMLFile {
 		saveData();
 	}
 
-	public ConfigurationSection getCHESTBackButton() {
-		return getData().getConfigurationSection("CHEST.BackButton");
-	}
+	@ConfigDataConfigurationSection(path = "CHEST.BackButton")
+	@Getter
+	private ConfigurationSection CHESTBackButton;
 
 	public int getChestShopIdentifierCost(String identifier) {
 		return getData().getInt("CHEST.Shop." + identifier + ".Cost");
@@ -187,7 +201,6 @@ public class GUI extends YMLFile {
 
 	public String getChestShopIdentifierRewardsPath(String identifier) {
 		return "CHEST.Shop." + identifier + ".Rewards";
-
 	}
 
 	public Set<String> getChestShopIdentifiers() {
@@ -202,25 +215,25 @@ public class GUI extends YMLFile {
 		return getData().getConfigurationSection("CHEST.Shop." + identifier);
 	}
 
-	public ConfigurationSection getChestVoteBestDayBestItem() {
-		return getData().getConfigurationSection("CHEST.VoteBest.DayBest.Item");
-	}
+	@ConfigDataConfigurationSection(path = "CHEST.VoteBest.DayBest.Item")
+	@Getter
+	private ConfigurationSection chestVoteBestDayBestItem;
 
-	public ConfigurationSection getChestVoteBestMonthBestItem() {
-		return getData().getConfigurationSection("CHEST.VoteBest.MonthBest.Item");
-	}
+	@ConfigDataConfigurationSection(path = "CHEST.VoteBest.MonthBest.Item")
+	@Getter
+	private ConfigurationSection chestVoteBestMonthBestItem;
 
-	public String getChestVoteBestName() {
-		return getData().getString("CHEST.VoteBest.Name", "VoteBest: %player%");
-	}
+	@ConfigDataString(path = "CHEST.VoteBest.Name")
+	@Getter
+	private String chestVoteBestName = "VoteBest: %player%";
 
-	public ConfigurationSection getChestVoteBestWeekBestItem() {
-		return getData().getConfigurationSection("CHEST.VoteBest.WeekBest.Item");
-	}
+	@ConfigDataConfigurationSection(path = "CHEST.VoteBest.WeekBest.Item")
+	@Getter
+	private ConfigurationSection chestVoteBestWeekBestItem;
 
-	public String getChestVoteGUIName() {
-		return getData().getString("CHEST.VoteGUIName", "&cVoteGUI: &c&l%player%");
-	}
+	@ConfigDataString(path = "CHEST.VoteGUIName")
+	@Getter
+	private String chestVoteGUIName = "&cVoteGUI: &c&l%player%";
 
 	/**
 	 * Gets the vote GUI slot command.
@@ -244,27 +257,22 @@ public class GUI extends YMLFile {
 		return (ArrayList<String>) getData().getList("CHEST.VoteGUI." + slot + ".Item.Lore", new ArrayList<String>());
 	}
 
-	public String getChestVoteGUISlotRewardsPath(String slot) {
-		return "CHEST.VoteGUI." + slot + ".Rewards";
+	public String getChestVoteGUISlotRewardsPath(String slot, String lastPath) {
+		return "CHEST.VoteGUI." + slot + "." + lastPath;
 	}
 
-	/**
-	 * Gets the vote GUI slots.
-	 *
-	 * @return the vote GUI slots
-	 */
-	public Set<String> getChestVoteGUISlots() {
-		try {
-			return getData().getConfigurationSection("CHEST.VoteGUI").getKeys(false);
-		} catch (Exception ex) {
-			return new HashSet<String>();
-		}
-	}
+	@ConfigDataKeys(path = "CHEST.VoteGUI")
+	@Getter
+	private Set<String> chestVoteGUISlots = new HashSet<String>();
 
 	public ConfigurationSection getChestVoteGUISlotSection(String slot) {
 		return getData().getConfigurationSection("CHEST.VoteGUI." + slot + ".Item");
 	}
 
+	@ConfigDataConfigurationSection(path = "CHEST.VoteTop.Customization")
+	@Getter
+	private ConfigurationSection chestVoteTopCustomization;
+
 	/**
 	 * Gets the vote GUI slot slot.
 	 *
@@ -275,45 +283,61 @@ public class GUI extends YMLFile {
 		return getData().getInt("CHEST.VoteGUI." + slot + ".Slot", -1);
 	}
 
-	public boolean getChestVoteLastBackButton() {
-		return getData().getBoolean("CHEST.VoteLast.BackButton");
+	@ConfigDataBoolean(path = "CHEST.VoteLast.BackButton")
+	@Getter
+	private boolean chestVoteLastBackButton = false;
+
+	@ConfigDataString(path = "CHEST.VoteLast.Line")
+	@Getter
+	private String chestVoteLastLine = "&6%timeSince%";
+
+	@ConfigDataString(path = "CHEST.VoteLast.Name")
+	@Getter
+	private String chestVoteLastName = "VoteLast: %player%";
+
+	@ConfigDataBoolean(path = "CHEST.VoteNext.BackButton")
+	@Getter
+	private boolean chestVoteNextBackButton = false;
+
+	@ConfigDataString(path = "CHEST.VoteNext.Name")
+	@Getter
+	private String chestVoteNextName = "VoteNext: %player%";
+
+	@ConfigDataString(path = "CHEST.VoteNext.Line")
+	@Getter
+	private String chestVoteNextLine = "%time%";
+
+	public String getChestVoteNextCustomSiteNamesDisplays(String site) {
+		return getData().getString("CHEST.VoteNext.CustomSiteNamesDisplays." + site, "");
 	}
 
-	public String getChestVoteLastLine() {
-		return getData().getString("CHEST.VoteLast.Line", "&6%timeSince%");
-	}
+	@ConfigDataString(path = "CHEST.VoteRewardName")
+	@Getter
+	private String chestVoteRewardName = "VoteReward";
 
-	public String getChestVoteLastName() {
-		return getData().getString("CHEST.VoteLast.Name", "VoteLast: %player%");
-	}
+	@ConfigDataBoolean(path = "CHEST.VoteShopBackButton")
+	@Getter
+	private boolean chestVoteShopBackButton = true;
 
-	public boolean getChestVoteNextBackButton() {
-		return getData().getBoolean("CHEST.VoteNext.BackButton");
-	}
-
-	public String getChestVoteNextName() {
-		return getData().getString("CHEST.VoteNext.Name", "VoteNext: %player%");
-	}
-
-	public String getChestVoteRewardName() {
-		return getData().getString("CHEST.VoteRewardName", "VoteReward");
-	}
-
-	public boolean getChestVoteShopBackButton() {
-		return getData().getBoolean("CHEST.VoteShopBackButton", true);
-	}
+	@ConfigDataBoolean(path = "CHEST.VoteShopReopenGUIOnPurchase")
+	@Getter
+	private boolean chestVoteShopReopenGUIOnPurchase = true;
 
 	public boolean getChestVoteShopCloseGUI(String shop) {
 		return getData().getBoolean("CHEST.Shop." + shop + ".CloseGUI", true);
 	}
-
-	public boolean getChestVoteShopEnabled() {
-		return getData().getBoolean("CHEST.VoteShopEnabled", true);
+	
+	public boolean getChestVoteShopHideOnNoPermission(String shop) {
+		return getData().getBoolean("CHEST.Shop." + shop + ".HideOnNoPermission", true);
 	}
 
-	public String getChestVoteShopName() {
-		return getData().getString("CHEST.VoteShopName", "VoteShop");
-	}
+	@ConfigDataBoolean(path = "CHEST.VoteShopEnabled")
+	@Getter
+	private boolean chestVoteShopEnabled = true;
+
+	@ConfigDataString(path = "CHEST.VoteShopName")
+	@Getter
+	private String chestVoteShopName = "VoteShop";
 
 	public boolean getChestVoteShopNotBuyable(String shop) {
 		return getData().getBoolean("CHEST.Shop." + shop + ".NotBuyable", false);
@@ -340,85 +364,93 @@ public class GUI extends YMLFile {
 		return getData().getBoolean("CHEST.Shop." + shop + ".Reset.Weekly", false);
 	}
 
-	public boolean getChestVoteStreakBackButton() {
-		return getData().getBoolean("CHEST.VoteStreak.BackButton");
-	}
+	@ConfigDataBoolean(path = "CHEST.VoteStreak.BackButton")
+	@Getter
+	private boolean chestVoteStreakBackButton = false;
 
-	public ConfigurationSection getChestVoteStreakCurrentDayStreakItem() {
-		return getData().getConfigurationSection("CHEST.VoteStreak.CurrentDayStreak.Item");
-	}
+	@ConfigDataConfigurationSection(path = "CHEST.VoteStreak.CurrentDayStreak.Item")
+	@Getter
+	private ConfigurationSection chestVoteStreakCurrentDayStreakItem;
 
-	public ConfigurationSection getChestVoteStreakCurrentMonthStreakItem() {
-		return getData().getConfigurationSection("CHEST.VoteStreak.CurrentMonthStreak.Item");
-	}
+	@ConfigDataConfigurationSection(path = "CHEST.VoteStreak.CurrentMonthStreak.Item")
+	@Getter
+	private ConfigurationSection chestVoteStreakCurrentMonthStreakItem;
 
-	public ConfigurationSection getChestVoteStreakCurrentWeekStreakItem() {
-		return getData().getConfigurationSection("CHEST.VoteStreak.CurrentWeekStreak.Item");
-	}
+	@ConfigDataConfigurationSection(path = "CHEST.VoteStreak.CurrentWeekStreak.Item")
+	@Getter
+	private ConfigurationSection chestVoteStreakCurrentWeekStreakItem;
 
-	public ConfigurationSection getChestVoteStreakHighestDayStreakItem() {
-		return getData().getConfigurationSection("CHEST.VoteStreak.HighestDayStreak.Item");
-	}
+	@ConfigDataConfigurationSection(path = "CHEST.VoteStreak.HighestDayStreak.Item")
+	@Getter
+	private ConfigurationSection chestVoteStreakHighestDayStreakItem;
 
-	public ConfigurationSection getChestVoteStreakHighestMonthStreakItem() {
-		return getData().getConfigurationSection("CHEST.VoteStreak.HighestMonthStreak.Item");
-	}
+	@ConfigDataConfigurationSection(path = "CHEST.VoteStreak.HighestMonthStreak.Item")
+	@Getter
+	private ConfigurationSection chestVoteStreakHighestMonthStreakItem;
 
-	public ConfigurationSection getChestVoteStreakHighestWeekStreakItem() {
-		return getData().getConfigurationSection("CHEST.VoteStreak.HighestWeekStreak.Item");
-	}
+	@ConfigDataConfigurationSection(path = "CHEST.VoteStreak.HighestWeekStreak.Item")
+	@Getter
+	private ConfigurationSection chestVoteStreakHighestWeekStreakItem;
 
-	public String getChestVoteStreakName() {
-		return getData().getString("CHEST.VoteStreak.Name", "VoteStreak");
-	}
+	@ConfigDataString(path = "CHEST.VoteStreak.Name")
+	@Getter
+	private String chestVoteStreakName = "VoteStreak";
 
-	public boolean getChestVoteTodayBackButton() {
-		return getData().getBoolean("CHEST.VoteToday.BackButton");
-	}
+	@ConfigDataBoolean(path = "CHEST.VoteToday.BackButton")
+	@Getter
+	private boolean chestVoteTodayBackButton = false;
 
-	public String getChestVoteTodayName() {
-		return getData().getString("CHEST.VoteToday.Name", "VoteToday");
-	}
+	@ConfigDataString(path = "CHEST.VoteToday.Name")
+	@Getter
+	private String chestVoteTodayName = "VoteToday";
 
-	public boolean getChestVoteTopBackButton() {
-		return getData().getBoolean("CHEST.VoteTop.BackButton");
-	}
+	@ConfigDataBoolean(path = "CHEST.VoteTop.BackButton")
+	@Getter
+	private boolean chestVoteTopBackButton = false;
 
-	public String getChestVoteTopItemLore() {
-		return getData().getString("CHEST.VoteTop.Item.Lore", "&3&lVotes: &3%votes%");
-	}
+	@ConfigDataString(path = "CHEST.VoteTop.Item.Lore")
+	@Getter
+	private String chestVoteTopItemLore = "&3&lVotes: &3%votes%";
 
-	public String getChestVoteTopItemName() {
-		return getData().getString("CHEST.VoteTop.Item.Name", "&3&l%position%: &3%player%");
-	}
+	@ConfigDataString(path = "CHEST.VoteTop.Item.Name")
+	@Getter
+	private String chestVoteTopItemName = "&3&l%position%: &3%player%";
 
-	public String getChestVoteTopName() {
-		return getData().getString("CHEST.VoteTop.Name", "VoteTop %topvoter%");
-	}
+	@ConfigDataString(path = "CHEST.VoteTop.Name")
+	@Getter
+	private String chestVoteTopName = "VoteTop %topvoter%";
 
-	public boolean getChestVoteTopOpenMainGUIOnClick() {
-		return getData().getBoolean("CHEST.VoteTop.OpenMainGUIOnClick", true);
-	}
+	@ConfigDataBoolean(path = "CHEST.VoteTop.OpenMainGUIOnClick")
+	@Getter
+	private boolean chestVoteTopOpenMainGUIOnClick = true;
 
-	public int getChestVoteTopSize() {
-		return getData().getInt("CHEST.VoteTop.Size", 27);
-	}
+	@ConfigDataBoolean(path = "CHEST.VoteTop.CloseGUIOnClick")
+	@Getter
+	private boolean chestVoteTopCloseGUIOnClick = true;
 
-	public ConfigurationSection getChestVoteTopSwitchItem() {
-		return getData().getConfigurationSection("CHEST.VoteTop.SwitchItem");
-	}
+	@ConfigDataInt(path = "CHEST.VoteTop.Size")
+	@Getter
+	private int chestVoteTopSize = 27;
 
-	public ConfigurationSection getChestVoteTotalAllTimeTotalItem() {
-		return getData().getConfigurationSection("CHEST.VoteTotal.AllTimeTotal.Item");
-	}
+	@ConfigDataConfigurationSection(path = "CHEST.VoteTop.SwitchItem")
+	@Getter
+	private ConfigurationSection chestVoteTopSwitchItem;
 
-	public boolean getChestVoteTotalBackButton() {
-		return getData().getBoolean("CHEST.VoteTotal.BackButton");
-	}
+	@ConfigDataListString(path = "CHEST.VoteTop.SwitchItem.TopVoters")
+	@Getter
+	private ArrayList<String> chestVoteTopSwitchItemTopVoters = new ArrayList<String>();
 
-	public ConfigurationSection getChestVoteTotalDayTotalItem() {
-		return getData().getConfigurationSection("CHEST.VoteTotal.DayTotal.Item");
-	}
+	@ConfigDataConfigurationSection(path = "CHEST.VoteTotal.AllTimeTotal.Item")
+	@Getter
+	private ConfigurationSection chestVoteTotalAllTimeTotalItem;
+
+	@ConfigDataBoolean(path = "CHEST.VoteTotal.BackButton")
+	@Getter
+	private boolean chestVoteTotalBackButton = false;
+
+	@ConfigDataConfigurationSection(path = "CHEST.VoteTotal.DayTotal.Item")
+	@Getter
+	private ConfigurationSection chestVoteTotalDayTotalItem;
 
 	public ConfigurationSection getChestVoteTotalItem(TopVoter top) {
 		switch (top) {
@@ -436,117 +468,104 @@ public class GUI extends YMLFile {
 		}
 	}
 
-	public ConfigurationSection getChestVoteTotalMonthTotalItem() {
-		return getData().getConfigurationSection("CHEST.VoteTotal.MonthTotal.Item");
-	}
+	@ConfigDataConfigurationSection(path = "CHEST.VoteTotal.MonthTotal.Item")
+	@Getter
+	private ConfigurationSection chestVoteTotalMonthTotalItem;
 
-	public String getChestVoteTotalName() {
-		return getData().getString("CHEST.VoteTotal.Name", "VoteTotal: %player%");
-	}
+	@ConfigDataString(path = "CHEST.VoteTotal.Name")
+	@Getter
+	private String chestVoteTotalName = "VoteTotal: %player%";
 
-	public ConfigurationSection getChestVoteTotalWeekTotalItem() {
-		return getData().getConfigurationSection("CHEST.VoteTotal.WeekTotal.Item");
-	}
+	@ConfigDataConfigurationSection(path = "CHEST.VoteTotal.WeekTotal.Item")
+	@Getter
+	private ConfigurationSection chestVoteTotalWeekTotalItem;
 
-	public int getChestVoteURLAllUrlsButtonSlot() {
-		return getData().getInt("CHEST.VoteURL.AllUrlsButton.Slot", -1);
-	}
+	@ConfigDataInt(path = "CHEST.VoteURL.AllUrlsButton.Slot")
+	@Getter
+	private int chestVoteURLAllUrlsButtonSlot = -1;
 
-	public int getChestVoteURLAllUrlsButtonStartSlot() {
-		return getData().getInt("CHEST.VoteURL.StartSlot", -1);
-	}
+	@ConfigDataInt(path = "CHEST.VoteURL.StartSlot")
+	@Getter
+	private int chestVoteURLAllUrlsButtonStartSlot = -1;
 
-	public ConfigurationSection getChestVoteURLAlreadyVotedAllUrlsButtonItemSection() {
-		if (getData().isConfigurationSection("CHEST.VoteURL.AllUrlsButton.AlreadyVotedItem")) {
-			return getData().getConfigurationSection("CHEST.VoteURL.AllUrlsButton.AlreadyVotedItem");
-		} else {
-			return getData().getConfigurationSection("CHEST.VoteURL.AlreadyVotedItem");
-		}
-	}
+	@ConfigDataConfigurationSection(path = "CHEST.VoteURL.AllUrlsButton.AlreadyVotedItem", secondPath = "CHEST.VoteURL.AlreadyVotedItem")
+	@Getter
+	private ConfigurationSection chestVoteURLAlreadyVotedAllUrlsButtonItemSection;
 
-	public ConfigurationSection getChestVoteURLAlreadyVotedItemSection() {
-		return getData().getConfigurationSection("CHEST.VoteURL.AlreadyVotedItem");
-	}
+	@ConfigDataConfigurationSection(path = "CHEST.VoteURL.AlreadyVotedItem")
+	@Getter
+	private ConfigurationSection chestVoteURLAlreadyVotedItemSection;
 
-	public boolean getChestVoteURLBackButton() {
-		return getData().getBoolean("CHEST.VoteURL.BackButton");
-	}
+	@ConfigDataBoolean(path = "CHEST.VoteURL.BackButton")
+	@Getter
+	private boolean chestVoteURLBackButton = false;
 
-	public ConfigurationSection getChestVoteURLCanVoteAllUrlsButtonItemSection() {
-		if (getData().isConfigurationSection("CHEST.VoteURL.AllUrlsButton.CanVoteItem")) {
-			return getData().getConfigurationSection("CHEST.VoteURL.AllUrlsButton.CanVoteItem");
-		} else {
-			return getData().getConfigurationSection("CHEST.VoteURL.CanVoteItem");
-		}
-	}
+	@ConfigDataConfigurationSection(path = "CHEST.VoteURL.AllUrlsButton.CanVoteItem", secondPath = "CHEST.VoteURL.CanVoteItem")
+	@Getter
+	private ConfigurationSection chestVoteURLCanVoteAllUrlsButtonItemSection;
 
-	public ConfigurationSection getChestVoteURLCanVoteItemSection() {
-		return getData().getConfigurationSection("CHEST.VoteURL.CanVoteItem");
-	}
+	@ConfigDataConfigurationSection(path = "CHEST.VoteURL.CanVoteItem")
+	@Getter
+	private ConfigurationSection chestVoteURLCanVoteItemSection;
 
-	public Set<String> getChestVoteURLExtraItems() {
-		if (getData().isConfigurationSection("CHEST.VoteURL.ExtraItems")) {
-			return getData().getConfigurationSection("CHEST.VoteURL.ExtraItems").getKeys(false);
-		}
-		return new HashSet<String>();
-	}
+	@ConfigDataKeys(path = "CHEST.VoteURL.ExtraItems")
+	@Getter
+	private Set<String> chestVoteURLExtraItems = new HashSet<String>();
 
 	public ConfigurationSection getChestVoteURLExtraItemsItem(String item) {
 		return getData().getConfigurationSection("CHEST.VoteURL.ExtraItems." + item);
 	}
 
-	/**
-	 * Gets the vote URL site name.
-	 *
-	 * @return the vote URL site name
-	 */
-	public String getChestVoteURLGUISiteName() {
-		return getData().getString("CHEST.VoteURL.SiteName", "&c%Name%");
+	public Set<String> getChestGUIExtraItems(String gui) {
+		if (getData().isConfigurationSection("CHEST." + gui + ".ExtraItems")) {
+			return getData().getConfigurationSection("CHEST." + gui + ".ExtraItems").getKeys(false);
+		}
+		return new HashSet<String>();
 	}
 
-	public String getChestVoteURLGUISiteNameCanVote() {
-		return getData().getString("CHEST.VoteURL.SiteNameCanVote", "&a%Name%");
+	public ConfigurationSection getChestGUIVoteShopExtraItems(String item) {
+		return getData().getConfigurationSection("CHEST.VoteShopExtraItems." + item);
 	}
 
-	public String getChestVoteURLName() {
-		return getData().getString("CHEST.VoteURL.Name", "&cVoteURL");
+	@ConfigDataKeys(path = "CHEST.VoteShopExtraItems")
+	@Getter
+	private Set<String> chestGUIVoteShopExtraItems = new HashSet<String>();
+
+	public ConfigurationSection getChestGUIExtraItemsItem(String gui, String item) {
+		return getData().getConfigurationSection("CHEST." + gui + ".ExtraItems." + item);
 	}
 
-	/**
-	 * Gets the vote URL next vote.
-	 *
-	 * @return the vote URL next vote
-	 */
-	public String getChestVoteURLNextVote() {
-		return getData().getString("CHEST.VoteURL.NextVote", "&cCan Vote In: %Info%");
+	@ConfigDataString(path = "CHEST.VoteURL.SiteName")
+	@Getter
+	private String chestVoteURLGUISiteName = "&c%Name%";
 
-	}
+	@ConfigDataString(path = "CHEST.VoteURL.SiteNameCanVote")
+	@Getter
+	private String chestVoteURLGUISiteNameCanVote = "&a%Name%";
 
-	/**
-	 * Gets the vote URL see URL.
-	 *
-	 * @return the vote URL see URL
-	 */
-	public String getChestVoteURLSeeURL() {
-		return getData().getString("CHEST.VoteURL.SeeURL", "&cClick to see URL");
-	}
+	@ConfigDataString(path = "CHEST.VoteURL.Name")
+	@Getter
+	private String chestVoteURLName = "&cVoteURL";
 
-	public String getChestVoteURLSiteName() {
-		return getData().getString("CHEST.VoteURLSite.Name", "VoteSite %site%");
-	}
+	@ConfigDataString(path = "CHEST.VoteURL.NextVote")
+	@Getter
+	private String chestVoteURLNextVote = "&cCan Vote In: %Info%";
 
-	public String getChestVoteURLURLText() {
-		return getData().getString("CHEST.VoteURL.URLText", "%VoteUrl%");
-	}
+	@ConfigDataString(path = "CHEST.VoteURL.SeeURL")
+	@Getter
+	private String chestVoteURLSeeURL = "&cClick to see URL";
 
-	/**
-	 * Gets the vote URL view all urls button enabled.
-	 *
-	 * @return the vote URL view all urls button enabled
-	 */
-	public boolean getChestVoteURLViewAllUrlsButtonEnabled() {
-		return getData().getBoolean("CHEST.VoteURL.ViewAllUrlsButtonEnabled");
-	}
+	@ConfigDataString(path = "CHEST.VoteURLSite.Name")
+	@Getter
+	private String chestVoteURLSiteName = "VoteSite %site%";
+
+	@ConfigDataString(path = "CHEST.VoteURL.URLText")
+	@Getter
+	private String chestVoteURLURLText = "%VoteUrl%";
+
+	@ConfigDataBoolean(path = "CHEST.VoteURL.ViewAllUrlsButtonEnabled")
+	@Getter
+	private boolean chestVoteURLViewAllUrlsButtonEnabled = false;
 
 	public boolean isChestVoteShopRequireConfirmation(String identifier) {
 		return getData().getBoolean("CHEST.Shop." + identifier + ".RequireConfirmation",

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

@@ -3,12 +3,17 @@ package com.bencodez.votingplugin.config;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import com.bencodez.advancedcore.api.yml.YMLFile;
 import com.bencodez.advancedcore.api.yml.annotation.AnnotationHandler;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataBoolean;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataDouble;
+import com.bencodez.advancedcore.api.yml.annotation.ConfigDataInt;
+import com.bencodez.advancedcore.api.yml.annotation.ConfigDataKeys;
+import com.bencodez.advancedcore.api.yml.annotation.ConfigDataListString;
+import com.bencodez.advancedcore.api.yml.annotation.ConfigDataString;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 
@@ -19,6 +24,9 @@ public class SpecialRewardsConfig extends YMLFile {
 	@Getter
 	private String allSitesRewardPath = "AllSites";
 
+	@Getter
+	private String almostAllSitesRewardPath = "AlmostAllSites";
+
 	@Getter
 	private String anySiteRewardsPath = "AnySiteRewards";
 
@@ -58,6 +66,22 @@ public class SpecialRewardsConfig extends YMLFile {
 	@ConfigDataBoolean(path = "VoteParty.ResetExtraVotesMonthly")
 	@Getter
 	private boolean votePartyResetExtraVotesMonthly = false;
+	
+	@ConfigDataBoolean(path = "VoteParty.ResetExtraVotesWeekly")
+	@Getter
+	private boolean votePartyResetExtraVotesWeekly = false;
+
+	@ConfigDataString(path = "VoteParty.VoteReminderBroadcast")
+	@Getter
+	private String votePartyVoteReminderBroadcast = "%votesrequired% left to go, go vote!";
+
+	@ConfigDataListString(path = "VoteParty.VoteReminderAtVotes")
+	@Getter
+	private ArrayList<String> votePartyVoteReminderAtVotes = new ArrayList<String>();
+
+	@ConfigDataListString(path = "VoteParty.GlobalRandomCommand")
+	@Getter
+	private ArrayList<String> votePartyGlobalRandomCommand = new ArrayList<String>();
 
 	@Getter
 	private String votePartyRewardsPath = "VoteParty.Rewards";
@@ -91,29 +115,18 @@ public class SpecialRewardsConfig extends YMLFile {
 		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>();
-		}
+	public List<Integer> getCumulativeBlackList(int cumulative) {
+		return getData().getIntegerList("Cumulative." + cumulative + ".BlackList");
 	}
 
-	/**
-	 * Gets the cumulative votes in same day.
-	 *
-	 * @param cumulative the cumulative
-	 * @return the cumulative votes in same day
-	 */
+	public boolean getCumulativeRecurring(int cumulative) {
+		return getData().getBoolean("Cumulative." + cumulative + ".Recurring", true);
+	}
+
+	@ConfigDataKeys(path = "Cumulative")
+	@Getter
+	private Set<String> cumulativeVotes = new HashSet<String>();
+
 	@Deprecated
 	public boolean getCumulativeVotesInSameDay(int cumulative) {
 		return getData().getBoolean("Cumulative." + cumulative + ".VotesInSameDay");
@@ -147,19 +160,9 @@ public class SpecialRewardsConfig extends YMLFile {
 		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>();
-
-		}
-	}
+	@ConfigDataKeys(path = "DailyAwards")
+	@Getter
+	private Set<String> dailyPossibleRewardPlaces = new HashSet<String>();
 
 	/**
 	 * Gets the milestone reward enabled.
@@ -181,22 +184,9 @@ public class SpecialRewardsConfig extends YMLFile {
 		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>();
-		}
-	}
+	@ConfigDataKeys(path = "MileStones")
+	@Getter
+	private Set<String> milestoneVotes = new HashSet<String>();
 
 	public String getMonthlyAwardRewardsPath(String path) {
 		return "MonthlyAwards." + path + ".Rewards";
@@ -215,77 +205,64 @@ public class SpecialRewardsConfig extends YMLFile {
 		}
 	}
 
-	public boolean getResetMilestonesMonthly() {
-		return getData().getBoolean("ResetMilestonesMonthly");
-	}
+	@ConfigDataBoolean(path = "ResetMilestonesMonthly")
+	@Getter
+	private boolean resetMilestonesMonthly = false;
+	@ConfigDataString(path = "VoteParty.Broadcast")
+	@Getter
+	private String votePartyBroadcast = "";
 
-	public String getVotePartyBroadcast() {
-		return getData().getString("VoteParty.Broadcast", "");
-	}
+	@ConfigDataListString(path = "VoteParty.GlobalCommands", secondPath = "VoteParty.Commands")
+	@Getter
+	private ArrayList<String> votePartyGlobalCommands = new ArrayList<String>();
 
-	@SuppressWarnings("unchecked")
-	public ArrayList<String> getVotePartyCommands() {
-		return (ArrayList<String>) getData().getList("VoteParty.Commands", new ArrayList<String>());
-	}
+	@ConfigDataBoolean(path = "VoteParty.CountFakeVotes")
+	@Getter
+	private boolean votePartyCountFakeVotes = true;
 
-	public boolean getVotePartyCountFakeVotes() {
-		return getData().getBoolean("VoteParty.CountFakeVotes", true);
-	}
+	@ConfigDataBoolean(path = "VoteParty.CountOfflineVotes")
+	@Getter
+	private boolean votePartyCountOfflineVotes = true;
 
-	public boolean getVotePartyCountOfflineVotes() {
-		return getData().getBoolean("VoteParty.CountOfflineVotes", true);
-	}
+	@ConfigDataBoolean(path = "VoteParty.Enabled")
+	@Getter
+	private boolean votePartyEnabled = false;
 
-	/**
-	 * Gets the vote party enabled.
-	 *
-	 * @return the vote party enabled
-	 */
-	public boolean getVotePartyEnabled() {
-		return getData().getBoolean("VoteParty.Enabled");
-	}
+	@ConfigDataBoolean(path = "VoteParty.GiveAllPlayers")
+	@Getter
+	private boolean votePartyGiveAllPlayers = false;
 
-	/**
-	 * Gets the vote party give all players.
-	 *
-	 * @return the vote party give all players
-	 */
-	public boolean getVotePartyGiveAllPlayers() {
-		return getData().getBoolean("VoteParty.GiveAllPlayers");
-	}
+	@ConfigDataInt(path = "VoteParty.IncreaseVotesRquired")
+	@Getter
+	private int votePartyIncreaseVotesRequired = 0;
 
-	public int getVotePartyIncreaseVotesRquired() {
-		return getData().getInt("VoteParty.IncreaseVotesRquired", 0);
-	}
+	@ConfigDataBoolean(path = "VoteParty.OnlyOncePerDay")
+	@Getter
+	private boolean votePartyOnlyOncePerDay = false;
 
-	public boolean getVotePartyOnlyOncePerDay() {
-		return getData().getBoolean("VoteParty.OnlyOncePerDay");
-	}
+	@ConfigDataBoolean(path = "VoteParty.OnlyOncePerWeek")
+	@Getter
+	private boolean votePartyOnlyOncePerWeek = false;
 
-	public boolean getVotePartyResetEachDay() {
-		return getData().getBoolean("VoteParty.ResetEachDay");
-	}
+	@ConfigDataBoolean(path = "VoteParty.ResetEachDay")
+	@Getter
+	private boolean votePartyResetEachDay = false;
 
-	public boolean getVotePartyResetMontly() {
-		return getData().getBoolean("VoteParty.ResetMonthly");
-	}
+	@ConfigDataBoolean(path = "VoteParty.ResetMonthly")
+	@Getter
+	private boolean votePartyResetMonthly = false;
 
-	public boolean getVotePartyResetWeekly() {
-		return getData().getBoolean("VoteParty.ResetWeekly");
-	}
+	@ConfigDataBoolean(path = "VoteParty.ResetWeekly")
+	@Getter
+	private boolean votePartyResetWeekly = false;
 
-	public int getVotePartyUserVotesRequired() {
-		return getData().getInt("VoteParty.UserVotesRequired");
-	}
+	@ConfigDataInt(path = "VoteParty.UserVotesRequired")
+	@Getter
+	private int votePartyUserVotesRequired = 0;
 
-	/**
-	 * Gets the vote party votes required.
-	 *
-	 * @return the vote party votes required
-	 */
-	public int getVotePartyVotesRequired() {
-		return getData().getInt("VoteParty.VotesRequired");
-	}
+	@ConfigDataInt(path = "VoteParty.VotesRequired")
+	@Getter
+	private int votePartyVotesRequired = 0;
 
 	public boolean getVoteStreakRewardEnabled(String type, String s) {
 		return getData().getBoolean("VoteStreak." + type + "." + s + ".Enabled");
@@ -311,18 +288,9 @@ public class SpecialRewardsConfig extends YMLFile {
 		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>();
-		}
-	}
+	@ConfigDataKeys(path = "WeeklyAwards")
+	@Getter
+	private Set<String> weeklyPossibleRewardPlaces = new HashSet<String>();
 
 	@Override
 	public void loadValues() {
@@ -353,8 +321,8 @@ public class SpecialRewardsConfig extends YMLFile {
 	}
 
 	public void setMilestone(int intValue) {
-		getData().set("Milestones." + intValue + ".Enabled", true);
-		getData().set("Milestones." + intValue + ".Rewards.Messages.Player", "&aYou got %milestone% milestone votes!");
+		getData().set("MileStones." + intValue + ".Enabled", true);
+		getData().set("MileStones." + intValue + ".Rewards.Messages.Player", "&aYou got %milestone% milestone votes!");
 		saveData();
 	}
 }

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

@@ -1,40 +1,50 @@
 package com.bencodez.votingplugin.cooldown;
 
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map.Entry;
 import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.advancedcore.api.user.AdvancedCoreUser;
 import com.bencodez.advancedcore.api.user.UserStartup;
+import com.bencodez.advancedcore.api.user.userstorage.Column;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.events.PlayerVoteCoolDownEndEvent;
+import com.bencodez.votingplugin.events.PlayerVoteSiteCoolDownEndEvent;
+import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
+import lombok.Getter;
+
 public class CoolDownCheck implements Listener {
 
 	private VotingPluginMain plugin;
 
-	private Set<UUID> uuids = new HashSet<UUID>();
+	private HashMap<UUID, ScheduledFuture<?>> perSiteTasks = new HashMap<UUID, ScheduledFuture<?>>();
+
+	private HashMap<UUID, ScheduledFuture<?>> allSiteTasks = new HashMap<UUID, ScheduledFuture<?>>();
 
 	public CoolDownCheck(VotingPluginMain plugin) {
 		this.plugin = plugin;
-		this.timer = new Timer();
+		this.timer = Executors.newScheduledThreadPool(1);
 	}
 
-	private Timer timer;
+	@Getter
+	private ScheduledExecutorService timer;
 
 	private boolean cooldownCheckEnabled = false;
 
 	public void checkEnabled() {
-		if (!plugin.getConfigFile().isDisableCoolDownCheck() && RewardHandler.getInstance()
+		if (!plugin.getConfigFile().isDisableCoolDownCheck() && plugin.getRewardHandler()
 				.hasRewards(plugin.getSpecialRewardsConfig().getData(), "VoteCoolDownEndedReward")) {
 			cooldownCheckEnabled = true;
 		} else {
@@ -43,74 +53,187 @@ public class CoolDownCheck implements Listener {
 	}
 
 	public void check(UUID uuid) {
-		check(plugin.getVotingPluginUserManager().getVotingPluginUser(uuid));
+		VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid);
+		if (!user.isOnline()) {
+			user.dontCache();
+		}
+		check(user);
 	}
 
-	public void vote(VotingPluginUser user) {
+	public void checkPerSite(UUID uuid) {
+		VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid);
+		if (!user.isOnline()) {
+			user.dontCache();
+		}
+		checkPerSite(user);
+	}
+
+	public void vote(VotingPluginUser user, VoteSite site) {
 		if (cooldownCheckEnabled) {
-			UUID uuid = UUID.fromString(user.getUUID());
-			if (!uuids.contains(uuid)) {
-				schedule(user);
+			schedule(user, true);
+		}
+
+		if (plugin.getConfigFile().isPerSiteCoolDownEvents()) {
+			user.setCoolDownCheckSite(site, Boolean.FALSE);
+			schedulePerSite(user, true);
+		}
+	}
+
+	public synchronized void check(VotingPluginUser user) {
+		boolean coolDownCheck = user.getCoolDownCheck();
+		if (coolDownCheck) {
+			if (user.canVoteAll()) {
+				user.setCoolDownCheck(false);
+				PlayerVoteCoolDownEndEvent event = new PlayerVoteCoolDownEndEvent(user);
+				plugin.getServer().getPluginManager().callEvent(event);
+				allSiteTasks.remove(user.getJavaUUID());
+			} else {
+				schedulePerSite(user, false);
 			}
 		}
 	}
 
-	public void check(VotingPluginUser user) {
-		boolean coolDownCheck = user.getCoolDownCheck();
-		if (user.canVoteAll() && coolDownCheck) {
-			user.setCoolDownCheck(false);
-			PlayerVoteCoolDownEndEvent event = new PlayerVoteCoolDownEndEvent(user);
-			plugin.getServer().getPluginManager().callEvent(event);
-			uuids.remove(UUID.fromString(user.getUUID()));
-		} else if (!coolDownCheck) {
-			schedule(user);
+	public synchronized void checkPerSite(VotingPluginUser user) {
+		if (plugin.getConfigFile().isPerSiteCoolDownEvents()) {
+			HashMap<String, Boolean> coolDownChecks = user.getCoolDownCheckSiteList();
+			boolean changed = false;
+			for (VoteSite site : plugin.getVoteSitesEnabled()) {
+				if (!coolDownChecks.containsKey(site.getKey()) || !coolDownChecks.get(site.getKey()).booleanValue()) {
+					if (user.canVoteSite(site)) {
+						coolDownChecks.put(site.getKey(), Boolean.TRUE);
+						changed = true;
+						plugin.extraDebug("Triggering votesitecooldownend event for " + user.getUUID());
+						PlayerVoteSiteCoolDownEndEvent event = new PlayerVoteSiteCoolDownEndEvent(user, site);
+						plugin.getServer().getPluginManager().callEvent(event);
+					}
+				}
+			}
+			if (changed) {
+				user.setCoolDownCheckSite(coolDownChecks);
+			}
+
+			schedulePerSite(user, false);
 		}
 
 	}
 
-	public void schedule(VotingPluginUser user) {
-		final UUID uuid = UUID.fromString(user.getUUID());
-		long time = user.getNextTimeAllSitesAvailable();
-		if (time > 0) {
-			user.setCoolDownCheck(true);
-			uuids.add(uuid);
-			timer.schedule(new TimerTask() {
+	public void schedulePerSite(VotingPluginUser user, boolean force) {
+		if (user.getSitesVotedOn() > 0 || force) {
+			final UUID uuid = UUID.fromString(user.getUUID());
+			long time = user.getNextTimeFirstSiteAvailable();
+			if (perSiteTasks.containsKey(uuid)) {
+				perSiteTasks.get(uuid).cancel(false);
+				perSiteTasks.remove(uuid);
+			}
+			if (time > 0) {
+				plugin.devDebug("PerSiteCoolDownEvent schedule time: " + time + " seconds");
+				ScheduledFuture<?> scheduledFuture = timer.schedule(new Runnable() {
 
-				@Override
-				public void run() {
-					check(uuid);
-				}
-			}, time * 1000 + 1500);
+					@Override
+					public void run() {
+						if (plugin != null && plugin.isEnabled()) {
+							checkPerSite(uuid);
+						}
+					}
+				}, time + 2, TimeUnit.SECONDS);
+				perSiteTasks.put(uuid, scheduledFuture);
+			} else {
+				plugin.extraDebug(user.getUUID() + "/" + user.getPlayerName() + " not scheduling cooldown check");
+			}
+		}
+	}
+
+	public void schedule(VotingPluginUser user, boolean force) {
+		if (user.getSitesVotedOn() > 0 || force) {
+			final UUID uuid = UUID.fromString(user.getUUID());
+			long time = user.getNextTimeAllSitesAvailable();
+			if (allSiteTasks.containsKey(uuid)) {
+				allSiteTasks.get(uuid).cancel(false);
+				allSiteTasks.remove(uuid);
+			}
+			if (time > 0) {
+				user.setCoolDownCheck(true);
+				ScheduledFuture<?> scheduledFuture = timer.schedule(new Runnable() {
+
+					@Override
+					public void run() {
+						if (plugin != null && plugin.isEnabled()) {
+							check(uuid);
+						}
+					}
+				}, time + 2, TimeUnit.SECONDS);
+				allSiteTasks.put(uuid, scheduledFuture);
+			} else {
+				plugin.extraDebug(user.getUUID() + "/" + user.getPlayerName() + " not scheduling cooldown check");
+			}
 		}
 
 	}
 
 	public void load() {
-		if (cooldownCheckEnabled) {
-			plugin.addUserStartup(new UserStartup() {
+		plugin.addUserStartup(new UserStartup() {
 
-				@Override
-				public void onStartUp(AdvancedCoreUser advancedcoreUser) {
-					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(advancedcoreUser);
+			@Override
+			public void onStartUp(AdvancedCoreUser advancedcoreUser) {
+				VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(advancedcoreUser);
+				user.dontCache();
+				if (cooldownCheckEnabled) {
 					check(user);
 				}
-
-				@Override
-				public void onStart() {
-
+				if (plugin.getConfigFile().isPerSiteCoolDownEvents()) {
+					checkPerSite(user);
 				}
+			}
 
-				@Override
-				public void onFinish() {
+			@Override
+			public void onStart() {
 
+			}
+
+			@Override
+			public void onFinish() {
+
+			}
+		});
+
+	}
+
+	public void checkAllVoteSite(VoteSite site) {
+		plugin.getLogger().info("Checking vote cooldown rewards for all players: " + site.getKey());
+		HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+		for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
+
+			String uuid = playerData.getKey().toString();
+			if (plugin != null && plugin.isEnabled()) {
+				if (uuid != null && !uuid.isEmpty()) {
+					VotingPluginUser user = plugin.getVotingPluginUserManager()
+							.getVotingPluginUser(UUID.fromString(uuid), false);
+					user.dontCache();
+					user.updateTempCacheWithColumns(playerData.getValue());
+					cols.put(playerData.getKey(), null);
+					checkPerSite(user);
+					user.clearTempCache();
+					user = null;
 				}
-			});
+			}
 		}
+		cols.clear();
+		cols = null;
+
+		plugin.getLogger().info("Finished checking vote cooldown rewards for all players: " + site.getKey());
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onCoolDownEnd(PlayerVoteCoolDownEndEvent event) {
-		RewardHandler.getInstance().giveReward(event.getPlayer(), plugin.getSpecialRewardsConfig().getData(),
+		plugin.getRewardHandler().giveReward(event.getPlayer(), plugin.getSpecialRewardsConfig().getData(),
 				"VoteCoolDownEndedReward", new RewardOptions());
 	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void onCoolDownEnd(PlayerVoteSiteCoolDownEndEvent event) {
+		plugin.getRewardHandler().giveReward(event.getPlayer(), event.getSite().getSiteData(), "CoolDownEndRewards",
+				new RewardOptions().addPlaceholder("sitename", event.getSite().getDisplayName()).addPlaceholder("url",
+						event.getSite().getVoteURL(false)));
+	}
+
 }

VotingPlugin/src/com/bencodez/votingplugin/data/ServerData.java

@@ -1,9 +1,12 @@
 package com.bencodez.votingplugin.data;
 
+import java.time.temporal.WeekFields;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
+import java.util.UUID;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -12,6 +15,7 @@ import org.bukkit.configuration.ConfigurationSection;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.signs.SignHandler;
+import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -27,12 +31,39 @@ public class ServerData {
 
 	public void addAutoCachedPlaceholder(String placeholder) {
 		List<String> p = getAutoCachedPlaceholder();
-		if (!p.contains(placeholder)) {
+
+		if (!ArrayUtils.getInstance().containsIgnoreCase(p, placeholder)) {
 			p.add(placeholder);
 			setAutoCachedPlaceholder(p);
 		}
 	}
 
+	public void updatePlaceholders() {
+		boolean data = getData().getBoolean("AutoCacheUpdated", false);
+		if (!data) {
+			List<String> placeholders = getAutoCachedPlaceholder();
+			for (int i = 0; i < placeholders.size(); i++) {
+				placeholders.set(i, placeholders.get(i).toLowerCase());
+			}
+			setAutoCachedPlaceholder(placeholders);
+			getData().set("AutoCacheUpdated", true);
+			saveData();
+		}
+	}
+
+	public void addVoteShopPurchase(String ident) {
+		setVoteShopPurchases(ident, (getVoteShopPurchases(ident) + 1));
+	}
+
+	public void setVoteShopPurchases(String ident, int amount) {
+		getData().set("VoteShopPurchases." + ident, amount);
+		saveData();
+	}
+
+	public int getVoteShopPurchases(String ident) {
+		return getData().getInt("VoteShopPurchases." + ident);
+	}
+
 	public void setAutoCachedPlaceholder(List<String> placeholders) {
 		getData().set("AutoCachePlaceholders", placeholders);
 		saveData();
@@ -42,6 +73,10 @@ public class ServerData {
 		return getData().getStringList("AutoCachePlaceholders");
 	}
 
+	public List<String> getDisabledReminders() {
+		return getData().getStringList("DisabledReminders");
+	}
+
 	public synchronized void addServiceSite(String site) {
 		ArrayList<String> l = getServiceSites();
 		if (!getServiceSites().contains(site)) {
@@ -157,7 +192,16 @@ public class ServerData {
 
 	public boolean isLastVotePartySameDay() {
 		int num = getData().getInt("LastVoteParty", 0);
-		if (num != plugin.getTimeChecker().getTime().getDayOfYear()) {
+		if (num == plugin.getTimeChecker().getTime().getDayOfYear()) {
+			return true;
+		}
+		return false;
+	}
+
+	public boolean isLastVotePartySameWeek() {
+		int num = getData().getInt("LastVotePartyWeek", -1);
+		if (num == plugin.getTimeChecker().getTime().get(WeekFields.of(Locale.getDefault()).weekOfYear())
+				&& num != -1) {
 			return true;
 		}
 		return false;
@@ -264,6 +308,12 @@ public class ServerData {
 		saveData();
 	}
 
+	public void updateLastVotePartyWeek() {
+		getData().set("LastVotePartyWeek",
+				plugin.getTimeChecker().getTime().get(WeekFields.of(Locale.getDefault()).weekOfYear()));
+		saveData();
+	}
+
 	public int getBungeeVotePartyCurrent() {
 		return getData().getInt("BungeeVotePartyCurrent");
 	}
@@ -282,10 +332,43 @@ public class ServerData {
 		saveData();
 	}
 
+	public void saveDisabledReminders(ArrayList<UUID> disabledReminders) {
+		ArrayList<String> uuids = new ArrayList<String>();
+		for (UUID uuid : disabledReminders) {
+			uuids.add(uuid.toString());
+		}
+		getData().set("DisabledReminders", uuids);
+		saveData();
+	}
+
 	/**
 	 * Update values.
 	 */
 	public void updateValues() {
 		setVersion();
 	}
+
+	public void addTimeVoted(int num, VoteTimeQueue vote) {
+		getData().set("TimedVoteCache." + num + ".Name", vote.getName());
+		getData().set("TimedVoteCache." + num + ".Service", vote.getService());
+		getData().set("TimedVoteCache." + num + ".Time", vote.getTime());
+		saveData();
+	}
+
+	public Set<String> getTimedVoteCacheKeys() {
+		if (getData().isConfigurationSection("TimedVoteCache")) {
+			return getData().getConfigurationSection("TimedVoteCache").getKeys(false);
+		} else {
+			return new HashSet<String>();
+		}
+	}
+
+	public ConfigurationSection getTimedVoteCacheSection(String num) {
+		return getData().getConfigurationSection("TimedVoteCache." + num);
+	}
+
+	public void clearTimedVoteCache() {
+		getData().set("TimedVoteCache", null);
+		saveData();
+	}
 }

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

@@ -0,0 +1,86 @@
+package com.bencodez.votingplugin.events;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.bencodez.votingplugin.bungee.BungeeMessageData;
+import com.bencodez.votingplugin.objects.VoteSite;
+import com.bencodez.votingplugin.user.VotingPluginUser;
+
+import lombok.Getter;
+import lombok.Setter;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class PlayerVoteEvent.
+ */
+public class PlayerPostVoteEvent extends Event {
+
+	/** The Constant handlers. */
+	private static final HandlerList handlers = new HandlerList();
+
+	/**
+	 * Gets the handler list.
+	 *
+	 * @return the handler list
+	 */
+	public static HandlerList getHandlerList() {
+		return handlers;
+	}
+
+	@Getter
+	@Setter
+	private boolean bungee = false;
+
+	@Getter
+	@Setter
+	private BungeeMessageData bungeeTextTotals;
+
+	@Getter
+	@Setter
+	private boolean cancelled;
+
+	@Getter
+	@Setter
+	private boolean forceBungee = false;
+
+	@Getter
+	@Setter
+	private VotingPluginUser user;
+
+	@Getter
+	@Setter
+	private boolean realVote = true;
+
+	@Getter
+	@Setter
+	private VoteSite voteSite;
+	
+	@Getter
+	@Setter
+	private long voteTime = 0;
+
+	@Getter
+	@Setter
+	private VotingPluginUser votingPluginUser;
+
+	public PlayerPostVoteEvent(VoteSite voteSite, VotingPluginUser user, boolean realVote, boolean forceBungee, long voteTime) {
+		super(true);
+		this.user = user;
+		this.voteSite = voteSite;
+		this.realVote = realVote;
+		this.forceBungee = forceBungee;
+		this.voteTime = voteTime;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.bukkit.event.Event#getHandlers()
+	 */
+	@Override
+	public HandlerList getHandlers() {
+		return handlers;
+	}
+
+}

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

@@ -80,6 +80,10 @@ public class PlayerVoteEvent extends Event {
 	@Setter
 	private boolean broadcast = true;
 
+	@Getter
+	@Setter
+	private int voteNumber = 1;
+
 	public PlayerVoteEvent(VoteSite voteSite, String voteUsername, String serviceSite, boolean realVote) {
 		super(true);
 		this.player = voteUsername;

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

@@ -0,0 +1,58 @@
+package com.bencodez.votingplugin.events;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.bencodez.votingplugin.objects.VoteSite;
+import com.bencodez.votingplugin.user.VotingPluginUser;
+
+import lombok.Getter;
+import lombok.Setter;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class PlayerVoteEvent.
+ */
+public class PlayerVoteSiteCoolDownEndEvent extends Event {
+
+	/** The Constant handlers. */
+	private static final HandlerList handlers = new HandlerList();
+
+	/**
+	 * Gets the handler list.
+	 *
+	 * @return the handler list
+	 */
+	public static HandlerList getHandlerList() {
+		return handlers;
+	}
+
+	@Getter
+	@Setter
+	private boolean cancelled;
+
+	@Getter
+	@Setter
+	private VotingPluginUser player;
+
+	@Getter
+	@Setter
+	private VoteSite site;
+
+	public PlayerVoteSiteCoolDownEndEvent(VotingPluginUser user, VoteSite site) {
+		super(true);
+		player = user;
+		this.site = site;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.bukkit.event.Event#getHandlers()
+	 */
+	@Override
+	public HandlerList getHandlers() {
+		return handlers;
+	}
+
+}

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

@@ -3,7 +3,7 @@ package com.bencodez.votingplugin.events;
 import lombok.Getter;
 
 public enum SpecialRewardType {
-	ALLSITE, CUMMULATIVE, FIRSTVOTE, FIRSTVOTETODAY, MILESTONE, VOTESTREAK;
+	ALLSITE, CUMMULATIVE, FIRSTVOTE, FIRSTVOTETODAY, MILESTONE, VOTESTREAK, ALMOSTALLSITES;
 
 	@Getter
 	private int amount = -1;

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

@@ -1,6 +1,5 @@
 package com.bencodez.votingplugin.listeners;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.block.Sign;
 import org.bukkit.event.EventHandler;
@@ -18,7 +17,7 @@ import com.bencodez.votingplugin.signs.SignHandler;
 public class BlockBreak implements Listener {
 
 	/** The plugin. */
-	private static VotingPluginMain plugin;
+	private VotingPluginMain plugin;
 
 	/**
 	 * Instantiates a new block break.
@@ -26,7 +25,7 @@ public class BlockBreak implements Listener {
 	 * @param plugin the plugin
 	 */
 	public BlockBreak(VotingPluginMain plugin) {
-		BlockBreak.plugin = plugin;
+		this.plugin = plugin;
 	}
 
 	/**
@@ -39,7 +38,7 @@ public class BlockBreak implements Listener {
 		if (event.getBlock().getState() instanceof Sign) {
 			Sign s = (Sign) event.getBlock().getState();
 			final Location loc = s.getLocation();
-			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+			plugin.getBukkitScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 				@Override
 				public void run() {

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

@@ -1,7 +1,5 @@
 package com.bencodez.votingplugin.listeners;
 
-import org.bukkit.Bukkit;
-
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
 import com.vexsoftware.votifier.model.Vote;
@@ -10,7 +8,7 @@ import com.vexsoftware.votifier.model.VotifierEvent;
 public class BungeeVotifierEvent {
 	public void send(VotingPluginMain plugin, PlayerVoteEvent event) {
 		plugin.debug("Triggering vote event");
-		Bukkit.getScheduler().runTask(plugin, new Runnable() {
+		plugin.getBukkitScheduler().runTask(plugin, new Runnable() {
 
 			@Override
 			public void run() {

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

@@ -12,7 +12,6 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import com.bencodez.advancedcore.api.misc.PlayerUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.signs.SignHandler;
-import com.bencodez.votingplugin.user.UserManager;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -21,7 +20,7 @@ import com.bencodez.votingplugin.user.UserManager;
 public class PlayerInteract implements Listener {
 
 	/** The plugin. */
-	private static VotingPluginMain plugin;
+	private VotingPluginMain plugin;
 
 	/**
 	 * Instantiates a new player interact.
@@ -29,7 +28,7 @@ public class PlayerInteract implements Listener {
 	 * @param plugin the plugin
 	 */
 	public PlayerInteract(VotingPluginMain plugin) {
-		PlayerInteract.plugin = plugin;
+		this.plugin = plugin;
 	}
 
 	/**
@@ -52,7 +51,7 @@ public class PlayerInteract implements Listener {
 						if (sign.isLocationSame(event.getClickedBlock().getLocation())) {
 							// plugin.debug(player.getName() +
 							// " right clicked a top voter sign, sending message");
-							UserManager.getInstance().getVotingPluginUser(player)
+							plugin.getVotingPluginUserManager().getVotingPluginUser(player)
 									.sendMessage(sign.getRightClickMessage());
 
 							if (!sign.isSkullSet()) {

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

@@ -1,17 +1,14 @@
 package com.bencodez.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.bencodez.advancedcore.api.user.UserStorage;
 import com.bencodez.advancedcore.listeners.AdvancedCoreLoginEvent;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 // TODO: Auto-generated Javadoc
@@ -21,7 +18,7 @@ import com.bencodez.votingplugin.user.VotingPluginUser;
 public class PlayerJoinEvent implements Listener {
 
 	/** The plugin. */
-	private static VotingPluginMain plugin;
+	private VotingPluginMain plugin;
 
 	/**
 	 * Instantiates a new player join event.
@@ -29,11 +26,11 @@ public class PlayerJoinEvent implements Listener {
 	 * @param plugin the plugin
 	 */
 	public PlayerJoinEvent(VotingPluginMain plugin) {
-		PlayerJoinEvent.plugin = plugin;
+		this.plugin = plugin;
 	}
 
 	private void login(Player player) {
-		VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
+		VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
 		if (player.isOp() && plugin.isYmlError()) {
 			user.sendMessage("&cVotingPlugin: Detected yml error, please check console for details");
 		}
@@ -49,9 +46,13 @@ public class PlayerJoinEvent implements Listener {
 
 		user.loginRewards();
 
+		plugin.getPlaceholders().onUpdate(user, true);
+
 		if (plugin.getBungeeSettings().isUseBungeecoord()
-				&& plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
-			plugin.getPluginMessaging().sendPluginMessage("Login", user.getPlayerName(), user.getUUID());
+				&& (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)
+						|| plugin.getBungeeHandler().getMethod().equals(BungeeMethod.REDIS))) {
+			plugin.getBungeeHandler().getGlobalMessageHandler().sendMessage("Login", user.getPlayerName(),
+					user.getUUID(), plugin.getBungeeSettings().getServer());
 		}
 	}
 
@@ -62,43 +63,30 @@ public class PlayerJoinEvent implements Listener {
 	 */
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
 	public void onPlayerLogin(AdvancedCoreLoginEvent event) {
-		if (event.getPlayer() == null || (VotingPluginMain.plugin.getStorageType().equals(UserStorage.MYSQL)
-				&& VotingPluginMain.plugin.getMysql() == null)) {
+		if (event.getPlayer() == null || !plugin.isMySQLOkay()) {
 			return;
 		}
 
-		int delay = plugin.getConfigFile().getDelayLoginEvent();
-		if (delay <= 0) {
-			login(event.getPlayer());
-		} else {
-			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
-
-				@Override
-				public void run() {
-					login(event.getPlayer());
-				}
-			}, delay);
-		}
+		login(event.getPlayer());
 
 	}
 
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
 	public void onPlayerQuit(PlayerQuitEvent event) {
-		if (plugin.getConfigFile().isDisableAdvancedTab()) {
-			return;
+		if (plugin != null && plugin.isEnabled()) {
+			final java.util.UUID uuid = event.getPlayer().getUniqueId();
+			plugin.getLoginTimer().execute(new Runnable() {
+
+				@Override
+				public void run() {
+					VotingPluginMain.plugin.getAdvancedTab().remove(uuid);
+
+					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid);
+					user.dontCache();
+					user.logoutRewards();
+					plugin.getPlaceholders().onLogout(user);
+				}
+			});
 		}
-		final java.util.UUID uuid = event.getPlayer().getUniqueId();
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				VotingPluginMain.plugin.getAdvancedTab().remove(uuid);
-
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(uuid);
-				user.dontCache();
-				user.logoutRewards();
-			}
-		});
-
 	}
 }

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

@@ -5,6 +5,7 @@ import java.time.ZoneId;
 import java.util.ArrayList;
 
 import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -13,9 +14,10 @@ import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.PlayerUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
+import com.bencodez.votingplugin.events.PlayerPostVoteEvent;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
 import com.bencodez.votingplugin.objects.VoteSite;
-import com.bencodez.votingplugin.user.UserManager;
+import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 // TODO: Auto-generated Javadoc
@@ -24,8 +26,6 @@ import com.bencodez.votingplugin.user.VotingPluginUser;
  */
 public class PlayerVoteListener implements Listener {
 
-	private static Object object = new Object();
-
 	private VotingPluginMain plugin;
 
 	/**
@@ -44,20 +44,25 @@ public class PlayerVoteListener implements Listener {
 	 */
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onplayerVote(PlayerVoteEvent event) {
+		if (!plugin.isEnabled()) {
+			plugin.getLogger().warning("Plugin disabled, ignoring vote");
+			return;
+		}
 		String playerName = event.getPlayer();
+		plugin.debug("Processing PlayerVoteEvent: " + playerName + "/" + event.getServiceSite());
 		if (!PlayerUtils.getInstance().isValidUser(playerName, plugin.getConfigFile().isAllowUnJoinedCheckServer())) {
 			if (!plugin.getConfigFile().isAllowUnjoined()) {
 				plugin.getLogger().warning("Player " + playerName
 						+ " has not joined before, disregarding vote, set AllowUnjoined to true to prevent this");
 				if (event.isBungee() && plugin.getBungeeSettings().isRemoveInvalidUsers()) {
-					UserManager.getInstance().getVotingPluginUser(playerName).remove();
+					plugin.getVotingPluginUserManager().getVotingPluginUser(playerName).remove();
 				}
 				return;
 			}
 		}
 
 		if (playerName.isEmpty()) {
-			plugin.getLogger().warning("Empty player name for vote");
+			plugin.getLogger().warning("Empty player name from vote, ignoring");
 			return;
 		}
 
@@ -86,7 +91,7 @@ public class PlayerVoteListener implements Listener {
 					services.add(site.getServiceSite());
 				}
 				plugin.getLogger()
-						.warning("Current known service sites: " + ArrayUtils.getInstance().makeStringList(services));
+						.warning("Currently set service sites: " + ArrayUtils.getInstance().makeStringList(services));
 			}
 			return;
 		}
@@ -100,121 +105,169 @@ public class PlayerVoteListener implements Listener {
 		if (event.getVotingPluginUser() != null) {
 			user = event.getVotingPluginUser();
 		} else {
-			user = UserManager.getInstance().getVotingPluginUser(playerName);
+			Player p = Bukkit.getPlayerExact(playerName);
+			if (p != null) {
+				// player online
+				user = plugin.getVotingPluginUserManager().getVotingPluginUser(p);
+			} else {
+				user = plugin.getVotingPluginUserManager().getVotingPluginUser(playerName);
+			}
 		}
 
 		if (voteSite.isWaitUntilVoteDelay() && !user.canVoteSite(voteSite)) {
-			plugin.getLogger().info(user.getPlayerName() + " must wait until votedelay is over, ignoring vote");
-			return;
+			if (!event.isRealVote()) {
+				plugin.getLogger().info(user.getPlayerName() + " did a not real vote, bypassing WaitUntilVoteDelay");
+			} else {
+				if (user.hasPermission("VotingPlugin.BypassWaitUntilVoteDelay")) {
+					plugin.getLogger()
+							.info(user.getPlayerName() + " has bypass permission for WaitUntilVoteDelay, bypassing");
+				} else {
+					plugin.getLogger().info(user.getPlayerName() + " must wait until votedelay is over, ignoring vote");
+					return;
+				}
+			}
 		}
 
-		synchronized (object) {
-			// reupdate cache
-			user.clearCache();
-			user.cache();
+		final String uuid = user.getUUID();
 
-			user.updateName(true);
+		// reupdate cache
+		user.cache();
 
-			// vote party
-			plugin.getVoteParty().vote(user, event.isRealVote(), event.isForceBungee());
+		user.updateName(true);
 
-			if (event.isBroadcast() && !plugin.getBungeeSettings().isDisableBroadcast()) {
-				// broadcast vote if enabled in config
-				if (plugin.getConfigFile().isBroadcastVotesEnabled()
-						&& (plugin.getBungeeSettings().isBungeeBroadcast() || !event.isBungee())) {
-					if (!plugin.getConfigFile().getFormatBroadcastWhenOnline() || user.isOnline()) {
-						voteSite.broadcastVote(user);
-					}
+		// vote party
+		plugin.getVoteParty().vote(user, event.isRealVote(), event.isForceBungee());
+
+		if (event.isBroadcast() && !plugin.getBungeeSettings().isDisableBroadcast()) {
+			// broadcast vote if enabled in config
+			if (plugin.getConfigFile().isBroadcastVotesEnabled()
+					&& (plugin.getBungeeSettings().isBungeeBroadcast() || !event.isBungee())) {
+				if (!plugin.getConfigFile().isFormatBroadcastWhenOnline() || user.isOnline()) {
+					voteSite.broadcastVote(user);
 				}
 			}
+		}
 
-			if (plugin.getBroadcastHandler() != null) {
-				plugin.getBroadcastHandler().onVote(playerName);
+		if (plugin.getBroadcastHandler() != null) {
+			plugin.getBroadcastHandler().onVote(playerName);
+		}
+
+		long voteTime = 0;
+		// update last vote time
+		if (event.getTime() != 0) {
+			user.setTime(voteSite, event.getTime());
+			voteTime = event.getTime();
+		} else {
+			user.setTime(voteSite);
+			voteTime = LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+		}
+
+		// try logging to file
+		if (plugin.getConfigFile().isLogVotesToFile()) {
+			try {
+				plugin.logVote(LocalDateTime.now().atZone(ZoneId.systemDefault()).toLocalDateTime(), playerName,
+						voteSite.getKey());
+			} catch (Exception e) {
+				e.printStackTrace();
 			}
+		}
 
-			// update last vote time
-			if (event.getTime() != 0) {
-				user.setTime(voteSite, event.getTime());
-			} else {
-				user.setTime(voteSite);
+		// check first vote rewards
+		plugin.getSpecialRewards().checkFirstVote(user, event.isForceBungee());
+		plugin.getSpecialRewards().checkFirstVoteToday(user, event.isForceBungee());
+
+		if (user.isReminded() && plugin.getConfigFile().isVoteRemindingRemindOnlyOnce()) {
+			user.setReminded(false);
+		}
+
+		// check if player has voted on all sites in one day
+		if (((user.isOnline() || voteSite.isGiveOffline()) && plugin.getOptions().isProcessRewards())
+				|| event.isBungee()) {
+			boolean online = true;
+			if (event.isBungee()) {
+				online = event.isWasOnline();
 			}
-			plugin.getCoolDownCheck().vote(user);
-
-			// try logging to file
-			if (plugin.getConfigFile().isLogVotesToFile()) {
-				try {
-					VotingPluginMain.plugin.logVote(
-							LocalDateTime.now().atZone(ZoneId.systemDefault()).toLocalDateTime(), playerName,
-							voteSite.getKey());
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-
-			// check first vote rewards
-			plugin.getSpecialRewards().checkFirstVote(user, event.isForceBungee());
-			plugin.getSpecialRewards().checkFirstVoteToday(user, event.isForceBungee());
-
-			if (user.isReminded() && plugin.getConfigFile().getVoteRemindingRemindOnlyOnce()) {
-				user.setReminded(false);
-			}
-
-			// check if player has voted on all sites in one day
-
-			if (((user.isOnline() || voteSite.isGiveOffline())
-					&& VotingPluginMain.plugin.getOptions().isProcessRewards()) || event.isBungee()) {
-				boolean online = true;
-				if (event.isBungee()) {
-					online = event.isWasOnline();
-				}
-				user.playerVote(voteSite, online, false, event.isForceBungee());
+			user.playerVote(voteSite, online, false, event.isForceBungee());
+			if (event.getVoteNumber() == 1) {
 				user.sendVoteEffects(online);
-				if (plugin.getConfigFile().isCloseInventoryOnVote()) {
-					user.closeInv();
-				}
-			} else {
+			}
+			if (plugin.getConfigFile().isCloseInventoryOnVote()) {
+				user.closeInv();
+			}
+		} else {
+			if (!plugin.getConfigFile().isOfflineVotesLimitEnabled()
+					|| user.getNumberOfOfflineVotes(voteSite) <= plugin.getConfigFile().getOfflineVotesLimitAmount()) {
 				user.addOfflineVote(voteSite.getKey());
 				plugin.debug(
 						"Offline vote set for " + playerName + " (" + user.getUUID() + ") on " + voteSite.getKey());
+			} else {
+				plugin.debug("Not setting offline vote, offline vote limit reached");
 			}
+		}
 
-			// add to total votes
-			if ((plugin.getConfigFile().isCountFakeVotes() || event.isRealVote()) && event.isAddTotals()) {
-				if (plugin.getConfigFile().isAddTotals()) {
+		// add to total votes
+		if ((plugin.getConfigFile().isCountFakeVotes() || event.isRealVote()) && event.isAddTotals()) {
+			if (plugin.getConfigFile().isAddTotals()) {
+				if (plugin.getConfigFile().isAddTotalsOffline() || user.isOnline()) {
 					user.addTotal();
 					user.addTotalDaily();
 					user.addTotalWeekly();
 				}
-				user.addPoints();
 			}
+			user.addPoints();
+		}
+		user.checkDayVoteStreak(event.isForceBungee());
 
-			user.checkDayVoteStreak(event.isForceBungee());
-
-			// other rewards
-			plugin.getSpecialRewards().checkAllSites(user, event.isForceBungee());
-			plugin.getSpecialRewards().checkCumualativeVotes(user, event.getBungeeTextTotals(), event.isForceBungee());
-			plugin.getSpecialRewards().checkMilestone(user, event.getBungeeTextTotals(), event.isForceBungee());
-
-			if (plugin.getBungeeSettings().isUseBungeecoord()) {
-				if (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.MYSQL)) {
-					final String uuid = user.getUUID();
-					Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
-
-						@Override
-						public void run() {
-							if (Bukkit.getOnlinePlayers().size() > 0) {
-								plugin.getPluginMessaging().sendPluginMessage("VoteUpdate", uuid);
-							}
-						}
-					}, 40);
-				}
+		if (plugin.getConfigFile().isLimitMonthlyVotes()) {
+			int value = 0;
+			if (event.isBungee()) {
+				value = event.getBungeeTextTotals().getMonthTotal();
+			} else {
+				value = user.getTotal(TopVoter.Monthly);
 			}
-			if (!user.isOnline()) {
-				user.clearCache();
+			LocalDateTime cTime = plugin.getTimeChecker().getTime();
+			int days = cTime.getDayOfMonth();
+			if (value >= days * plugin.getVoteSitesEnabled().size()) {
+				user.setTotal(TopVoter.Monthly, days * plugin.getVoteSitesEnabled().size());
 			}
 		}
 
+		// other rewards
+		plugin.getSpecialRewards().checkAllSites(user, event.isForceBungee());
+		plugin.getSpecialRewards().checkAlmostAllSites(user, event.isForceBungee());
+		plugin.getSpecialRewards().checkCumualativeVotes(user, event.getBungeeTextTotals(), event.isForceBungee());
+		plugin.getSpecialRewards().checkMilestone(user, event.getBungeeTextTotals(), event.isForceBungee());
+		plugin.getCoolDownCheck().vote(user, voteSite);
+
+		if (plugin.getBungeeSettings().isUseBungeecoord()) {
+			if (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.MYSQL)) {
+
+				plugin.getBukkitScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+
+					@Override
+					public void run() {
+						if (Bukkit.getOnlinePlayers().size() > 0) {
+							plugin.getBungeeHandler().getGlobalMessageHandler().sendMessage("VoteUpdate", uuid);
+						}
+					}
+				}, 2);
+			}
+		}
+
+		PlayerPostVoteEvent postVoteEvent = new PlayerPostVoteEvent(voteSite, user, event.isRealVote(),
+				event.isForceBungee(), voteTime);
+		plugin.getServer().getPluginManager().callEvent(postVoteEvent);
+
+		if (user.isOnline()) {
+			plugin.getPlaceholders().onUpdate(user, true);
+		}
+
+		if (!user.isOnline()) {
+			user.clearCache();
+		}
 		plugin.setUpdate(true);
+
+		plugin.extraDebug("Finished vote processing: " + playerName + "/" + uuid);
 	}
 
 }

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

@@ -1,6 +1,5 @@
 package com.bencodez.votingplugin.listeners;
 
-import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.SignChangeEvent;
@@ -16,7 +15,7 @@ import com.bencodez.votingplugin.VotingPluginMain;
 public class SignChange implements Listener {
 
 	/** The plugin. */
-	private static VotingPluginMain plugin;
+	private VotingPluginMain plugin;
 
 	/**
 	 * Instantiates a new sign change.
@@ -24,7 +23,7 @@ public class SignChange implements Listener {
 	 * @param plugin the plugin
 	 */
 	public SignChange(VotingPluginMain plugin) {
-		SignChange.plugin = plugin;
+		this.plugin = plugin;
 	}
 
 	/**
@@ -47,7 +46,7 @@ public class SignChange implements Listener {
 					plugin.getServerData().addSign(event.getBlock().getLocation(), event.getLine(2),
 							Integer.parseInt(event.getLine(1)));
 					event.getPlayer().sendMessage(StringParser.getInstance().colorize("&aAdded sign!"));
-					Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+					plugin.getBukkitScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 						@Override
 						public void run() {

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

@@ -2,7 +2,6 @@ package com.bencodez.votingplugin.listeners;
 
 import java.util.ArrayList;
 
-import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -65,53 +64,75 @@ public class VotiferEvent implements Listener {
 		plugin.debug("VoteSite: " + voteSite);
 		plugin.debug("IP: " + IP);
 
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+		plugin.getVoteTimer().submit(new Runnable() {
 
 			@Override
 			public void run() {
-				plugin.getServerData().addServiceSite(voteSite);
-				if (plugin.getBungeeSettings().isUseBungeecoord() && !plugin.getBungeeSettings().isVotifierBypass()
-						&& (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)
-								|| plugin.getBungeeHandler().getMethod().equals(BungeeMethod.SOCKETS))) {
-					plugin.getLogger().severe(
-							"Ignoring vote from votifier since pluginmessaging or socket bungee method is enabled, this means you aren't setup correctly for those methods, please check: https://github.com/BenCodez/VotingPlugin/wiki/Bungeecord-Setups");
-					return;
-				}
-				String voteSiteNameStr = plugin.getVoteSiteName(false, voteSite);
+				try {
+					plugin.getServerData().addServiceSite(voteSite);
+					if (plugin.getBungeeSettings().isUseBungeecoord() && !plugin.getBungeeSettings().isVotifierBypass()
+							&& (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)
+									|| plugin.getBungeeHandler().getMethod().equals(BungeeMethod.SOCKETS))) {
+						plugin.getLogger().severe(
+								"Ignoring vote from votifier since pluginmessaging or socket bungee method is enabled, this means you aren't setup correctly for those methods, please check: https://github.com/BenCodez/VotingPlugin/wiki/Bungeecord-Setups");
+						return;
+					}
+					String matchSite = "";
+					if (plugin.getConfigFile().isAdvancedServiceSiteHandling()) {
+						if (plugin.getServiceSiteHandler() != null) {
+							matchSite = plugin.getServiceSiteHandler().matchReverse(voteSite);
+						}
+					}
 
-				ArrayList<String> sites = plugin.getConfigVoteSites().getVoteSitesNames(false);
-				boolean createSite = false;
-				if (sites != null) {
-					if (!sites.contains(voteSiteNameStr)) {
+					String voteSiteNameStr = plugin.getVoteSiteName(false, voteSite, matchSite);
+
+					ArrayList<String> sites = plugin.getConfigVoteSites().getVoteSitesNames(false);
+					boolean createSite = false;
+					if (sites != null) {
+						if (!ArrayUtils.getInstance().containsIgnoreCase(sites, voteSiteNameStr)) {
+							createSite = true;
+						}
+					} else {
 						createSite = true;
 					}
-				} else {
-					createSite = true;
-				}
 
-				if (plugin.getConfigFile().isAutoCreateVoteSites() && createSite) {
-					plugin.getLogger().warning("VoteSite with service site '" + voteSiteNameStr
-							+ "' does not exist, attempting to generaterate...");
-					plugin.getConfigVoteSites().generateVoteSite(voteSiteNameStr);
+					String serviceSite = voteSite;
 
-					plugin.getLogger().info("Current known service sites: "
-							+ ArrayUtils.getInstance().makeStringList(plugin.getServerData().getServiceSites()));
-				}
+					if (plugin.getConfigFile().isAutoCreateVoteSites() && createSite) {
+						plugin.getLogger().warning("VoteSite with service site '" + voteSiteNameStr
+								+ "' does not exist, attempting to generate...");
+						plugin.getConfigVoteSites().generateVoteSite(voteSiteNameStr);
 
-				String voteSiteName = plugin.getVoteSiteName(true, voteSite);
+						plugin.getLogger().info("Current known service sites: "
+								+ ArrayUtils.getInstance().makeStringList(plugin.getServerData().getServiceSites()));
+					}
 
-				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName, true), voteUsername,
-						voteSite, true);
-				plugin.getServer().getPluginManager().callEvent(voteEvent);
+					if (plugin.getTimeChecker().isActiveProcessing()
+							&& plugin.getConfigFile().isQueueVotesDuringTimeChange()) {
+						// time change in progress
+						plugin.debug("Adding vote to time queue " + voteUsername + "/" + voteSite);
+						plugin.getTimeQueueHandler().addVote(voteUsername, voteSite);
 
-				if (voteEvent.isCancelled()) {
-					plugin.debug("Vote cancelled");
-					return;
+						return;
+					}
+
+					String voteSiteName = plugin.getVoteSiteName(true, serviceSite, matchSite);
+
+					PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName, true),
+							voteUsername, voteSite, true);
+					plugin.getServer().getPluginManager().callEvent(voteEvent);
+
+					if (voteEvent.isCancelled()) {
+						plugin.debug("Vote cancelled");
+						return;
+					}
+				} catch (Exception e) {
+					plugin.getLogger().severe("Error occured during vote processing");
+					e.printStackTrace();
 				}
 
 			}
 		});
-
 	}
 
 }

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

@@ -14,7 +14,7 @@ import com.bencodez.votingplugin.VotingPluginMain;
 public class VotingPluginUpdateEvent implements Listener {
 
 	/** The plugin. */
-	private static VotingPluginMain plugin;
+	private VotingPluginMain plugin;
 
 	/**
 	 * Instantiates a new advanced core update event.
@@ -22,7 +22,7 @@ public class VotingPluginUpdateEvent implements Listener {
 	 * @param plugin the plugin
 	 */
 	public VotingPluginUpdateEvent(VotingPluginMain plugin) {
-		VotingPluginUpdateEvent.plugin = plugin;
+		this.plugin = plugin;
 	}
 
 	/**

VotingPlugin/src/com/bencodez/votingplugin/objects/VoteSite.java

@@ -14,10 +14,8 @@ import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 import lombok.Getter;
@@ -66,7 +64,7 @@ public class VoteSite {
 
 	@Getter
 	@Setter
-	private double timeOffSet;
+	private int voteDelayDailyHour;
 
 	@Getter
 	@Setter
@@ -108,6 +106,11 @@ public class VoteSite {
 			return;
 		}
 		if (!user.isVanished()) {
+			String playerName = user.getPlayerName();
+			if (plugin.getConfigFile().getVotingBroadcastBlacklist().contains(playerName)) {
+				plugin.getLogger().info("Not broadcasting for " + playerName + ", in blacklist");
+				return;
+			}
 			if (checkBungee && plugin.getBungeeSettings().isBungeeBroadcast()
 					&& plugin.getBungeeSettings().isUseBungeecoord()) {
 				if (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.SOCKETS)) {
@@ -123,11 +126,6 @@ public class VoteSite {
 				}
 
 			} else {
-				String playerName = user.getPlayerName();
-				if (plugin.getConfigFile().getVotingBroadcastBlacklist().contains(playerName)) {
-					plugin.getLogger().info("Not broadcasting for " + playerName + ", in blacklist");
-					return;
-				}
 				String bc = StringParser.getInstance().colorize(plugin.getConfigFile().getFormatBroadCastMsg());
 				HashMap<String, String> placeholders = new HashMap<String, String>();
 				placeholders.put("player", playerName);
@@ -135,11 +133,13 @@ public class VoteSite {
 						(user.getPlayer() != null) ? user.getPlayer().getDisplayName() : user.getPlayerName());
 				placeholders.put("sitename", getDisplayName());
 				placeholders.put("servicesite", getServiceSite());
+				placeholders.put("votesrequired", "" + plugin.getVoteParty().getVotesRequired());
+				placeholders.put("neededvotes", "" + plugin.getVoteParty().getNeededVotes());
 				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()) {
+					if (!plugin.getVotingPluginUserManager().getVotingPluginUser(p).getDisableBroadcast()) {
 						players.add(p);
 					}
 				}
@@ -173,7 +173,8 @@ public class VoteSite {
 	}
 
 	public String getVoteURL(boolean json) {
-		if (!plugin.getConfigFile().isFormatCommandsVoteForceLinks() || !json) {
+		if (!plugin.getConfigFile().isFormatCommandsVoteForceLinks() || !json
+				|| StringParser.getInstance().containsJson(voteURL)) {
 			return voteURL;
 		} else {
 			if (!voteURL.startsWith("http")) {
@@ -209,7 +210,7 @@ public class VoteSite {
 	}
 
 	public boolean hasRewards() {
-		return RewardHandler.getInstance().hasRewards(plugin.getConfigVoteSites().getData(),
+		return plugin.getRewardHandler().hasRewards(plugin.getConfigVoteSites().getData(),
 				plugin.getConfigVoteSites().getRewardsPath(key));
 	}
 
@@ -231,7 +232,7 @@ public class VoteSite {
 		voteDelayDaily = plugin.getConfigVoteSites().getVoteSiteResetVoteDelayDaily(key);
 		giveOffline = plugin.getConfigVoteSites().getVoteSiteGiveOffline(key);
 		waitUntilVoteDelay = plugin.getConfigVoteSites().getWaitUntilVoteDelay(key);
-		timeOffSet = plugin.getConfigVoteSites().getTimeOffSet(key);
+		voteDelayDailyHour = plugin.getConfigVoteSites().getVoteDelayDailyHour(key);
 		hidden = plugin.getConfigVoteSites().getVoteSiteHidden(key);
 		ignoreCanVote = plugin.getConfigVoteSites().getVoteSiteIgnoreCanVote(key);
 	}
@@ -240,4 +241,19 @@ public class VoteSite {
 		return ArrayUtils.getInstance().containsIgnoreCase(plugin.getServerData().getServiceSites(), getServiceSite());
 	}
 
+	public String loadingDebug() {
+		String str = "Loading votesite key: " + key;
+		str += ", Displayname: " + displayName;
+		str += ", VoteDelay: " + getVoteDelay();
+		str += ", VoteDelayMin: " + getVoteDelayMin();
+		str += ", VoteDelayDaily: " + isVoteDelayDaily();
+		str += ", IsWaitUntilVoteDelay: " + isWaitUntilVoteDelay();
+		str += ", ServiceSite: " + getServiceSite();
+		str += ", VoteDelayDailyHour:" + getVoteDelayDailyHour();
+		str += ", Url: " + getVoteURL();
+		str += ", IgnoreCanVote: " + isIgnoreCanVote();
+		str += ", Hidden: " + isHidden();
+		return str;
+	}
+
 }

VotingPlugin/src/com/bencodez/votingplugin/placeholders/MVdWPlaceholders.java

@@ -5,7 +5,6 @@ import org.bukkit.Bukkit;
 import com.bencodez.advancedcore.api.placeholder.NonPlayerPlaceHolder;
 import com.bencodez.advancedcore.api.placeholder.PlaceHolder;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 import be.maximvdw.placeholderapi.PlaceholderAPI;
@@ -41,11 +40,11 @@ public class MVdWPlaceholders {
 
 								@Override
 								public String onPlaceholderReplace(PlaceholderReplaceEvent event) {
-									VotingPluginUser user = UserManager.getInstance()
+									VotingPluginUser user = plugin.getVotingPluginUserManager()
 											.getVotingPluginUser(event.getOfflinePlayer());
 									if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders()
 											&& user.hasPrimaryAccount()) {
-										user = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
+										user = plugin.getVotingPluginUserManager().getVotingPluginUser(user.getPrimaryAccount());
 									}
 									return place.placeholderRequest(user,
 											event.getPlaceholder().substring("VotingPlugin_".length()));

VotingPlugin/src/com/bencodez/votingplugin/placeholders/PlaceHolders.java

@@ -3,6 +3,8 @@ package com.bencodez.votingplugin.placeholders;
 import java.text.NumberFormat;
 import java.time.Duration;
 import java.time.LocalDateTime;
+import java.time.temporal.TemporalField;
+import java.time.temporal.WeekFields;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -18,6 +20,7 @@ import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.placeholder.CalculatingPlaceholder;
 import com.bencodez.advancedcore.api.placeholder.NonPlayerPlaceHolder;
 import com.bencodez.advancedcore.api.placeholder.PlaceHolder;
 import com.bencodez.advancedcore.api.user.AdvancedCoreUser;
@@ -26,7 +29,6 @@ import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
-import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 import lombok.Getter;
@@ -47,61 +49,193 @@ public class PlaceHolders {
 
 	public PlaceHolders(VotingPluginMain plugin) {
 		this.plugin = plugin;
+		cacheLevel = plugin.getConfigFile().getPlaceholderCacheLevel();
+	}
+
+	public void reload() {
+		cacheLevel = plugin.getConfigFile().getPlaceholderCacheLevel();
+		onUpdate();
+		if (!cacheLevel.equals(PlaceholderCacheLevel.NONE)) {
+			for (Player player : Bukkit.getOnlinePlayers()) {
+				onUpdate(plugin.getVotingPluginUserManager().getVotingPluginUser(player), player.isOnline());
+			}
+		}
 	}
 
 	private ArrayList<String> cachedPlaceholders = new ArrayList<String>();
 
 	private ConcurrentLinkedQueue<String> placeholdersToSetCacheOn = new ConcurrentLinkedQueue<String>();
 
+	@Getter
+	private PlaceholderCacheLevel cacheLevel;
+
 	public String getPlaceHolder(OfflinePlayer p, String identifier) {
 		return getPlaceHolder(p, identifier, true);
 	}
 
-	public String getPlaceHolder(OfflinePlayer p, String identifier, boolean javascript) {
-		if (plugin.getConfigFile().isUseJavascriptPlaceholders() && javascript) {
+	public String getPlaceHolder(OfflinePlayer p, String identifier1, boolean javascript) {
+		boolean forceProcess = false;
+		boolean useCache = true;
+		String identifier = identifier1.toLowerCase();
+		boolean custom = false;
+		if (identifier.endsWith("_process")) {
+			forceProcess = true;
+			identifier = identifier.replaceAll("_process", "");
+		}
+		if (identifier.endsWith("_nocache")) {
+			useCache = false;
+			identifier = identifier.replaceAll("_nocache", "");
+		}
+		if (getCacheLevel().equals(PlaceholderCacheLevel.NONE)) {
+			useCache = false;
+		}
+
+		if (identifier.startsWith("custom_")) {
+			custom = true;
+			identifier = identifier.replaceAll("custom_", "");
+		}
+
+		if (custom && plugin.getConfigFile().getCustomPlaceholderReturns().contains(identifier)) {
+			String str = getPlaceholderValue(p, identifier, javascript, true, useCache);
+			String returnStr = plugin.getConfigFile().getCustomPlaceholderReturns(identifier, str);
+			if (!returnStr.isEmpty()) {
+				return returnStr;
+			}
+			return str;
+		} else {
+			return getPlaceholderValue(p, identifier, javascript, forceProcess, useCache);
+		}
+
+	}
+
+	public String getPlaceholderValue(OfflinePlayer p, String identifier, boolean javascript, boolean forceProcess,
+			boolean useCache) {
+		if (plugin.getConfigFile().isUseJavascriptPlaceholders() && javascript && p != null) {
 			identifier = StringParser.getInstance().replaceJavascript(p, identifier);
 		}
 
-		for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : nonPlayerPlaceholders) {
-			if (placeholder.matches(identifier)) {
-				return placeholder.placeholderRequest(identifier);
+		if (!identifier.endsWith("Position")) {
+			for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : nonPlayerPlaceholders) {
+				if (placeholder.matches(identifier)) {
+					String str = placeholder.placeholderRequest(identifier);
+					if (str != null) {
+						return str;
+					}
+				}
 			}
 		}
 
-		VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(p);
-		if (!cachedPlaceholders.contains(identifier)) {
-			if (Bukkit.isPrimaryThread() || plugin.getConfigFile().isAlwaysWaitForCachePlaceholders()) {
-				user.setWaitForCache(false);
-				if (!user.isCached()) {
-					user.loadCache();
-					placeholdersToSetCacheOn.add(identifier);
-					return "..";
+		if (p == null) {
+			return "no player";
+		}
+
+		VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(p);
+		if (useCache) {
+			if (!cachedPlaceholders.contains(identifier)) {
+				// not cached placeholder
+				if (!forceProcess) {
+					for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
+						if (placeholder.matches(identifier)) {
+							if (getCacheLevel().shouldCache()) {
+								if (!placeholdersToSetCacheOn.contains(identifier)) {
+									placeholdersToSetCacheOn.add(identifier);
+									schedulePlaceholderCheck(user);
+								}
+							}
+							return "..";
+						}
+					}
+					return "Not a valid placeholder";
+
 				}
 			}
 		}
 		if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders()) {
 			if (user.hasPrimaryAccount()) {
-				user = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
+				user = plugin.getVotingPluginUserManager().getVotingPluginUser(user.getPrimaryAccount());
 			}
 		}
 
 		for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
 			try {
 				if (placeholder.matches(identifier)) {
-					if (placeholder.isUsesCache() && placeholder.isCached(identifier)) {
-						ConcurrentHashMap<UUID, String> cache = placeholder.getCache().get(identifier);
-						if (cache.containsKey(p.getUniqueId())) {
-							return cache.get(p.getUniqueId());
+					if (placeholder instanceof CalculatingPlaceholder<?>) {
+						if (useCache) {
+							CalculatingPlaceholder<VotingPluginUser> cPlaceholder = (CalculatingPlaceholder<VotingPluginUser>) placeholder;
+							if (placeholder.isUsesCache() && placeholder.isCached(identifier)) {
+								ConcurrentHashMap<UUID, String> cache = placeholder.getCache().get(identifier);
+								if (cache.containsKey(p.getUniqueId())) {
+									if (cPlaceholder.getCacheData().containsKey(user.getJavaUUID())) {
+										return cPlaceholder.placeholderRequest(user, identifier);
+									}
+									return cache.get(p.getUniqueId());
+								} else if (!forceProcess) {
+									schedulePlaceholderCheck(user);
+									return "...";
+								}
+							}
+
+							if (forceProcess) {
+								if (getCacheLevel().shouldCache()) {
+									if (!placeholdersToSetCacheOn.contains(identifier)
+											&& !cachedPlaceholders.contains(identifier)) {
+										placeholdersToSetCacheOn.add(identifier);
+										schedulePlaceholderCheck(user);
+									}
+								}
+								return placeholder.placeholderRequest(user, identifier);
+							} else {
+								if (getCacheLevel().shouldCache()) {
+									if (!placeholdersToSetCacheOn.contains(identifier)
+											&& !cachedPlaceholders.contains(identifier)) {
+										placeholdersToSetCacheOn.add(identifier);
+										schedulePlaceholderCheck(user);
+									}
+								}
+								return ".";
+							}
 						} else {
-							return "....";
+							return placeholder.placeholderRequest(user, identifier);
 						}
 					} else {
-						return placeholder.placeholderRequest(user, identifier);
+						if (useCache) {
+							if (placeholder.isUsesCache() && placeholder.isCached(identifier)) {
+								ConcurrentHashMap<UUID, String> cache = placeholder.getCache().get(identifier);
+								if (cache.containsKey(p.getUniqueId())) {
+									return cache.get(p.getUniqueId());
+								} else if (!forceProcess) {
+									schedulePlaceholderCheck(user);
+									return "...";
+								}
+							}
+
+							if (forceProcess) {
+								if (getCacheLevel().shouldCache()) {
+									if (!placeholdersToSetCacheOn.contains(identifier)
+											&& !cachedPlaceholders.contains(identifier)) {
+										placeholdersToSetCacheOn.add(identifier);
+										schedulePlaceholderCheck(user);
+									}
+								}
+								return placeholder.placeholderRequest(user, identifier);
+							} else {
+								if (getCacheLevel().shouldCache()) {
+									if (!placeholdersToSetCacheOn.contains(identifier)
+											&& !cachedPlaceholders.contains(identifier)) {
+										placeholdersToSetCacheOn.add(identifier);
+										schedulePlaceholderCheck(user);
+									}
+								}
+								return ".";
+							}
+						} else {
+							return placeholder.placeholderRequest(user, identifier);
+						}
 					}
 				}
 			} catch (Exception e) {
 				plugin.debug(e);
-				return "...";
+				return "Error";
 			}
 		}
 
@@ -154,6 +288,20 @@ public class PlaceHolders {
 			}
 		}.withDescription("Returns true/false if user has broadcast disabled").updateDataKey("DisableBroadcast"));
 
+		placeholders.add(new PlaceHolder<VotingPluginUser>("DisableReminders") {
+
+			@Override
+			public String placeholderRequest(VotingPluginUser user, String identifier) {
+				if (plugin.getVoteReminding().getRemindersEnabled().containsKey(user.getJavaUUID())) {
+					if (!plugin.getVoteReminding().getRemindersEnabled().get(user.getJavaUUID()).booleanValue()) {
+
+						return "True";
+					}
+				}
+				return "False";
+			}
+		}.withDescription("Returns true/false if user has reminders disabled"));
+
 		placeholders.add(new PlaceHolder<VotingPluginUser>("MilestoneCount") {
 
 			@Override
@@ -162,6 +310,47 @@ public class PlaceHolders {
 			}
 		}.withDescription("User milestonecount").updateDataKey("MilestoneCount"));
 
+		Set<String> mVotes = plugin.getSpecialRewardsConfig().getMilestoneVotes();
+		for (String vote : mVotes) {
+			if (StringParser.getInstance().isInt(vote)) {
+
+				final int num = Integer.parseInt(vote);
+				if (plugin.getSpecialRewardsConfig().getMilestoneRewardEnabled(num)) {
+					placeholders.add(new PlaceHolder<VotingPluginUser>("milestone_numberofvotesuntil_" + num) {
+
+						@Override
+						public String placeholderRequest(VotingPluginUser user, String identifier) {
+							int toGo = num - user.getMilestoneCount();
+							if (toGo >= 0) {
+								return "" + toGo;
+							}
+							return "0";
+						}
+					}.withDescription("Get number of votes until milestone").updateDataKey("MilestoneCount"));
+				}
+			}
+		}
+
+		placeholders.add(new PlaceHolder<VotingPluginUser>("nextmilestone_votes_required") {
+
+			@Override
+			public String placeholderRequest(VotingPluginUser user, String identifier) {
+				return "" + user.getNextAvailableMileStone();
+			}
+		}.withDescription("Get number of votes required for next available milestone").updateDataKey("MilestoneCount"));
+
+		placeholders.add(new PlaceHolder<VotingPluginUser>("nextmilestone_votes_until") {
+
+			@Override
+			public String placeholderRequest(VotingPluginUser user, String identifier) {
+				int toGo = user.getNextAvailableMileStone() - user.getMilestoneCount();
+				if (toGo >= 0) {
+					return "" + toGo;
+				}
+				return "0";
+			}
+		}.withDescription("Get number of votes until next available milestone").updateDataKey("MilestoneCount"));
+
 		for (final String identifier : plugin.getGui().getChestShopIdentifiers()) {
 			if (plugin.getGui().getChestShopIdentifierLimit(identifier) > 0) {
 				placeholders.add(new PlaceHolder<VotingPluginUser>("VoteShopLimit_" + identifier) {
@@ -298,7 +487,7 @@ public class PlaceHolders {
 				}
 				long smallest = -1;
 				HashMap<Long, VoteSite> times = new HashMap<Long, VoteSite>();
-				for (VoteSite site : plugin.getVoteSites()) {
+				for (VoteSite site : plugin.getVoteSitesEnabled()) {
 					long t = user.voteNextDurationTime(site);
 					if (smallest == -1) {
 						smallest = t;
@@ -318,13 +507,34 @@ public class PlaceHolders {
 			}
 		}.withDescription("How long until user can vote on anysite").updateDataKey("LastVotes"));
 
-		for (final VoteSite voteSite : plugin.getVoteSites()) {
-			placeholders.add(new PlaceHolder<VotingPluginUser>("Next_" + voteSite.getKey()) {
+		placeholders.add(new PlaceHolder<VotingPluginUser>("SitesAvailable") {
+
+			@Override
+			public String placeholderRequest(VotingPluginUser user, String identifier) {
+				return "" + user.getSitesNotVotedOn();
+			}
+		}.withDescription("Get number of sites available to be voted on").updateDataKey("LastVotes"));
+
+		for (final VoteSite voteSite : plugin.getVoteSitesEnabled()) {
+			placeholders.add(new CalculatingPlaceholder<VotingPluginUser>("Next_" + voteSite.getKey()) {
 
 				@Override
 				public String placeholderRequest(VotingPluginUser user, String identifier) {
+					if (getCacheData().containsKey(user.getJavaUUID())) {
+						String data = getCacheData().get(user.getJavaUUID());
+						if (!data.isEmpty()) {
+							long time = Long.valueOf(data);
+							return user.voteCommandNextInfo(voteSite, time);
+						}
+					}
 					return user.voteCommandNextInfo(voteSite);
 				}
+
+				@Override
+				public String placeholderDataRequest(VotingPluginUser user, String identifier) {
+					long time = user.getTime(voteSite);
+					return "" + time;
+				}
 			}.withDescription("How long until user can vote on " + voteSite.getKey()).updateDataKey("LastVotes"));
 			placeholders.add(new PlaceHolder<VotingPluginUser>("Last_" + voteSite.getKey()) {
 
@@ -358,6 +568,18 @@ public class PlaceHolders {
 			}
 		}.withDescription("Get user top voter position"));
 
+		placeholders.add(new PlaceHolder<VotingPluginUser>("EnoughPoints_") {
+
+			@Override
+			public String placeholderRequest(VotingPluginUser user, String identifier) {
+				int number = Integer.parseInt(identifier.split("_")[1]);
+				if (user.getPoints() >= number) {
+					return "true";
+				}
+				return "false";
+			}
+		}.withDescription("Return true/false if player has said points").updateDataKey("Points").useStartsWith());
+
 		nonPlayerPlaceholders.add(new NonPlayerPlaceHolder<VotingPluginUser>("Top_AllVotes_") {
 
 			@Override
@@ -378,6 +600,9 @@ public class PlaceHolders {
 
 			@Override
 			public String placeholderRequest(String identifier) {
+				if (!StringParser.getInstance().isInt(identifier.split("_")[2])) {
+					return null;
+				}
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
 				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.AllTime).entrySet()) {
@@ -406,10 +631,66 @@ public class PlaceHolders {
 			}
 		}.withDescription("Get user top voter position"));
 
+		if (plugin.getGui().isLastMonthGUI()) {
+			placeholders.add(new PlaceHolder<VotingPluginUser>("Top_LastMonth_Position") {
+
+				@Override
+				public String placeholderRequest(VotingPluginUser user, String identifier) {
+					int num = 1;
+					UUID toMatch = UUID.fromString(user.getUUID());
+					for (Entry<TopVoterPlayer, Integer> entry : plugin.getLastMonthTopVoter().entrySet()) {
+						if (entry.getKey().getUuid().equals(toMatch)) {
+							return "" + num;
+						}
+						num++;
+					}
+					return "";
+				}
+			}.withDescription("Get user top voter position for lastmonth"));
+			nonPlayerPlaceholders.add(new NonPlayerPlaceHolder<VotingPluginUser>("Top_LastMonth_") {
+
+				@Override
+				public String placeholderRequest(String identifier) {
+					if (!StringParser.getInstance().isInt(identifier.split("_")[2])) {
+						return null;
+					}
+					int num = 1;
+					int number = Integer.parseInt(identifier.split("_")[2]);
+					for (Entry<TopVoterPlayer, Integer> entry : plugin.getLastMonthTopVoter().entrySet()) {
+						if (num == number) {
+							return entry.getKey().getPlayerName();
+						}
+						num++;
+					}
+					return "";
+				}
+			}.useStartsWith().withDescription("Get user at position in last month top voter"));
+
+			nonPlayerPlaceholders.add(new NonPlayerPlaceHolder<VotingPluginUser>("Top_LastMonthVotes_") {
+
+				@Override
+				public String placeholderRequest(String identifier) {
+					int num = 1;
+					int number = Integer.parseInt(identifier.split("_")[2]);
+					for (Entry<TopVoterPlayer, Integer> entry : plugin.getLastMonthTopVoter().entrySet()) {
+						if (num == number) {
+							return "" + entry.getValue().intValue();
+						}
+						num++;
+					}
+					return "";
+				}
+			}.useStartsWith().withDescription("Get user votes at position in last month top voter"));
+
+		}
+
 		nonPlayerPlaceholders.add(new NonPlayerPlaceHolder<VotingPluginUser>("Top_Month_") {
 
 			@Override
 			public String placeholderRequest(String identifier) {
+				if (!StringParser.getInstance().isInt(identifier.split("_")[2])) {
+					return null;
+				}
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
 				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Monthly).entrySet()) {
@@ -458,6 +739,9 @@ public class PlaceHolders {
 
 			@Override
 			public String placeholderRequest(String identifier) {
+				if (!StringParser.getInstance().isInt(identifier.split("_")[2])) {
+					return null;
+				}
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
 				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Weekly).entrySet()) {
@@ -506,6 +790,9 @@ public class PlaceHolders {
 
 			@Override
 			public String placeholderRequest(String identifier) {
+				if (!StringParser.getInstance().isInt(identifier.split("_")[2])) {
+					return null;
+				}
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
 				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Daily).entrySet()) {
@@ -575,7 +862,7 @@ public class PlaceHolders {
 				if (plugin.getBungeeHandler() != null) {
 					return Integer.toString(plugin.getBungeeHandler().getBungeeVotePartyCurrent());
 				}
-				return "" + 0;
+				return "-1";
 			}
 		}.withDescription("Current amount of bungee voteparty votes"));
 
@@ -587,7 +874,7 @@ public class PlaceHolders {
 					return Integer.toString(plugin.getBungeeHandler().getBungeeVotePartyRequired()
 							- plugin.getBungeeHandler().getBungeeVotePartyCurrent());
 				}
-				return "" + 0;
+				return "-1";
 			}
 		}.withDescription("Voteparty bungee votes needed"));
 
@@ -598,7 +885,7 @@ public class PlaceHolders {
 				if (plugin.getBungeeHandler() != null) {
 					return Integer.toString(plugin.getBungeeHandler().getBungeeVotePartyRequired());
 				}
-				return "" + 0;
+				return "-1";
 			}
 		}.withDescription("Amount of votes needed for bungee  voteparty"));
 
@@ -654,7 +941,7 @@ public class PlaceHolders {
 
 			@Override
 			public String placeholderRequest(String identifier) {
-				LocalDateTime now = LocalDateTime.now();
+				LocalDateTime now = plugin.getTimeChecker().getTime();
 				LocalDateTime offsetoclocktoday = plugin.getTimeChecker().getTime().withHour(0).withMinute(0);
 				LocalDateTime offsetoclocktomorrow = plugin.getTimeChecker().getTime().plusDays(1).withHour(0)
 						.withMinute(0);
@@ -688,43 +975,105 @@ public class PlaceHolders {
 			}
 		}.withDescription("Time until plugin time day changes"));
 
+		nonPlayerPlaceholders.add(new NonPlayerPlaceHolder<VotingPluginUser>("TimeUntilWeekReset") {
+
+			@Override
+			public String placeholderRequest(String identifier) {
+				LocalDateTime now = plugin.getTimeChecker().getTime();
+				LocalDateTime newWeek = plugin.getTimeChecker().getTime().withHour(0).withMinute(0);
+
+				TemporalField woy = WeekFields.of(Locale.getDefault()).weekOfWeekBasedYear();
+				int weekNumber = newWeek.get(woy);
+				int newWeekNumber = weekNumber;
+
+				while (weekNumber == newWeekNumber) {
+					newWeek = newWeek.plusDays(1);
+					newWeekNumber = newWeek.get(woy);
+				}
+
+				String timeMsg = "%days% Days %hours% Hours %minutes% Minutes";
+				Duration dur = Duration.between(now, newWeek);
+
+				int diffDays = (int) (dur.getSeconds() / (60 * 60 * 24));
+				int diffHours = (int) (dur.getSeconds() / (60 * 60) - diffDays * 24);
+				long diffMinutes = dur.getSeconds() / 60 - diffHours * 60 - diffDays * 24 * 60;
+
+				if (diffHours < 0) {
+					diffHours = diffHours * -1;
+				}
+				if (diffHours >= 24) {
+					diffHours = diffHours - 24;
+				}
+				if (diffMinutes < 0) {
+					diffMinutes = diffMinutes * -1;
+				}
+
+				timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%days%", Integer.toString(diffDays));
+				timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%hours%", Integer.toString(diffHours));
+				timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
+						Long.toString(diffMinutes));
+				return timeMsg;
+
+			}
+		}.withDescription("Time until plugin time week changes"));
+
+		nonPlayerPlaceholders.add(new NonPlayerPlaceHolder<VotingPluginUser>("TimeUntilMonthReset") {
+
+			@Override
+			public String placeholderRequest(String identifier) {
+				LocalDateTime now = plugin.getTimeChecker().getTime();
+				LocalDateTime newMonth = plugin.getTimeChecker().getTime().plusMonths(1).withDayOfMonth(1).withHour(0)
+						.withMinute(0);
+
+				String timeMsg = "%days% Days %hours% Hours %minutes% Minutes";
+				Duration dur = Duration.between(now, newMonth);
+
+				int diffDays = (int) (dur.getSeconds() / (60 * 60 * 24));
+				int diffHours = (int) (dur.getSeconds() / (60 * 60) - diffDays * 24);
+				long diffMinutes = dur.getSeconds() / 60 - diffHours * 60 - diffDays * 24 * 60;
+
+				if (diffHours < 0) {
+					diffHours = diffHours * -1;
+				}
+				if (diffHours >= 24) {
+					diffHours = diffHours - 24;
+				}
+				if (diffMinutes < 0) {
+					diffMinutes = diffMinutes * -1;
+				}
+
+				timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%days%", Integer.toString(diffDays));
+				timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%hours%", Integer.toString(diffHours));
+				timeMsg = StringParser.getInstance().replaceIgnoreCase(timeMsg, "%minutes%",
+						Long.toString(diffMinutes));
+				return timeMsg;
+
+			}
+		}.withDescription("Time until plugin time month changes"));
+
 		Set<String> placeholdersSet = new HashSet<String>();
 		placeholdersSet.addAll(plugin.getConfigFile().getCachedPlaceholders());
-		placeholdersSet.addAll(plugin.getServerData().getAutoCachedPlaceholder());
+		if (getCacheLevel().equals(PlaceholderCacheLevel.AUTO)) {
+			placeholdersSet.addAll(plugin.getServerData().getAutoCachedPlaceholder());
+		}
 
 		for (String toCache : placeholdersSet) {
-			if (toCache.startsWith("VotingPlugin")) {
-				toCache = toCache.substring("VotingPlugin_".length());
+			if (toCache.startsWith("votingplugin")) {
+				toCache = toCache.substring("votingplugin_".length());
 			}
 			for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : nonPlayerPlaceholders) {
-				if (placeholder.isUseStartsWith()) {
-					if (toCache.startsWith(placeholder.getIdentifier())) {
-						placeholder.setUseCache(true, toCache);
-						cachedPlaceholders.add(toCache);
-						plugin.extraDebug("Caching placeholder " + toCache);
-					}
-				} else {
-					if (placeholder.getIdentifier().equalsIgnoreCase(toCache)) {
-						placeholder.setUseCache(true, toCache);
-						cachedPlaceholders.add(toCache);
-						plugin.extraDebug("Caching placeholder " + toCache);
-					}
+				if (placeholder.matches(toCache)) {
+					placeholder.setUseCache(true, toCache);
+					cachedPlaceholders.add(toCache);
+					plugin.extraDebug("Caching placeholder " + toCache);
 				}
 			}
 
 			for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
-				if (placeholder.isUseStartsWith()) {
-					if (toCache.startsWith(placeholder.getIdentifier())) {
-						placeholder.setUseCache(true, toCache);
-						cachedPlaceholders.add(toCache);
-						plugin.extraDebug("Caching placeholder " + toCache);
-					}
-				} else {
-					if (placeholder.getIdentifier().equalsIgnoreCase(toCache)) {
-						placeholder.setUseCache(true, toCache);
-						cachedPlaceholders.add(toCache);
-						plugin.extraDebug("Caching placeholder " + toCache);
-					}
+				if (placeholder.matches(toCache)) {
+					placeholder.setUseCache(true, toCache);
+					cachedPlaceholders.add(toCache);
+					plugin.extraDebug("Caching placeholder " + toCache);
 				}
 			}
 		}
@@ -733,18 +1082,45 @@ public class PlaceHolders {
 
 			@Override
 			public void onChange(AdvancedCoreUser user, String... keys) {
+				VotingPluginUser vpUser = plugin.getVotingPluginUserManager().getVotingPluginUser(user);
+				if (!vpUser.isCached()) {
+					vpUser.dontCache();
+				}
 				for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
 					if (placeholder.isUsesCache()) {
-						for (String key : keys) {
-							if (placeholder.getUpdateDataKey().equalsIgnoreCase(key)) {
-								VotingPluginUser vpUser = UserManager.getInstance().getVotingPluginUser(user);
-								for (String ident : placeholder.getCache().keySet()) {
-									placeholder.getCache().get(ident).put(vpUser.getJavaUUID(),
-											placeholder.placeholderRequest(vpUser, ident));
-									plugin.devDebug("Updated cache for " + vpUser.getUUID() + " on " + key);
-
+						if (placeholder.isCached(placeholder.getIdentifier(), user.getJavaUUID())
+								|| !getCacheLevel().onlineOnly() || user.isOnline()) {
+							if (placeholder instanceof CalculatingPlaceholder<?>) {
+								CalculatingPlaceholder<VotingPluginUser> cPlaceholder = (CalculatingPlaceholder<VotingPluginUser>) placeholder;
+								if (placeholder.isUsesCache()) {
+									for (String key : keys) {
+										if (placeholder.getUpdateDataKey().equalsIgnoreCase(key)) {
+											for (String ident : placeholder.getCache().keySet()) {
+												String value = placeholder.placeholderRequest(vpUser, ident);
+												cPlaceholder.getCacheData().put(user.getJavaUUID(),
+														cPlaceholder.placeholderDataRequest(vpUser, ident));
+												placeholder.getCache().get(ident).put(vpUser.getJavaUUID(), value);
+												plugin.devDebug("Updated calculating placeholder cache for "
+														+ vpUser.getUUID() + " on " + key + " with " + value);
+											}
+										}
+									}
 								}
+							} else {
+								if (placeholder.isUsesCache()) {
+									for (String key : keys) {
+										if (placeholder.getUpdateDataKey().equalsIgnoreCase(key)) {
+											for (String ident : placeholder.getCache().keySet()) {
+												String value = placeholder.placeholderRequest(vpUser, ident);
+												placeholder.getCache().get(ident).put(vpUser.getJavaUUID(), value);
+												plugin.devDebug("Updated placeholder cache for " + vpUser.getUUID()
+														+ " on " + key + " with " + value);
 
+											}
+
+										}
+									}
+								}
 							}
 						}
 					}
@@ -754,86 +1130,115 @@ public class PlaceHolders {
 	}
 
 	public void onVotePartyUpdate() {
-		for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : nonPlayerPlaceholders) {
-			if (placeholder.isUsesCache()) {
-				if (placeholder.getIdentifier().startsWith("VoteParty")) {
-					for (String ident : placeholder.getCache().keySet()) {
-						placeholder.getCache().put(ident, placeholder.placeholderRequest(ident));
-					}
-				}
-			}
-		}
+		/*
+		 * for (NonPlayerPlaceHolder<VotingPluginUser> placeholder :
+		 * nonPlayerPlaceholders) { if (placeholder.isUsesCache()) { if
+		 * (placeholder.getIdentifier().startsWith("VoteParty")) { for (String ident :
+		 * placeholder.getCache().keySet()) { placeholder.getCache().put(ident,
+		 * placeholder.placeholderRequest(ident)); } } } }
+		 */
 	}
 
 	public void onBungeeVotePartyUpdate() {
-		for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : nonPlayerPlaceholders) {
-			if (placeholder.isUsesCache()) {
-				if (placeholder.getIdentifier().startsWith("BungeeVoteParty")) {
-					for (String ident : placeholder.getCache().keySet()) {
-						placeholder.getCache().put(ident, placeholder.placeholderRequest(ident));
-					}
-				}
-			}
-		}
+		/*
+		 * for (NonPlayerPlaceHolder<VotingPluginUser> placeholder :
+		 * nonPlayerPlaceholders) { if (placeholder.isUsesCache()) { if
+		 * (placeholder.getIdentifier().startsWith("BungeeVoteParty")) { for (String
+		 * ident : placeholder.getCache().keySet()) { placeholder.getCache().put(ident,
+		 * placeholder.placeholderRequest(ident)); } } } }
+		 */
 	}
 
-	public void onUpdate(VotingPluginUser user) {
-		for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
-			if (placeholder.isUsesCache()) {
-				if (!placeholder.getIdentifier().startsWith("Top_") || placeholder.getCache().isEmpty()
-						|| placeholder.getUpdateDataKey().isEmpty()) {
-					for (String ident : placeholder.getCache().keySet()) {
-						placeholder.getCache().get(ident).put(user.getJavaUUID(),
-								placeholder.placeholderRequest(user, ident));
-					}
-				}
-			}
-		}
-	}
-
-	public void onUpdate() {
-		ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
-		while (!placeholdersToSetCacheOn.isEmpty()) {
-			String toCache = placeholdersToSetCacheOn.poll();
-			for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : nonPlayerPlaceholders) {
-				if (placeholder.matches(toCache)) {
-					placeholder.setUseCache(true, toCache);
-					cachedPlaceholders.add(toCache);
-					plugin.getServerData().addAutoCachedPlaceholder(toCache);
-					plugin.debug("Auto caching placeholder: " + toCache);
-				}
-			}
-			for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
-				if (placeholder.matches(toCache)) {
-					placeholder.setUseCache(true, toCache);
-					cachedPlaceholders.add(toCache);
-					plugin.getServerData().addAutoCachedPlaceholder(toCache);
-					plugin.debug("Auto caching placeholder: " + toCache);
-				}
-			}
-
-		}
-		for (NonPlayerPlaceHolder<VotingPluginUser> placeholder : nonPlayerPlaceholders) {
-			if (placeholder.isUsesCache()) {
-				for (String ident : placeholder.getCache().keySet()) {
-					placeholder.getCache().put(ident, placeholder.placeholderRequest(ident));
-				}
-			}
-		}
-		for (String uuid : uuids) {
-			VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
-			user.dontCache();
+	public void onLogout(VotingPluginUser user) {
+		if (plugin.getPlaceholders().getCacheLevel().onlineOnly()) {
 			for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
 				if (placeholder.isUsesCache()) {
-					if (placeholder.getIdentifier().startsWith("Top_")) {
-						for (String ident : placeholder.getCache().keySet()) {
-							placeholder.getCache().get(ident).put(user.getJavaUUID(),
-									placeholder.placeholderRequest(user, ident));
+					placeholder.clearCachePlayer(user.getJavaUUID());
+				}
+			}
+		}
+	}
+
+	public void onUpdate(VotingPluginUser user, boolean login) {
+		for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
+			if (placeholder.isUsesCache()) {
+				if (placeholder.isCached(placeholder.getIdentifier(), user.getJavaUUID()) || login) {
+					if (placeholder instanceof CalculatingPlaceholder<?>) {
+
+						CalculatingPlaceholder<VotingPluginUser> cPlaceholder = (CalculatingPlaceholder<VotingPluginUser>) placeholder;
+						if (placeholder.isUsesCache()) {
+							for (String ident : placeholder.getCache().keySet()) {
+								cPlaceholder.getCacheData().put(user.getJavaUUID(),
+										cPlaceholder.placeholderDataRequest(user, ident));
+								placeholder.getCache().get(ident).put(user.getJavaUUID(),
+										placeholder.placeholderRequest(user, ident));
+							}
+
+						}
+					} else {
+						if (placeholder.isUsesCache()) {
+							for (String ident : placeholder.getCache().keySet()) {
+								placeholder.getCache().get(ident).put(user.getJavaUUID(),
+										placeholder.placeholderRequest(user, ident));
+							}
 						}
 					}
 				}
 			}
 		}
+	}
+
+	public void checkNonCachedPlaceholders() {
+		while (!placeholdersToSetCacheOn.isEmpty()) {
+			String toCache = placeholdersToSetCacheOn.poll().toLowerCase();
+			if (toCache.startsWith("votingplugin")) {
+				toCache = toCache.substring("votingplugin_".length());
+			}
+			/*
+			 * for (NonPlayerPlaceHolder<VotingPluginUser> placeholder :
+			 * nonPlayerPlaceholders) { if (placeholder.matches(toCache)) {
+			 * placeholder.setUseCache(true, toCache); cachedPlaceholders.add(toCache);
+			 * plugin.getServerData().addAutoCachedPlaceholder(toCache);
+			 * plugin.extraDebug("Auto Caching placeholder " + toCache); }
+			 * 
+			 * }
+			 */
+			for (PlaceHolder<VotingPluginUser> placeholder : placeholders) {
+				if (placeholder.matches(toCache)) {
+					placeholder.setUseCache(true, toCache);
+					cachedPlaceholders.add(toCache);
+					plugin.getServerData().addAutoCachedPlaceholder(toCache);
+					plugin.extraDebug("Auto Caching placeholder " + toCache);
+				}
+			}
+
+		}
+	}
+
+	public void schedulePlaceholderCheck(VotingPluginUser user) {
+		plugin.getTimer().execute(new Runnable() {
+
+			@Override
+			public void run() {
+				checkNonCachedPlaceholders();
+				onUpdate(user, user.isOnline());
+			}
+		});
+	}
+
+	public void onUpdate() {
+		checkNonCachedPlaceholders();
+		for (Player p : Bukkit.getOnlinePlayers()) {
+			onUpdate(plugin.getVotingPluginUserManager().getVotingPluginUser(p), true);
+		}
+		/*
+		 * for (NonPlayerPlaceHolder<VotingPluginUser> placeholder :
+		 * nonPlayerPlaceholders) { if (placeholder.isUsesCache()) { for (String ident :
+		 * placeholder.getCache().keySet()) { if (ident != null) { String str =
+		 * placeholder.placeholderRequest(ident); if (str != null) {
+		 * placeholder.getCache().put(ident, str); } } else {
+		 * plugin.debug("ident null: " + placeholder.getIdentifier()); } } } }
+		 */
 
 	}
 }

VotingPlugin/src/com/bencodez/votingplugin/placeholders/PlaceholderCacheLevel.java

@@ -0,0 +1,42 @@
+package com.bencodez.votingplugin.placeholders;
+
+public enum PlaceholderCacheLevel {
+	NONE, SPECIFIC, AUTO, AUTOALL, SPECIFICALL;
+
+	public static PlaceholderCacheLevel getCache(String str) {
+		for (PlaceholderCacheLevel v : PlaceholderCacheLevel.values()) {
+			if (v.toString().equalsIgnoreCase(str)) {
+				return v;
+			}
+		}
+		return AUTO;
+	}
+
+	public boolean onlineOnly() {
+		if (this == AUTOALL) {
+			return false;
+		}
+		if (this == SPECIFICALL) {
+			return false;
+		}
+		return true;
+	}
+
+	public boolean shouldCache() {
+		switch (this) {
+		case AUTO:
+			return true;
+		case NONE:
+			return false;
+		case SPECIFIC:
+			return false;
+		case SPECIFICALL:
+			return false;
+		case AUTOALL:
+			return true;
+		default:
+			return false;
+		}
+	}
+
+}

VotingPlugin/src/com/bencodez/votingplugin/placeholders/VotingPluginExpansion.java

@@ -0,0 +1,41 @@
+package com.bencodez.votingplugin.placeholders;
+
+import org.bukkit.OfflinePlayer;
+
+import com.bencodez.votingplugin.VotingPluginMain;
+
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+
+public class VotingPluginExpansion extends PlaceholderExpansion {
+
+	private VotingPluginMain plugin;
+
+	public VotingPluginExpansion(VotingPluginMain plugin) {
+		this.plugin = plugin;
+	}
+
+	@Override
+	public String getAuthor() {
+		return "bencodez";
+	}
+
+	@Override
+	public String getIdentifier() {
+		return "votingplugin";
+	}
+
+	@Override
+	public String getVersion() {
+		return "1.6";
+	}
+
+	@Override
+	public boolean persist() {
+		return true;
+	}
+
+	@Override
+	public String onRequest(OfflinePlayer p, String indendifier) {
+		return plugin.getPlaceholders().getPlaceHolder(p, indendifier);
+	}
+}

VotingPlugin/src/com/bencodez/votingplugin/servicesites/ServiceSiteHandler.java

@@ -0,0 +1,97 @@
+package com.bencodez.votingplugin.servicesites;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map.Entry;
+
+import com.bencodez.votingplugin.VotingPluginMain;
+
+import lombok.Getter;
+
+public class ServiceSiteHandler {
+	@Getter
+	private HashMap<String, String> serviceSites = new HashMap<String, String>();
+	private VotingPluginMain plugin;
+
+	public String match(String service) {
+		for (Entry<String, String> entry : serviceSites.entrySet()) {
+			if (entry.getKey().equalsIgnoreCase(service)) {
+				return entry.getValue();
+			}
+		}
+		return service;
+	}
+
+	public String matchReverse(String service) {
+		for (Entry<String, String> entry : serviceSites.entrySet()) {
+			if (entry.getValue().equalsIgnoreCase(service)) {
+				return entry.getKey();
+			}
+		}
+		return service;
+	}
+
+	public ServiceSiteHandler(VotingPluginMain plugin) {
+		this.plugin = plugin;
+		loadFromGithub();
+		for (Entry<String, String> entry : serviceSites.entrySet()) {
+			plugin.extraDebug(entry.getKey() + " - " + entry.getValue());
+		}
+
+	}
+
+	public void readFromWeb(String webURL) throws IOException {
+		serviceSites.clear();
+		URL url = new URL(webURL);
+		InputStream is = url.openStream();
+		try (BufferedReader br = new BufferedReader(new InputStreamReader(is))) {
+			String line;
+			boolean rawFound = false;
+			while ((line = br.readLine()) != null) {
+				if (line.contains("<ul>")) {
+					rawFound = true;
+				} else if (!line.contains(" - ")) {
+					rawFound = false;
+				} else if (rawFound) {
+					String data = line.replaceAll("<li>", "").replaceAll("</li>", "");
+					String[] split = data.split(" - ");
+					if (split.length > 0) {
+						serviceSites.put(split[0], split[1]);
+					}
+
+				}
+			}
+		} catch (MalformedURLException e) {
+			plugin.debug(e);
+			// e.printStackTrace();
+			// throw new MalformedURLException("URL is malformed!!");
+		} catch (IOException e) {
+			plugin.debug(e);
+			// e.printStackTrace();
+			// throw new IOException();
+		}
+
+	}
+
+	public void loadFromGithub() {
+		try {
+			readFromWeb("https://github.com/BenCodez/VotingPlugin/wiki/Minecraft-Server-Lists");
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public boolean contains(String service) {
+		for (Entry<String, String> entry : serviceSites.entrySet()) {
+			if (entry.getKey().equalsIgnoreCase(service)) {
+				return true;
+			}
+		}
+		return false;
+	}
+}

VotingPlugin/src/com/bencodez/votingplugin/signs/SignHandler.java

@@ -2,7 +2,6 @@ package com.bencodez.votingplugin.signs;
 
 import java.util.ArrayList;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -111,7 +110,7 @@ public class SignHandler {
 	 * Check valid sign.
 	 */
 	public void checkValidSign() {
-		Bukkit.getScheduler().runTask(plugin, new Runnable() {
+		plugin.getBukkitScheduler().runTask(plugin, new Runnable() {
 
 			@Override
 			public void run() {
@@ -121,7 +120,7 @@ public class SignHandler {
 					setValid(false);
 				}
 			}
-		});
+		}, getLocation());
 
 	}
 
@@ -240,8 +239,9 @@ public class SignHandler {
 	 * @param delay the delay
 	 */
 	public void updateSign(int delay) {
-		Bukkit.getScheduler().runTaskLater(plugin, new Runnable() {
+		plugin.getBukkitScheduler().runTaskLater(plugin, new Runnable() {
 
+			@SuppressWarnings("deprecation")
 			@Override
 			public void run() {
 				try {
@@ -261,7 +261,7 @@ public class SignHandler {
 					VotingPluginMain.plugin.debug(ex);
 				}
 			}
-		}, delay);
+		}, delay, getLocation());
 	}
 
 	public void updateSkulls(Location loc1, Location loc2) {

VotingPlugin/src/com/bencodez/votingplugin/signs/Signs.java

@@ -77,7 +77,7 @@ public class Signs {
 			} else {
 				getSigns().get(i).updateLines();
 				getSigns().get(i).updateSign(time);
-				time += 5;
+				time += 1;
 			}
 		}
 

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

@@ -2,13 +2,13 @@ package com.bencodez.votingplugin.specialrewards;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 
 import org.bukkit.Bukkit;
 
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.bungee.BungeeMessageData;
@@ -49,6 +49,40 @@ public class SpecialRewards {
 		return checkAllVotes;
 	}
 
+	public void bungeeAllSitesCheck(VotingPluginUser user, int numberOfVotes, int num) {
+		if (plugin.getBungeeSettings().isGiveExtraAllSitesRewards()) {
+			int numberOfSites = plugin.getVoteSitesEnabled().size();
+			if (numberOfVotes >= numberOfSites * 2) {
+				if (num > numberOfSites) {
+					if (num % numberOfSites == 0) {
+						// should give extra allsites?
+						if (user.checkAllVotes()) {
+							plugin.debug("Giving extra allsites reward from bungee");
+							giveAllSitesRewards(user, user.isOnline(), true);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	public boolean checkAlmostAllSites(VotingPluginUser user, boolean forceBungee) {
+		boolean checkAllVotes = user.checkAlmostAllVotes();
+		plugin.extraDebug("Checking almostallsites reward: " + checkAllVotes + "/" + user.getSitesNotVotedOn());
+		if (checkAllVotes) {
+			int currentDay = LocalDateTime.now().getDayOfYear();
+			int day = user.getGottenAlmostAllSitesDay();
+			if (currentDay == day) {
+				checkAllVotes = false;
+				plugin.debug("Not giving almostallsites, already gotten today");
+			} else {
+				user.setGottenAlmostAllSitesDay(currentDay);
+				giveAlmostAllSitesRewards(user, user.isOnline(), forceBungee);
+			}
+		}
+		return checkAllVotes;
+	}
+
 	public boolean checkCumualativeVotes(VotingPluginUser user, BungeeMessageData bungeeMessageData,
 			boolean forceBungee) {
 		boolean gotCumulativeAny = false;
@@ -58,7 +92,7 @@ public class SpecialRewards {
 				int votesRequired = Integer.parseInt(vote);
 				if (votesRequired != 0) {
 					if (plugin.getSpecialRewardsConfig().getCumulativeRewardEnabled(votesRequired)
-							&& RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 									plugin.getSpecialRewardsConfig().getCumulativeRewardsPath(votesRequired))) {
 						boolean gotCumulative = false;
 						int total = 0;
@@ -87,8 +121,25 @@ public class SpecialRewards {
 							}
 						}
 
-						if (total != 0 && total >= votesRequired) {
-							if ((total % votesRequired) == 0) {
+						List<Integer> blackList = plugin.getSpecialRewardsConfig()
+								.getCumulativeBlackList(votesRequired);
+						boolean blackListed = false;
+						for (Integer num : blackList) {
+							if (num.intValue() == total) {
+								blackListed = true;
+								plugin.extraDebug("Not giving cumulative " + votesRequired + " to "
+										+ user.getPlayerName() + " due to blacklist");
+							}
+						}
+
+						if (plugin.getSpecialRewardsConfig().getCumulativeRecurring(votesRequired)) {
+							if (total != 0 && total >= votesRequired) {
+								if ((total % votesRequired) == 0 && !blackListed) {
+									gotCumulative = true;
+								}
+							}
+						} else {
+							if (total == votesRequired) {
 								gotCumulative = true;
 							}
 						}
@@ -116,7 +167,7 @@ public class SpecialRewards {
 	}
 
 	public boolean checkFirstVote(VotingPluginUser user, boolean forceBungee) {
-		if (RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+		if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getFirstVoteRewardsPath())) {
 			if (!user.hasGottenFirstVote()) {
 				giveFirstVoteRewards(user, user.isOnline(), forceBungee);
@@ -128,7 +179,7 @@ public class SpecialRewards {
 	}
 
 	public boolean checkFirstVoteToday(VotingPluginUser user, boolean forceBungee) {
-		if (RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+		if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getFirstVoteRewardsPath())) {
 			if (!user.hasGottenFirstVoteToday()) {
 				giveFirstVoteTodayRewards(user, user.isOnline(), forceBungee);
@@ -181,7 +232,7 @@ public class SpecialRewards {
 				int votesRequired = Integer.parseInt(vote);
 				if (votesRequired != 0) {
 					if (plugin.getSpecialRewardsConfig().getMilestoneRewardEnabled(votesRequired)
-							&& RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 									plugin.getSpecialRewardsConfig().getMilestoneRewardsPath(votesRequired))) {
 
 						int userVotesTotal = milestoneCount;
@@ -212,12 +263,14 @@ public class SpecialRewards {
 			if (streak.contains("-")) {
 				// multiple
 				multiple = true;
+
 			}
+			plugin.debug("Streak: " + streak + " multiple: " + multiple);
 			if (StringParser.getInstance().isInt(s)) {
 				int streakRequired = Integer.parseInt(s);
 				if (streakRequired != 0) {
 					if (plugin.getSpecialRewardsConfig().getVoteStreakRewardEnabled(type, streak)
-							&& RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
+							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 									plugin.getSpecialRewardsConfig().getVoteStreakRewardsPath(type, "" + streak))) {
 						int curStreak = 0;
 						if (type.equalsIgnoreCase("day")) {
@@ -237,8 +290,7 @@ public class SpecialRewards {
 							}
 						} else {
 							if (curStreak != 0 && curStreak % streakRequired == 0) {
-								giveVoteStreakReward(user, user.isOnline(), type, streakRequired + "-", curStreak,
-										forceBungee);
+								giveVoteStreakReward(user, user.isOnline(), type, streak, curStreak, forceBungee);
 								gotReward = true;
 								plugin.debug(
 										user.getPlayerName() + " got VoteStreak " + streakRequired + "* for " + type);
@@ -261,11 +313,23 @@ public class SpecialRewards {
 		if (event.isCancelled()) {
 			return;
 		}
-		RewardHandler.getInstance().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
+		plugin.getRewardHandler().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getAllSitesRewardPath(),
 				new RewardOptions().setServer(forceBungee).setOnline(online));
 	}
 
+	public void giveAlmostAllSitesRewards(VotingPluginUser user, boolean online, boolean forceBungee) {
+		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user, SpecialRewardType.ALMOSTALLSITES);
+		Bukkit.getPluginManager().callEvent(event);
+
+		if (event.isCancelled()) {
+			return;
+		}
+		plugin.getRewardHandler().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
+				plugin.getSpecialRewardsConfig().getAlmostAllSitesRewardPath(),
+				new RewardOptions().setServer(forceBungee).setOnline(online));
+	}
+
 	public void giveCumulativeVoteReward(VotingPluginUser user, boolean online, int cumulative, boolean forceBungee) {
 		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user,
 				SpecialRewardType.CUMMULATIVE.setAmount(cumulative));
@@ -277,7 +341,7 @@ public class SpecialRewards {
 
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getCumulativeRewardsPath(cumulative)).setServer(forceBungee)
-						.setOnline(online).withPlaceHolder("Cumulative", "" + cumulative).send(user);
+				.setOnline(online).withPlaceHolder("Cumulative", "" + cumulative).send(user);
 	}
 
 	public void giveFirstVoteRewards(VotingPluginUser user, boolean online, boolean forceBungee) {
@@ -287,7 +351,7 @@ public class SpecialRewards {
 		if (event.isCancelled()) {
 			return;
 		}
-		RewardHandler.getInstance().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
+		plugin.getRewardHandler().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getFirstVoteRewardsPath(),
 				new RewardOptions().setServer(forceBungee).setOnline(online));
 	}
@@ -299,7 +363,7 @@ public class SpecialRewards {
 		if (event.isCancelled()) {
 			return;
 		}
-		RewardHandler.getInstance().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
+		plugin.getRewardHandler().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getFirstVoteTodayRewardsPath(),
 				new RewardOptions().setServer(forceBungee).setOnline(online));
 	}
@@ -314,7 +378,7 @@ public class SpecialRewards {
 		}
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getMilestoneRewardsPath(milestone)).setOnline(online)
-						.withPlaceHolder("Milestone", "" + milestone).setServer(forceBungee).send(user);
+				.withPlaceHolder("Milestone", "" + milestone).setServer(forceBungee).send(user);
 	}
 
 	public void giveVoteStreakReward(VotingPluginUser user, boolean online, String type, String string, int votes,
@@ -328,8 +392,7 @@ public class SpecialRewards {
 		}
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getVoteStreakRewardsPath(type, string)).setOnline(online)
-						.withPlaceHolder("Type", type).setServer(forceBungee).withPlaceHolder("Streak", "" + votes)
-						.send(user);
+				.withPlaceHolder("Type", type).setServer(forceBungee).withPlaceHolder("Streak", "" + votes).send(user);
 	}
 
 }

VotingPlugin/src/com/bencodez/votingplugin/test/VoteTester.java

@@ -1,75 +1,155 @@
 package com.bencodez.votingplugin.test;
 
 import java.util.ArrayList;
+import java.util.Random;
+import java.util.UUID;
 
 import com.bencodez.advancedcore.api.rewards.Reward;
-import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
-import com.bencodez.votingplugin.user.UserManager;
+import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class VoteTester {
 
-	private static VoteTester instance = new VoteTester();
-
-	public static VoteTester getInstance() {
-		return instance;
+	public VoteTester(VotingPluginMain plugin) {
+		this.plugin = plugin;
 	}
 
-	private VotingPluginMain plugin = VotingPluginMain.plugin;
+	private VotingPluginMain plugin;
 
 	public void testRewards(int amount, String name, String rewardName) {
-		long time1 = System.currentTimeMillis();
-		ArrayList<Long> timesPerReward = new ArrayList<Long>();
-		VotingPluginUser 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));
+		plugin.getVoteTimer().submit(new Runnable() {
+
+			@Override
+			public void run() {
+				long time1 = System.currentTimeMillis();
+				ArrayList<Long> timesPerReward = new ArrayList<Long>();
+				VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(name);
+				Reward reward = plugin.getRewardHandler().getReward(rewardName);
+				int rewardsGiven = 0;
+				for (int i = 0; i < amount; i++) {
+					long start1 = System.currentTimeMillis();
+					if (reward.canGiveReward(user, new RewardOptions())) {
+						rewardsGiven++;
+						plugin.getRewardHandler().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();
+				VotingPluginMain.plugin.getLogger()
+						.info("Time to process rewards (" + amount + "): " + time + " ms, average per reward "
+								+ timePerRewardAvg + " ms. " + VotingPluginMain.plugin.getStorageType() + ", "
+								+ plugin.getVotingPluginUserManager().getAllUUIDs().size() + " users. " + rewardsGiven
+								+ " rewards given");
 			}
-			long start2 = System.currentTimeMillis();
-			timesPerReward.add(start2 - start1);
+
+		});
+
+	}
+
+	private String getSaltString() {
+		String SALTCHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
+		StringBuilder salt = new StringBuilder();
+		Random rnd = new Random();
+		while (salt.length() < 18) { // length of the random string.
+			int index = (int) (rnd.nextFloat() * SALTCHARS.length());
+			salt.append(SALTCHARS.charAt(index));
 		}
-		long time2 = System.currentTimeMillis();
-		long time = time2 - time1;
-		long timeTotal = 0;
-		for (Long t : timesPerReward) {
-			timeTotal += t.longValue();
+		String saltStr = salt.toString();
+		return saltStr;
+
+	}
+
+	public void generatePlayers(int numberOfPlayers) {
+		if (plugin.getOptions().getDebug().isDebug()) {
+			int num = 1;
+			String salt = getSaltString();
+			Random random = new Random();
+			for (int i = 0; i < numberOfPlayers; i++) {
+				UUID uuid = UUID.randomUUID();
+				if (!plugin.getUserManager().userExist(uuid)) {
+					String playerName = salt + num;
+					if (!plugin.getUserManager().userExist(playerName)) {
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid,
+								playerName);
+						user.dontCache();
+						user.setPoints(random.nextInt(100));
+						for (TopVoter top : TopVoter.values()) {
+							user.setTotal(top, random.nextInt(1000));
+						}
+						user.setMilestoneCount(random.nextInt(100));
+						user.setPlayerName(playerName);
+						user.updateName(true);
+						num++;
+						plugin.debug("Generated user " + uuid.toString() + "/" + playerName);
+					}
+				}
+			}
 		}
-		long timePerRewardAvg = timeTotal / timesPerReward.size();
-		VotingPluginMain.plugin.getLogger().info("Time to process rewards (" + amount + "): " + time
-				+ " ms, average per reward " + timePerRewardAvg + " ms. " + VotingPluginMain.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>();
+		plugin.getVoteTimer().submit(new Runnable() {
+
+			@Override
+			public void run() {
+				long time1 = System.currentTimeMillis();
+				ArrayList<Long> timesPerVote = new ArrayList<Long>();
+				for (int i = 0; i < amount; i++) {
+					long start1 = System.currentTimeMillis();
+					PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(site, false), name,
+							plugin.getVoteSiteServiceSite(site), false);
+					plugin.getServer().getPluginManager().callEvent(voteEvent);
+					long start2 = System.currentTimeMillis();
+					timesPerVote.add(start2 - start1);
+				}
+				long time2 = System.currentTimeMillis();
+				long time = time2 - time1;
+				long timeTotal = 0;
+				for (Long t : timesPerVote) {
+					timeTotal += t.longValue();
+				}
+				long timePerVoteAvg = timeTotal / timesPerVote.size();
+				VotingPluginMain.plugin.getLogger()
+						.info("Time to process votes (" + amount + "): " + time + " ms, average per vote "
+								+ timePerVoteAvg + " ms. " + VotingPluginMain.plugin.getStorageType() + ", "
+								+ plugin.getVotingPluginUserManager().getAllUUIDs().size() + " users. "
+								+ plugin.getVoteSitesEnabled().size() + " votesites");
+			}
+
+		});
+
+	}
+
+	public void testSpam(int amount, String name, String site) {
 		for (int i = 0; i < amount; i++) {
-			long start1 = System.currentTimeMillis();
-			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(site, false), name,
-					plugin.getVoteSiteServiceSite(site), false);
-			plugin.getServer().getPluginManager().callEvent(voteEvent);
-			long start2 = System.currentTimeMillis();
-			timesPerVote.add(start2 - start1);
+			plugin.getBukkitScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					plugin.getVoteTimer().submit(new Runnable() {
+
+						@Override
+						public void run() {
+							PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(site, false), name,
+									plugin.getVoteSiteServiceSite(site), false);
+							plugin.getServer().getPluginManager().callEvent(voteEvent);
+						}
+					});
+				}
+			});
+
 		}
-		long time2 = System.currentTimeMillis();
-		long time = time2 - time1;
-		long timeTotal = 0;
-		for (Long t : timesPerVote) {
-			timeTotal += t.longValue();
-		}
-		long timePerVoteAvg = timeTotal / timesPerVote.size();
-		VotingPluginMain.plugin.getLogger()
-				.info("Time to process votes (" + amount + "): " + time + " ms, average per vote " + timePerVoteAvg
-						+ " ms. " + VotingPluginMain.plugin.getStorageType() + ", "
-						+ UserManager.getInstance().getAllUUIDs().size() + " users. "
-						+ VotingPluginMain.plugin.getVoteSites().size() + " votesites");
 	}
 
 }