Little bug fix

Fix ToggleBroadcasts configuration path

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/ISSUE_TEMPLATE/question-concerns.md

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

.github/stale.yml

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

README.md

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

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

@@ -10,6 +10,7 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=disabled
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled

VotingPlugin/Resources/Config.yml

@@ -2,9 +2,11 @@
 # Main Config
 # See wiki for help: 
 # https://github.com/Ben12345rocks/VotingPlugin/wiki
-
+# Config is sorted in sections
+# Use Control + F to search with Notepad++
+# 
 # Valid Options:
-# - SQLITE
+# - SQLITE 
 # - FLAT
 # - MYSQL
 DataStorage: SQLITE
@@ -32,6 +34,10 @@ MySQL:
 # Recommend: False (Will prevent creating random user data)
 AllowUnjoined: false
 
+# Use server lookup for when allowunjoined is set to false
+# Recommend leaving enabled unless you face issues
+AllowUnJoinedCheckServer: true
+
 # ------------------------------------------------
 # VoteReminding
 # ------------------------------------------------
@@ -42,12 +48,12 @@ AllowUnjoined: false
 VoteReminding:
   # Enable vote reminding
   # This will remind player when he can vote on all sites
-  # Requires VoteDelay's to be setup properly
+  # Requires VoteDelays to be setup properly
   # Use /vote next to see when you can be reminded
   # Players require the perm "VotingPlugin.Login.RemindVotes" or "VotingPlugin.Player"
   Enabled: true
 
-  # Wether or t to remind only once when the player can vote
+  # Whether or not to remind only once when the player can vote
   # Does not apply to login reminds.
   RemindOnlyOnce: true
 
@@ -91,7 +97,7 @@ VoteReminding:
 # Set Message to '' (2 ') to disable message
 
 Commands:
-  # Wether or not the following commands will open GUIs rather than display text
+  # Whether or not the following commands will open GUIs rather than display text
   UseGUI:
     Today: true
     TopVoter: true
@@ -224,6 +230,9 @@ Format:
         - '&3Highest Week Streak: &3&l%BestWeeklyStreak%'
         - '&3Highest Month Streak: &3&l%BestMonthlyStreak%'
         
+      Today:
+        Line: '&6%player% : %VoteSite% : %Time%'
+        
       # PlaceHolders:
       # %VotesRequired% = VotesRequired
       # %NeededVotes% = Number of votes needed to reach VotesRequired
@@ -234,7 +243,7 @@ Format:
       # %Points% = player points
       Points: '&a%Player% currently has &a&l%Points%&a Points!'
       
-      ToggleBroadcast:
+      ToggleBroadcasts:
         Enabled: '&cYou will now see vote broadcasts'
         Disabled: '&cYou will no longer see vote broadcasts'
   
@@ -282,9 +291,16 @@ Format:
   # User not exist message, from commands such as /vote next (player)
   UserNotExist: '&cUser does not exist: %player%'
   
-  # Text for page buttons in inventories
-  PrevPage: '&aPrevious Page'
-  NextPage: '&aNext Page'
+  # Prev/Next page tems in GUIs
+  PrevItem:
+    Material: 'BLACK_STAINED_GLASS_PANE'
+    Amount: 1
+    Name: '&aPrevious Page'
+    
+  NextItem:
+    Material: 'BLACK_STAINED_GLASS_PANE'
+    Amount: 1
+    Name: '&aNext Page'
   
   InvFull: '&cInventory full, dropping items on ground'
   
@@ -300,6 +316,10 @@ Format:
 # GUI Options
 # ------------------------------------------------
   
+# Enable command for last month gui
+# Requires restart to take effect
+LastMonthGUI: false
+  
 # Configure GUI's here
 # Note: Slots start at 0 instead of 1, max slot is 53 (don't go over) (E.g: last slot in first row of inventory is 8)
 # Item Material's can be found here: https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Material.html
@@ -367,6 +387,7 @@ GUI:
     NextVote: '&cCan Vote In: %Info%'
     ViewAllUrlsButtonEnabled: true
     AllUrlsButton:
+      RequireAllSitesVoted: true
       AlreadyVotedItem:
         Material: 'REDSTONE_BLOCK'
         Data: 0 
@@ -433,8 +454,8 @@ GUI:
       Name: '&3&l%position%: &3%player%'
       Lore: '&3&lVotes: &3%votes%'
     SwitchItem:
-      Name: 'Switch TopVoter'
-      Lore: 'Currently: %Top%'
+      Name: '&3Switch TopVoter'
+      Lore: '&bCurrently: %Top%'
       Material: 'SIGN'
       Amount: 1
       # 8 Slots over from the bottom left
@@ -442,6 +463,11 @@ GUI:
     # Number of topvoters to display on page +9
     # 9 Slots on the botton are used for page buttons
     Size: 27
+    # If true, /vote top will show player heads
+    UseSkull: true
+    # Item for player in GUI if use skull is false
+    PlayerItem:
+      Material: 'PAPER'
   VoteTotal:
     Name: 'VoteTotal: %player%'
     BackButton: true
@@ -535,16 +561,21 @@ GUI:
   VoteShopName: 'VoteShop'
   
 BackButton:
-  Material: 'PAPER'
+  Material: 'BARRIER'
   Data: 0
   Amount: 1
   Name: '&8Back to VoteGUI'
 
 VoteShopBackButton: true
 VoteShopEnabled: true
+# Hide items in vote shop which user can not buy
+VoteShopHideLimitedReached: true
+# Requires above to be false
+VoteShopLimitReached: '&aYou reached your limit'
 Shop:
   # Identifier
   # Used in placeholders for formats
+  # Do not have spaces in the identifier
   Diamond:
     # Item
     Material: 'DIAMOND'
@@ -562,7 +593,9 @@ Shop:
     Permission: ''
     # Limit how many times you can buy this
     #Limit: 3
-    # Rewards to run if player buys succesfully
+    # If true, item is not buyable
+    #NotBuyable: false
+    # Rewards to run if player buys successfully
     Rewards:
       Items:
         Diamond:
@@ -576,13 +609,12 @@ Shop:
 # To disable reward set value to []
 # Eg:
 # FirstVote: [] (All in one line)
-# By default all rewards are disabled
+# Rewards will be given if there is a reward to give
 
 # First vote rewards
 FirstVote: 
   Messages:
     Player: '&aYou voted for your first time!'
-  Money: 100
 
 # All vote rewards
 # Reward for voting on all sites in one day
@@ -620,6 +652,8 @@ VoteParty:
   ResetEachDay: false
   # Reset at the end of the month
   ResetMonthly: false
+  # Reset extra votes
+  ResetExtraVotesMonthly: false
   # Count votes from /av vote?
   CountFakeVotes: true
   # Number of user votes that apply to vote party total the user needs to get rewards
@@ -629,7 +663,7 @@ VoteParty:
   # List of commands to execute, these only execute once.
   # %player% does not work here
   Commands: []
-  # Rewards to give
+  # Rewards to give per player
   Rewards: 
     Commands:
     - say %player%
@@ -644,7 +678,7 @@ ResetMilestonesMonthly: false
 MileStones:
   # Number of votes required
   # Allows multiple milestones
-  # Number be be around ' (E.g. '1')
+  # Number be around ' (E.g. '1')
   # Can have multiple listed here
   '20':
     Enabled: false
@@ -693,6 +727,9 @@ VoteStreak:
     Day: 50
     Week: 50
     Month: 50
+    
+# Reward given when vote cooldown ended
+VoteCoolDownEndedReward: []
           
   
 # ONLY USE THIS FOR TITLES/SOUNDS AND OTHER EFFECTS
@@ -799,13 +836,19 @@ ClickSound:
   Sound: 'UI_BUTTON_CLICK'
   Volume: 1.0
   Pitch: 1.0
+  
+# Limit monthly votes to number of days of a month multipled by the number of sites
+LimitMonthlyVotes: false
 
+######################
 # Debug
-Debug: false
+######################
 
-# Extra Debug
-# Only needed in extreme cases
-ExtraDebug: false
+# Debug levels:
+# NONE
+# INFO
+# EXTRA
+DebugLevel: NONE
 
 # Debug info ingame
 # Players with permission "VotingPlugin.Debug"
@@ -813,20 +856,10 @@ ExtraDebug: false
 DebugInGame: false
 
 # Will log debug messages to VotingPlugin/Log/log.txt
-# Requires Debug to be on
-LogDebugToFile: false
-
-# Options for request api
-# Current methods
-# ANVIL
-# BOOK
-# CHAT
-# This is mainly used for admin gui's to type in values
-RequestAPI:
-  DefaultMethod: 'Anvil'
-  DisabledMethods: []
+# Only needed for extreme cases
+#LogDebugToFile: false
   
-# Wether or not to log every vote to a file
+# Whether or not to log every vote to a file
 # Use this if you wanna track player votes
 # Not recommended though
 LogVotesToFile: false
@@ -855,6 +888,10 @@ CountFakeVotes: true
 # Requires restart to take affect
 GiveDefaultPermission: true
 
+# Permissions given by VotingPlugin.Player by default
+# Permissions listed here will no be accessible with the default permission
+DisabledDefaultPermissions: []
+
 # Remove old player files
 # Happens on startup or /av purge
 PurgeOldData: false
@@ -882,6 +919,9 @@ AutoDownload: false
 # Whether or not to disable update checks
 DisableUpdateChecking: false
 
+# Allow transfer of vote points between players
+AllowVotePointTransfers: false
+
 # Disable this on a hub server for example
 # Still processes rewards for offline rewards (just won't give any)
 ProcessRewards: true
@@ -893,12 +933,65 @@ DisableAdvancedTab: false
 # Requires restart to take effect
 LoadCommandAliases: true
 
+# Wait until user is logged in with AuthMe
+# Requires AuthMe
+WaitUntilLoggedIn: true
+
+# Preload skulls to improve performance
+# If false, skulls will be cached as they are used
+PreloadSkulls: false
+
+# Setting to false disables saving skulls in a cache to improve speeds
+# Will reduce ram usage if disabled
+LoadSkulls: true
+
+# Use vault for permission checks
+# May not work on some plugins
+UseVaultPermissions: false
+
+# List of disabled commands from /vote
+# List the specific permission
+# E.g:
+# - PERMISSION
+DisabledCommands: []
+
+# Enable to true for extra player checks
+ExtraBackgroundUpdate: false
+
+# --------------------------
+# 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
+UseBungeecoord: false
+
+# Get the plugin to broadcast to all servers
+BungeeBroadcast: false
+
+# What server this is in bungee (must match)
+# Also can be applied to rewards
+Server: PleaseSet
+
+# Bungee communication, add bungee host/port here
+BungeeServer:
+  Host: '127.0.0.1'
+  Port: 1297
+  
+# Bungee communication, add this to bungee server
+SpigotServer:
+  Host: '127.0.0.1'
+  Port: 1298
+
 # ---------------------------------------------------------
 # Mysql cache options
 # Clearing cache forces the plugin to pull from database
+# Not needed unless you are using multiple servers
 # ---------------------------------------------------------
 
 # Clear cache on update, setting to true reduces update speed
+# Also may require AlwaysUpdate set to true
 ClearCacheOnUpdate: false
 
 # Clear mysql on player join always
@@ -912,18 +1005,22 @@ ClearCacheOnVote: false
 # ###############################################################
 # Deprecated options, don't recommend using any of these
 
-# Whether or not to disable checking names on mojang, disable if you hit the rate limit
-# Shouldn't make a noticeable impact if set to false
-#CheckNameMojang: false
+# Will force GUI's to close on every click
+AlwaysCloseInventory: false
+
+# Options for request api
+# Current methods:
+# ANVIL
+# BOOK
+# CHAT
+# This is mainly used for admin gui's to type in values
+RequestAPI:
+  DefaultMethod: 'Anvil'
+  DisabledMethods: []
 
 # Shouldn't need to change this
 #AutoKillInvs: true
 
-# Used in special cases
-# Much slower, but may work better
-# Not recommended in newer versions
-#AlternateUUIDLookup: false
-
 # Disable checking on world change
 # May improve performance
-#DisableCheckOnWorldChange: false
+#DisableCheckOnWorldChange: false

VotingPlugin/Resources/VoteSites.yml

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

VotingPlugin/Resources/bungee.yml

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

VotingPlugin/Resources/bungeeconfig.yml

@@ -0,0 +1,49 @@
+# STILL A WORK IN PROGRESS, USE AT YOUR OWN RISK
+# 
+# Set bungeecoord to true on servers on the network
+# Set server name in each server related to what it is on bungee
+#
+# Have a reward on each server
+SendVotesToAllServers: true
+# Have a reward on 1 server on the network
+SendToOnlineServer: false 
+# Tell servers to broadcast
+Broadcast: true
+# List of servers the plugin won't send the vote to
+BlockedServers:
+- hub
+FallBackServer: factions
+
+# Bungee communication, Add this to each spigot server
+BungeeServer:
+  Host: '127.0.0.1'
+  Port: 1297
+  
+# Bungee communication, add each spigot server here
+SpigotServers:
+  lobby:
+    Host: '127.0.0.1'
+    Port: 1298
+  factions:
+    Host: '127.0.0.1'
+    Port: 1999
+
+
+# MYSQL Required
+# MYSQL INFO --------------------------
+Host: ''
+# Default port is 3306
+Port: 3306 
+Database: ''
+Username: ''
+Password: ''
+# Max number of connections
+MaxConnections: 1
+# Maxium size of caching mysql
+# -1 for no limit
+# Affecting this value may affect performance
+MaxSize: -1
+# Table name prefix, for use with mutliple servers
+Prefix: ''
+#UseSSL: true
+#########################################

VotingPlugin/Resources/plugin.yml

@@ -4,6 +4,7 @@ main: com.Ben12345rocks.VotingPlugin.Main
 description: Highly Customizable Voting Listener!
 website: https://www.spigotmc.org/resources/votingplugin.15358/
 author: Ben12345rocks
+softdepend: [MVdWPlaceholders, Votifier, CMI, Vault, PlaceholderAPI, ProtocolLib]
 api-version: 1.13
 commands:
   vote:
@@ -60,9 +61,18 @@ commands:
   votepoints:
     description: A command
     aliases: vpoints
+  votelist:
+    description: A command
+    aliases: vlist
+  voteall:
+    description: A command
+    aliases: vall
   votechoices:
     description: A command
     alaises: vchoices
+  votegivepoints:
+    description: A command
+    alaises: vgivepoints
   adminvotehelp:
     description: Open adminvote help
     aliases: avhelp
@@ -81,6 +91,9 @@ commands:
   adminvotereload:
     description: Command Alias
     aliases: avreload
+  adminvotetestreward:
+    description: Command Alias
+    aliases: avtestreward
   adminvoteversion:
     description: Command Alias
     aliases: avversion
@@ -212,4 +225,6 @@ permissions:
     default: false
   VotingPlugin.Sign.Create:
     description: Permission to create sign
+  VotingPlugin.Admin.GenerateServiceSite:
+    description: Permission for generating votesite message
   

VotingPlugin/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>5.17.3</version>
+	<version>5.21</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -27,6 +27,7 @@
 				<filtering>true</filtering>
 				<includes>
 					<include>plugin.yml</include>
+					<include>bungee.yml</include>
 				</includes>
 			</resource>
 			<resource>
@@ -120,6 +121,10 @@
 							<pattern>com.zaxxer.HikariCP</pattern>
 							<shadedPattern>${project.groupId}.${project.artifactId}.HikariCP</shadedPattern>
 						</relocation>
+						<relocation>
+							<pattern>com.zaxxer.hikari</pattern>
+							<shadedPattern>${project.groupId}.${project.artifactId}.hikari</shadedPattern>
+						</relocation>
 						<relocation>
 							<pattern>org.slf4j.slf4j-simple</pattern>
 							<shadedPattern>${project.groupId}.${project.artifactId}.slf4j-simple</shadedPattern>
@@ -229,6 +234,18 @@
 				<updatePolicy>always</updatePolicy>
 			</snapshots>
 		</repository>
+		<repository>
+			<id>maven-central</id>
+			<url>https://oss.sonatype.org/content/groups/public</url>
+		</repository>
+		<repository>
+			<id>bungeecord-repo</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+		</repository>
+		<repository>
+			<id>bintray-repo</id>
+			<url>https://dl.bintray.com/nuvotifier/maven/</url>
+		</repository>
 	</repositories>
 	<dependencies>
 		<dependency>
@@ -236,12 +253,13 @@
 			<artifactId>AdvancedCore</artifactId>
 			<version>master-SNAPSHOT</version>
 		</dependency>
+
 		<!-- <dependency> <groupId>com.Ben12345rocks</groupId> <artifactId>AdvancedCore</artifactId> 
 			<version>LATEST</version> <scope>compile</scope> </dependency> -->
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.13.2-R0.1-SNAPSHOT</version>
+			<version>1.15.2-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -278,5 +296,29 @@
 			<scope>system</scope>
 			<systemPath>${project.basedir}/Jars/SuperbVote-0.5.3.jar</systemPath>
 		</dependency>
+		<dependency>
+			<groupId>be.maximvdw</groupId>
+			<artifactId>MVdWPlaceholderAPI</artifactId>
+			<version>LATEST</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/Jars/MVdWPlaceholderAPI.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>net.md-5</groupId>
+			<artifactId>bungeecord-api</artifactId>
+			<version>LATEST</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.vexsoftware</groupId>
+			<artifactId>nuvotifier-universal</artifactId>
+			<version>2.3.4</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.tchristofferson</groupId>
+			<artifactId>ConfigUpdater</artifactId>
+			<version>1.1-SNAPSHOT</version>
+		</dependency>
 	</dependencies>
 </project>

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

@@ -0,0 +1,125 @@
+package com.Ben12345rocks.VotingPlugin;
+
+import java.io.File;
+import java.util.UUID;
+
+import org.bukkit.Bukkit;
+
+import com.Ben12345rocks.AdvancedCore.Util.Encryption.EncryptionHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Sockets.ClientHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Sockets.SocketHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Sockets.SocketReceiver;
+import com.Ben12345rocks.VotingPlugin.Config.Config;
+import com.Ben12345rocks.VotingPlugin.Objects.User;
+import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
+import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+
+import lombok.Getter;
+
+public class BungeeHandler {
+	private static BungeeHandler instance = new BungeeHandler();
+
+	public static BungeeHandler getInstance() {
+		return instance;
+	}
+
+	@Getter
+	private SocketHandler socketHandler;
+
+	@Getter
+	private ClientHandler clientHandler;
+
+	private EncryptionHandler encryptionHandler;
+
+	public void close() {
+		socketHandler.closeConnection();
+		clientHandler.stopConnection();
+	}
+
+	public void load() {
+		encryptionHandler = new EncryptionHandler(new File(Main.plugin.getDataFolder(), "secretkey.key"));
+		Bukkit.getScheduler().runTask(Main.plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				clientHandler = new ClientHandler(Config.getInstance().getBungeeServerHost(),
+						Config.getInstance().getBungeeServerPort(), encryptionHandler);
+
+				socketHandler.add(new SocketReceiver() {
+
+					@Override
+					public void onReceive(String[] data) {
+						if (data.length > 3) {
+							if (data[0].equalsIgnoreCase("bungeevote")) {
+								String uuid = data[1];
+								User user = null;
+								if (!uuid.isEmpty()) {
+									user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+								} else {
+									user = UserManager.getInstance().getVotingPluginUser(data[2]);
+								}
+
+								user.clearCache();
+
+								user.bungeeVote(data[3]);
+
+							}
+						}
+					}
+				});
+
+				socketHandler.add(new SocketReceiver() {
+
+					@Override
+					public void onReceive(String[] data) {
+						if (data.length > 3) {
+							if (data[0].equalsIgnoreCase("bungeevoteonline")) {
+								String uuid = data[1];
+								User user = null;
+								if (!uuid.isEmpty()) {
+									user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+								} else {
+									user = UserManager.getInstance().getVotingPluginUser(data[2]);
+								}
+
+								user.clearCache();
+
+								user.bungeeVoteOnline(data[3]);
+
+							}
+						}
+					}
+				});
+
+				socketHandler.add(new SocketReceiver() {
+
+					@Override
+					public void onReceive(String[] data) {
+						if (data.length > 2) {
+							if (data[0].equalsIgnoreCase("BungeeBroadcast")) {
+
+								VoteSite site = Main.plugin.getVoteSite(data[1]);
+								String p = data[3];
+								User user = UserManager.getInstance().getVotingPluginUser(p);
+								if (site != null) {
+									site.broadcastVote(user, false);
+								} else {
+									Main.plugin.getLogger().warning("No votesite for " + data[1]);
+								}
+								Main.plugin.setUpdate(true);
+							}
+						}
+					}
+				});
+			}
+		});
+
+		socketHandler = new SocketHandler(Main.plugin.getVersion(), Config.getInstance().getSpigotServerHost(),
+				Config.getInstance().getSpigotServerPort(), encryptionHandler);
+
+	}
+
+	public void sendData(String... strings) {
+		clientHandler.sendMessage(strings);
+	}
+}

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

@@ -1,9 +1,12 @@
 package com.Ben12345rocks.VotingPlugin.Commands;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -14,19 +17,22 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
+import com.Ben12345rocks.AdvancedCore.DebugLevel;
 import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
 import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandle;
 import com.Ben12345rocks.AdvancedCore.CommandAPI.TabCompleteHandler;
 import com.Ben12345rocks.AdvancedCore.Commands.GUI.UserGUI;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
 import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory.ClickEvent;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventoryButton;
+import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
+import com.Ben12345rocks.AdvancedCore.Util.Placeholder.PlaceHolder;
 import com.Ben12345rocks.AdvancedCore.Util.Updater.Updater;
 import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.ValueRequest;
 import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.Listeners.BooleanListener;
@@ -47,7 +53,6 @@ import com.Ben12345rocks.VotingPlugin.Test.VoteTester;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
-import com.Ben12345rocks.VotingPlugin.Util.PlaceHolders.PlaceHolder;
 import com.Ben12345rocks.VotingPlugin.Util.PlaceHolders.PlaceHolders;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
 import com.google.common.collect.ListMultimap;
@@ -58,6 +63,7 @@ import com.mythicacraft.voteroulette.Voter;
 import com.swifteh.GAL.GAL;
 import com.swifteh.GAL.GALVote;
 import com.swifteh.GAL.VoteType;
+import com.tchristofferson.configupdater.ConfigUpdater;
 
 import io.minimum.minecraft.superbvote.SuperbVote;
 import io.minimum.minecraft.superbvote.util.PlayerVotes;
@@ -89,6 +95,8 @@ public class CommandLoader {
 		return instance;
 	}
 
+	private Object pointLock = new Object();
+
 	/** The commands. */
 	private HashMap<String, CommandHandler> commands;
 
@@ -316,7 +324,7 @@ public class CommandLoader {
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 						user.setPoints(Integer.parseInt(args[3]));
 						sender.sendMessage(
-								StringUtils.getInstance().colorize("&cSet " + args[1] + " points to " + args[3]));
+								StringParser.getInstance().colorize("&cSet " + args[1] + " points to " + args[3]));
 					}
 				});
 
@@ -335,6 +343,19 @@ public class CommandLoader {
 			}
 		});
 
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ResyncMilestones", "(player)" },
+				"VotingPlugin.Commands.AdminVote.SetResyncMilestones|" + adminPerm, "Resync Milestones") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+				user.setMilestoneCount(user.getTotal(TopVoter.AllTime));
+
+				sendMessage(sender, "&cResynced milestones for " + args[1]);
+
+			}
+		});
+
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "User", "(player)", "AddPoints", "(number)" },
 						"VotingPlugin.Commands.AdminVote.AddPoints|" + adminPerm, "Add to players voting points") {
@@ -342,8 +363,10 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
-						user.addPoints(Integer.parseInt(args[3]));
-						sender.sendMessage(StringUtils.getInstance().colorize("&cGave " + args[1] + " " + args[3]
+						synchronized (pointLock) {
+							user.addPoints(Integer.parseInt(args[3]));
+						}
+						sender.sendMessage(StringParser.getInstance().colorize("&cGave " + args[1] + " " + args[3]
 								+ " points" + ", " + args[1] + " now has " + user.getPoints() + " points"));
 					}
 				});
@@ -356,7 +379,7 @@ public class CommandLoader {
 					public void execute(CommandSender sender, String[] args) {
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 						user.removePoints(Integer.parseInt(args[3]));
-						sender.sendMessage(StringUtils.getInstance().colorize("&cRemoved " + args[3] + " points from "
+						sender.sendMessage(StringParser.getInstance().colorize("&cRemoved " + args[3] + " points from "
 								+ args[1] + ", " + args[1] + " now has " + user.getPoints() + " points"));
 					}
 				});
@@ -457,10 +480,22 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				sender.sendMessage(ChatColor.RED + "Reloading " + plugin.getName() + "...");
+				sendMessage(sender, "&4" + "Reloading " + plugin.getName() + "...");
 				plugin.reload();
-				sender.sendMessage(
-						ChatColor.RED + plugin.getName() + " v" + plugin.getDescription().getVersion() + " reloaded!");
+				if (plugin.isYmlError()) {
+					sendMessage(sender, "&3Detected yml error, please check server log for details");
+				}
+				sendMessage(sender,
+						"&4" + plugin.getName() + " v" + plugin.getDescription().getVersion() + " reloaded!");
+				if (ServerData.getInstance().getServiceSites().size() == 0) {
+					sendMessage(sender, "&c"
+							+ "Detected that server hasn't received any votes from votifier, please check votifier connection");
+				}
+				if (!Config.getInstance().isDisableUpdateChecking()
+						&& plugin.getUpdater().getResult().equals(Updater.UpdateResult.UPDATE_AVAILABLE)) {
+					sendMessage(sender,
+							"&3Plugin has update available! https://www.spigotmc.org/resources/votingplugin.15358/");
+				}
 			}
 		});
 
@@ -490,6 +525,8 @@ public class CommandLoader {
 					});
 
 				}
+				sendMessage(sender,
+						"Using AdvancedCore " + plugin.getVersion() + "' built on '" + plugin.getBuildTime());
 			}
 		});
 
@@ -561,7 +598,7 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				if (sender instanceof Player) {
 					sender.sendMessage(
-							StringUtils.getInstance().colorize("&cThis command can not be done from ingame"));
+							StringParser.getInstance().colorize("&cThis command can not be done from ingame"));
 					return;
 				}
 
@@ -569,7 +606,7 @@ public class CommandLoader {
 					User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
 					user.clearTotals();
 				}
-				sender.sendMessage(StringUtils.getInstance().colorize("&cCleared totals for everyone"));
+				sender.sendMessage(StringParser.getInstance().colorize("&cCleared totals for everyone"));
 			}
 		});
 
@@ -580,7 +617,7 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				if (sender instanceof Player) {
 					sender.sendMessage(
-							StringUtils.getInstance().colorize("&cThis command can not be done from ingame"));
+							StringParser.getInstance().colorize("&cThis command can not be done from ingame"));
 					return;
 				}
 
@@ -588,7 +625,7 @@ public class CommandLoader {
 					User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
 					user.clearOfflineRewards();
 				}
-				sender.sendMessage(StringUtils.getInstance().colorize("&cCleared totals for everyone"));
+				sender.sendMessage(StringParser.getInstance().colorize("&cCleared totals for everyone"));
 			}
 		});
 
@@ -600,13 +637,13 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 						if (sender instanceof Player) {
-							sender.sendMessage(StringUtils.getInstance().colorize("&cThis can not be done ingame"));
+							sender.sendMessage(StringParser.getInstance().colorize("&cThis can not be done ingame"));
 							return;
 						}
 						try {
 							sender.sendMessage("Starting to convert");
 							UserStorage prevStorage = UserStorage.valueOf(args[1].toUpperCase());
-							plugin.convertDataStorage(prevStorage, AdvancedCoreHook.getInstance().getStorageType());
+							plugin.convertDataStorage(prevStorage, Main.plugin.getStorageType());
 							sender.sendMessage("Finished converting!");
 						} catch (Exception ex) {
 							ex.printStackTrace();
@@ -624,7 +661,7 @@ public class CommandLoader {
 						public void execute(CommandSender sender, String[] args) {
 							UserManager.getInstance().getVotingPluginUser(args[1]).setTotal(top,
 									Integer.parseInt(args[4]));
-							sender.sendMessage(StringUtils.getInstance().colorize(
+							sender.sendMessage(StringParser.getInstance().colorize(
 									"&cSet " + top.toString() + " total for '" + args[1] + "' to " + args[4]));
 						}
 					});
@@ -638,7 +675,7 @@ public class CommandLoader {
 						public void execute(CommandSender sender, String[] args) {
 							User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 							user.setTotal(top, user.getTotal(top) + Integer.parseInt(args[4]));
-							sender.sendMessage(StringUtils.getInstance()
+							sender.sendMessage(StringParser.getInstance()
 									.colorize("&cAdded " + top.toString() + " total for " + args[1]));
 						}
 					});
@@ -651,7 +688,7 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 				user.clearTotals();
-				sender.sendMessage(StringUtils.getInstance().colorize("&cCleared totals for '" + args[1] + "'"));
+				sender.sendMessage(StringParser.getInstance().colorize("&cCleared totals for '" + args[1] + "'"));
 			}
 		});
 
@@ -664,7 +701,8 @@ public class CommandLoader {
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 						user.setMilestoneCount(user.getMilestoneCount() + Integer.parseInt(args[3]));
 						SpecialRewards.getInstance().checkMilestone(user);
-						sender.sendMessage(StringUtils.getInstance().colorize("&cAdded milestonecount for " + args[1]));
+						sender.sendMessage(
+								StringParser.getInstance().colorize("&cAdded milestonecount for " + args[1]));
 					}
 				});
 
@@ -677,24 +715,11 @@ public class CommandLoader {
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 						user.setMilestoneCount(Integer.parseInt(args[3]));
 						SpecialRewards.getInstance().checkMilestone(user);
-						sender.sendMessage(StringUtils.getInstance()
+						sender.sendMessage(StringParser.getInstance()
 								.colorize("&cSet milestonecount for " + args[1] + " to " + args[3]));
 					}
 				});
 
-		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "User", "(player)", "SetData", "(Text)", "(text)" },
-						"VotingPlugin.Commands.AdminVote.SetData|" + adminPerm, "Set data") {
-
-					@Override
-					public void execute(CommandSender sender, String[] args) {
-						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
-						user.getData().setString(args[3], args[4]);
-						sender.sendMessage(StringUtils.getInstance()
-								.colorize("&cSet " + args[3] + " for " + args[1] + " to " + args[4]));
-					}
-				});
-
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Vote", "(player)", "(Sitename)" },
 				"VotingPlugin.Commands.AdminVote.Vote|" + adminPerm, "Trigger manual vote") {
 
@@ -710,18 +735,12 @@ public class CommandLoader {
 				}
 				plugin.getServer().getPluginManager().callEvent(voteEvent);
 
-			}
-		});
-
-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "User", "(Player)", "ViewData" },
-				"VotingPlugin.Commands.AdminVote.ViewData|" + adminPerm, "View playerdata") {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
-				for (String key : user.getData().getKeys()) {
-					user.sendMessage("&c&l" + key + " &c" + user.getData().getString(key));
+				if (plugin.isYmlError()) {
+					sendMessage(sender,
+							"&4" + plugin.getName() + " v" + plugin.getDescription().getVersion() + " reloaded!");
+					sendMessage(sender, "&3Detected yml error, please check server log for details");
 				}
+
 			}
 		});
 
@@ -751,22 +770,64 @@ public class CommandLoader {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				sender.sendMessage(StringUtils.getInstance().colorize("&cCreating VoteSite..." + args[1]));
+				sender.sendMessage(StringParser.getInstance().colorize("&cCreating VoteSite..." + args[1]));
 
 				ConfigVoteSites.getInstance().generateVoteSite(args[1]);
-				sender.sendMessage(StringUtils.getInstance().colorize("&cCreated VoteSite: &c&l" + args[1]));
+				sender.sendMessage(StringParser.getInstance().colorize("&cCreated VoteSite: &c&l" + args[1]));
 
 			}
 		});
 
 		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "Config", "SetDebug", "(boolean)" },
+				.add(new CommandHandler(new String[] { "Config", "TempDebug" },
 						"VotingPlugin.Commands.AdminVote.Config.Edit|" + adminPerm,
-						"Set Debug on or off, effective until reload/restart") {
+						"Enable debug, effective until reload/restart") {
 
 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						AdvancedCoreHook.getInstance().getOptions().setDebug(true);
+						Main.plugin.getOptions().setDebug(DebugLevel.INFO);
+					}
+				});
+
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Config", "Update" },
+				"VotingPlugin.Commands.AdminVote.Config.Edit|" + adminPerm, "Updates config with missing values") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				ArrayList<String> ignoreSections = new ArrayList<String>();
+				ignoreSections.add("VoteReminding");
+				ignoreSections.add("GUI");
+				ignoreSections.add("Shop");
+				ignoreSections.add("FirstVote");
+				ignoreSections.add("AllSites");
+				ignoreSections.add("Cummulative");
+				ignoreSections.add("VoteParty");
+				ignoreSections.add("MileStones");
+				ignoreSections.add("VoteStreak");
+				ignoreSections.add("MonthlyAwards");
+				ignoreSections.add("WeeklyAwards");
+				ignoreSections.add("DailyAwards");
+
+				File file = new File(plugin.getDataFolder(), "Config.yml");
+				try {
+					ConfigUpdater.update(plugin, "Config.yml", file, ignoreSections);
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+				config.reloadData();
+				config.loadValues();
+				sendMessage(sender, "&cUpdated config with new values");
+			}
+		});
+
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "Config", "TempExtraDebug" },
+						"VotingPlugin.Commands.AdminVote.Config.Edit|" + adminPerm,
+						"Enable extra debug, effective until reload/restart") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						Main.plugin.getOptions().setDebug(DebugLevel.EXTRA);
 					}
 				});
 
@@ -779,7 +840,7 @@ public class CommandLoader {
 						String voteSite = plugin.getVoteSiteName(args[1]);
 						String serviceSite = args[3];
 						ConfigVoteSites.getInstance().setServiceSite(voteSite, serviceSite);
-						sender.sendMessage(StringUtils.getInstance()
+						sender.sendMessage(StringParser.getInstance()
 								.colorize("&cSet ServiceSite to &c&l" + serviceSite + "&c on &c&l" + voteSite));
 					}
 				});
@@ -793,7 +854,7 @@ public class CommandLoader {
 						String voteSite = plugin.getVoteSiteName(args[1]);
 						String url = args[3];
 						ConfigVoteSites.getInstance().setVoteURL(voteSite, url);
-						sender.sendMessage(StringUtils.getInstance()
+						sender.sendMessage(StringParser.getInstance()
 								.colorize("&cSet VoteURL to &c&l" + url + "&c on &c&l" + voteSite));
 					}
 				});
@@ -807,7 +868,7 @@ public class CommandLoader {
 						String voteSite = plugin.getVoteSiteName(args[1]);
 						int value = Integer.parseInt(args[3]);
 						ConfigVoteSites.getInstance().setPriority(voteSite, value);
-						sender.sendMessage(StringUtils.getInstance()
+						sender.sendMessage(StringParser.getInstance()
 								.colorize("&cSet priortiy to &c&l" + value + "&c on &c&l" + voteSite));
 
 					}
@@ -822,7 +883,7 @@ public class CommandLoader {
 						String voteSite = plugin.getVoteSiteName(args[1]);
 						int delay = Integer.parseInt(args[3]);
 						ConfigVoteSites.getInstance().setVoteDelay(voteSite, delay);
-						sender.sendMessage(StringUtils.getInstance()
+						sender.sendMessage(StringParser.getInstance()
 								.colorize("&cSet VoteDelay to &c&l" + delay + "&c on &c&l" + voteSite));
 
 					}
@@ -838,22 +899,22 @@ public class CommandLoader {
 
 					@Override
 					public void run() {
-						sender.sendMessage(StringUtils.getInstance().colorize("&cChecking for update..."));
+						sender.sendMessage(StringParser.getInstance().colorize("&cChecking for update..."));
 						plugin.setUpdater(new Updater(plugin, 15358, false));
 						final Updater.UpdateResult result = plugin.getUpdater().getResult();
 						switch (result) {
 							case FAIL_SPIGOT: {
-								sender.sendMessage(StringUtils.getInstance()
+								sender.sendMessage(StringParser.getInstance()
 										.colorize("&cFailed to check for update for &c&l" + plugin.getName() + "&c!"));
 								break;
 							}
 							case NO_UPDATE: {
-								sender.sendMessage(StringUtils.getInstance().colorize("&c&l" + plugin.getName()
+								sender.sendMessage(StringParser.getInstance().colorize("&c&l" + plugin.getName()
 										+ " &cis up to date! Version: &c&l" + plugin.getUpdater().getVersion()));
 								break;
 							}
 							case UPDATE_AVAILABLE: {
-								sender.sendMessage(StringUtils.getInstance()
+								sender.sendMessage(StringParser.getInstance()
 										.colorize("&c&l" + plugin.getName()
 												+ " &chas an update available! Your Version: &c&l"
 												+ plugin.getDescription().getVersion() + " &cNew Version: &c&l"
@@ -880,7 +941,7 @@ public class CommandLoader {
 						boolean value = Boolean.parseBoolean(args[3]);
 
 						ConfigVoteSites.getInstance().setEnabled(voteSite, value);
-						sender.sendMessage(StringUtils.getInstance()
+						sender.sendMessage(StringParser.getInstance()
 								.colorize("&cSet votesite " + voteSite + " enabled to " + value));
 
 					}
@@ -893,23 +954,23 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				String siteName = args[1];
 				if (!ConfigVoteSites.getInstance().isServiceSiteGood(siteName)) {
-					sender.sendMessage(StringUtils.getInstance()
+					sender.sendMessage(StringParser.getInstance()
 							.colorize("&cServiceSite is invalid, votes may not work properly"));
 				} else {
 					String service = ConfigVoteSites.getInstance().getServiceSite(siteName);
 					if (ServerData.getInstance().getServiceSites().contains(service)) {
-						sender.sendMessage(StringUtils.getInstance().colorize("&aServiceSite is properly setup"));
+						sender.sendMessage(StringParser.getInstance().colorize("&aServiceSite is properly setup"));
 					} else {
-						sender.sendMessage(StringUtils.getInstance()
+						sender.sendMessage(StringParser.getInstance()
 								.colorize("&cService may not be valid, haven't recieved a vote from " + service
 										+ ", see /av servicesites"));
 					}
 
 				}
 				if (!ConfigVoteSites.getInstance().isVoteURLGood(siteName)) {
-					sender.sendMessage(StringUtils.getInstance().colorize("&cVoteURL is invalid"));
+					sender.sendMessage(StringParser.getInstance().colorize("&cVoteURL is invalid"));
 				} else {
-					sender.sendMessage(StringUtils.getInstance().colorize("&aVoteURL is properly setup"));
+					sender.sendMessage(StringParser.getInstance().colorize("&aVoteURL is properly setup"));
 				}
 			}
 		});
@@ -921,7 +982,7 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				plugin.setUpdate(true);
 				plugin.update();
-				sender.sendMessage(StringUtils.getInstance().colorize("&cUpdating..."));
+				sender.sendMessage(StringParser.getInstance().colorize("&cUpdating..."));
 			}
 		});
 
@@ -944,7 +1005,7 @@ public class CommandLoader {
 					User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
 					user.setOfflineVotes(new ArrayList<String>());
 				}
-				sender.sendMessage(StringUtils.getInstance().colorize("&cCleared"));
+				sender.sendMessage(StringParser.getInstance().colorize("&cCleared"));
 			}
 		});
 
@@ -961,6 +1022,19 @@ public class CommandLoader {
 					}
 				});
 
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "TestReward", "(Player)", "(reward)", "(number)" },
+						"VotingPlugin.Commands.AdminVote.TestReward|" + adminPerm, "Test reward times") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						VoteTester.getInstance().testRewards(Integer.parseInt(args[3]), args[1], args[2]);
+						if (isPlayer(sender)) {
+							sendMessage(sender, "&cSee console for details");
+						}
+					}
+				});
+
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "Placeholders" },
 						"VotingPlugin.Commands.AdminVote.Placeholders|" + adminPerm,
@@ -970,7 +1044,7 @@ public class CommandLoader {
 					public void execute(CommandSender sender, String[] args) {
 						ArrayList<String> msg = new ArrayList<String>();
 						msg.add("&cPlaceholders:");
-						for (PlaceHolder placeholder : PlaceHolders.getInstance().getPlaceholders()) {
+						for (PlaceHolder<User> placeholder : PlaceHolders.getInstance().getPlaceholders()) {
 							String identifier = placeholder.getIdentifier();
 							if (identifier.endsWith("_")) {
 								identifier += "#";
@@ -982,7 +1056,7 @@ public class CommandLoader {
 							}
 						}
 
-						for (PlaceHolder placeholder : PlaceHolders.getInstance().getNonPlayerPlaceholders()) {
+						for (PlaceHolder<User> placeholder : PlaceHolders.getInstance().getNonPlayerPlaceholders()) {
 							String identifier = placeholder.getIdentifier();
 							if (identifier.endsWith("_")) {
 								identifier += "#";
@@ -1009,6 +1083,18 @@ public class CommandLoader {
 					}
 				});
 
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "VotePartyExtraRequired", "(Number)" },
+						"VotingPlugin.Commands.AdminVote.VoteParty.SetExtraRequired|" + adminPerm,
+						"Force a voteparty reward, resets vote count") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						ServerData.getInstance().setVotePartyExtraRequired(Integer.parseInt(args[1]));
+						sendMessage(sender, "&cSet VotePartyExtraRequired to " + args[1]);
+					}
+				});
+
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "User", "(player)", "ForceMilestone", "(Number)" },
 						"VotingPlugin.Commands.AdminVote.ForceMilestone|" + adminPerm, "Force a milestone") {
@@ -1017,6 +1103,7 @@ public class CommandLoader {
 					public void execute(CommandSender sender, String[] args) {
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 						SpecialRewards.getInstance().giveMilestoneVoteReward(user, user.isOnline(), parseInt(args[3]));
+						sendMessage(sender, "&cMilestone " + args[3] + " forced");
 					}
 				});
 
@@ -1028,6 +1115,7 @@ public class CommandLoader {
 					public void execute(CommandSender sender, String[] args) {
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 						SpecialRewards.getInstance().giveCumulativeVoteReward(user, user.isOnline(), parseInt(args[3]));
+						sendMessage(sender, "&cCummulative " + args[3] + " forced");
 					}
 				});
 
@@ -1038,6 +1126,7 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 				SpecialRewards.getInstance().giveAllSitesRewards(user, user.isOnline());
+				sendMessage(sender, "&cAllSites forced");
 			}
 		});
 
@@ -1048,6 +1137,7 @@ public class CommandLoader {
 			public void execute(CommandSender sender, String[] args) {
 				User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 				SpecialRewards.getInstance().giveFirstVoteRewards(user, user.isOnline());
+				sendMessage(sender, "&cFirstVote forced");
 			}
 		});
 
@@ -1060,6 +1150,7 @@ public class CommandLoader {
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
 						SpecialRewards.getInstance().giveVoteStreakReward(user, user.isOnline(), args[3], args[4],
 								parseInt(args[4]));
+						sendMessage(sender, "&cVoteStreak " + args[3] + " " + args[4] + " forced");
 					}
 				});
 
@@ -1073,7 +1164,7 @@ public class CommandLoader {
 						ArrayList<String> msg = new ArrayList<String>();
 						msg.add("&cPlaceholders:");
 						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
-						for (PlaceHolder placeholder : PlaceHolders.getInstance().getPlaceholders()) {
+						for (PlaceHolder<User> placeholder : PlaceHolders.getInstance().getPlaceholders()) {
 							String identifier = placeholder.getIdentifier();
 							if (identifier.endsWith("_")) {
 								identifier += "1";
@@ -1082,7 +1173,7 @@ public class CommandLoader {
 									+ placeholder.placeholderRequest(user.getOfflinePlayer(), user, identifier));
 						}
 
-						for (PlaceHolder placeholder : PlaceHolders.getInstance().getNonPlayerPlaceholders()) {
+						for (PlaceHolder<User> placeholder : PlaceHolders.getInstance().getNonPlayerPlaceholders()) {
 							String identifier = placeholder.getIdentifier();
 							if (identifier.endsWith("_")) {
 								identifier += "1";
@@ -1223,7 +1314,7 @@ public class CommandLoader {
 										String playerName = (String) event.getMeta(player, "Player");
 										BInventory inv = new BInventory("MileStones: " + playerName);
 										for (String mileStoneName : Config.getInstance().getMilestoneVotes()) {
-											if (StringUtils.getInstance().isInt(mileStoneName)) {
+											if (StringParser.getInstance().isInt(mileStoneName)) {
 												int mileStone = Integer.parseInt(mileStoneName);
 
 												inv.addButton(inv.getNextSlot(),
@@ -1235,7 +1326,7 @@ public class CommandLoader {
 
 															@Override
 															public void onClick(ClickEvent clickEvent) {
-																if (StringUtils.getInstance()
+																if (StringParser.getInstance()
 																		.isInt(clickEvent.getClickedItem().getItemMeta()
 																				.getDisplayName())) {
 																	Player player = clickEvent.getPlayer();
@@ -1331,14 +1422,93 @@ public class CommandLoader {
 			}
 		});
 
-		plugin.getVoteCommand().add(new CommandHandler(new String[] { "Shop" },
-				"VotingPlugin.Commands.Vote.Shop|" + playerPerm, "Open VoteShop GUI", false) {
+		if (Config.getInstance().getVoteShopEnabled()) {
+			plugin.getVoteCommand().add(new CommandHandler(new String[] { "Shop" },
+					"VotingPlugin.Commands.Vote.Shop|" + playerPerm, "Open VoteShop GUI", false) {
 
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				PlayerGUIs.getInstance().openVoteShop((Player) sender);
-			}
-		});
+				@Override
+				public void execute(CommandSender sender, String[] args) {
+					PlayerGUIs.getInstance().openVoteShop((Player) sender);
+				}
+			});
+			plugin.getVoteCommand().add(new CommandHandler(new String[] { "Shop", "(Text)" },
+					"VotingPlugin.Commands.Vote.Shop|" + playerPerm, "Open VoteShop GUI", false) {
+
+				@Override
+				public void execute(CommandSender sender, String[] args) {
+					if (!Config.getInstance().getVoteShopEnabled()) {
+						sender.sendMessage(StringParser.getInstance().colorize("&cVote shop disabled"));
+						return;
+					}
+
+					String identifier = args[1];
+					Set<String> identifiers = Config.getInstance().getIdentifiers();
+					if (ArrayUtils.getInstance().containsIgnoreCase(identifiers, identifier)) {
+						for (String ident : identifiers) {
+							if (ident.equalsIgnoreCase(args[1])) {
+								identifier = ident;
+							}
+						}
+
+						String perm = Config.getInstance().getVoteShopPermission(identifier);
+						boolean hasPerm = false;
+						if (perm.isEmpty()) {
+							hasPerm = true;
+						} else {
+							hasPerm = sender.hasPermission(perm);
+						}
+
+						int limit = Config.getInstance().getIdentifierLimit(identifier);
+
+						User user = UserManager.getInstance().getVotingPluginUser(sender.getName());
+						boolean limitPass = true;
+						if (limit > 0) {
+
+							if (user.getVoteShopIdentifierLimit(identifier) >= limit) {
+								limitPass = false;
+							}
+						}
+
+						if (!Config.getInstance().getVoteShopNotBuyable(identifier)) {
+							if (hasPerm) {
+								user.clearCache();
+								int points = Config.getInstance().getIdentifierCost(identifier);
+								if (identifier != null) {
+
+									if (limitPass) {
+										HashMap<String, String> placeholders = new HashMap<String, String>();
+										placeholders.put("identifier", identifier);
+										placeholders.put("points", "" + points);
+										placeholders.put("limit", "" + limit);
+										if (user.removePoints(points)) {
+
+											RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
+													Config.getInstance().getIdentifierRewardsPath(identifier),
+													new RewardOptions().setPlaceholders(placeholders));
+
+											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
+													Config.getInstance().getFormatShopPurchaseMsg(), placeholders));
+											if (limit > 0) {
+												user.setVoteShopIdentifierLimit(identifier,
+														user.getVoteShopIdentifierLimit(identifier) + 1);
+											}
+										} else {
+											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
+													Config.getInstance().getFormatShopFailedMsg(), placeholders));
+										}
+									} else {
+										user.sendMessage(Config.getInstance().getVoteShopLimitReached());
+									}
+								}
+
+							}
+						}
+					} else {
+						sendMessage(sender, "&cWrong voteshop item");
+					}
+				}
+			});
+		}
 
 		plugin.getVoteCommand().add(new CommandHandler(new String[] { "URL" },
 				"VotingPlugin.Commands.Vote.URL|" + playerPerm, "Open VoteURL GUI", false) {
@@ -1350,7 +1520,7 @@ public class CommandLoader {
 			}
 		});
 		plugin.getVoteCommand().add(new CommandHandler(new String[] { "URL", "(SiteName)" },
-				"VotingPlugin.Commands.Vote.URL.VoteSite|" + playerPerm, "Open VoteURL GUI", false) {
+				"VotingPlugin.Commands.Vote.URL.VoteSite", "Open VoteURL GUI", false) {
 
 			@Override
 			public void execute(CommandSender sender, String[] args) {
@@ -1403,7 +1573,7 @@ public class CommandLoader {
 								UserManager.getInstance().getVotingPluginUser(args[1]));
 					}
 				} else {
-					sendMessage(sender, StringUtils.getInstance()
+					sendMessage(sender, StringParser.getInstance()
 							.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
 				}
 
@@ -1469,7 +1639,7 @@ public class CommandLoader {
 								UserManager.getInstance().getVotingPluginUser(args[1]));
 					}
 				} else {
-					sendMessage(sender, StringUtils.getInstance()
+					sendMessage(sender, StringParser.getInstance()
 							.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
 				}
 			}
@@ -1487,10 +1657,10 @@ public class CommandLoader {
 					if (sender instanceof Player) {
 						UserManager.getInstance().getVotingPluginUser((Player) sender).sendMessage(msg);
 					} else {
-						sender.sendMessage(StringUtils.getInstance().colorize(msg));
+						sender.sendMessage(StringParser.getInstance().colorize(msg));
 					}
 				} else {
-					sendMessage(sender, StringUtils.getInstance()
+					sendMessage(sender, StringParser.getInstance()
 							.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
 				}
 
@@ -1550,13 +1720,26 @@ public class CommandLoader {
 					PlayerGUIs.getInstance().openVoteGUI(player,
 							UserManager.getInstance().getVotingPluginUser(args[1]));
 				} else {
-					sendMessage(sender, StringUtils.getInstance()
+					sendMessage(sender, StringParser.getInstance()
 							.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
 				}
 
 			}
 		});
 
+		if (Config.getInstance().isLastMonthGUI()) {
+			plugin.getVoteCommand()
+					.add(new CommandHandler(new String[] { "LastMonthTop" },
+							"VotingPlugin.Commands.Vote.LastMonthTop|" + playerPerm,
+							"Open list of Top Voters from last month") {
+
+						@Override
+						public void execute(CommandSender sender, String[] args) {
+							PlayerGUIs.getInstance().openVoteTopLastMonth((Player) sender);
+						}
+					});
+		}
+
 		plugin.getVoteCommand().add(new CommandHandler(new String[] { "Top" },
 				"VotingPlugin.Commands.Vote.Top|" + playerPerm, "Open list of Top Voters") {
 
@@ -1888,7 +2071,7 @@ public class CommandLoader {
 								UserManager.getInstance().getVotingPluginUser(args[1]));
 					}
 				} else {
-					sendMessage(sender, StringUtils.getInstance()
+					sendMessage(sender, StringParser.getInstance()
 							.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
 				}
 
@@ -1942,7 +2125,7 @@ public class CommandLoader {
 								UserManager.getInstance().getVotingPluginUser(args[1]));
 					}
 				} else {
-					sendMessage(sender, StringUtils.getInstance()
+					sendMessage(sender, StringParser.getInstance()
 							.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
 				}
 			}
@@ -1975,12 +2158,37 @@ public class CommandLoader {
 								UserManager.getInstance().getVotingPluginUser(args[1]));
 					}
 				} else {
-					sendMessage(sender, StringUtils.getInstance()
+					sendMessage(sender, StringParser.getInstance()
 							.replacePlaceHolder(Config.getInstance().getFormatUserNotExist(), "player", args[1]));
 				}
 			}
 		});
 
+		if (Config.getInstance().isAllowVotePointTransfers()) {
+			plugin.getVoteCommand().add(new CommandHandler(new String[] { "GivePoints", "(player)", "(number)" },
+					"VotingPlugin.Commands.Vote.GivePoints", "Give someone points from your points", false) {
+
+				@Override
+				public void execute(CommandSender sender, String[] args) {
+					if (Config.getInstance().isAllowVotePointTransfers()) {
+						User cPlayer = UserManager.getInstance().getVotingPluginUser((Player) sender);
+
+						User user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						int pointsToGive = Integer.parseInt(args[2]);
+						if (cPlayer.getPoints() >= pointsToGive) {
+							user.addPoints(pointsToGive);
+							cPlayer.removePoints(pointsToGive);
+							sendMessage(sender, "&c" + pointsToGive + " points given to " + user.getPlayerName());
+							user.sendMessage(
+									"&cYou received " + pointsToGive + " points from " + cPlayer.getPlayerName());
+						} else {
+							sendMessage(sender, "&cNot enough points");
+						}
+					}
+				}
+			});
+		}
+
 		plugin.getVoteCommand().add(
 				new CommandHandler(new String[] {}, "VotingPlugin.Commands.Vote|" + playerPerm, "See voting URLs") {
 
@@ -2000,12 +2208,58 @@ public class CommandLoader {
 					}
 				});
 
+		plugin.getVoteCommand().add(new CommandHandler(new String[] { "List&All" },
+				"VotingPlugin.Commands.Vote.List|" + playerPerm, "See voting URLs") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				if (isPlayer(sender)) {
+					User user = UserManager.getInstance().getVotingPluginUser((Player) sender);
+					user.sendMessage(Commands.getInstance().voteURLs(user));
+				} else {
+					sender.sendMessage(Commands.getInstance().voteURLs(null));
+				}
+			}
+		});
+
 		ArrayList<CommandHandler> avCommands = com.Ben12345rocks.AdvancedCore.Commands.CommandLoader.getInstance()
 				.getBasicCommands("VotingPlugin");
 		for (CommandHandler cmd : avCommands) {
 			cmd.setPerm(cmd.getPerm() + "|" + playerPerm);
 		}
 		plugin.getVoteCommand().addAll(avCommands);
+
+		ArrayList<CommandHandler> list = plugin.getVoteCommand();
+		ArrayList<String> disabledCommands = Config.getInstance().getDisabledCommands();
+		for (int i = list.size() - 1; i >= 0; i--) {
+			boolean remove = false;
+			for (String disabled : disabledCommands) {
+				CommandHandler handle = list.get(i);
+				if (handle.getPerm().contains(disabled)) {
+					remove = true;
+				}
+			}
+
+			if (remove) {
+				plugin.debug("Disabling: " + ArrayUtils.getInstance()
+						.makeStringList(ArrayUtils.getInstance().convert(list.get(i).getArgs())));
+				list.remove(i);
+			}
+		}
+		ArrayList<String> disabledDefaultPerms = config.getDisabledDefaultPermissions();
+		for (CommandHandler cmd : list) {
+			boolean contains = false;
+			for (String dis : disabledDefaultPerms) {
+				if (cmd.getPerm().contains(dis + "|")) {
+					contains = true;
+				}
+			}
+			if (contains) {
+				cmd.setPerm(cmd.getPerm().replace("|" + playerPerm, ""));
+				plugin.debug("Disabling VotingPlugin.Player permission on " + cmd.getPerm());
+
+			}
+		}
 	}
 
 	/**

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

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

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

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

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

@@ -1,26 +1,28 @@
 package com.Ben12345rocks.VotingPlugin.Commands.GUI;
 
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventory.ClickEvent;
 import com.Ben12345rocks.AdvancedCore.Util.Inventory.BInventoryButton;
 import com.Ben12345rocks.AdvancedCore.Util.Item.ItemBuilder;
+import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Commands.Commands;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
@@ -51,12 +53,28 @@ public class PlayerGUIs {
 	private PlayerGUIs() {
 	}
 
-	public ItemBuilder getBackButton() {
+	public BInventoryButton getBackButton() {
 		ConfigurationSection sec = Config.getInstance().getBackButton();
+		ItemBuilder item;
 		if (sec != null) {
-			return new ItemBuilder(sec);
+			item = new ItemBuilder(sec);
+		} else {
+			item = new ItemBuilder(Material.BARRIER, 1).setName("&8Back to VoteGUI");
 		}
-		return new ItemBuilder(Material.PAPER, 1).setName("&8Back to VoteGUI");
+
+		BInventoryButton b = new BInventoryButton(item) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				openVoteGUI(event.getWhoClicked(), getSelectedPlayer(event.getWhoClicked()));
+			}
+		};
+
+		if (!Config.getInstance().isAlwaysCloseInventory()) {
+			b.dontClose();
+		}
+
+		return b;
 	}
 
 	public User getSelectedPlayer(Player player) {
@@ -66,7 +84,7 @@ public class PlayerGUIs {
 
 	public void openVoteBest(Player player, User user) {
 		setSelectedPlayer(player, user);
-		BInventory inv = new BInventory(StringUtils.getInstance()
+		BInventory inv = new BInventory(StringParser.getInstance()
 				.replacePlaceHolder(Config.getInstance().getGUIVoteBestName(), "player", user.getPlayerName()));
 
 		inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteBestDayBestItem())
@@ -109,13 +127,15 @@ public class PlayerGUIs {
 				&& !player.hasPermission("VotingPlugin.Mod"))
 				|| (!player.hasPermission("VotingPlugin.Commands.Vote.GUI")
 						&& !player.hasPermission("VotingPlugin.Player"))) {
-			player.sendMessage(
-					StringUtils.getInstance().colorize(AdvancedCoreHook.getInstance().getOptions().getFormatNoPerms()));
+			player.sendMessage(StringParser.getInstance().colorize(Main.plugin.getOptions().getFormatNoPerms()));
 			return;
 		}
 		setSelectedPlayer(player, user);
-		BInventory inv = new BInventory(StringUtils.getInstance()
+		BInventory inv = new BInventory(StringParser.getInstance()
 				.replacePlaceHolder(Config.getInstance().getGUIVoteGUIName(), "player", user.getPlayerName()));
+		if (!Config.getInstance().isAlwaysCloseInventory()) {
+			inv.dontClose();
+		}
 
 		for (String slot : Config.getInstance().getVoteGUISlots()) {
 			ItemBuilder builder = new ItemBuilder(Config.getInstance().getVoteGUISlotSection(slot));
@@ -161,30 +181,46 @@ public class PlayerGUIs {
 
 				@Override
 				public void onClick(ClickEvent event) {
-					Player player = event.getWhoClicked();
-					String cmd = Config.getInstance().getVoteGUISlotCommand(slot);
-					User user = getSelectedPlayer(player);
-					if (!cmd.equals("")) {
-						player.performCommand(cmd);
-					} else {
-						if (slot.equalsIgnoreCase("url")) {
-							openVoteURL(player);
-						} else if (slot.equalsIgnoreCase("next")) {
-							openVoteNext(player, user);
-						} else if (slot.equalsIgnoreCase("last")) {
-							openVoteLast(player, user);
-						} else if (slot.equalsIgnoreCase("total")) {
-							openVoteTotal(player, user);
-						} else if (slot.equalsIgnoreCase("top")) {
-							openVoteTop(player, null);
-						} else if (slot.equalsIgnoreCase("today")) {
-							openVoteToday(player);
-						} else if (slot.equalsIgnoreCase("help")) {
-							player.performCommand("vote help");
-						} else if (slot.equalsIgnoreCase("shop")) {
-							openVoteShop(player);
+					Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+						@Override
+						public void run() {
+							Player player = event.getWhoClicked();
+							String cmd = Config.getInstance().getVoteGUISlotCommand(slot);
+							User user = getSelectedPlayer(player);
+							if (cmd.equalsIgnoreCase("none")) {
+								return;
+							} else if (!cmd.equals("")) {
+								Bukkit.getScheduler().runTask(plugin, new Runnable() {
+
+									@Override
+									public void run() {
+										player.performCommand(cmd);
+									}
+								});
+							} else {
+								if (slot.equalsIgnoreCase("url")) {
+									openVoteURL(player);
+								} else if (slot.equalsIgnoreCase("next")) {
+									openVoteNext(player, user);
+								} else if (slot.equalsIgnoreCase("last")) {
+									openVoteLast(player, user);
+								} else if (slot.equalsIgnoreCase("total")) {
+									openVoteTotal(player, user);
+								} else if (slot.equalsIgnoreCase("top")) {
+									openVoteTop(player, null);
+								} else if (slot.equalsIgnoreCase("today")) {
+									openVoteToday(player);
+								} else if (slot.equalsIgnoreCase("help")) {
+									player.performCommand("vote help");
+								} else if (slot.equalsIgnoreCase("shop")) {
+									openVoteShop(player);
+								} else if (slot.equalsIgnoreCase("lastmonth")) {
+									openVoteTopLastMonth(player);
+								}
+							}
 						}
-					}
+					});
 
 				}
 			});
@@ -195,7 +231,7 @@ public class PlayerGUIs {
 
 	public void openVoteLast(Player player, User user) {
 		setSelectedPlayer(player, user);
-		BInventory inv = new BInventory(StringUtils.getInstance()
+		BInventory inv = new BInventory(StringParser.getInstance()
 				.replacePlaceHolder(Config.getInstance().getGUIVoteLastName(), "player", user.getPlayerName()));
 		for (VoteSite site : plugin.getVoteSites()) {
 			inv.addButton(inv.getNextSlot(), new BInventoryButton(site.getItem().setName(site.getDisplayName())
@@ -209,14 +245,7 @@ public class PlayerGUIs {
 		}
 
 		if (Config.getInstance().getGUIVoteLastBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-
-			});
+			inv.addButton(getBackButton());
 		}
 
 		inv.openInventory(player);
@@ -224,7 +253,7 @@ public class PlayerGUIs {
 
 	public void openVoteNext(Player player, User user) {
 		setSelectedPlayer(player, user);
-		BInventory inv = new BInventory(StringUtils.getInstance()
+		BInventory inv = new BInventory(StringParser.getInstance()
 				.replacePlaceHolder(Config.getInstance().getGUIVoteNextName(), "player", user.getPlayerName()));
 		for (VoteSite site : plugin.getVoteSites()) {
 			inv.addButton(inv.getNextSlot(), new BInventoryButton(site.getItem().setName(site.getDisplayName())
@@ -238,21 +267,14 @@ public class PlayerGUIs {
 		}
 
 		if (Config.getInstance().getGUIVoteNextBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-
-			});
+			inv.addButton(getBackButton());
 		}
 		inv.openInventory(player);
 	}
 
 	public void openVoteShop(Player player) {
 		if (!Config.getInstance().getVoteShopEnabled()) {
-			player.sendMessage(StringUtils.getInstance().colorize("&cVote shop disabled"));
+			player.sendMessage(StringParser.getInstance().colorize("&cVote shop disabled"));
 			return;
 		}
 
@@ -278,70 +300,78 @@ public class PlayerGUIs {
 				}
 			}
 
-			if (hasPerm && limitPass) {
-				ItemBuilder builder = new ItemBuilder(Config.getInstance().getIdentifierSection(identifier));
+			if (!Config.getInstance().getVoteShopNotBuyable(identifier)) {
+				if (hasPerm && (limitPass || !Config.getInstance().isVoteShopHideLimitedReached())) {
+					ItemBuilder builder = new ItemBuilder(Config.getInstance().getIdentifierSection(identifier));
 
-				inv.addButton(new BInventoryButton(builder) {
+					inv.addButton(new BInventoryButton(builder) {
 
-					@Override
-					public void onClick(ClickEvent event) {
-						Player player = event.getWhoClicked();
+						@Override
+						public void onClick(ClickEvent event) {
+							Player player = event.getWhoClicked();
+							event.getButton().getInv().closeInv(player, null);
 
-						User user = UserManager.getInstance().getVotingPluginUser(player);
-						user.clearCache();
-						String identifier = (String) getData("identifier");
-						int limit = (int) getData("Limit");
-						int points = Config.getInstance().getIdentifierCost(identifier);
-						if (identifier != null) {
+							User user = UserManager.getInstance().getVotingPluginUser(player);
+							user.clearCache();
+							String identifier = (String) getData("identifier");
+							int limit = (int) getData("Limit");
+							int points = Config.getInstance().getIdentifierCost(identifier);
+							if (identifier != null) {
 
-							// limit fail-safe, should never be needed, except in rare cases
-							boolean limitPass = true;
-							if (limit > 0) {
-								if (user.getVoteShopIdentifierLimit(identifier) >= limit) {
-									limitPass = false;
+								// limit fail-safe, should never be needed, except in rare cases
+								boolean limitPass = true;
+								if (limit > 0) {
+									if (user.getVoteShopIdentifierLimit(identifier) >= limit) {
+										limitPass = false;
+									}
 								}
-							}
 
-							if (limitPass) {
-								HashMap<String, String> placeholders = new HashMap<String, String>();
-								placeholders.put("identifier", identifier);
-								placeholders.put("points", "" + points);
-								placeholders.put("limit", "" + limit);
-								if (user.removePoints(points)) {
+								if (limitPass) {
+									HashMap<String, String> placeholders = new HashMap<String, String>();
+									placeholders.put("identifier", identifier);
+									placeholders.put("points", "" + points);
+									placeholders.put("limit", "" + limit);
+									if (user.removePoints(points)) {
 
-									RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
-											Config.getInstance().getIdentifierRewardsPath(identifier),
-											new RewardOptions().setPlaceholders(placeholders));
+										RewardHandler.getInstance().giveReward(user, Config.getInstance().getData(),
+												Config.getInstance().getIdentifierRewardsPath(identifier),
+												new RewardOptions().setPlaceholders(placeholders));
 
-									user.sendMessage(StringUtils.getInstance().replacePlaceHolder(
-											Config.getInstance().getFormatShopPurchaseMsg(), placeholders));
-									if (limit > 0) {
-										user.setVoteShopIdentifierLimit(identifier,
-												user.getVoteShopIdentifierLimit(identifier) + 1);
+										user.sendMessage(StringParser.getInstance().replacePlaceHolder(
+												Config.getInstance().getFormatShopPurchaseMsg(), placeholders));
+										if (limit > 0) {
+											user.setVoteShopIdentifierLimit(identifier,
+													user.getVoteShopIdentifierLimit(identifier) + 1);
+										}
+									} else {
+										user.sendMessage(StringParser.getInstance().replacePlaceHolder(
+												Config.getInstance().getFormatShopFailedMsg(), placeholders));
 									}
 								} else {
-									user.sendMessage(StringUtils.getInstance().replacePlaceHolder(
-											Config.getInstance().getFormatShopFailedMsg(), placeholders));
+									user.sendMessage(Config.getInstance().getVoteShopLimitReached());
 								}
 							}
 						}
-					}
 
-				}.addData("identifier", identifier).addData("Limit", limit));
+					}.addData("identifier", identifier).addData("Limit", limit));
+				}
+			} else {
+				if (hasPerm) {
+					ItemBuilder builder = new ItemBuilder(Config.getInstance().getIdentifierSection(identifier));
+					inv.addButton(new BInventoryButton(builder) {
+
+						@Override
+						public void onClick(ClickEvent event) {
+
+						}
+
+					}.dontClose().addData("identifier", identifier).addData("Limit", limit));
+				}
 			}
 		}
 
 		if (Config.getInstance().getVoteShopBackButton()) {
-			inv.addButton(new BInventoryButton(PlayerGUIs.getInstance().getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					PlayerGUIs.getInstance().openVoteGUI(event.getPlayer(),
-							UserManager.getInstance().getVotingPluginUser(player));
-				}
-
-			});
-
+			inv.addButton(getBackButton());
 		}
 
 		inv.openInventory(player);
@@ -349,7 +379,7 @@ public class PlayerGUIs {
 
 	public void openVoteStreak(Player player, User user) {
 		setSelectedPlayer(player, user);
-		BInventory inv = new BInventory(StringUtils.getInstance()
+		BInventory inv = new BInventory(StringParser.getInstance()
 				.replacePlaceHolder(Config.getInstance().getGUIVoteStreakName(), "player", user.getPlayerName()));
 
 		inv.addButton(new BInventoryButton(new ItemBuilder(Config.getInstance().getGUIVoteStreakCurrentDayStreakItem())
@@ -409,13 +439,7 @@ public class PlayerGUIs {
 				});
 
 		if (Config.getInstance().getGUIVoteStreakBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-			});
+			inv.addButton(getBackButton());
 		}
 
 		inv.openInventory(player);
@@ -424,6 +448,9 @@ public class PlayerGUIs {
 	public void openVoteToday(Player player) {
 		setSelectedPlayer(player, null);
 		BInventory inv = new BInventory(Config.getInstance().getGUIVoteTodayName());
+		if (!Config.getInstance().isAlwaysCloseInventory()) {
+			inv.dontClose();
+		}
 		for (User user : plugin.getVoteToday().keySet()) {
 
 			for (VoteSite voteSite : plugin.getVoteToday().get(user).keySet()) {
@@ -438,83 +465,127 @@ public class PlayerGUIs {
 						User user = UserManager.getInstance()
 								.getVotingPluginUser(clickEvent.getClickedItem().getItemMeta().getDisplayName());
 						openVoteGUI(player, user);
-
 					}
 				});
 			}
 		}
 
 		if (Config.getInstance().getGUIVoteTodayBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-
-			});
+			inv.addButton(getBackButton());
 		}
 		inv.openInventory(player);
 	}
 
 	public void openVoteTop(Player player, TopVoter top) {
-		if (top == null) {
-			top = TopVoter.getDefault();
-		}
-		Set<Entry<User, Integer>> users = null;
+		try {
+			if (top == null) {
+				top = TopVoter.getDefault();
+			}
+			Set<Entry<User, Integer>> users = null;
 
-		String topVoter = top.getName();
-		users = plugin.getTopVoter(top).entrySet();
+			String topVoter = top.getName();
+			@SuppressWarnings("unchecked")
+			LinkedHashMap<User, Integer> topVotes = (LinkedHashMap<User, Integer>) plugin.getTopVoter(top).clone();
+			users = topVotes.entrySet();
 
-		BInventory inv = new BInventory(StringUtils.getInstance()
-				.replacePlaceHolder(Config.getInstance().getGUIVoteTopName(), "topvoter", topVoter));
+			BInventory inv = new BInventory(StringParser.getInstance()
+					.replacePlaceHolder(Config.getInstance().getGUIVoteTopName(), "topvoter", topVoter));
+			if (!Config.getInstance().isAlwaysCloseInventory()) {
+				inv.dontClose();
+			}
 
-		int pos = 1;
-		for (Entry<User, Integer> entry : users) {
+			int pos = 1;
+			for (Entry<User, Integer> entry : users) {
+				ItemBuilder playerItem;
 
-			inv.addButton(new BInventoryButton(
-					new ItemBuilder(MiscUtils.getInstance().setSkullOwner(entry.getKey().getOfflinePlayer()))
-							.setName(Config.getInstance().getGUIVoteTopItemName())
-							.addLoreLine(Config.getInstance().getGUIVoteTopItemLore())
-							.addPlaceholder("position", "" + pos)
-							.addPlaceholder("player", entry.getKey().getPlayerName())
-							.addPlaceholder("votes", "" + entry.getValue())) {
+				if (Config.getInstance().isGuiVoteTopUseSkull()) {
+					playerItem = new ItemBuilder(entry.getKey().getPlayerHead());
+				} else {
+					playerItem = new ItemBuilder(
+							Material.valueOf(Config.getInstance().getGuiVoteTopPlayerItemMaterial()));
+				}
+
+				playerItem.setLore(new ArrayList<String>());
+
+				inv.addButton(new BInventoryButton(playerItem.setName(Config.getInstance().getGUIVoteTopItemName())
+						.addLoreLine(Config.getInstance().getGUIVoteTopItemLore()).addPlaceholder("position", "" + pos)
+						.addPlaceholder("player", entry.getKey().getPlayerName())
+						.addPlaceholder("votes", "" + entry.getValue())) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						User user = (User) getData("User");
+						openVoteGUI(player, user);
+					}
+				}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey()));
+				pos++;
+			}
+
+			final TopVoter cur = top;
+			inv.getPageButtons().add(new BInventoryButton(
+					new ItemBuilder(Config.getInstance().getGUIVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
 
 				@Override
 				public void onClick(ClickEvent clickEvent) {
-					// ItemBuilder item = new ItemBuilder(clickEvent.getClickedItem());
-					// String name = ChatColor.stripColor(item.getName()).split(":")[1].trim();
-					String name = (String) clickEvent.getButton().getData("player");
+					if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
+						openVoteTop(player, cur.next());
+					} else {
+						openVoteTop(player, cur.prev());
+					}
+				}
+			});
 
-					User user = UserManager.getInstance().getVotingPluginUser(name);
+			if (Config.getInstance().getGUIVoteTopBackButton()) {
+				inv.getPageButtons().add(getBackButton().setSlot(1));
+			}
+
+			inv.setPages(true);
+			inv.setMaxInvSize(Config.getInstance().getGUIVoteTopSize());
+			inv.openInventory(player);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void openVoteTopLastMonth(Player player) {
+		Set<Entry<User, Integer>> users = null;
+
+		users = plugin.getLastMonthTopVoter().entrySet();
+
+		BInventory inv = new BInventory(StringParser.getInstance()
+				.replacePlaceHolder(Config.getInstance().getGUIVoteTopName(), "topvoter", "Last Month"));
+		if (!Config.getInstance().isAlwaysCloseInventory()) {
+			inv.dontClose();
+		}
+
+		int pos = 1;
+		for (Entry<User, Integer> entry : users) {
+			ItemBuilder playerItem;
+
+			if (Config.getInstance().isGuiVoteTopUseSkull()) {
+				playerItem = new ItemBuilder(entry.getKey().getPlayerHead());
+			} else {
+				playerItem = new ItemBuilder(Material.valueOf(Config.getInstance().getGuiVoteTopPlayerItemMaterial()));
+			}
+
+			playerItem.setLore(new ArrayList<String>());
+
+			inv.addButton(new BInventoryButton(playerItem.setName(Config.getInstance().getGUIVoteTopItemName())
+					.addLoreLine(Config.getInstance().getGUIVoteTopItemLore()).addPlaceholder("position", "" + pos)
+					.addPlaceholder("player", entry.getKey().getPlayerName())
+					.addPlaceholder("votes", "" + entry.getValue())) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					User user = (User) getData("User");
 					openVoteGUI(player, user);
 				}
-			}.addData("player", entry.getKey().getPlayerName()));
+			}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey()));
 			pos++;
 		}
 
-		final TopVoter cur = top;
-		inv.getPageButtons().add(new BInventoryButton(
-				new ItemBuilder(Config.getInstance().getGUIVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
-
-			@Override
-			public void onClick(ClickEvent clickEvent) {
-				if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
-					openVoteTop(player, cur.next());
-				} else {
-					openVoteTop(player, cur.prev());
-				}
-			}
-		});
-
 		if (Config.getInstance().getGUIVoteTopBackButton()) {
-			inv.getPageButtons().add(new BInventoryButton(getBackButton().setSlot(1)) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-			});
+			inv.getPageButtons().add(getBackButton().setSlot(1));
 		}
 
 		inv.setPages(true);
@@ -525,7 +596,7 @@ public class PlayerGUIs {
 
 	public void openVoteTotal(Player player, User user) {
 		setSelectedPlayer(player, user);
-		BInventory inv = new BInventory(StringUtils.getInstance()
+		BInventory inv = new BInventory(StringParser.getInstance()
 				.replacePlaceHolder(Config.getInstance().getGUIVoteTotalName(), "player", user.getPlayerName()));
 
 		for (TopVoter top : TopVoter.values()) {
@@ -540,14 +611,7 @@ public class PlayerGUIs {
 		}
 
 		if (Config.getInstance().getGUIVoteTotalBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-
-			});
+			inv.addButton(getBackButton());
 		}
 		inv.openInventory(player);
 	}
@@ -568,8 +632,14 @@ public class PlayerGUIs {
 		if (Config.getInstance().getVoteURLViewAllUrlsButtonEnabled()) {
 			ItemBuilder builderAll = new ItemBuilder(
 					Config.getInstance().getVoteURLAlreadyVotedAllUrlsButtonItemSection());
-			if (user.canVoteAll()) {
-				builderAll = new ItemBuilder(Config.getInstance().getVoteURLCanVoteAllUrlsButtonItemSection());
+			if (Config.getInstance().isGuiVoteURLAllUrlsButtonrequireAllSitesVoted()) {
+				if (user.canVoteAny()) {
+					builderAll = new ItemBuilder(Config.getInstance().getVoteURLCanVoteAllUrlsButtonItemSection());
+				}
+			} else {
+				if (user.canVoteAll()) {
+					builderAll = new ItemBuilder(Config.getInstance().getVoteURLCanVoteAllUrlsButtonItemSection());
+				}
 			}
 
 			if (!builderAll.hasCustomDisplayName()) {
@@ -585,7 +655,6 @@ public class PlayerGUIs {
 				public void onClick(ClickEvent event) {
 					User user = UserManager.getInstance().getVotingPluginUser(event.getPlayer());
 					user.sendMessage(Commands.getInstance().voteURLs(user));
-
 				}
 			});
 
@@ -614,8 +683,8 @@ public class PlayerGUIs {
 							voteReward(player, voteSite.getKey());
 						} else {
 							User user = UserManager.getInstance().getVotingPluginUser(player);
-							user.sendMessage(StringUtils.getInstance().replacePlaceHolder(StringUtils.getInstance()
-									.replacePlaceHolder(StringUtils.getInstance().replacePlaceHolder(
+							user.sendMessage(StringParser.getInstance().replacePlaceHolder(StringParser.getInstance()
+									.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
 											Config.getInstance().getGUIVoteURLURLText(), "voteurl",
 											voteSite.getVoteURL()), "sitename", voteSite.getDisplayName()),
 									"player", player.getName()));
@@ -628,13 +697,7 @@ public class PlayerGUIs {
 		}
 
 		if (Config.getInstance().getGUIVoteURLBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-			});
+			inv.addButton(getBackButton());
 		}
 
 		inv.openInventory(player);
@@ -642,11 +705,18 @@ public class PlayerGUIs {
 	}
 
 	public void openVoteURL(Player player, String voteSite) {
+		if (!plugin.isVoteSite(voteSite)) {
+			player.sendMessage("Not a valid votesite");
+			return;
+		}
 		User user = UserManager.getInstance().getVotingPluginUser(player);
 		VoteSite site = plugin.getVoteSite(voteSite);
-		BInventory inv = new BInventory(StringUtils.getInstance()
+		BInventory inv = new BInventory(StringParser.getInstance()
 				.replacePlaceHolder(Config.getInstance().getGUIVoteURLSiteName(), "site", site.getDisplayName()));
 		inv.setMeta(player, "VoteSite", site);
+		if (!Config.getInstance().isAlwaysCloseInventory()) {
+			inv.dontClose();
+		}
 
 		inv.addButton(
 				new BInventoryButton(new ItemBuilder(Material.BOW).setName("&4URL").addLoreLine("Click to see URL")) {
@@ -677,13 +747,7 @@ public class PlayerGUIs {
 		});
 
 		if (Config.getInstance().getGUIVoteURLBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-			});
+			inv.addButton(getBackButton());
 		}
 		inv.openInventory(player);
 	}
@@ -738,13 +802,7 @@ public class PlayerGUIs {
 		}
 
 		if (Config.getInstance().isVoteRewardBackButton()) {
-			inv.addButton(new BInventoryButton(getBackButton()) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					openVoteGUI(event.getPlayer(), getSelectedPlayer(event.getPlayer()));
-				}
-			});
+			inv.addButton(getBackButton());
 		}
 
 		inv.openInventory(player);

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

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

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

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

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

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

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

@@ -11,6 +11,7 @@ import com.Ben12345rocks.AdvancedCore.Util.Annotation.AnnotationHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataBoolean;
 import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataDouble;
 import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataInt;
+import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataListString;
 import com.Ben12345rocks.AdvancedCore.Util.Annotation.ConfigDataString;
 import com.Ben12345rocks.AdvancedCore.YML.YMLFile;
 import com.Ben12345rocks.VotingPlugin.Main;
@@ -55,6 +56,10 @@ public class Config extends YMLFile {
 	@ConfigDataBoolean(path = "Commands.VoteRewardFromVoteURL")
 	@Getter
 	private boolean commandsVoteRewardFromVoteURL = false;
+	
+	@ConfigDataBoolean(path = "ExtraBackgroundUpdate")
+	@Getter
+	private boolean extraBackgroundUpdate = false;
 
 	@ConfigDataString(path = "Format.Commands.Vote.Last.TimeFormat", defaultValue = "%amount% %TimeType%")
 	@Getter
@@ -68,9 +73,9 @@ public class Config extends YMLFile {
 	@Getter
 	private String formatCommandsVoteLastNeverVoted;
 
-	@ConfigDataString(path = "Format.Commands.Vote.Last.LastVoted", defaultValue = "%times% ago")
+	@ConfigDataString(path = "Format.Commands.Vote.Last.LastVoted")
 	@Getter
-	private String formatCommandsVoteLastLastVoted;
+	private String formatCommandsVoteLastLastVoted = "%times% ago";
 
 	@ConfigDataString(path = "Format.TimeFormats.Days", defaultValue = "Days")
 	@Getter
@@ -124,6 +129,10 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean addTotals = true;
 
+	@ConfigDataBoolean(path = "AlterColumns")
+	@Getter
+	private boolean alterColumns = true;
+
 	@Getter
 	private String allSitesRewardPath = "AllSites";
 
@@ -138,6 +147,18 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean autoCreateVoteSites = true;
 
+	@ConfigDataBoolean(path = "UseBungeecoord")
+	@Getter
+	private boolean useBungeeCoord = false;
+
+	@ConfigDataBoolean(path = "BungeeBroadcast")
+	@Getter
+	private boolean bungeeBroadcast = false;
+
+	@ConfigDataBoolean(path = "GUI.VoteURL.AllUrlsButton.RequireAllSitesVoted")
+	@Getter
+	private boolean guiVoteURLAllUrlsButtonrequireAllSitesVoted = true;
+
 	@ConfigDataBoolean(path = "Format.BroadcastVote")
 	@Getter
 	private boolean broadcastVotesEnabled = true;
@@ -194,6 +215,10 @@ public class Config extends YMLFile {
 	@Getter
 	private int convertDelay;
 
+	@ConfigDataInt(path = "ConvertAmount")
+	@Getter
+	private int convertAmount = 250;
+
 	@ConfigDataBoolean(path = "EnableDailyRewards")
 	@Getter
 	private boolean enableDailyRewards = false;
@@ -210,6 +235,14 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean disableNoServiceSiteMessage = false;
 
+	@ConfigDataListString(path = "DisabledDefaultPermissions")
+	@Getter
+	private ArrayList<String> disabledDefaultPermissions = new ArrayList<String>();
+
+	@ConfigDataBoolean(path = "VoteParty.ResetExtraVotesMonthly")
+	@Getter
+	private boolean votePartyResetExtraVotesMonthly = false;
+
 	@ConfigDataBoolean(path = "DisableAdvancedTab")
 	@Getter
 	private boolean disableAdvancedTab = false;
@@ -252,9 +285,73 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean loadCommandAliases = true;
 
+	@ConfigDataBoolean(path = "GUI.VoteTop.UseSkull")
+	@Getter
+	private boolean guiVoteTopUseSkull = true;
+
+	@ConfigDataString(path = "GUI.VoteTop.PlayerItem.Material")
+	@Getter
+	private String guiVoteTopPlayerItemMaterial = "PAPER";
+
+	@ConfigDataBoolean(path = "AllowVotePointTransfers")
+	@Getter
+	private boolean allowVotePointTransfers = false;
+
+	@ConfigDataBoolean(path = "LimitMonthlyVotes")
+	@Getter
+	private boolean limitMonthlyVotes = false;
+
+	@ConfigDataBoolean(path = "AlwaysCloseInventory")
+	@Getter
+	private boolean alwaysCloseInventory = false;
+
+	@ConfigDataBoolean(path = "VoteShopHideLimitedReached")
+	@Getter
+	private boolean voteShopHideLimitedReached = true;
+
+	@ConfigDataString(path = "VoteShopLimitReached")
+	@Getter
+	private String voteShopLimitReached = "&aYou reached your limit";
+
 	@Getter
 	private int formatPageSize = 10;
 
+	@ConfigDataString(path = "Format.Commands.Vote.Today.Line")
+	@Getter
+	private String formatCommandsVoteTodayLine = "&6%player% : %VoteSite% : %Time%";
+
+	@ConfigDataBoolean(path = "OverrideVersionDisable")
+	@Getter
+	private boolean overrideVersionDisable = false;
+
+	@ConfigDataBoolean(path = "LastMonthGUI")
+	@Getter
+	private boolean lastMonthGUI = false;
+
+	@ConfigDataBoolean(path = "AllowUnJoinedCheckServer")
+	@Getter
+	private boolean allowUnJoinedCheckServer = true;
+
+	@ConfigDataListString(path = "DisabledCommands")
+	@Getter
+	private ArrayList<String> disabledCommands = new ArrayList<String>();
+
+	@ConfigDataString(path = "BungeeServer.Host")
+	@Getter
+	private String bungeeServerHost = "";
+
+	@ConfigDataString(path = "SpigotServer.Host")
+	@Getter
+	private String spigotServerHost = "";
+
+	@ConfigDataInt(path = "BungeeServer.Port")
+	@Getter
+	private int bungeeServerPort = 1297;
+
+	@ConfigDataInt(path = "SpigotServer.Port")
+	@Getter
+	private int spigotServerPort = 1298;
+
 	/**
 	 * Instantiates a new config.
 	 */
@@ -1231,6 +1328,10 @@ public class Config extends YMLFile {
 		return getData().getString("GUI.VoteShopName", "VoteShop");
 	}
 
+	public boolean getVoteShopNotBuyable(String shop) {
+		return getData().getBoolean("Shop." + shop + ".NotBuyable", false);
+	}
+
 	public String getVoteShopPermission(String ident) {
 		return getData().getString("Shop." + ident + ".Permission", "");
 	}

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

@@ -6,11 +6,14 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
 
+import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.YML.YMLFile;
 import com.Ben12345rocks.VotingPlugin.Main;
@@ -65,6 +68,13 @@ public class ConfigVoteSites extends YMLFile {
 			set(siteName, "Rewards.Messages.Player", "&aThanks for voting on %ServiceSite%!");
 
 			plugin.loadVoteSites();
+
+			for (Player p : Bukkit.getOnlinePlayers()) {
+				if (p.hasPermission("VotingPlugin.Admin.GenerateServiceSite")) {
+					p.sendMessage(StringParser.getInstance().colorize("&cGenerating votesite for service site "
+							+ siteName + ", please check console for details"));
+				}
+			}
 		}
 	}
 

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,57 @@
+package com.Ben12345rocks.VotingPlugin.Events;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.Ben12345rocks.VotingPlugin.Objects.User;
+import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
+
+import lombok.Getter;
+import lombok.Setter;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class PlayerVoteEvent.
+ */
+public class PlayerVoteCoolDownEndEvent extends Event {
+
+	/** The Constant handlers. */
+	private static final HandlerList handlers = new HandlerList();
+
+	/**
+	 * Gets the handler list.
+	 *
+	 * @return the handler list
+	 */
+	public static HandlerList getHandlerList() {
+		return handlers;
+	}
+
+	@Getter
+	@Setter
+	private User player;
+
+	@Getter
+	@Setter
+	private VoteSite voteSite;
+
+	@Getter
+	@Setter
+	private boolean cancelled;
+
+	public PlayerVoteCoolDownEndEvent(User user, VoteSite site) {
+		super(true);
+		player = user;
+		voteSite = site;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.bukkit.event.Event#getHandlers()
+	 */
+	@Override
+	public HandlerList getHandlers() {
+		return handlers;
+	}
+
+}

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

@@ -45,13 +45,17 @@ public class PlayerVoteEvent extends Event {
 	@Getter
 	@Setter
 	private String serviceSite = "";
+	
+	@Getter
+	@Setter
+	private long time;
 
 	public PlayerVoteEvent(VoteSite voteSite, String voteUsername, String serviceSite, boolean realVote) {
 		super(true);
-		setPlayer(voteUsername);
-		setVoteSite(voteSite);
-		setRealVote(realVote);
-		setServiceSite(serviceSite);
+		this.player = voteUsername;
+		this.voteSite = voteSite;
+		this.realVote = realVote;
+		this.serviceSite = serviceSite;
 	}
 
 	/*
@@ -63,4 +67,12 @@ public class PlayerVoteEvent extends Event {
 		return handlers;
 	}
 
+	@Getter
+	@Setter
+	private boolean bungee = false;
+	
+	@Getter
+	@Setter
+	private boolean forceBungee = false;
+
 }

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

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

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

@@ -4,9 +4,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerLoginEvent;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
+import com.Ben12345rocks.AdvancedCore.Listeners.AdvancedCoreLoginEvent;
 import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Objects.User;
@@ -19,6 +18,7 @@ import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
 public class PlayerJoinEvent implements Listener {
 
 	/** The plugin. */
+	@SuppressWarnings("unused")
 	private static Main plugin;
 
 	/**
@@ -38,31 +38,27 @@ public class PlayerJoinEvent implements Listener {
 	 *            the event
 	 */
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-	public void onPlayerLogin(PlayerLoginEvent event) {
-		plugin.getServer().getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+	public void onPlayerLogin(AdvancedCoreLoginEvent event) {
+		if (event.getPlayer() == null
+				|| (Main.plugin.getStorageType().equals(UserStorage.MYSQL) && Main.plugin.getMysql() == null)) {
+			return;
+		}
+		Player player = event.getPlayer();
 
-			@Override
-			public void run() {
-				if (event.getPlayer() == null
-						|| (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)
-								&& AdvancedCoreHook.getInstance().getMysql() == null)) {
-					return;
-				}
-				Player player = event.getPlayer();
+		User user = UserManager.getInstance().getVotingPluginUser(player);
+		if (player.isOp() && plugin.isYmlError()) {
+			user.sendMessage("&cVotingPlugin: Detected yml error, please check console for details");
+		}
 
-				if (player != null) {
-					User user = UserManager.getInstance().getVotingPluginUser(player);
+		boolean data = user.getData().hasData();
 
-					// run remind
-					user.loginMessage();
+		// run remind
+		user.loginMessage();
 
-					if (user.getData().hasData()) {
-						// give offline vote (if they voted offline)
-						user.offVote();
-					}
-				}
-			}
-		}, 20L);
+		if (data) {
+			// give offline vote (if they voted offline)
+			user.offVote();
+		}
 
 	}
 }

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

@@ -6,7 +6,6 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
@@ -55,7 +54,7 @@ public class PlayerVoteListener implements Listener {
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onplayerVote(PlayerVoteEvent event) {
 		String playerName = event.getPlayer();
-		if (!PlayerUtils.getInstance().isValidUser(playerName)) {
+		if (!PlayerUtils.getInstance().isValidUser(playerName, Config.getInstance().isAllowUnJoinedCheckServer())) {
 			if (!config.isAllowUnjoined()) {
 				plugin.getLogger().warning("Player " + playerName
 						+ " has not joined before, disregarding vote, set AllowUnjoined to true to prevent this");
@@ -85,7 +84,7 @@ public class PlayerVoteListener implements Listener {
 		User user = UserManager.getInstance().getVotingPluginUser(playerName);
 		user.updateName();
 
-		if (Config.getInstance().isClearCacheOnVote()) {
+		if (Config.getInstance().isClearCacheOnVote() || Config.getInstance().isUseBungeeCoord()) {
 			user.clearCache();
 		}
 
@@ -100,14 +99,19 @@ public class PlayerVoteListener implements Listener {
 			VoteParty.getInstance().vote(user, event.isRealVote());
 
 			// broadcast vote if enabled in config
-			if (config.isBroadcastVotesEnabled()) {
+			if (config.isBroadcastVotesEnabled() && (!Config.getInstance().isBungeeBroadcast() || !event.isBungee())) {
 				if (!Config.getInstance().getFormatBroadcastWhenOnline() || user.isOnline()) {
 					voteSite.broadcastVote(user);
 				}
 			}
 
 			// update last vote time
-			user.setTime(voteSite);
+			if (event.getTime() != 0) {
+				user.setTime(voteSite, event.getTime());
+			} else {
+				user.setTime(voteSite);
+			}
+			user.setLastVoteCoolDownCheck(false, voteSite);
 
 			// check first vote rewards
 			SpecialRewards.getInstance().checkFirstVote(user);
@@ -118,9 +122,9 @@ public class PlayerVoteListener implements Listener {
 
 			// check if player has voted on all sites in one day
 
-			if ((user.isOnline() || voteSite.isGiveOffline())
-					&& AdvancedCoreHook.getInstance().getOptions().isProcessRewards()) {
-				user.playerVote(voteSite, true, false);
+			if (((user.isOnline() || voteSite.isGiveOffline()) && Main.plugin.getOptions().isProcessRewards())
+					|| event.isBungee()) {
+				user.playerVote(voteSite, true, false, event.isForceBungee());
 				user.closeInv();
 			} else {
 				user.addOfflineVote(voteSite.getKey());

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

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

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

@@ -7,11 +7,13 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
+import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
 import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteEvent;
+import com.Ben12345rocks.VotingPlugin.Objects.VoteSite;
 import com.vexsoftware.votifier.model.Vote;
 import com.vexsoftware.votifier.model.VotifierEvent;
 
@@ -51,6 +53,7 @@ public class VotiferEvent implements Listener {
 
 		Vote vote = event.getVote();
 		final String voteSite = vote.getServiceName();
+		final String IP = vote.getAddress();
 		final String voteUsername = vote.getUsername().trim();
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
@@ -65,10 +68,12 @@ public class VotiferEvent implements Listener {
 			return;
 		}
 
-		plugin.getLogger().info("Recieved a vote from '" + voteSite + "' by player '" + voteUsername + "'!");
+		plugin.getLogger()
+				.info("Received a vote from service site '" + voteSite + "' by player '" + voteUsername + "'!");
 
 		plugin.debug("PlayerUsername: " + voteUsername);
 		plugin.debug("VoteSite: " + voteSite);
+		plugin.debug("IP: " + IP);
 
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
@@ -77,15 +82,26 @@ public class VotiferEvent implements Listener {
 				String voteSiteName = plugin.getVoteSiteName(voteSite);
 
 				ArrayList<String> sites = configVoteSites.getVoteSitesNames();
+				boolean createSite = false;
 				if (sites != null) {
-					if (!sites.contains(voteSiteName) && Config.getInstance().isAutoCreateVoteSites()) {
-						plugin.getLogger()
-								.warning("VoteSite " + voteSiteName + " doe not exist, generaterating one...");
-						ConfigVoteSites.getInstance().generateVoteSite(voteSiteName);
+					if (!sites.contains(voteSiteName)) {
+						createSite = true;
 					}
-				} else if (Config.getInstance().isAutoCreateVoteSites()) {
-					plugin.getLogger().warning("VoteSite " + voteSiteName + " doe not exist, generaterating one...");
+				} else {
+					createSite = true;
+				}
+
+				if (Config.getInstance().isAutoCreateVoteSites() && createSite) {
+					plugin.getLogger().warning("VoteSite with service site '" + voteSiteName
+							+ "' does not exist, attempting to generaterate...");
 					ConfigVoteSites.getInstance().generateVoteSite(voteSiteName);
+
+					ArrayList<String> services = new ArrayList<String>();
+					for (VoteSite site : plugin.getVoteSites()) {
+						services.add(site.getServiceSite());
+					}
+					plugin.getLogger()
+							.info("Current known service sites: " + ArrayUtils.getInstance().makeStringList(services));
 				}
 
 				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName), voteUsername,

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Main.java

@@ -18,19 +18,23 @@ import java.util.TimerTask;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.java.JavaPlugin;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
+import com.Ben12345rocks.AdvancedCore.AdvancedCorePlugin;
 import com.Ben12345rocks.AdvancedCore.CommandAPI.CommandHandler;
 import com.Ben12345rocks.AdvancedCore.NMSManager.NMSManager;
 import com.Ben12345rocks.AdvancedCore.Rewards.Reward;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
+import com.Ben12345rocks.AdvancedCore.Rewards.RewardPlaceholderHandle;
+import com.Ben12345rocks.AdvancedCore.Rewards.Injected.RewardInject;
+import com.Ben12345rocks.AdvancedCore.Rewards.Injected.RewardInjectConfigurationSection;
 import com.Ben12345rocks.AdvancedCore.Rewards.Injected.RewardInjectInt;
+import com.Ben12345rocks.AdvancedCore.Rewards.Injected.RewardInjectValidator;
 import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
 import com.Ben12345rocks.AdvancedCore.UserManager.UserStorage;
 import com.Ben12345rocks.AdvancedCore.Util.EditGUI.EditGUIButton;
@@ -38,9 +42,9 @@ import com.Ben12345rocks.AdvancedCore.Util.EditGUI.ValueTypes.EditGUIValueNumber
 import com.Ben12345rocks.AdvancedCore.Util.Item.ItemBuilder;
 import com.Ben12345rocks.AdvancedCore.Util.Javascript.JavascriptPlaceholderRequest;
 import com.Ben12345rocks.AdvancedCore.Util.Logger.Logger;
+import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.AdvancedCore.Util.Metrics.BStatsMetrics;
 import com.Ben12345rocks.AdvancedCore.Util.Metrics.MCStatsMetrics;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Updater.Updater;
 import com.Ben12345rocks.VotingPlugin.Commands.CommandLoader;
 import com.Ben12345rocks.VotingPlugin.Commands.Commands;
@@ -51,6 +55,7 @@ import com.Ben12345rocks.VotingPlugin.Commands.TabCompleter.AdminVoteTabComplete
 import com.Ben12345rocks.VotingPlugin.Commands.TabCompleter.VoteTabCompleter;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.CoolDown.CoolDownCheck;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
 import com.Ben12345rocks.VotingPlugin.Listeners.BlockBreak;
 import com.Ben12345rocks.VotingPlugin.Listeners.PlayerCommandSendListener;
@@ -68,9 +73,11 @@ import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoterHandler;
 import com.Ben12345rocks.VotingPlugin.Updater.CheckUpdate;
 import com.Ben12345rocks.VotingPlugin.UserManager.UserManager;
+import com.Ben12345rocks.VotingPlugin.Util.PlaceHolders.MVdWPlaceholders;
 import com.Ben12345rocks.VotingPlugin.Util.PlaceHolders.PlaceHolders;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
 import com.Ben12345rocks.VotingPlugin.VoteReminding.VoteReminding;
+import com.vexsoftware.votifier.Votifier;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -78,7 +85,7 @@ import lombok.Setter;
 /**
  * The Class Main.
  */
-public class Main extends JavaPlugin {
+public class Main extends AdvancedCorePlugin {
 
 	/** The config. */
 	public static Config config;
@@ -92,6 +99,9 @@ public class Main extends JavaPlugin {
 	@Getter
 	private LinkedHashMap<TopVoter, LinkedHashMap<User, Integer>> topVoter;
 
+	@Getter
+	private LinkedHashMap<User, Integer> lastMonthTopVoter;
+
 	@Getter
 	@Setter
 	private Updater updater;
@@ -124,9 +134,10 @@ public class Main extends JavaPlugin {
 	@Getter
 	private boolean updateStarted = false;
 
-	public AdvancedCoreHook getAdvancedCoreHook() {
-		return AdvancedCoreHook.getInstance();
-	}
+	@Getter
+	private boolean ymlError = false;
+
+	private boolean votifierLoaded = true;
 
 	/**
 	 * Check votifier.
@@ -135,8 +146,54 @@ public class Main extends JavaPlugin {
 		try {
 			Class.forName("com.vexsoftware.votifier.model.VotifierEvent");
 		} catch (ClassNotFoundException e) {
-			plugin.getLogger()
-					.warning("No VotifierEvent found, install Votifier, NuVotifier, or another Votifier plugin");
+			if (!Config.getInstance().isUseBungeeCoord()) {
+				plugin.getLogger()
+						.warning("No VotifierEvent found, install Votifier, NuVotifier, or another Votifier plugin");
+			} else {
+				plugin.debug("No VotifierEvent found, but usebungeecoord enabled");
+			}
+			votifierLoaded = false;
+		}
+	}
+
+	private boolean checkVotifierLoaded() {
+		try {
+			Class.forName("com.vexsoftware.votifier.Votifier");
+			if (Votifier.getInstance().getVoteReceiver() == null) {
+				return false;
+			}
+		} catch (ClassNotFoundException e) {
+			debug("Using NuVotiifer?");
+		}
+		return true;
+	}
+
+	private void checkYMLError() {
+		if (config.isFailedToRead() || configVoteSites.isFailedToRead()) {
+			ymlError = true;
+		} else if (!config.isFailedToRead() && !configVoteSites.isFailedToRead()) {
+			ymlError = false;
+		}
+
+		if (config.isFailedToRead()) {
+			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					plugin.getLogger().severe("Failed to load Config.yml");
+				}
+			}, 10);
+		}
+
+		if (configVoteSites.isFailedToRead()) {
+			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					plugin.getLogger().severe("Failed to load VoteSites.yml");
+				}
+
+			}, 10);
 		}
 	}
 
@@ -144,27 +201,26 @@ public class Main extends JavaPlugin {
 		if (from == null || to == null) {
 			throw new RuntimeException("Invalid Storage Method");
 		}
-		UserStorage cur = AdvancedCoreHook.getInstance().getStorageType();
-		AdvancedCoreHook.getInstance().getOptions().setStorageType(from);
-		if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)
-				&& AdvancedCoreHook.getInstance().getMysql() != null) {
-			AdvancedCoreHook.getInstance().getMysql().clearCache();
+		UserStorage cur = getStorageType();
+		getOptions().setStorageType(from);
+		if (getStorageType().equals(UserStorage.MYSQL) && getMysql() != null) {
+			getMysql().clearCache();
 		}
 		ArrayList<String> uuids = new ArrayList<String>(UserManager.getInstance().getAllUUIDs());
 
 		while (uuids.size() > 0) {
 			HashMap<User, HashMap<String, String>> data = new HashMap<User, HashMap<String, String>>();
-			AdvancedCoreHook.getInstance().getOptions().setStorageType(from);
-			// AdvancedCoreHook.getInstance().setStorageType(to);
+			getOptions().setStorageType(from);
+			loadUserAPI(getOptions().getStorageType());
+			// setStorageType(to);
 
-			if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)
-					&& AdvancedCoreHook.getInstance().getMysql() != null) {
-				AdvancedCoreHook.getInstance().getMysql().clearCache();
+			if (getStorageType().equals(UserStorage.MYSQL) && getMysql() != null) {
+				getMysql().clearCache();
 			}
 
 			ArrayList<String> converted = new ArrayList<String>();
 			int i = 0;
-			while (i < 250 && i < uuids.size()) {
+			while (i < Config.getInstance().getConvertAmount() && i < uuids.size()) {
 				String uuid = uuids.get(i);
 				try {
 					User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
@@ -181,7 +237,7 @@ public class Main extends JavaPlugin {
 					data.put(user, values);
 					debug("[Convert] Added " + uuid);
 				} catch (Exception e) {
-					AdvancedCoreHook.getInstance().debug(e);
+					debug(e);
 					plugin.getLogger().warning("Exception occoured for '" + uuid + "': " + e.getMessage()
 							+ ", turn debug on to see full stack traces");
 				}
@@ -194,20 +250,20 @@ public class Main extends JavaPlugin {
 
 			uuids.removeAll(converted);
 
-			plugin.getLogger()
-					.info("Finished getting data from " + from.toString() + " Converting " + data.size() + " users");
+			plugin.getLogger().info("Finished getting data from " + from.toString() + " Converting " + data.size()
+					+ " users, " + uuids.size() + " left to convert");
 
-			AdvancedCoreHook.getInstance().getOptions().setStorageType(to);
-			if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)
-					&& AdvancedCoreHook.getInstance().getMysql() != null) {
-				AdvancedCoreHook.getInstance().getMysql().clearCache();
+			getOptions().setStorageType(to);
+			loadUserAPI(getOptions().getStorageType());
+			if (getStorageType().equals(UserStorage.MYSQL) && getMysql() != null) {
+				getMysql().clearCache();
 			}
 
 			writeConvertData(data);
 		}
 
-		AdvancedCoreHook.getInstance().getOptions().setStorageType(cur);
-		AdvancedCoreHook.getInstance().reload();
+		getOptions().setStorageType(cur);
+		reload();
 
 		plugin.getLogger().info("Finished convertting");
 	}
@@ -216,16 +272,6 @@ public class Main extends JavaPlugin {
 		return new ArrayList<User>(set);
 	}
 
-	/**
-	 * Debug.
-	 *
-	 * @param message
-	 *            the message
-	 */
-	public void debug(String message) {
-		AdvancedCoreHook.getInstance().debug(plugin, message);
-	}
-
 	public LinkedHashMap<User, Integer> getTopVoter(TopVoter top) {
 		return topVoter.get(top);
 	}
@@ -241,14 +287,19 @@ public class Main extends JavaPlugin {
 		return UserManager.getInstance().getVotingPluginUser(uuid);
 	}
 
-	public UserManager getUserManager() {
-		return UserManager.getInstance();
-	}
-
 	public VoteParty getVoteParty() {
 		return VoteParty.getInstance();
 	}
 
+	public boolean isVoteSite(String voteSite) {
+		for (VoteSite site : getVoteSites()) {
+			if (site.getKey().equalsIgnoreCase(voteSite)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * Gets the vote site.
 	 *
@@ -274,31 +325,37 @@ public class Main extends JavaPlugin {
 	/**
 	 * Gets the vote site name.
 	 *
-	 * @param url
+	 * @param urls
 	 *            the url
 	 * @return the vote site name
 	 */
-	public String getVoteSiteName(String url) {
+	public String getVoteSiteName(String... urls) {
 		ArrayList<String> sites = ConfigVoteSites.getInstance().getVoteSitesNames();
-		if (url == null) {
-			return null;
-		}
-		if (sites != null) {
-			for (String siteName : sites) {
-				String URL = ConfigVoteSites.getInstance().getServiceSite(siteName);
-				if (URL != null) {
-					if (URL.equalsIgnoreCase(url)) {
+		for (String url : urls) {
+			if (url == null) {
+				return null;
+			}
+			if (sites != null) {
+				for (String siteName : sites) {
+					String URL = ConfigVoteSites.getInstance().getServiceSite(siteName);
+					if (URL != null) {
+						if (URL.equalsIgnoreCase(url)) {
+							return siteName;
+						}
+					}
+				}
+				for (String siteName : sites) {
+					if (siteName.equalsIgnoreCase(url)) {
 						return siteName;
 					}
 				}
 			}
-			for (String siteName : sites) {
-				if (siteName.equalsIgnoreCase(url)) {
-					return siteName;
-				}
-			}
+			return url;
 		}
-		return url;
+		for (String url : urls) {
+			return url;
+		}
+		return "";
 
 	}
 
@@ -324,6 +381,10 @@ public class Main extends JavaPlugin {
 
 	}
 
+	public UserManager getVotingPluginUserManager() {
+		return UserManager.getInstance();
+	}
+
 	public boolean hasVoteSite(String site) {
 		String siteName = getVoteSiteName(site);
 		for (VoteSite voteSite : getVoteSites()) {
@@ -339,13 +400,42 @@ public class Main extends JavaPlugin {
 
 			@Override
 			public void run() {
-				AdvancedCoreHook.getInstance().getTimer().schedule(new TimerTask() {
+				getTimer().schedule(new TimerTask() {
 
 					@Override
 					public void run() {
-						update();
+						if (plugin != null) {
+							update();
+						} else {
+							cancel();
+						}
 					}
 				}, 1000, 1000 * 60 * Config.getInstance().getDelayBetweenUpdates());
+
+				getTimer().schedule(new TimerTask() {
+
+					@Override
+					public void run() {
+						if (plugin != null) {
+							CoolDownCheck.getInstance().checkAll();
+						} else {
+							cancel();
+						}
+					}
+				}, 1000 * 60 * 10, 1000 * 60 * 5);
+
+				getTimer().schedule(new TimerTask() {
+
+					@Override
+					public void run() {
+						if (plugin != null && Config.getInstance().isExtraBackgroundUpdate()) {
+							basicBungeeUpdate();
+						} else {
+							cancel();
+						}
+					}
+				}, 1000, 1000 * 30);
+
 			}
 		}, 40L);
 
@@ -564,7 +654,7 @@ public class Main extends JavaPlugin {
 
 			@Override
 			public String getValue() {
-				return "" + AdvancedCoreHook.getInstance().getOptions().isSendScoreboards();
+				return "" + getOptions().isSendScoreboards();
 			}
 		});
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("numberofuser") {
@@ -576,6 +666,10 @@ public class Main extends JavaPlugin {
 				num = num * 100;
 				int num2 = (total + 100) / 100;
 				num2 = num2 * 100;
+				if (total < 1000) {
+					num = 0;
+					num2 = 1000;
+				}
 				return "" + num + "-" + num2;
 			}
 		});
@@ -583,14 +677,14 @@ public class Main extends JavaPlugin {
 
 			@Override
 			public String getValue() {
-				return AdvancedCoreHook.getInstance().getOptions().getStorageType().toString();
+				return getOptions().getStorageType().toString();
 			}
 		});
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("DisableCheckOnWorldChange") {
 
 			@Override
 			public String getValue() {
-				return "" + AdvancedCoreHook.getInstance().getOptions().isDisableCheckOnWorldChange();
+				return "" + getOptions().isDisableCheckOnWorldChange();
 			}
 		});
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("votereminding_enabled") {
@@ -679,42 +773,23 @@ public class Main extends JavaPlugin {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.bukkit.plugin.java.JavaPlugin#onDisable()
-	 */
 	@Override
-	public void onDisable() {
-		new Timer().schedule(new TimerTask() {
-
-			@Override
-			public void run() {
-				Signs.getInstance().storeSigns();
+	public void onPostLoad() {
+		if (Config.getInstance().isUseBungeeCoord()) {
+			BungeeHandler.getInstance().load();
+			if (Config.getInstance().isUseBungeeCoord()) {
+				if (getOptions().getServer().equalsIgnoreCase("PleaseSet")) {
+					getLogger().warning(
+							"Bungeecoord is true and server name is not set, bungeecoord features may not work");
+				}
 			}
-		}, 0);
-		HandlerList.unregisterAll(plugin);
-		plugin = null;
-	}
+		}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.bukkit.plugin.java.JavaPlugin#onEnable()
-	 */
-	@Override
-	public void onEnable() {
-		plugin = this;
-
-		setupFiles();
-		loadVoteSites();
-		AdvancedCoreHook.getInstance().setJenkinsSite("ben12345rocks.com");
-		updateAdvancedCoreHook();
-		AdvancedCoreHook.getInstance().loadHook(this);
 		registerCommands();
-		registerEvents();
 		checkVotifier();
+		registerEvents();
 		CheckUpdate.getInstance().startUp();
 		VoteReminding.getInstance().loadRemindChecking();
-
 		plugin.signs = new ArrayList<SignHandler>();
 
 		Bukkit.getScheduler().runTask(plugin, new Runnable() {
@@ -725,6 +800,15 @@ public class Main extends JavaPlugin {
 			}
 		});
 
+		lastMonthTopVoter = new LinkedHashMap<User, Integer>();
+		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				TopVoterHandler.getInstance().loadLastMonth();
+				debug("Loaded last month top voters");
+			}
+		});
 		topVoter = new LinkedHashMap<TopVoter, LinkedHashMap<User, Integer>>();
 		for (TopVoter top : TopVoter.values()) {
 			topVoter.put(top, new LinkedHashMap<User, Integer>());
@@ -744,60 +828,108 @@ public class Main extends JavaPlugin {
 
 		metrics();
 
-		AdvancedCoreHook.getInstance().getJavascriptEngineRequests().add(new JavascriptPlaceholderRequest("User") {
+		// javascript api
+		getJavascriptEngineRequests().add(new JavascriptPlaceholderRequest("User") {
 
 			@Override
 			public Object getObject(OfflinePlayer player) {
-				return getUserManager().getVotingPluginUser(player);
+				return getVotingPluginUserManager().getVotingPluginUser(player);
 			}
 		});
+		getJavascriptEngine().put("VotingPluginHooks", VotingPluginHooks.getInstance());
 
 		loadTimer();
 
+		// placeholderapi loading
 		PlaceHolders.getInstance().load();
 
-		// set columns
-		if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("TopVoterIgnore", "VARCHAR(5)");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("CheckWorld", "VARCHAR(5)");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("Reminded", "VARCHAR(5)");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("DisableBroadcast", "VARCHAR(5)");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("LastOnline", "VARCHAR(20)");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("PlayerName", "VARCHAR(30)");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("DailyTotal", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("WeeklyTotal", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("DayVoteStreak", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("BestDayVoteStreak", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("WeekVoteStreak", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("BestWeekVoteStreak", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("VotePartyVotes", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("MonthVoteStreak", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("Points", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("HighestDailyTotal", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("MileStoneTotal", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("AllTimeTotal", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("HighestMonthlyTotal", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("MilestoneCount", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("MonthTotal", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
-			AdvancedCoreHook.getInstance().getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
+		// MVDW placeholders, may be removed in the future
+		if (Bukkit.getPluginManager().isPluginEnabled("MVdWPlaceholderAPI")) {
+			MVdWPlaceholders.getInstance().loadMVdWPlaceholders();
 		}
 
-		RewardHandler.getInstance().getInjectedRewards().add(new RewardInjectInt("Points", 0) {
+		// set columns
+		if (getStorageType().equals(UserStorage.MYSQL) && Config.getInstance().isAlterColumns()) {
+			getMysql().alterColumnType("TopVoterIgnore", "VARCHAR(5)");
+			getMysql().alterColumnType("CheckWorld", "VARCHAR(5)");
+			getMysql().alterColumnType("Reminded", "VARCHAR(5)");
+			getMysql().alterColumnType("DisableBroadcast", "VARCHAR(5)");
+			getMysql().alterColumnType("LastOnline", "VARCHAR(20)");
+			getMysql().alterColumnType("PlayerName", "VARCHAR(30)");
+			getMysql().alterColumnType("DailyTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("WeeklyTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("DayVoteStreak", "INT DEFAULT '0'");
+			getMysql().alterColumnType("BestDayVoteStreak", "INT DEFAULT '0'");
+			getMysql().alterColumnType("WeekVoteStreak", "INT DEFAULT '0'");
+			getMysql().alterColumnType("BestWeekVoteStreak", "INT DEFAULT '0'");
+			getMysql().alterColumnType("VotePartyVotes", "INT DEFAULT '0'");
+			getMysql().alterColumnType("MonthVoteStreak", "INT DEFAULT '0'");
+			getMysql().alterColumnType("Points", "INT DEFAULT '0'");
+			getMysql().alterColumnType("HighestDailyTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("MileStoneTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("AllTimeTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("HighestMonthlyTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("MilestoneCount", "INT DEFAULT '0'");
+			getMysql().alterColumnType("MonthTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
+		}
+
+		// Add rewards
+		RewardHandler.getInstance().addInjectedReward(new RewardInjectInt("Points", 0) {
 
 			@Override
-			public void onRewardRequest(Reward reward, com.Ben12345rocks.AdvancedCore.UserManager.User user, int num,
+			public String onRewardRequest(Reward reward, com.Ben12345rocks.AdvancedCore.UserManager.User user, int num,
 					HashMap<String, String> placeholders) {
 				UserManager.getInstance().getVotingPluginUser(user).addPoints(num);
+				return null;
 			}
-		}.addEditButton(new EditGUIButton(new ItemBuilder(Material.PAPER), new EditGUIValueNumber("Points", null) {
+		}.synchronize().addEditButton(
+				new EditGUIButton(new ItemBuilder(Material.PAPER), new EditGUIValueNumber("Points", null) {
+
+					@Override
+					public void setValue(Player player, Number value) {
+						Reward reward = (Reward) getInv().getData("Reward");
+						reward.getConfig().set("Points", value.intValue());
+					}
+				})).validator(new RewardInjectValidator() {
+
+					@Override
+					public void onValidate(Reward reward, RewardInject inject, ConfigurationSection data) {
+						if (data.getInt(inject.getPath(), -1) == 0) {
+							warning(reward, inject, "Points can not be 0");
+						}
+					}
+				}));
+
+		RewardHandler.getInstance().addInjectedReward(new RewardInjectConfigurationSection("VoteBossBar") {
 
 			@Override
-			public void setValue(Player player, Number value) {
-				Reward reward = (Reward) getInv().getData("Reward");
-				reward.getConfig().set("Points", value.intValue());
+			public String onRewardRequested(Reward arg0, com.Ben12345rocks.AdvancedCore.UserManager.User user,
+					ConfigurationSection section, HashMap<String, String> placeholders) {
+				if (section.getBoolean("Enabled")) {
+					user.sendBossBar(
+							StringParser.getInstance().replacePlaceHolder(section.getString("Message", ""),
+									placeholders),
+							section.getString("Color", "BLUE"), section.getString("Style", "SOLID"),
+							(double) UserManager.getInstance().getVotingPluginUser(user).getSitesVotedOn()
+									/ plugin.getVoteSites().size(),
+							section.getInt("Delay", 30));
+				}
+				return null;
 			}
-		})));
+		});
+
+		for (final TopVoter top : TopVoter.values()) {
+			RewardHandler.getInstance().addPlaceholder(new RewardPlaceholderHandle("Total_" + top.toString()) {
+
+				@Override
+				public String getValue(Reward reward, com.Ben12345rocks.AdvancedCore.UserManager.User user) {
+					User vUser = UserManager.getInstance().getVotingPluginUser(user);
+					return "" + vUser.getTotal(top);
+				}
+			});
+		}
 
 		plugin.getLogger().info("Enabled VotingPlugin " + plugin.getDescription().getVersion());
 
@@ -832,15 +964,74 @@ public class Main extends JavaPlugin {
 				@Override
 				public void run() {
 					plugin.getLogger().warning(
-							"Detected an issue with voting sites, check the plugin startup log for more details");
+							"Detected an issue with voting sites, check the server startup log for more details");
 				}
 			}, 30l);
 		}
+		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				if (!checkVotifierLoaded()) {
+					plugin.getLogger().warning("Detected votifier not loaded properly, check startup for details");
+				}
+			}
+		});
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.bukkit.plugin.java.JavaPlugin#onEnable()
+	 */
+	@Override
+	public void onPreLoad() {
+		plugin = this;
+
+		// disable plugin for older versions below 1.12
 
 		if (NMSManager.getInstance().isVersion("1.7", "1.8", "1.9", "1.10", "1.11", "1.12")) {
-			plugin.getLogger().severe("Detected running " + NMSManager.getInstance().getVersion()
-					+ ", this version is not supported on this build. Support is limited");
+			plugin.getLogger().severe("Detected running " + Bukkit.getVersion()
+					+ ", this version is not supported on this build, read the plugin page. Disabling...");
+			if (!Config.getInstance().isOverrideVersionDisable()) {
+				Bukkit.getPluginManager().disablePlugin(this);
+				return;
+			} else {
+				plugin.getLogger().warning("Overriding version disable, beware of using this! This may cause issues!");
+			}
 		}
+
+		setupFiles();
+
+		loadVoteSites();
+
+		setJenkinsSite("ben12345rocks.com");
+		updateAdvancedCoreHook();
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.bukkit.plugin.java.JavaPlugin#onDisable()
+	 */
+	@Override
+	public void onUnLoad() {
+		new Timer().schedule(new TimerTask() {
+
+			@Override
+			public void run() {
+				Signs.getInstance().storeSigns();
+			}
+		}, 0);
+		HandlerList.unregisterAll(plugin);
+		if (Config.getInstance().isUseBungeeCoord()) {
+			try {
+				BungeeHandler.getInstance().close();
+			} catch (Exception e) {
+				debug(e);
+			}
+		}
+		plugin = null;
 	}
 
 	/**
@@ -866,6 +1057,7 @@ public class Main extends JavaPlugin {
 		if (perm != null) {
 			if (Config.getInstance().getGiveDefaultPermission()) {
 				perm.setDefault(PermissionDefault.TRUE);
+				getLogger().info("Giving VotingPlugin.Player permission by default, can be disabled in the config");
 			} else {
 				perm.setDefault(PermissionDefault.OP);
 			}
@@ -882,13 +1074,16 @@ public class Main extends JavaPlugin {
 		PluginManager pm = getServer().getPluginManager();
 
 		pm.registerEvents(new PlayerJoinEvent(this), this);
-		pm.registerEvents(new VotiferEvent(this), this);
+		if (votifierLoaded) {
+			pm.registerEvents(new VotiferEvent(this), this);
+		}
 		pm.registerEvents(new PlayerVoteListener(this), this);
 		pm.registerEvents(new SignChange(this), this);
 		pm.registerEvents(new BlockBreak(this), this);
 		pm.registerEvents(new PlayerInteract(this), this);
 		pm.registerEvents(new VotingPluginUpdateEvent(this), this);
 		pm.registerEvents(new PlayerCommandSendListener(this), this);
+		pm.registerEvents(new CoolDownCheck(this), this);
 
 		plugin.debug("Loaded Events");
 
@@ -897,49 +1092,39 @@ public class Main extends JavaPlugin {
 	/**
 	 * Reload.
 	 */
+	@Override
 	public void reload() {
 		setUpdate(true);
+
 		config.reloadData();
 		config.loadValues();
+
 		configVoteSites.reloadData();
+		checkYMLError();
+
 		updateAdvancedCoreHook();
 		plugin.loadVoteSites();
-		AdvancedCoreHook.getInstance().setConfigData(Config.getInstance().getData());
-		AdvancedCoreHook.getInstance().reload();
+		reloadAdvancedCore();
 		PlaceHolders.getInstance().load();
+		CoolDownCheck.getInstance().checkAll();
+		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				update();
+			}
+		});
 	}
 
 	private void setupFiles() {
-		try {
-			config = Config.getInstance();
-			config.setup();
-			config.loadValues();
-		} catch (Exception e) {
-			e.printStackTrace();
-			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+		config = Config.getInstance();
+		config.setup();
+		config.loadValues();
 
-				@Override
-				public void run() {
-					plugin.getLogger().severe("Failed to load Config.yml");
-					e.printStackTrace();
-				}
-			}, 10);
-		}
-		try {
-			configVoteSites = ConfigVoteSites.getInstance();
-			configVoteSites.setup();
-		} catch (Exception e) {
-			e.printStackTrace();
-			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+		configVoteSites = ConfigVoteSites.getInstance();
+		configVoteSites.setup();
 
-				@Override
-				public void run() {
-					plugin.getLogger().severe("Failed to load VoteSites.yml");
-					e.printStackTrace();
-				}
-
-			}, 10);
-		}
+		checkYMLError();
 
 		plugin.debug("Loaded Files");
 
@@ -949,21 +1134,22 @@ public class Main extends JavaPlugin {
 	 * Update.
 	 */
 	public void update() {
-		if (update || Config.getInstance().isAlwaysUpdate()) {
+		if (update || Config.getInstance().isAlwaysUpdate() || Config.getInstance().isUseBungeeCoord()) {
 			if (!updateStarted && plugin != null) {
 				if (!Config.getInstance().isUpdateWithPlayersOnlineOnly() || Bukkit.getOnlinePlayers().size() != 0) {
 					updateStarted = true;
 					update = false;
 
 					synchronized (plugin) {
-						if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
-							if (AdvancedCoreHook.getInstance().getMysql() == null) {
+						if (getStorageType().equals(UserStorage.MYSQL)) {
+							if (getMysql() == null) {
 								plugin.debug("MySQL not loaded yet");
 								return;
-							} else if (Config.getInstance().isClearCacheOnUpdate()) {
-								AdvancedCoreHook.getInstance().getMysql().clearCache();
+							} else if (Config.getInstance().isClearCacheOnUpdate()
+									|| Config.getInstance().isUseBungeeCoord()) {
+								getMysql().clearCache();
 							} else {
-								AdvancedCoreHook.getInstance().getMysql().clearCacheBasic();
+								getMysql().clearCacheBasic();
 							}
 						}
 
@@ -976,7 +1162,7 @@ public class Main extends JavaPlugin {
 								if (uuid != null && !uuid.isEmpty()) {
 									User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
 									users.add(user);
-									// AdvancedCoreHook.getInstance().extraDebug("Loading " + uuid);
+									// extraDebug("Loading " + uuid);
 									// java.lang.Thread.sleep(5000);
 								}
 							}
@@ -989,14 +1175,17 @@ public class Main extends JavaPlugin {
 							ServerData.getInstance().updateValues();
 							Signs.getInstance().updateSigns();
 
-							for (Player player : Bukkit.getOnlinePlayers()) {
-								UserManager.getInstance().getVotingPluginUser(player).offVote();
+							if (!Config.getInstance().isExtraBackgroundUpdate()) {
+								for (Player player : Bukkit.getOnlinePlayers()) {
+									User user = UserManager.getInstance().getVotingPluginUser(player);
+									user.offVote();
+								}
 							}
 							time1 = ((System.currentTimeMillis() - time) / 1000);
 							plugin.debug("Background task finished in " + time1 + " seconds");
 						} catch (Exception ex) {
+							plugin.getLogger().info("Looks like something went wrong");
 							ex.printStackTrace();
-							plugin.getLogger().info("Looks like something went wrong.");
 						}
 					}
 
@@ -1006,21 +1195,30 @@ public class Main extends JavaPlugin {
 		}
 	}
 
+	public void basicBungeeUpdate() {
+		for (Player player : Bukkit.getOnlinePlayers()) {
+			User user = UserManager.getInstance().getVotingPluginUser(player);
+			user.clearCache();
+			user.offVote();
+			user.checkOfflineRewards();
+		}
+	}
+
 	public void updateAdvancedCoreHook() {
-		AdvancedCoreHook.getInstance().getJavascriptEngine().put("VotingPlugin", this);
-		AdvancedCoreHook.getInstance().allowDownloadingFromSpigot(15358);
-		AdvancedCoreHook.getInstance().setConfigData(Config.getInstance().getData());
+		getJavascriptEngine().put("VotingPlugin", this);
+		allowDownloadingFromSpigot(15358);
+		setConfigData(Config.getInstance().getData());
 	}
 
 	private void writeConvertData(HashMap<User, HashMap<String, String>> data) {
-		boolean checkInt = AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL);
+		boolean checkInt = getStorageType().equals(UserStorage.MYSQL);
 		for (Entry<User, HashMap<String, String>> entry : data.entrySet()) {
 			try {
 				for (Entry<String, String> values : entry.getValue().entrySet()) {
 					String value = values.getValue();
 					if (value != null && !value.equalsIgnoreCase("null")) {
 						if (checkInt) {
-							if (StringUtils.getInstance().isInt(value)) {
+							if (StringParser.getInstance().isInt(value)) {
 								entry.getKey().getData().setInt(values.getKey(), Integer.parseInt(value));
 							} else {
 								entry.getKey().getData().setString(values.getKey(), value);
@@ -1032,8 +1230,8 @@ public class Main extends JavaPlugin {
 				}
 			} catch (Exception e) {
 				e.printStackTrace();
-				plugin.getLogger().warning("Exception occoured for '" + entry.getKey().getUUID() + "': "
-						+ e.getMessage() + ", turn debug on to see full stack traces");
+				plugin.getLogger()
+						.warning("Exception occoured for '" + entry.getKey().getUUID() + "': " + e.getMessage());
 			}
 		}
 	}

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

@@ -1,6 +1,7 @@
 package com.Ben12345rocks.VotingPlugin.Objects;
 
 import java.time.Instant;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
@@ -11,18 +12,22 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
+import com.Ben12345rocks.AdvancedCore.TimeChecker.TimeChecker;
 import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
+import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerReceivePointsEvent;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteCoolDownEndEvent;
+import com.Ben12345rocks.VotingPlugin.Events.PlayerVoteEvent;
 import com.Ben12345rocks.VotingPlugin.SpecialRewards.SpecialRewards;
 import com.Ben12345rocks.VotingPlugin.TopVoter.TopVoter;
 import com.Ben12345rocks.VotingPlugin.VoteParty.VoteParty;
@@ -111,47 +116,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		setOfflineVotes(offlineVotes);
 	}
 
-	public boolean hasPercentageTotal(TopVoter top, double percentage, LocalDateTime time) {
-		int total = getTotal(top);
-		switch (top) {
-			case Daily:
-				return total / plugin.getVoteSites().size() * 100 > percentage;
-			case Monthly:
-				return total / (plugin.getVoteSites().size() * time.getMonth().length(false)) * 100 > percentage;
-			case Weekly:
-				return total / (plugin.getVoteSites().size() * 7) * 100 > percentage;
-			default:
-				return false;
-		}
-	}
-
-	public void checkDayVoteStreak() {
-		if (!voteStreakUpdatedToday(LocalDateTime.now())) {
-			if (!Config.getInstance().isVoteStreakRequirementUsePercentage()
-					|| hasPercentageTotal(TopVoter.Daily, Config.getInstance().getVoteStreakRequirementDay(), null)) {
-				addDayVoteStreak();
-				SpecialRewards.getInstance().checkVoteStreak(this, "Day");
-				setDayVoteStreakLastUpdate(System.currentTimeMillis());
-			}
-		}
-	}
-
-	public boolean voteStreakUpdatedToday(LocalDateTime time) {
-		return MiscUtils.getInstance().getTime(getDayVoteStreakLastUpdate()).getDayOfYear() == time.getDayOfYear();
-	}
-
-	public long getDayVoteStreakLastUpdate() {
-		String str = getData().getString("DayVoteStreakLastUpdate");
-		if (str.isEmpty()) {
-			return 0;
-		}
-		return Long.parseLong(str);
-	}
-
-	public void setDayVoteStreakLastUpdate(long time) {
-		getData().setString("DayVoteStreakLastUpdate", "" + time);
-	}
-
 	/**
 	 * Adds the points.
 	 */
@@ -169,7 +133,13 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	 *            the value
 	 */
 	public void addPoints(int value) {
-		setPoints(getPoints() + value);
+		PlayerReceivePointsEvent event = new PlayerReceivePointsEvent(this, value);
+		Bukkit.getPluginManager().callEvent(event);
+
+		if (event.isCancelled()) {
+			return;
+		}
+		setPoints(getPoints() + event.getPoints());
 	}
 
 	/**
@@ -219,6 +189,26 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		return true;
 	}
 
+	public boolean canVoteAny() {
+		for (VoteSite voteSite : plugin.getVoteSites()) {
+			boolean canVote = canVoteSite(voteSite);
+			if (canVote) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public int getSitesVotedOn() {
+		int amount = 0;
+		for (VoteSite site : plugin.getVoteSites()) {
+			if (!canVoteSite(site)) {
+				amount++;
+			}
+		}
+		return amount;
+	}
+
 	/**
 	 * Can vote site.
 	 *
@@ -233,25 +223,31 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		if (time == 0) {
 			return true;
 		}
-		LocalDateTime now = LocalDateTime.now();
-		LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault());
+		try {
+			LocalDateTime now = TimeChecker.getInstance().getTime();
+			LocalDateTime lastVote = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault())
+					.plusHours(Main.plugin.getOptions().getTimeHourOffSet());
 
-		if (!voteSite.isVoteDelayDaily()) {
-			int votedelay = ConfigVoteSites.getInstance().getVoteDelay(siteName);
+			if (!voteSite.isVoteDelayDaily()) {
+				int votedelay = ConfigVoteSites.getInstance().getVoteDelay(siteName);
 
-			if (votedelay == 0) {
+				if (votedelay == 0) {
+					return false;
+				}
+
+				LocalDateTime nextvote = lastVote.plusHours(votedelay);
+
+				return now.isAfter(nextvote);
+			} else {
+				if (now.getDayOfYear() != lastVote.getDayOfYear() || now.getYear() != lastVote.getYear()) {
+					return true;
+				}
 				return false;
 			}
-
-			LocalDateTime nextvote = lastVote.plusHours(votedelay);
-
-			return now.isAfter(nextvote);
-		} else {
-			if (now.getDayOfYear() != lastVote.getDayOfYear() || now.getYear() != lastVote.getYear()) {
-				return true;
-			}
-			return false;
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
+		return false;
 
 	}
 
@@ -293,6 +289,28 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		return true;
 	}
 
+	public void checkCoolDownEvents() {
+		for (VoteSite site : plugin.getVoteSites()) {
+			if (canVoteSite(site) != getLastCoolDownCheck(site)) {
+				plugin.debug(getPlayerName() + " vote cooldown ended: " + site.getKey());
+				PlayerVoteCoolDownEndEvent event = new PlayerVoteCoolDownEndEvent(this, site);
+				plugin.getServer().getPluginManager().callEvent(event);
+				setLastVoteCoolDownCheck(true, site);
+			}
+		}
+	}
+
+	public void checkDayVoteStreak() {
+		if (!voteStreakUpdatedToday(LocalDateTime.now())) {
+			if (!Config.getInstance().isVoteStreakRequirementUsePercentage()
+					|| hasPercentageTotal(TopVoter.Daily, Config.getInstance().getVoteStreakRequirementDay(), null)) {
+				addDayVoteStreak();
+				SpecialRewards.getInstance().checkVoteStreak(this, "Day");
+				setDayVoteStreakLastUpdate(System.currentTimeMillis());
+			}
+		}
+	}
+
 	public void clearOfflineRewards() {
 		setOfflineVotes(new ArrayList<String>());
 		setOfflineRewards(new ArrayList<String>());
@@ -331,6 +349,14 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		return getData().getInt("DayVoteStreak");
 	}
 
+	public long getDayVoteStreakLastUpdate() {
+		String str = getData().getString("DayVoteStreakLastUpdate");
+		if (str.isEmpty()) {
+			return 0;
+		}
+		return Long.parseLong(str);
+	}
+
 	public boolean getDisableBroadcast() {
 		return getUserData().getBoolean("DisableBroadcast");
 	}
@@ -360,6 +386,35 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		return getData().getInt("HighestWeeklyTotal");
 	}
 
+	public boolean getLastCoolDownCheck(VoteSite site) {
+		HashMap<VoteSite, Boolean> array = getLastCoolDownCheckArray();
+		if (array.containsKey(site)) {
+			return array.get(site).booleanValue();
+		}
+		return true;
+	}
+
+	public HashMap<VoteSite, Boolean> getLastCoolDownCheckArray() {
+		HashMap<VoteSite, Boolean> lastVotesCheck = new HashMap<VoteSite, Boolean>();
+		ArrayList<String> LastVotesCheckList = getUserData().getStringList("LastVoteCoolDownCheck");
+		for (String str : LastVotesCheckList) {
+			String[] data = str.split("//");
+			if (data.length > 1 && plugin.hasVoteSite(data[0])) {
+				VoteSite site = plugin.getVoteSite(data[0]);
+				if (site != null) {
+					Boolean value = Boolean.FALSE;
+					try {
+						value = Boolean.valueOf(data[1]);
+					} catch (NumberFormatException e) {
+						plugin.debug("Not value: " + data[1]);
+					}
+					lastVotesCheck.put(site, value);
+				}
+			}
+		}
+		return lastVotesCheck;
+	}
+
 	public int getLastMonthTotal() {
 		return getData().getInt("LastMonthTotal");
 	}
@@ -483,15 +538,18 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 
 	public void giveDailyTopVoterAward(int place, String path) {
 		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getDailyAwardRewardsPath(path))
-				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Daily").send(this);
+				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Daily")
+				.withPlaceHolder("votes", "" + getTotal(TopVoter.Daily)).setOnline(isOnline()).send(this);
 	}
 
 	public void giveMonthlyTopVoterAward(int place, String path) {
 		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getMonthlyAwardRewardsPath(path))
-				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Monthly").send(this);
+				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Monthly")
+				.withPlaceHolder("votes", "" + getTotal(TopVoter.Monthly)).setOnline(isOnline()).send(this);
 	}
 
 	public void giveOfflineOtherRewards() {
+		// old reward api, will be removed in the future
 		ArrayList<String> offlineRewards = getOfflineOtherRewards();
 		for (String str : offlineRewards) {
 			if (str.equalsIgnoreCase("FirstVote")) {
@@ -502,7 +560,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 				VoteParty.getInstance().giveReward(this, false);
 			} else if (str.contains("Cumulative")) {
 				String st = str.substring("Cumulative".length());
-				if (StringUtils.getInstance().isInt(st)) {
+				if (StringParser.getInstance().isInt(st)) {
 					int votesRequired = Integer.parseInt(st);
 					if (votesRequired != 0) {
 						if (Config.getInstance().getCumulativeRewardEnabled(votesRequired)) {
@@ -512,7 +570,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 				}
 			} else if (str.contains("MileStone")) {
 				String st = str.substring("MileStone".length());
-				if (StringUtils.getInstance().isInt(st)) {
+				if (StringParser.getInstance().isInt(st)) {
 					int votesRequired = Integer.parseInt(st);
 					if (votesRequired > 0) {
 						if (Config.getInstance().getMilestoneRewardEnabled(votesRequired)) {
@@ -543,7 +601,44 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 
 	public void giveWeeklyTopVoterAward(int place, String path) {
 		new RewardBuilder(Config.getInstance().getData(), Config.getInstance().getWeeklyAwardRewardsPath(path))
-				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Weekly").send(this);
+				.withPlaceHolder("place", "" + place).withPlaceHolder("topvoter", "Weekly")
+				.withPlaceHolder("votes", "" + getTotal(TopVoter.Weekly)).setOnline(isOnline()).send(this);
+	}
+
+	public void bungeeVote(String service) {
+		if (Config.getInstance().isUseBungeeCoord()) {
+			Main.plugin.debug("Bungee vote for " + getPlayerName() + " on " + service);
+
+			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service), getPlayerName(), service,
+					true);
+			voteEvent.setBungee(true);
+			voteEvent.setForceBungee(true);
+			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					plugin.getServer().getPluginManager().callEvent(voteEvent);
+				}
+			});
+		}
+	}
+
+	public void bungeeVoteOnline(String service) {
+		if (Config.getInstance().isUseBungeeCoord()) {
+			Main.plugin.debug("Bungee online vote for " + getPlayerName() + " on " + service);
+
+			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service), getPlayerName(), service,
+					true);
+			voteEvent.setBungee(true);
+			voteEvent.setForceBungee(false);
+			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					plugin.getServer().getPluginManager().callEvent(voteEvent);
+				}
+			});
+		}
 	}
 
 	/**
@@ -570,6 +665,20 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		return false;
 	}
 
+	public boolean hasPercentageTotal(TopVoter top, double percentage, LocalDateTime time) {
+		int total = getTotal(top);
+		switch (top) {
+			case Daily:
+				return total / plugin.getVoteSites().size() * 100 > percentage;
+			case Monthly:
+				return total / (plugin.getVoteSites().size() * time.getMonth().length(false)) * 100 > percentage;
+			case Weekly:
+				return total / (plugin.getVoteSites().size() * 7) * 100 > percentage;
+			default:
+				return false;
+		}
+	}
+
 	public boolean isReminded() {
 		return getUserData().getBoolean("Reminded");
 	}
@@ -591,11 +700,12 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	 * Off vote.
 	 */
 	public void offVote() {
-		if (!AdvancedCoreHook.getInstance().getOptions().isProcessRewards()) {
-			AdvancedCoreHook.getInstance().debug("Processing rewards is disabled");
+		if (!Main.plugin.getOptions().isProcessRewards()) {
+			Main.plugin.debug("Processing rewards is disabled");
 			return;
 		}
-		AdvancedCoreHook.getInstance().extraDebug("Checking offline vote site votes");
+
+		Main.plugin.extraDebug("Checking offline vote site votes");
 		Player player = getPlayer();
 		if (player != null) {
 			boolean topVoterIngorePerm = player.hasPermission("VotingPlugin.TopVoter.Ignore");
@@ -608,37 +718,27 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 				sendVoteEffects(true);
 			}
 
+			setOfflineVotes(new ArrayList<String>());
+
 			for (int i = 0; i < offlineVotes.size(); i++) {
 				if (plugin.hasVoteSite(offlineVotes.get(i))) {
 					plugin.debug("Giving offline site reward: " + offlineVotes.get(i));
-					playerVote(plugin.getVoteSite(offlineVotes.get(i)), false, true);
+					playerVote(plugin.getVoteSite(offlineVotes.get(i)), false, true, false);
 				} else {
 					plugin.debug("Site doesn't exist: " + offlineVotes.get(i));
 				}
 			}
 
-			setOfflineVotes(new ArrayList<String>());
-
 			giveOfflineOtherRewards();
 		}
 	}
 
-	/**
-	 * Player vote.
-	 *
-	 * @param voteSite
-	 *            the vote site
-	 * @param online
-	 *            the online
-	 * @param broadcast
-	 *            the broadcast
-	 */
-	public void playerVote(VoteSite voteSite, boolean online, boolean broadcast) {
+	public void playerVote(VoteSite voteSite, boolean online, boolean broadcast, boolean bungee) {
 		if (Config.getInstance().getFormatBroadcastWhenOnline() && Config.getInstance().isBroadcastVotesEnabled()
 				&& broadcast) {
 			voteSite.broadcastVote(this);
 		}
-		voteSite.giveRewards(this, online);
+		voteSite.giveRewards(this, online, bungee);
 	}
 
 	/**
@@ -657,9 +757,6 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 	}
 
 	public void resetTotals(TopVoter topVoter) {
-		if (topVoter.equals(TopVoter.Monthly)) {
-			setLastMonthTotal(getTotal(TopVoter.Monthly));
-		}
 		setTotal(topVoter, 0);
 	}
 
@@ -676,7 +773,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 
 	@Deprecated
 	public void setAllTimeTotal(int allTimeTotal) {
-		getUserData().setInt("AllTimeTotal", allTimeTotal);
+		setTotal(TopVoter.AllTime, allTimeTotal);
 	}
 
 	public void setBestDayVoteStreak(int streak) {
@@ -693,7 +790,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 
 	@Deprecated
 	public void setDailyTotal(int total) {
-		getUserData().setInt("DailyTotal", total);
+		setTotal(TopVoter.Daily, total);
 	}
 
 	public void setDayVoteStreak(int streak) {
@@ -703,6 +800,10 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		}
 	}
 
+	public void setDayVoteStreakLastUpdate(long time) {
+		getData().setString("DayVoteStreakLastUpdate", "" + time);
+	}
+
 	public void setDisableBroadcast(boolean value) {
 		getUserData().setBoolean("DisableBroadcast", value);
 	}
@@ -734,10 +835,25 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		getData().setInt("HighestWeeklyTotal", total);
 	}
 
+	public void setLastCoolDownCheckArray(HashMap<VoteSite, Boolean> lastVotesCheck) {
+		ArrayList<String> data = new ArrayList<String>();
+		for (Entry<VoteSite, Boolean> entry : lastVotesCheck.entrySet()) {
+			String str = entry.getKey().getKey() + "//" + entry.getValue().booleanValue();
+			data.add(str);
+		}
+		getUserData().setStringList("LastVoteCoolDownCheck", data);
+	}
+
 	public void setLastMonthTotal(int total) {
 		getData().setInt("LastMonthTotal", total);
 	}
 
+	public void setLastVoteCoolDownCheck(boolean lastDelay, VoteSite voteSite) {
+		HashMap<VoteSite, Boolean> array = getLastCoolDownCheckArray();
+		array.put(voteSite, Boolean.valueOf(lastDelay));
+		setLastCoolDownCheckArray(array);
+	}
+
 	public void setLastVotes(HashMap<VoteSite, Long> lastVotes) {
 		ArrayList<String> data = new ArrayList<String>();
 		for (Entry<VoteSite, Long> entry : lastVotes.entrySet()) {
@@ -753,7 +869,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 
 	@Deprecated
 	public void setMonthTotal(int total) {
-		getData().setInt("MonthTotal", total);
+		setTotal(TopVoter.Monthly, total);
 	}
 
 	public void setMonthVoteStreak(int streak) {
@@ -808,6 +924,12 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 				getUserData().setInt("DailyTotal", value);
 				break;
 			case Monthly:
+				if (Config.getInstance().isLimitMonthlyVotes()) {
+					int days = LocalDate.now().lengthOfMonth();
+					if (value >= days * plugin.getVoteSites().size()) {
+						value = days * plugin.getVoteSites().size();
+					}
+				}
 				getData().setInt("MonthTotal", value);
 				break;
 			case Weekly:
@@ -829,7 +951,7 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 
 	@Deprecated
 	public void setWeeklyTotal(int total) {
-		getUserData().setInt("WeeklyTotal", total);
+		setTotal(TopVoter.Weekly, total);
 	}
 
 	public void setWeekVoteStreak(int streak) {
@@ -849,4 +971,8 @@ public class User extends com.Ben12345rocks.AdvancedCore.UserManager.User {
 		return true;
 	}
 
+	public boolean voteStreakUpdatedToday(LocalDateTime time) {
+		return MiscUtils.getInstance().getTime(getDayVoteStreakLastUpdate()).getDayOfYear() == time.getDayOfYear();
+	}
+
 }

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

@@ -11,9 +11,10 @@ import org.bukkit.entity.Player;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Item.ItemBuilder;
+import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
+import com.Ben12345rocks.VotingPlugin.BungeeHandler;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
@@ -101,31 +102,43 @@ public class VoteSite {
 		init();
 	}
 
+	public void broadcastVote(User user) {
+		broadcastVote(user, true);
+	}
+
 	/**
 	 * Broadcast vote.
 	 *
 	 * @param user
 	 *            the user
+	 * @param checkBungee
+	 *            check bungee broadcast
 	 */
-	public void broadcastVote(User user) {
+	public void broadcastVote(User user, boolean checkBungee) {
 		if (!user.isVanished()) {
-			String playerName = user.getPlayerName();
-			String bc = StringUtils.getInstance().colorize(config.getFormatBroadCastMsg());
-			HashMap<String, String> placeholders = new HashMap<String, String>();
-			placeholders.put("player", playerName);
-			placeholders.put("nickname",
-					(user.getPlayer() != null) ? user.getPlayer().getDisplayName() : user.getPlayerName());
-			placeholders.put("sitename", getDisplayName());
-			placeholders.put("servicesite", getServiceSite());
-			bc = StringUtils.getInstance().replacePlaceHolder(bc, placeholders);
-			ArrayList<Player> players = new ArrayList<Player>();
-			for (Player p : Bukkit.getOnlinePlayers()) {
-				if (!UserManager.getInstance().getVotingPluginUser(p).getDisableBroadcast()) {
-					players.add(p);
+			if (checkBungee && Config.getInstance().isBungeeBroadcast()) {
+				BungeeHandler.getInstance().sendData("Broadcast", getServiceSite(), user.getPlayerName());
+			} else {
+				String playerName = user.getPlayerName();
+				String bc = StringParser.getInstance().colorize(config.getFormatBroadCastMsg());
+				HashMap<String, String> placeholders = new HashMap<String, String>();
+				placeholders.put("player", playerName);
+				placeholders.put("nickname",
+						(user.getPlayer() != null) ? user.getPlayer().getDisplayName() : user.getPlayerName());
+				placeholders.put("sitename", getDisplayName());
+				placeholders.put("servicesite", getServiceSite());
+				bc = StringParser.getInstance().replacePlaceHolder(bc, placeholders);
+				ArrayList<Player> players = new ArrayList<Player>();
+				for (Player p : Bukkit.getOnlinePlayers()) {
+					if (!UserManager.getInstance().getVotingPluginUser(p).getDisableBroadcast()) {
+						players.add(p);
+					}
 				}
-			}
 
-			MiscUtils.getInstance().broadcast(bc, players);
+				MiscUtils.getInstance().broadcast(bc, players);
+			}
+		} else {
+			plugin.debug(user.getPlayerName() + " is vanished, not broadcasting");
 		}
 	}
 
@@ -142,22 +155,20 @@ public class VoteSite {
 		}
 	}
 
-	/**
-	 * Give rewards.
-	 *
-	 * @param user
-	 *            the user
-	 * @param online
-	 *            the online
-	 */
-	public void giveRewards(User user, boolean online) {
+	public ConfigurationSection getSiteData() {
+		return configVoteSites.getData(key);
+	}
+
+	public void giveRewards(User user, boolean online, boolean bungee) {
 		new RewardBuilder(configVoteSites.getData(), configVoteSites.getRewardsPath(key)).setOnline(online)
 				.withPlaceHolder("ServiceSite", getServiceSite()).withPlaceHolder("SiteName", getDisplayName())
-				.withPlaceHolder("VoteDelay", "" + getVoteDelay()).withPlaceHolder("VoteURL", getVoteURL()).send(user);
+				.withPlaceHolder("VoteDelay", "" + getVoteDelay()).withPlaceHolder("VoteURL", getVoteURL())
+				.setServer(bungee).send(user);
 
 		new RewardBuilder(configVoteSites.getData(), configVoteSites.getEverySiteRewardPath()).setOnline(online)
 				.withPlaceHolder("ServiceSite", getServiceSite()).withPlaceHolder("SiteName", getDisplayName())
-				.withPlaceHolder("VoteDelay", "" + getVoteDelay()).withPlaceHolder("VoteURL", getVoteURL()).send(user);
+				.withPlaceHolder("VoteDelay", "" + getVoteDelay()).withPlaceHolder("VoteURL", getVoteURL())
+				.setServer(bungee).send(user);
 	}
 
 	public boolean hasRewards() {

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

@@ -9,8 +9,8 @@ import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.Sign;
 import org.bukkit.block.Skull;
+import org.bukkit.block.data.Directional;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
@@ -36,6 +36,10 @@ public class SignHandler {
 	@Setter
 	private Location location;
 
+	@Getter
+	@Setter
+	private Location skullLocation;
+
 	@Getter
 	@Setter
 	private String data;
@@ -59,21 +63,10 @@ public class SignHandler {
 	@Setter
 	private boolean valid;
 
-	/**
-	 * Instantiates a new sign handler.
-	 *
-	 * @param sign
-	 *            the sign
-	 * @param location
-	 *            the location
-	 * @param data
-	 *            the data
-	 * @param position
-	 *            the position
-	 */
-	public SignHandler(String sign, Location location, String data, int position) {
+	public SignHandler(String sign, Location location, Location skullLocation, String data, int position) {
 		setSign(sign);
 		setLocation(location);
+		setSkullLocation(skullLocation);
 		setData(data);
 		this.position = position;
 		setValid(true);
@@ -93,6 +86,10 @@ public class SignHandler {
 		return false;
 	}
 
+	public boolean isSkullSet() {
+		return skullLocation != null;
+	}
+
 	/**
 	 * Check skulls.
 	 */
@@ -100,6 +97,11 @@ public class SignHandler {
 		if (playerName.equalsIgnoreCase("No Player") || playerName.equals("")) {
 			return;
 		}
+		if (skullLocation != null) {
+			checkSkull(skullLocation.getBlock());
+			return;
+		}
+
 		Location loc = location;
 		Location loc1 = new Location(loc.getWorld(), loc.getBlockX() - 1, loc.getBlockY() - 1, loc.getBlockZ() - 1);
 		Location loc2 = new Location(loc.getWorld(), loc.getBlockX() + 1, loc.getBlockY() + 1, loc.getBlockZ() + 1);
@@ -160,7 +162,7 @@ public class SignHandler {
 	 * Store sign.
 	 */
 	public void storeSign() {
-		ServerData.getInstance().setSign(sign, location, data, position);
+		ServerData.getInstance().setSign(sign, location, skullLocation, data, position);
 	}
 
 	/**
@@ -250,7 +252,7 @@ public class SignHandler {
 					}
 
 				} catch (Exception ex) {
-					AdvancedCoreHook.getInstance().debug(ex);
+					Main.plugin.debug(ex);
 				}
 			}
 		}, delay);
@@ -258,9 +260,9 @@ public class SignHandler {
 
 	public void updateSkulls(Location loc1, Location loc2) {
 		BlockState state = getLocation().getBlock().getState();
-		if (state instanceof Sign) {
-			org.bukkit.material.Sign s = (org.bukkit.material.Sign) state.getData();
-			Block b = location.getBlock().getRelative(s.getAttachedFace());
+		if (state instanceof Sign && state.getBlockData() instanceof Directional) {
+			Directional s = (Directional) state.getBlockData();
+			Block b = location.getBlock().getRelative(s.getFacing());
 			Block above = b.getRelative(BlockFace.UP);
 			if (checkSkull(above)) {
 				return;

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

@@ -69,7 +69,8 @@ public class Signs {
 		for (String sign : ServerData.getInstance().getSigns()) {
 			// plugin.getLogger().info("Loading sign " + sign);
 			plugin.getSigns().add(new SignHandler(sign, ServerData.getInstance().getSignLocation(sign),
-					ServerData.getInstance().getSignData(sign), ServerData.getInstance().getSignPosition(sign)));
+					ServerData.getInstance().getSignSkullLocation(sign), ServerData.getInstance().getSignData(sign),
+					ServerData.getInstance().getSignPosition(sign)));
 		}
 	}
 

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

@@ -7,7 +7,7 @@ import org.bukkit.Bukkit;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardHandler;
 import com.Ben12345rocks.AdvancedCore.Rewards.RewardOptions;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
+import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Config.ConfigVoteSites;
@@ -85,7 +85,7 @@ public class SpecialRewards {
 		boolean gotCumulative = false;
 		Set<String> votes = Config.getInstance().getCumulativeVotes();
 		for (String vote : votes) {
-			if (StringUtils.getInstance().isInt(vote)) {
+			if (StringParser.getInstance().isInt(vote)) {
 				int votesRequired = Integer.parseInt(vote);
 				if (votesRequired != 0) {
 					if (Config.getInstance().getCumulativeRewardEnabled(votesRequired)
@@ -147,7 +147,7 @@ public class SpecialRewards {
 		boolean gotMilestone = false;
 		Set<String> votes = Config.getInstance().getMilestoneVotes();
 		for (String vote : votes) {
-			if (StringUtils.getInstance().isInt(vote)) {
+			if (StringParser.getInstance().isInt(vote)) {
 				int votesRequired = Integer.parseInt(vote);
 				if (votesRequired != 0) {
 					if (Config.getInstance().getMilestoneRewardEnabled(votesRequired)
@@ -181,7 +181,7 @@ public class SpecialRewards {
 				// multiple
 				multiple = true;
 			}
-			if (StringUtils.getInstance().isInt(s)) {
+			if (StringParser.getInstance().isInt(s)) {
 				int streakRequired = Integer.parseInt(s);
 				if (streakRequired != 0) {
 					if (Config.getInstance().getVoteStreakRewardEnabled(type, streak)

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

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

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

@@ -16,15 +16,14 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.DateChangedEvent;
 import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.DayChangeEvent;
 import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.MonthChangeEvent;
 import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.PreDateChangedEvent;
 import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.WeekChangeEvent;
 import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
+import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.AdvancedCore.YML.YMLFileHandler;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
@@ -97,10 +96,31 @@ public class TopVoterHandler implements Listener {
 		return place;
 	}
 
+	public void loadLastMonth() {
+		if (Config.getInstance().isLastMonthGUI()) {
+			plugin.getLastMonthTopVoter().clear();
+
+			LinkedHashMap<User, Integer> totals = new LinkedHashMap<User, Integer>();
+			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+				User user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+				int total = user.getLastMonthTotal();
+				if (total > 0) {
+					totals.put(user, total);
+				}
+			}
+
+			plugin.getLastMonthTopVoter().putAll(sortByValues(totals, false));
+
+			plugin.debug("Loaded last month top voters");
+		}
+
+	}
+
 	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
 	public void onDateChanged(DateChangedEvent event) {
 		plugin.setUpdate(true);
 		plugin.update();
+		loadLastMonth();
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -119,7 +139,7 @@ public class TopVoterHandler implements Listener {
 		}
 
 		if (Config.getInstance().getStoreTopVotersDaily()) {
-			plugin.debug("Storing TopVoters Daily");
+			plugin.getLogger().info("Saving TopVoters Daily");
 			storeTopVoters(TopVoter.Daily);
 		}
 
@@ -162,13 +182,15 @@ public class TopVoterHandler implements Listener {
 				}
 			}
 
+			user.setLastMonthTotal(user.getTotal(TopVoter.Monthly));
+
 			if (user.getHighestMonthlyTotal() < user.getTotal(TopVoter.Monthly)) {
 				user.setHighestMonthlyTotal(user.getTotal(TopVoter.Monthly));
 			}
 		}
 
 		if (Config.getInstance().getStoreTopVotersMonthly()) {
-			plugin.debug("Storing TopVoters Monthly");
+			plugin.getLogger().info("Saving TopVoters Monthly");
 			storeTopVoters(TopVoter.Monthly);
 		}
 
@@ -193,6 +215,7 @@ public class TopVoterHandler implements Listener {
 				lastTotal = user.getTotal(TopVoter.Monthly);
 			}
 		}
+
 		resetTotals(TopVoter.Monthly);
 
 		if (Config.getInstance().getResetMilestonesMonthly()) {
@@ -231,7 +254,7 @@ public class TopVoterHandler implements Listener {
 		}
 
 		if (Config.getInstance().getStoreTopVotersWeekly()) {
-			plugin.debug("Storing TopVoters Weekly");
+			plugin.getLogger().info("Saving TopVoters Weekly");
 			storeTopVoters(TopVoter.Weekly);
 		}
 
@@ -356,7 +379,7 @@ public class TopVoterHandler implements Listener {
 		title = title.replace("%page%", "" + page);
 		title = title.replace("%maxpages%", "" + pageSize);
 		title = title.replace("%Top%", "All Time");
-		msg.add(StringUtils.getInstance().colorize(title));
+		msg.add(StringParser.getInstance().colorize(title));
 
 		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 			msg.add(topVoters.get(i));
@@ -396,7 +419,7 @@ public class TopVoterHandler implements Listener {
 		title = title.replace("%page%", "" + page);
 		title = title.replace("%maxpages%", "" + pageSize);
 		title = title.replace("%Top%", "Daily");
-		msg.add(StringUtils.getInstance().colorize(title));
+		msg.add(StringParser.getInstance().colorize(title));
 
 		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 			msg.add(topVoters.get(i));
@@ -436,7 +459,7 @@ public class TopVoterHandler implements Listener {
 		title = title.replace("%page%", "" + page);
 		title = title.replace("%maxpages%", "" + pageSize);
 		title = title.replace("%Top%", "Monthly");
-		msg.add(StringUtils.getInstance().colorize(title));
+		msg.add(StringParser.getInstance().colorize(title));
 
 		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 			msg.add(topVoters.get(i));
@@ -462,7 +485,7 @@ public class TopVoterHandler implements Listener {
 			try {
 				line = line.replace("%player%", entry.getKey().getPlayerName());
 			} catch (Exception ex) {
-				AdvancedCoreHook.getInstance().debug(ex);
+				Main.plugin.debug(ex);
 			}
 			line = line.replace("%votes%", "" + entry.getValue());
 
@@ -489,7 +512,7 @@ public class TopVoterHandler implements Listener {
 			try {
 				line = line.replace("%player%", users.get(i).getPlayerName());
 			} catch (Exception ex) {
-				AdvancedCoreHook.getInstance().debug(ex);
+				Main.plugin.debug(ex);
 			}
 			line = line.replace("%votes%", "" + plugin.getTopVoter(TopVoter.Monthly).get(users.get(i)));
 			msg.add(line);
@@ -515,7 +538,7 @@ public class TopVoterHandler implements Listener {
 			try {
 				line = line.replace("%player%", entry.getKey().getPlayerName());
 			} catch (Exception ex) {
-				AdvancedCoreHook.getInstance().debug(ex);
+				Main.plugin.debug(ex);
 			}
 			line = line.replace("%votes%", "" + entry.getValue());
 
@@ -557,7 +580,7 @@ public class TopVoterHandler implements Listener {
 		title = title.replace("%page%", "" + page);
 		title = title.replace("%maxpages%", "" + pageSize);
 		title = title.replace("%Top%", "Weekly");
-		msg.add(StringUtils.getInstance().colorize(title));
+		msg.add(StringParser.getInstance().colorize(title));
 
 		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 			msg.add(topVoters.get(i));

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

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

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

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

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

@@ -1,12 +1,15 @@
 package com.Ben12345rocks.VotingPlugin.Util.PlaceHolders;
 
+import java.text.NumberFormat;
 import java.util.ArrayList;
+import java.util.Locale;
 import java.util.Map.Entry;
 
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
+import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
+import com.Ben12345rocks.AdvancedCore.Util.Placeholder.PlaceHolder;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Commands.Commands;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
@@ -40,10 +43,10 @@ public class PlaceHolders {
 	}
 
 	@Getter
-	private ArrayList<PlaceHolder> placeholders = new ArrayList<PlaceHolder>();
+	private ArrayList<PlaceHolder<User>> placeholders = new ArrayList<PlaceHolder<User>>();
 
 	@Getter
-	private ArrayList<PlaceHolder> nonPlayerPlaceholders = new ArrayList<PlaceHolder>();
+	private ArrayList<PlaceHolder<User>> nonPlayerPlaceholders = new ArrayList<PlaceHolder<User>>();
 
 	/**
 	 * Instantiates a new place holders.
@@ -62,9 +65,9 @@ public class PlaceHolders {
 	}
 
 	public String getPlaceHolder(OfflinePlayer p, String identifier) {
-		identifier = StringUtils.getInstance().replaceJavascript(p, identifier);
+		identifier = StringParser.getInstance().replaceJavascript(p, identifier);
 
-		for (PlaceHolder placeholder : nonPlayerPlaceholders) {
+		for (PlaceHolder<User> placeholder : nonPlayerPlaceholders) {
 			if (placeholder.matches(identifier)) {
 				return placeholder.placeholderRequest(p, null, identifier);
 			}
@@ -72,17 +75,17 @@ public class PlaceHolders {
 
 		User user = UserManager.getInstance().getVotingPluginUser(p);
 
-		for (PlaceHolder placeholder : placeholders) {
+		for (PlaceHolder<User> placeholder : placeholders) {
 			if (placeholder.matches(identifier)) {
 				return placeholder.placeholderRequest(p, user, identifier);
 			}
 		}
 
-		return identifier;
+		return "Not a valid placeholder";
 	}
 
 	public String getPlaceHolder(Player p, String identifier) {
-		identifier = StringUtils.getInstance().replaceJavascript(p, identifier);
+		identifier = StringParser.getInstance().replaceJavascript(p, identifier);
 		return getPlaceHolder((OfflinePlayer) p, identifier);
 	}
 
@@ -91,7 +94,7 @@ public class PlaceHolders {
 		nonPlayerPlaceholders.clear();
 
 		// older placeholders, might be removed in the future
-		placeholders.add(new PlaceHolder("total") {
+		placeholders.add(new PlaceHolder<User>("total") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -99,7 +102,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Month total"));
 
-		placeholders.add(new PlaceHolder("alltimetotal") {
+		placeholders.add(new PlaceHolder<User>("alltimetotal") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -107,7 +110,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Alltime total"));
 
-		placeholders.add(new PlaceHolder("lastmonthtotal") {
+		placeholders.add(new PlaceHolder<User>("lastmonthtotal") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -117,7 +120,7 @@ public class PlaceHolders {
 
 		// end of older placeholders
 
-		placeholders.add(new PlaceHolder("DisableBroadcast") {
+		placeholders.add(new PlaceHolder<User>("DisableBroadcast") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -125,7 +128,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Returns true/false if user has broadcast disabled"));
 
-		placeholders.add(new PlaceHolder("MilestoneCount") {
+		placeholders.add(new PlaceHolder<User>("MilestoneCount") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -135,7 +138,7 @@ public class PlaceHolders {
 
 		for (final String identifier : Config.getInstance().getIdentifiers()) {
 			if (Config.getInstance().getIdentifierLimit(identifier) > 0) {
-				placeholders.add(new PlaceHolder("VoteShopLimit_" + identifier) {
+				placeholders.add(new PlaceHolder<User>("VoteShopLimit_" + identifier) {
 
 					@Override
 					public String placeholderRequest(OfflinePlayer p, User user, String ident) {
@@ -146,7 +149,7 @@ public class PlaceHolders {
 		}
 
 		for (final TopVoter top : TopVoter.values()) {
-			placeholders.add(new PlaceHolder("Total_" + top.toString()) {
+			placeholders.add(new PlaceHolder<User>("Total_" + top.toString()) {
 
 				@Override
 				public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -155,7 +158,7 @@ public class PlaceHolders {
 			}.withDescription("User total for " + top.getName()));
 		}
 
-		placeholders.add(new PlaceHolder("BestDailyTotal") {
+		placeholders.add(new PlaceHolder<User>("BestDailyTotal") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -163,7 +166,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Best daily total"));
 
-		placeholders.add(new PlaceHolder("BestWeeklyTotal") {
+		placeholders.add(new PlaceHolder<User>("BestWeeklyTotal") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -171,7 +174,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Best weekly total"));
 
-		placeholders.add(new PlaceHolder("BestMonthlyTotal") {
+		placeholders.add(new PlaceHolder<User>("BestMonthlyTotal") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -179,7 +182,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Best monthly total"));
 
-		placeholders.add(new PlaceHolder("DailyVoteStreak") {
+		placeholders.add(new PlaceHolder<User>("DailyVoteStreak") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -187,7 +190,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Current daily votestreak"));
 
-		placeholders.add(new PlaceHolder("WeeklyVoteStreak") {
+		placeholders.add(new PlaceHolder<User>("WeeklyVoteStreak") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -195,7 +198,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Current weekly votestreak"));
 
-		placeholders.add(new PlaceHolder("MonthVoteStreak") {
+		placeholders.add(new PlaceHolder<User>("MonthVoteStreak") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -203,7 +206,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Current month votestreak"));
 
-		placeholders.add(new PlaceHolder("BestDailyVoteStreak") {
+		placeholders.add(new PlaceHolder<User>("BestDailyVoteStreak") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -211,7 +214,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Best daily votestreak"));
 
-		placeholders.add(new PlaceHolder("BestWeeklyVoteStreak") {
+		placeholders.add(new PlaceHolder<User>("BestWeeklyVoteStreak") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -219,7 +222,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Best weekly votestreak"));
 
-		placeholders.add(new PlaceHolder("BestMonthVoteStreak") {
+		placeholders.add(new PlaceHolder<User>("BestMonthVoteStreak") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -227,7 +230,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Best month votestreak"));
 
-		placeholders.add(new PlaceHolder("Points") {
+		placeholders.add(new PlaceHolder<User>("Points") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -235,7 +238,16 @@ public class PlaceHolders {
 			}
 		}.withDescription("User points"));
 
-		placeholders.add(new PlaceHolder("CanVote") {
+		placeholders.add(new PlaceHolder<User>("Points_Format") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US);
+				return numberFormat.format(user.getPoints());
+			}
+		}.withDescription("User points"));
+
+		placeholders.add(new PlaceHolder<User>("CanVote") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -244,21 +256,21 @@ public class PlaceHolders {
 		}.withDescription("Return true/false if player can vote on all sites"));
 
 		for (final VoteSite voteSite : plugin.getVoteSites()) {
-			placeholders.add(new PlaceHolder("Next_" + voteSite.getKey()) {
+			placeholders.add(new PlaceHolder<User>("Next_" + voteSite.getKey()) {
 
 				@Override
 				public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
 					return Commands.getInstance().voteCommandNextInfo(user, voteSite);
 				}
 			}.withDescription("How long until user can vote on " + voteSite.getKey()));
-			placeholders.add(new PlaceHolder("Last_" + voteSite.getKey()) {
+			placeholders.add(new PlaceHolder<User>("Last_" + voteSite.getKey()) {
 
 				@Override
 				public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
 					return Commands.getInstance().voteCommandLastDuration(user, voteSite);
 				}
 			}.withDescription("How long ago user voted on " + voteSite.getKey()));
-			placeholders.add(new PlaceHolder("CanVote_" + voteSite.getKey()) {
+			placeholders.add(new PlaceHolder<User>("CanVote_" + voteSite.getKey()) {
 
 				@Override
 				public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -267,7 +279,7 @@ public class PlaceHolders {
 			}.withDescription("Whether or not player can vote on " + voteSite.getKey()));
 		}
 
-		placeholders.add(new PlaceHolder("Top_All_Position") {
+		placeholders.add(new PlaceHolder<User>("Top_All_Position") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -282,7 +294,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Get user top voter position"));
 
-		placeholders.add(new PlaceHolder("Top_AllVotes_") {
+		placeholders.add(new PlaceHolder<User>("Top_AllVotes_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -298,7 +310,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user votes at position in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_All_") {
+		placeholders.add(new PlaceHolder<User>("Top_All_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -314,7 +326,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user at postion in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_Month_Position") {
+		placeholders.add(new PlaceHolder<User>("Top_Month_Position") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -329,7 +341,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Get user top voter position"));
 
-		placeholders.add(new PlaceHolder("Top_Month_") {
+		placeholders.add(new PlaceHolder<User>("Top_Month_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -345,7 +357,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user at position in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_MonthVotes_") {
+		placeholders.add(new PlaceHolder<User>("Top_MonthVotes_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -361,7 +373,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user votes at position in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_Week_Position") {
+		placeholders.add(new PlaceHolder<User>("Top_Week_Position") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -376,7 +388,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Get user top voter position"));
 
-		placeholders.add(new PlaceHolder("Top_Week_") {
+		placeholders.add(new PlaceHolder<User>("Top_Week_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -392,7 +404,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user at postion in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_WeekVotes_") {
+		placeholders.add(new PlaceHolder<User>("Top_WeekVotes_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -408,7 +420,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user votes at position in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_Daily_Position") {
+		placeholders.add(new PlaceHolder<User>("Top_Daily_Position") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -423,7 +435,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Get user top voter position"));
 
-		placeholders.add(new PlaceHolder("Top_Daily_") {
+		placeholders.add(new PlaceHolder<User>("Top_Daily_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -439,7 +451,7 @@ public class PlaceHolders {
 			}
 		}.useStartsWith().withDescription("Get user at postion in top voter"));
 
-		placeholders.add(new PlaceHolder("Top_DailyVotes_") {
+		placeholders.add(new PlaceHolder<User>("Top_DailyVotes_") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -457,7 +469,7 @@ public class PlaceHolders {
 
 		// non players
 
-		nonPlayerPlaceholders.add(new PlaceHolder("VotePartyVotesCurrent") {
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("VotePartyVotesCurrent") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -465,7 +477,7 @@ public class PlaceHolders {
 			}
 		}.withDescription("Current amount of voteparty votes"));
 
-		nonPlayerPlaceholders.add(new PlaceHolder("VotePartyVotesNeeded") {
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("VotePartyVotesNeeded") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
@@ -473,12 +485,60 @@ public class PlaceHolders {
 			}
 		}.withDescription("Voteparty votes needed"));
 
-		nonPlayerPlaceholders.add(new PlaceHolder("VotePartyVotesRequired") {
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("VotePartyVotesRequired") {
 
 			@Override
 			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
 				return Integer.toString(VoteParty.getInstance().getVotesRequired());
 			}
 		}.withDescription("Amount of votes needed for voteparty"));
+
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("GlobalMonthTotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int total = 0;
+				for (int num : Main.plugin.getTopVoter(TopVoter.Monthly).values()) {
+					total += num;
+				}
+				return Integer.toString(total);
+			}
+		}.withDescription("Global month total"));
+
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("GlobalAllTimeTotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int total = 0;
+				for (int num : Main.plugin.getTopVoter(TopVoter.AllTime).values()) {
+					total += num;
+				}
+				return Integer.toString(total);
+			}
+		}.withDescription("Global alltime total"));
+
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("GlobalWeeklyTotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int total = 0;
+				for (int num : Main.plugin.getTopVoter(TopVoter.Weekly).values()) {
+					total += num;
+				}
+				return Integer.toString(total);
+			}
+		}.withDescription("Global weekly total"));
+
+		nonPlayerPlaceholders.add(new PlaceHolder<User>("GlobalDailyTotal") {
+
+			@Override
+			public String placeholderRequest(OfflinePlayer p, User user, String identifier) {
+				int total = 0;
+				for (int num : Main.plugin.getTopVoter(TopVoter.Daily).values()) {
+					total += num;
+				}
+				return Integer.toString(total);
+			}
+		}.withDescription("Global daily total"));
 	}
 }

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

@@ -13,9 +13,9 @@ import com.Ben12345rocks.AdvancedCore.Rewards.RewardBuilder;
 import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.DayChangeEvent;
 import com.Ben12345rocks.AdvancedCore.TimeChecker.Events.MonthChangeEvent;
 import com.Ben12345rocks.AdvancedCore.UserManager.UUID;
+import com.Ben12345rocks.AdvancedCore.Util.Messages.StringParser;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.MiscUtils;
-import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.VotingPlugin.Main;
 import com.Ben12345rocks.VotingPlugin.Config.Config;
 import com.Ben12345rocks.VotingPlugin.Data.ServerData;
@@ -125,7 +125,7 @@ public class VoteParty implements Listener {
 			msg = ArrayUtils.getInstance().colorize(ArrayUtils.getInstance().replacePlaceHolder(msg, placeholders));
 			sender.sendMessage(ArrayUtils.getInstance().convert(msg));
 		} else {
-			sender.sendMessage(StringUtils.getInstance().colorize("&cVoteParty not enabled"));
+			sender.sendMessage(StringParser.getInstance().colorize("&cVoteParty not enabled"));
 		}
 	}
 
@@ -231,6 +231,10 @@ public class VoteParty implements Listener {
 		if (Config.getInstance().getVotePartyResetMontly()) {
 			reset();
 		}
+
+		if (Config.getInstance().isVotePartyResetExtraVotesMonthly()) {
+			ServerData.getInstance().setVotePartyExtraRequired(0);
+		}
 	}
 
 	public void register() {

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

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

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

@@ -0,0 +1,164 @@
+package com.Ben12345rocks.VotingPlugin.bungee;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.List;
+
+import com.Ben12345rocks.AdvancedCore.Util.Encryption.EncryptionHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Sockets.ClientHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Sockets.SocketHandler;
+import com.Ben12345rocks.AdvancedCore.Util.Sockets.SocketReceiver;
+import com.vexsoftware.votifier.bungee.events.VotifierEvent;
+import com.vexsoftware.votifier.model.Vote;
+
+import lombok.Getter;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.plugin.Plugin;
+import net.md_5.bungee.config.Configuration;
+import net.md_5.bungee.event.EventHandler;
+
+public class Bungee extends Plugin implements net.md_5.bungee.api.plugin.Listener {
+
+	@Getter
+	private Config config;
+
+	@Getter
+	private BungeeMySQL mysql;
+
+	private SocketHandler socketHandler;
+
+	private HashMap<String, ClientHandler> clientHandles;
+
+	private EncryptionHandler encryptionHandler;
+
+	@Override
+	public void onEnable() {
+		getProxy().getPluginManager().registerListener(this, this);
+		config = new Config(this);
+		config.load();
+
+		mysql = new BungeeMySQL("VotingPlugin_Users", config.getData());
+
+		// column types
+		getMysql().alterColumnType("TopVoterIgnore", "VARCHAR(5)");
+		getMysql().alterColumnType("CheckWorld", "VARCHAR(5)");
+		getMysql().alterColumnType("Reminded", "VARCHAR(5)");
+		getMysql().alterColumnType("DisableBroadcast", "VARCHAR(5)");
+		getMysql().alterColumnType("LastOnline", "VARCHAR(20)");
+		getMysql().alterColumnType("PlayerName", "VARCHAR(30)");
+		getMysql().alterColumnType("DailyTotal", "INT DEFAULT '0'");
+		getMysql().alterColumnType("WeeklyTotal", "INT DEFAULT '0'");
+		getMysql().alterColumnType("DayVoteStreak", "INT DEFAULT '0'");
+		getMysql().alterColumnType("BestDayVoteStreak", "INT DEFAULT '0'");
+		getMysql().alterColumnType("WeekVoteStreak", "INT DEFAULT '0'");
+		getMysql().alterColumnType("BestWeekVoteStreak", "INT DEFAULT '0'");
+		getMysql().alterColumnType("VotePartyVotes", "INT DEFAULT '0'");
+		getMysql().alterColumnType("MonthVoteStreak", "INT DEFAULT '0'");
+		getMysql().alterColumnType("Points", "INT DEFAULT '0'");
+		getMysql().alterColumnType("HighestDailyTotal", "INT DEFAULT '0'");
+		getMysql().alterColumnType("MileStoneTotal", "INT DEFAULT '0'");
+		getMysql().alterColumnType("AllTimeTotal", "INT DEFAULT '0'");
+		getMysql().alterColumnType("HighestMonthlyTotal", "INT DEFAULT '0'");
+		getMysql().alterColumnType("MilestoneCount", "INT DEFAULT '0'");
+		getMysql().alterColumnType("MonthTotal", "INT DEFAULT '0'");
+		getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
+		getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
+
+		getProxy().getPluginManager().registerCommand(this, new VotingPluginBungeeCommand(this));
+		encryptionHandler = new EncryptionHandler(new File(getDataFolder(), "secretkey.key"));
+
+		socketHandler = new SocketHandler(getDescription().getVersion(), config.getBungeeHost(), config.getBungeePort(),
+				encryptionHandler);
+
+		socketHandler.add(new SocketReceiver() {
+
+			@Override
+			public void onReceive(String[] data) {
+				if (data.length > 2) {
+					if (data[0].equalsIgnoreCase("Broadcast")) {
+						sendServerMessage(data);
+					}
+				}
+			}
+		});
+
+		clientHandles = new HashMap<String, ClientHandler>();
+		List<String> l = config.getBlockedServers();
+		for (String s : config.getSpigotServers()) {
+			if (!l.contains(s)) {
+				Configuration d = config.getSpigotServerConfiguration(s);
+				clientHandles.put(s,
+						new ClientHandler(d.getString("Host", ""), d.getInt("Port", 1298), encryptionHandler));
+			}
+		}
+	}
+
+	public void reload() {
+		config.load();
+	}
+
+	@EventHandler
+	public void onVote(VotifierEvent event) {
+		Vote vote = event.getVote();
+		getLogger().info("Vote received " + vote.getUsername() + " from service site " + vote.getServiceName());
+		saveVote(vote.getUsername(), vote.getServiceName());
+	}
+
+	public String getUUID(String playerName) {
+		ProxiedPlayer p = getProxy().getPlayer(playerName);
+		if (p != null && p.isConnected()) {
+			return p.getUniqueId().toString();
+		}
+		String str = mysql.getUUID(playerName);
+		if (str != null) {
+			return str;
+		}
+		return "";
+	}
+
+	public void saveVote(String name, String service) {
+		String uuid = getUUID(name);
+
+		if (!uuid.isEmpty()) {
+			if (config.getSendVotesToAllServers()) {
+				// for (String send : getProxy().getServers().keySet()) {
+				// mysql.update(uuid, "Proxy_" + send, finalData, DataType.STRING);
+				// }
+				sendServerMessage("bungeevote", uuid, name, service);
+				if (config.getBroadcast()) {
+					sendServerMessage("BungeeBroadcast", service, uuid, name);
+				}
+			} else if (config.getSendToOnlineServer()) {
+				ProxiedPlayer p = getProxy().getPlayer(name);
+
+				String server = "";
+				if (p != null && p.isConnected()) {
+					server = p.getServer().getInfo().getName();
+				} else {
+					server = config.getFallBack();
+				}
+				if (config.getBlockedServers().contains(server)) {
+					server = config.getFallBack();
+				}
+				// mysql.update(uuid, "Proxy_Online", finalData, DataType.STRING);
+				sendServerMessageServer(server, "bungeevoteonline", uuid, name, service);
+				if (config.getBroadcast()) {
+					sendServerMessage("BungeeBroadcast", service, uuid, name);
+				}
+			}
+		}
+	}
+
+	public void sendServerMessage(String... messageData) {
+		for (ClientHandler h : clientHandles.values()) {
+			h.sendMessage(messageData);
+		}
+	}
+
+	public void sendServerMessageServer(String server, String... messageData) {
+		if (clientHandles.containsKey(server)) {
+			clientHandles.get(server).sendMessage(messageData);
+		}
+	}
+
+}

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

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

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

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

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

@@ -0,0 +1,36 @@
+package com.Ben12345rocks.VotingPlugin.bungee;
+
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.plugin.Command;
+
+public class VotingPluginBungeeCommand extends Command {
+	private Bungee bungee;
+
+	public VotingPluginBungeeCommand(Bungee bungee) {
+		super("votingpluginbungee", "votingplugin.admin");
+		this.bungee = bungee;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if (sender.hasPermission("votingplugin.admin")) {
+			if (args.length > 0) {
+				if (args[0].equalsIgnoreCase("reload")) {
+					bungee.reload();
+					sender.sendMessage(new TextComponent("Reloading VotingPluginBungee"));
+				}
+				if (args[0].equalsIgnoreCase("vote")) {
+					if (args.length >= 2) {
+						String user = args[1];
+						String site = args[2];
+						bungee.saveVote(user, site);
+						sender.sendMessage(new TextComponent("Sending vote"));
+					}
+				}
+			}
+		} else {
+			sender.sendMessage(new TextComponent("You do not have permission to do this!"));
+		}
+	}
+}