Update version number to 6.3

Remove unused file
Improvements to interact event & more
2021-04-25 13:53:14 -04:00 · 2021-04-25 12:45:31 -04:00 · 2021-04-24 21:07:38 -04:00 · 2021-04-24 07:53:25 -04:00 · 2021-04-23 21:54:16 -04:00 · 2021-04-23 21:43:22 -04:00
65 changed files with 3557 additions and 879 deletions
@@ -5,6 +5,7 @@ daysUntilClose: 5
 # Issues with these labels will never be considered stale
 exemptLabels:
  - Priority
+  - nonstale
 # Label to use when marking an issue as stale
 staleLabel: stale
 # Comment to post when marking an issue as stale. Set to `false` to disable
@@ -7,10 +7,6 @@
 # Plugin using bungee, requires plugin on bungee server
 UseBungeecord: false

-# For pluginmessaging method only
-# Whether to broadcast on cached votes
-BungeeBroadcastAlways: false
-
 # What type of bungee setup
 # Requires restart and set on all servers
 # https://github.com/Ben12345rocks/VotingPlugin/wiki/Bungeecoord-Setups
@@ -26,11 +22,22 @@ BungeeDebug: false

 # Get the plugin to broadcast to all servers
 # If false you need to enable 
+# Only use for global rewards (one per network), otherwise you will get double broadcasts
 BungeeBroadcast: false

-# If true & AllowUnJoined is false (Config.yml) it will remove any invalid players
-# Not fully tested, could cause some trouble in some cases
-RemoveInvalidUsers: false
+# For pluginmessaging method only
+# Whether to broadcast on cached votes
+BungeeBroadcastAlways: false
+
+# If true, offline rewards will be stored per server, rather than global
+# This shouldn't need to be set unless you get alot of cross server rewards issues
+# You can also specify the server within the rewards
+# Requires server name below to be correct
+PerServerRewards: false
+
+# If true, plugin will trigger VotifierEvent
+# Should allow some compability with other plugins
+TriggerVotifierEvent: false

 # What server this is in bungee (must match)
 # Also can be applied to rewards
@@ -41,11 +48,13 @@ Server: PleaseSet
 # -----------------------------

 # Bungee communication, add bungee host/port here
+# For socket method
 BungeeServer:
  Host: '127.0.0.1'
  Port: 1297
  
 # Bungee communication, add this to bungee server
+# For socket method
 SpigotServer:
  Host: '127.0.0.1'
  Port: 1298
@@ -30,6 +30,35 @@ MySQL:
  Prefix: ''
  #UseSSL: true
  #PublicKeyRetrieval: false
+  
+# ---------------------------------------------------------
+# Mysql cache options 
+# Clearing cache forces the plugin to pull from database
+# Not needed unless you are using multiple servers
+# If using a bungee setup most of these options are overriden automatically
+# ---------------------------------------------------------
+
+# Clear cache on update, setting to true reduces update speed
+# Also may require AlwaysUpdate set to true
+ClearCacheOnUpdate: false
+
+# Clear cache on player join always
+ClearCacheOnJoin: false
+
+# Clears cache for the player who voted only
+# Only effects if using mysql
+# Would recommend for some bungee setups
+ClearCacheOnVote: false
+
+# Clear cache when player leaves
+ClearCacheOnLeave: false
+
+ClearCacheOnVoteShopPurchase: true
+
+# --------------------
+# AllowUnJoined options
+# May need to set to true for bungee setup
+# --------------------

 # Let players who never joined before vote
 # Recommend: False (Will prevent creating random user data)
@@ -108,6 +137,13 @@ Format:
  # Broadcast only when player is online
  BroadcastWhenOnline: false
  
+  # Broadcast every x number of minutes with number of players that voted
+  AlternateBroadcast:
+    Enabled: false
+    Broadcast: '&6[&4Broadcast&6] &2%numberofplayers% voted in the last half hour! /vote'
+    # Delay in minutes
+    Delay: 30
+  
  Commands:
    # Format for /vote
    # %num% = the number of the site, for a numbered list
@@ -217,6 +253,9 @@ Format:
        - '&3Highest Month Streak: &3&l%BestMonthlyStreak%'
        
      Today:
+        Title:
+        - "&cToday's Votes %page%/%maxpage%"
+        - '&cPlayerName : VoteSite : Time'
        Line: '&6%player% : %VoteSite% : %Time%'
        
      # PlaceHolders:
@@ -241,6 +280,9 @@ Format:
  # See https://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html
  TimeFormat: 'EEE, d MMM yyyy HH:mm'
  
+  # Reward time format for %date% placeholder (Time of giving reward)
+  RewardTimeFormat: 'EEE, d MMM yyyy HH:mm'
+  
  TimeFormats:
    Day: 'Day'
    Days: 'Days'
@@ -333,8 +375,8 @@ MaxiumNumberOfTopVotersToLoad: -1

 # When top voter awards are given (even if there are none listed) it will store top voters
 # Files will created in TopVoters folder.
+# Monthly top voters are always saved by default now
 StoreTopVoters:
-  Monthly: true
  Weekly: false
  Daily: false
    
@@ -343,6 +385,28 @@ StoreTopVoters:
 # Most of these values can be left untouched for most setups
 # ------------------------------------------------

+# If true vanished players are treated as if they are offline
+TreatVanishAsOffline: false
+
+# If true, cooldown check is disabled
+DisableCoolDownCheck: false
+
+# If true, disable PlayerInteractEvent (for clicking signs and skulls)
+DisableInteractEvent: false
+
+# Delays login event, delays vote reminding and more
+# In ticks
+DelayLoginEvent: 0
+
+# If false, votestreaks will be disabled
+UseVoteStreaks: true
+
+# If false, storing best totals will be disabled
+UseHighestTotals: true
+
+# If true, /vote will open /vote gui by default
+UseVoteGUIMainCommand: false
+
 # Number of points to give on vote
 # Set to 0 to give no points
 PointsOnVote: 1
@@ -355,6 +419,9 @@ AddTotals: true
 # If false, items will be given when there is space
 DropOnFullInv: true

+# If true, allsites will have an extra check to prevent duplicate allsites from being given
+ExtraAllSitesCheck: false
+
 # Click sound when using gui
 # Set to none for no sound
 ClickSound: 
@@ -385,6 +452,9 @@ PreventRepeatMilestones: false
 # Mainly to be used for alts and such
 UsePrimaryAccountForPlaceholders: false

+# If true, permissions will be handled differently
+MultiplePermissionsCheck: false
+
 AddCustomCommands: false

 # Injects custom command to /vote
@@ -516,6 +586,10 @@ UseVaultPermissions: false
 # - PERMISSION
 DisabledCommands: []

+# Enable Geyser prefix support
+GeyserPrefixSupport: false
+GeyserPrefix: '*'
+
 # Enable to true for extra player checks
 ExtraBackgroundUpdate: false

@@ -526,29 +600,6 @@ SpamClickTime: 350
 # Uncomment to use
 #SpamClickMessage: '&cDetected spam clicking GUI, closing to prevent exploits'

-# ---------------------------------------------------------
-# 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 cache on player join always
-ClearCacheOnJoin: false
-
-# Clears cache for the player who voted only
-# Only effects if using mysql
-# Would recommend for some bungee setups
-ClearCacheOnVote: false
-
-# Clear cache when player leaves
-ClearCacheOnLeave: false
-
-ClearCacheOnVoteShopPurchase: true
-
 # ###############################################################
 # Deprecated options, don't recommend using any of these

@@ -4,7 +4,7 @@
 #
 # GUI Methods:
 # - BOOK
-# - GUI
+# - CHEST
 # - CHAT (Disables GUI)
 GUIMethod:
  Today: CHEST #BOOK not available (future update?)
@@ -24,12 +24,13 @@ LastMonthGUI: false
 CHEST:
  # GUI for /vote gui, /vgui, /votegui
  VoteGUI:
-    # Items will be orders as it is below
+    # Items will be ordered as listed here
+    # You can add items following this format, even set slots
+    # See extra item below. GUI will auto resize to what is needed
    URL:
      # Standard item format, lore is automaticly applied 
      Item:
        Material: 'BOW'
-        Data: 0
        Amount: 1
        Name: '&4URL'
        Lore:
@@ -40,41 +41,45 @@ CHEST:
    Next:
      Item:
        Material: 'COMPASS'
-        Data: 0
        Amount: 1
        Name: '&4Next'
    Last:
      Item:
        Material: 'CLOCK'
-        Data: 0
        Amount: 1
        Name: '&4Last'
    Total:
      Item:
        Material: 'CHEST'
-        Data: 0
        Amount: 1
        Name: '&4Total'
    Top:
      Item:
        Material: 'OAK_SIGN'
-        Data: 0
        Amount: 1
        Name: '&4Top'
    Today:
      Item:
        Material: 'BOOK'
-        Data: 0
        Amount: 1
        Name: '&4Today'
    Shop:
      Item:
        Material: 'DIAMOND'
-        Data: 0
        Amount: 1
        Name: '&4Vote Shop'
        Lore:
        - '&aYou currently have %points% points'
+    # 'ExtraName' below is an identifier, can be whatever
+    # ExtraItem:
+      # Item:
+        # Material: 'DIRT'
+        # Amount: 1
+        # Name: 'Extra item'
+        ## Works on most GUI items
+        # Slot: 10
+        ## Send rewards on click, run commands, check conditions, etc
+        # Rewards: []
        
  # GUI for /vote url, /vote
  VoteURL:
@@ -82,10 +87,15 @@ CHEST:
    Name: '&cVoteURL'
    BackButton: true
    SiteName: '&c%Name%'
+    SiteNameCanVote: '&a%Name%'
    SeeURL: '&cClick to see URL'
    NextVote: '&cCan Vote In: %Info%'
+    #Start slot for specific site buttons
+    #StartSlot: 1
    ViewAllUrlsButtonEnabled: true
    AllUrlsButton:
+      #Set slot for AllUrlsButton
+      #Slot: 0
      RequireAllSitesVoted: true
      AlreadyVotedItem:
        Material: 'REDSTONE_BLOCK'
@@ -110,6 +120,14 @@ CHEST:
      Data: 0
      Amount: 1
    URLText: '%VoteUrl%'
+    # #Add Extra items
+    # ExtraItems:
+      # Item1:
+        # Material: DIRT
+        # Amount: 1
+        # Slot: 1
+        # #Can run commands or effects
+        # Rewards: []
    
  VoteLast:
    Name: 'VoteLast: %player%'
@@ -129,19 +147,22 @@ CHEST:
      Amount: 1
  VoteTop:
    Name: 'VoteTop %topvoter%'
-    BackButton: false
+    BackButton: true
+    # Item of top voter (change material below)
    Item:
      Name: '&3&l%position%: &3%player%'
      Lore: '&3&lVotes: &3%votes%'
+    # Opens main GUI of the specific player that gets clicked
+    OpenMainGUIOnClick: true
    SwitchItem:
      Name: '&3Switch TopVoter'
      Lore: '&bCurrently: %Top%'
      Material: 'OAK_SIGN'
      Amount: 1
      # 8 Slots over from the bottom left
+      # Bottom of GUI
      Slot: 7
-    # Number of topvoters to display on page +9
-    # 9 Slots on the botton are used for page buttons
+    # Number of topvoters to display on each GUI page, must be a multiple of 9
    Size: 27
    # If true, /vote top will show player heads
    UseSkull: true
@@ -245,6 +266,10 @@ CHEST:
    Data: 0
    Amount: 1
    Name: '&8Back to VoteGUI'
+    # If true, clicking back button will open VoteURL
+    OpenVoteURL: false
+    # If true, backbutton will be the last slot of the GUI
+    EndOfGUI: false

  VoteShopBackButton: true
  VoteShopEnabled: true
@@ -258,11 +283,11 @@ CHEST:
    # Identifier
    # Used in placeholders for formats
    # Do not have spaces in the identifier
+    # Change the identifier for each shop item
    Diamond:
      Identifier_Name: 'Diamond'
      # Item
      Material: 'DIAMOND'
-      Data: 0
      Amount: 1
      Name: '&4Buy A Diamond'
      # You can set skulls of the player using the following
@@ -291,6 +316,9 @@ CHEST:
      #NotBuyable: false
      # Rewards to run if player buys successfully
      Rewards:
+        # Run command on purchase
+        #Commands:
+        #- 'command here'
        Items:
          Diamond:
            Material: 'DIAMOND'
@@ -49,8 +49,12 @@ VoteParty:
  GiveAllPlayers: false
  # If true, the vote count will reset each day
  ResetEachDay: false
+  # If true, the vote count will reset each week
+  ResetWeekly: false
  # Reset at the end of the month
  ResetMonthly: false
+  # If true, will give voteparty only once per day
+  OnlyOncePerDay: false
  # Reset extra votes
  ResetExtraVotesMonthly: false
  # Count votes from /av vote?
@@ -66,7 +70,7 @@ VoteParty:
  Commands: []
  # Rewards to give per player
  Rewards: 
-    # Uncomment below for online player rewards only
+    # Uncomment below for online players to be rewarded only
    #RewardType: ONLINE
    Commands:
    - say %player%
@@ -133,6 +137,7 @@ VoteStreak:
    Month: 50
    
 # Reward given when vote cooldown ended
+# Using this is a little memory intensive
 VoteCoolDownEndedReward: []

 # ONLY USE THIS FOR TITLES/SOUNDS AND OTHER EFFECTS
@@ -141,14 +146,14 @@ VoteCoolDownEndedReward: []
 # It is recommended to add rewards to each site instead of here
 # Using forceoffline won't work here
 # Use EverySiteReward in VoteSites.yml for a global reward for each site
-AnySiteRewards: []
+AnySiteRewards: {}

 # Rewards to run when player logs in
-LoginRewards: []
+LoginRewards: {}

 # Rewards to run when player logs off
 # Will queue until player logs in unless forceoffline is enabled
-LogoutRewards: []
+LogoutRewards: {}

 EnableMonthlyAwards: true

@@ -15,6 +15,9 @@ VoteSites:
    # Used for sorted list
    # High prority, higher on the list
    Priority: 5
+    
+    # If true, voteside will be hidden from some GUI's, similar to being disabled
+    Hidden: false
          
    # The serviceName from the vote, has to be correct to work correctly
    # Gotten from voting on the site (will be in console/log)
@@ -44,6 +47,9 @@ VoteSites:
    # Recommend: false
    VoteDelayDaily: false
    
+    #Offset time for /vote next caculations
+    #TimeOffSet: 0
+    
    # If true, rewards can be executed offline (requires ForceOffline to be true in the reward)
    # Setting this to true will execute the reward offline while the player is offline
    # This basiclly disables offline voting if set to true, don't misinterpret this option
@@ -101,6 +107,12 @@ VoteSites:
        Fallback:
          Messages:
            Player: 'You got unlucky'
+            
+      # Give 1 diamond
+      Items:
+        item1:
+          Material: DIAMOND
+          Amount: 1

      Messages:
        Player: 'You voted'
@@ -108,4 +120,4 @@ VoteSites:
 # Reward for any site
 # Similar to AnySiteReward
 # This requires the site to be configured in order to get the reward.
-EverySiteReward: []
+EverySiteReward: {}
@@ -38,21 +38,44 @@ BlockedServers:
 # MYSQL
 BungeeMethod: PLUGINMESSAGING

-FallBackServer: factions
+# If false, votes will be checked if user is a valid player that has joined to server
+# Works for PLUGINMESSAGING and SOCKETS methods only
+# This requires spigot servers AllowUnJoined to be set to true in Config.yml
+AllowUnJoined: false
+
+# If true, bungee will handle adding totals
+# If false, spigot servers will EACH set their own totals
+# If false, AllowUnJoined should false on bungee, spigot servers will handle that
+# Recommened to leave true, setting to false setups are currently unsupported
+BungeeManageTotals: true

 # ----------------------------
-# SOCKET METHOD Settings
+# PLUGINMESSAGING Settings
+# ----------------------------
+
+# Applies to PLUGINMESSAGING & when SendVotesToAllServers is true
+# Votes will be forwarded when specific player is online
+WaitForUserOnline: false
+
+# ----------------------------
+# SOCKET Settings, do not touch otherwise
 # ----------------------------

 # Tell servers to broadcast
+# For socket method
 Broadcast: true

+# Server to send vote to if player is offline
+FallBackServer: factions
+
 # Bungee communication, Add this to each spigot server
+# For socket method
 BungeeServer:
  Host: '127.0.0.1'
  Port: 1297
  
 # Bungee communication, add each spigot server here
+# For socket method
 SpigotServers:
  lobby:
    Host: '127.0.0.1'
@@ -112,9 +112,6 @@ commands:
  adminvoteconfig:
    description: Command Alias
    aliases: avconfig
-  adminvotesettotal:
-    description: Command Alias
-    aliases: avsettotal
  adminvoteupdatecheck:
    description: Command Alias
    aliases: avupdatecheck
@@ -127,9 +124,6 @@ commands:
  adminvotegivereward:
    description: Command Alias
    aliases: avgivereward
-  adminvoteusers:
-    description: Command Alias
-    aliases: avusers
  adminvoteConvertFromData:
    description: Command Alias
    aliases: avConvertFromData
@@ -147,6 +141,20 @@ commands:
  adminvoteSetVotePartyCount:
    description: Command Alias
    aliases: avSetVotePartyCount
+  adminvoteChoices:
+    description: Command Alias
+    aliases: avChoices
+  adminvoteReloadAll:
+    description: Command Alias
+    aliases: avReloadAll
+  adminvotePermsPlayer:
+    description: Command Alias
+    aliases: avPermsPlayer
+  adminvoteResyncMilestonesAlreadyGiven:
+    description: Command Alias
+    aliases: avResyncMilestonesAlreadyGiven
+  voteSetPrimaryAccount:
+    description: Command Alias
  adminvoteClearOfflineVotes:
    description: Command Alias
    aliases: avClearOfflineVotes
@@ -215,9 +223,9 @@ permissions:
  VotingPlugin.Player:
    description: Allows basic access player commands
  VotingPlugin.Mod:
-    description: Allows mod access player commands
+    description: Allows mod commands
  VotingPlugin.Admin:
-    description: Allows admin access player commands
+    description: Allows admincommands
  VotingPlugin.Login.RemindVotes:
    description: Allows players to get remined on login if they can vote
    default: true
@@ -234,4 +242,9 @@ permissions:
    description: Permission to create sign
  VotingPlugin.Admin.GenerateServiceSite:
    description: Permission for generating votesite message
+  VotingPlugin.Login.RemindVotes:
+    description: Permission to allow timed reminders
+  VotingPlugin.Login.RemindVotes.Any:
+    description: Remind if player can vote on any website, rather than all
+    default: false
  
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>6.0.4</version>
+	<version>6.3</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -101,6 +101,7 @@
 				<version>2.4.3</version>
 				<configuration>
 					<shadedArtifactAttached>false</shadedArtifactAttached>
+					<minimizeJar>true</minimizeJar>
 					<relocations>
 						<!-- Lets relocate the shaded API so we dont cause any conflicts with 
 							other plugins -->
@@ -127,8 +128,8 @@
 							<shadedPattern>${project.groupId}.votingplugin.hikari</shadedPattern>
 						</relocation>
 						<relocation>
-							<pattern>org.slf4j.slf4j-simple</pattern>
-							<shadedPattern>${project.groupId}.votingplugin.slf4j-simple</shadedPattern>
+							<pattern>xyz.upperlevel.spigot.book</pattern>
+							<shadedPattern>${project.groupId}.votingplugin.upperlevel.book</shadedPattern>
 						</relocation>
 					</relocations>
 				</configuration>
@@ -227,14 +228,7 @@
 			<id>spigot-repo</id>
 			<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
 		</repository>
-		<repository>
-			<id>jitpack.io</id>
-			<url>https://jitpack.io</url>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
+
 		<repository>
 			<id>maven-central</id>
 			<url>https://oss.sonatype.org/content/groups/public</url>
@@ -243,11 +237,16 @@
 			<id>bungeecord-repo</id>
 			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
 		</repository>
+		<repository>
+			<id>velocity</id>
+			<url>https://nexus.velocitypowered.com/repository/maven-public/</url>
+		</repository>
 		<repository>
 			<id>bintray-repo</id>
-			<url>https://dl.bintray.com/nuvotifier/maven/</url>
+			<url>https://dl.bintray.com/ichbinjoe/public/</url>
 		</repository>
 	</repositories>
+
 	<dependencies>
 		<!--<dependency> <groupId>com.github.Ben12345rocks</groupId> <artifactId>AdvancedCore</artifactId> 
 			<version>3.0-SNAPSHOT</version> </dependency> -->
@@ -256,16 +255,9 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.16.4-R0.1-SNAPSHOT</version>
+			<version>1.16.5-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.vexsoftware</groupId>
-			<artifactId>votifier</artifactId>
-			<version>1.9</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/Jars/Votifier.jar</systemPath>
-		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
@@ -281,7 +273,7 @@
 		<dependency>
 			<groupId>com.vexsoftware</groupId>
 			<artifactId>nuvotifier-universal</artifactId>
-			<version>2.3.4</version>
+			<version>2.6.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -319,6 +311,16 @@
 					<version>master-SNAPSHOT</version>
 				</dependency>
 			</dependencies>
+			<repositories>
+				<repository>
+					<id>jitpack.io</id>
+					<url>https://jitpack.io</url>
+					<snapshots>
+						<enabled>true</enabled>
+						<updatePolicy>always</updatePolicy>
+					</snapshots>
+				</repository>
+			</repositories>
 		</profile>
 		<profile>
 			<id>prod2</id>
@@ -9,7 +9,9 @@ import com.bencodez.advancedcore.bungeeapi.pluginmessage.PluginMessageHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.ClientHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketHandler;
 import com.bencodez.advancedcore.bungeeapi.sockets.SocketReceiver;
+import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
+import com.bencodez.votingplugin.bungee.BungeeVersion;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
@@ -54,34 +56,47 @@ public class BungeeHandler {
 			plugin.getPluginMessaging().add(new PluginMessageHandler("Vote") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					String player = args.get(0);
-					String uuid = args.get(1);
-					String service = args.get(2);
-					long time = Long.parseLong(args.get(3));
-					plugin.debug("pluginmessaging vote received from " + player + " on " + service);
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
+					if (args.size() > 8) {
+						int bungeeVersion = Integer.parseInt(args.get(8));
+						if (bungeeVersion != BungeeVersion.getPluginMessageVersion()) {
+							plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
+							return;
+						}

-					boolean wasOnline = Boolean.valueOf(args.get(4));
+						String player = args.get(0);
+						String uuid = args.get(1);
+						String service = args.get(2);
+						long time = Long.parseLong(args.get(3));
+						plugin.debug("pluginmessaging vote received from " + player + "/" + uuid + " on " + service);
+						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
+								player);

-					String text = args.get(6);
+						boolean wasOnline = Boolean.valueOf(args.get(4));

-					user.clearCache();
+						BungeeMessageData text = new BungeeMessageData(args.get(6));

-					user.bungeeVotePluginMessaging(service, time, text);
+						boolean setTotals = Boolean.valueOf(args.get(7));

-					if (!plugin.getBungeeSettings().isBungeeBroadcast()) {
-						if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
-							VoteSite site = plugin.getVoteSite(service);
-							if (site != null) {
-								site.broadcastVote(user, false);
-							} else {
-								plugin.getLogger().warning("No votesite for " + service);
+						user.clearCache();
+
+						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline);
+
+						if (!plugin.getBungeeSettings().isBungeeBroadcast()) {
+							if (wasOnline || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
+								VoteSite site = plugin.getVoteSite(service);
+								if (site != null) {
+									site.broadcastVote(user, false);
+								} else {
+									plugin.getLogger().warning("No votesite for " + service);
+								}
 							}
 						}
-					}

-					if (args.size() > 4 && Boolean.valueOf(args.get(5))) {
-						plugin.getServerData().addServiceSite(service);
+						if (Boolean.valueOf(args.get(5))) {
+							plugin.getServerData().addServiceSite(service);
+						}
+					} else {
+						plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
 					}

 				}
@@ -90,30 +105,45 @@ public class BungeeHandler {
 			plugin.getPluginMessaging().add(new PluginMessageHandler("VoteOnline") {
 				@Override
 				public void onRecieve(String subChannel, ArrayList<String> args) {
-					String player = args.get(0);
-					String uuid = args.get(1);
-					String service = args.get(2);
-					long time = Long.parseLong(args.get(3));
-					String text = args.get(6);
-					plugin.debug("pluginmessaging voteonline received from " + player + " on " + service);
-					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid));
-					user.clearCache();
+					if (args.size() > 8) {
+						int bungeeVersion = Integer.parseInt(args.get(8));
+						if (bungeeVersion != BungeeVersion.getPluginMessageVersion()) {
+							plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
+							return;
+						}
+						String player = args.get(0);
+						String uuid = args.get(1);
+						String service = args.get(2);
+						long time = Long.parseLong(args.get(3));
+						BungeeMessageData text = new BungeeMessageData(args.get(6));
+						plugin.debug(
+								"pluginmessaging voteonline received from " + player + "/" + uuid + " on " + service);
+						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(UUID.fromString(uuid),
+								player);
+						user.clearCache();

-					user.bungeeVotePluginMessaging(service, time, text);
+						boolean setTotals = Boolean.valueOf(args.get(7));

-					if (!plugin.getBungeeSettings().isBungeeBroadcast()) {
-						if (Boolean.valueOf(args.get(4)) || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
-							VoteSite site = plugin.getVoteSite(service);
-							if (site != null) {
-								site.broadcastVote(user, false);
-							} else {
-								plugin.getLogger().warning("No votesite for " + service);
+						boolean wasOnline = Boolean.valueOf(args.get(4));
+
+						user.bungeeVotePluginMessaging(service, time, text, !setTotals, wasOnline);
+
+						if (!plugin.getBungeeSettings().isBungeeBroadcast()) {
+							if (Boolean.valueOf(args.get(4)) || plugin.getBungeeSettings().isBungeeBroadcastAlways()) {
+								VoteSite site = plugin.getVoteSite(service);
+								if (site != null) {
+									site.broadcastVote(user, false);
+								} else {
+									plugin.getLogger().warning("No votesite for " + service);
+								}
 							}
 						}
-					}

-					if (args.size() > 4 && Boolean.valueOf(args.get(5))) {
-						plugin.getServerData().addServiceSite(service);
+						if (Boolean.valueOf(args.get(5))) {
+							plugin.getServerData().addServiceSite(service);
+						}
+					} else {
+						plugin.getLogger().warning("Incompatible version with bungee, please update all servers");
 					}
 				}
 			});
@@ -147,6 +177,15 @@ public class BungeeHandler {
 				}
 			});

+			plugin.getPluginMessaging().add(new PluginMessageHandler("Status") {
+				@Override
+				public void onRecieve(String subChannel, ArrayList<String> args) {
+					String server = args.get(0);
+					plugin.getPluginMessaging().sendPluginMessage("statusokay", server);
+
+				}
+			});
+
 		} else if (method.equals(BungeeMethod.SOCKETS)) {
 			encryptionHandler = new EncryptionHandler(new File(plugin.getDataFolder(), "secretkey.key"));

@@ -162,7 +201,7 @@ public class BungeeHandler {

 				@Override
 				public void onReceive(String[] data) {
-					if (data.length > 3) {
+					if (data.length > 5) {
 						plugin.extraDebug("BungeeVote from " + data[2] + ", processing");
 						String uuid = data[1];
 						VotingPluginUser user = null;
@@ -174,7 +213,7 @@ public class BungeeHandler {

 						user.clearCache();

-						user.bungeeVote(data[3]);
+						user.bungeeVote(data[3], new BungeeMessageData(data[4]), !Boolean.valueOf(data[5]));
 					}
 				}
 			});
@@ -183,7 +222,7 @@ public class BungeeHandler {

 				@Override
 				public void onReceive(String[] data) {
-					if (data.length > 3) {
+					if (data.length > 5) {
 						plugin.extraDebug("BungeeVoteOnline from " + data[2] + ", processing");
 						String uuid = data[1];
 						VotingPluginUser user = null;
@@ -195,7 +234,7 @@ public class BungeeHandler {

 						user.clearCache();

-						user.bungeeVoteOnline(data[3]);
+						user.bungeeVoteOnline(data[3], new BungeeMessageData(data[4]), !Boolean.valueOf(data[5]));
 					}
 				}
 			});
@@ -40,7 +40,9 @@ import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.javascript.JavascriptPlaceholderRequest;
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
+import com.bencodez.advancedcore.api.rewards.DirectlyDefinedReward;
 import com.bencodez.advancedcore.api.rewards.Reward;
+import com.bencodez.advancedcore.api.rewards.RewardEditData;
 import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardPlaceholderHandle;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInject;
@@ -52,6 +54,7 @@ import com.bencodez.advancedcore.api.user.UUID;
 import com.bencodez.advancedcore.api.user.UserStorage;
 import com.bencodez.advancedcore.logger.Logger;
 import com.bencodez.advancedcore.nms.NMSManager;
+import com.bencodez.votingplugin.broadcast.BroadcastHandler;
 import com.bencodez.votingplugin.commands.CommandLoader;
 import com.bencodez.votingplugin.commands.executers.CommandAdminVote;
 import com.bencodez.votingplugin.commands.executers.CommandVote;
@@ -66,7 +69,6 @@ import com.bencodez.votingplugin.config.SpecialRewardsConfig;
 import com.bencodez.votingplugin.cooldown.CoolDownCheck;
 import com.bencodez.votingplugin.data.ServerData;
 import com.bencodez.votingplugin.listeners.BlockBreak;
-import com.bencodez.votingplugin.listeners.PlayerCommandSendListener;
 import com.bencodez.votingplugin.listeners.PlayerInteract;
 import com.bencodez.votingplugin.listeners.PlayerJoinEvent;
 import com.bencodez.votingplugin.listeners.PlayerVoteListener;
@@ -85,7 +87,6 @@ import com.bencodez.votingplugin.user.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 import com.bencodez.votingplugin.voteparty.VoteParty;
 import com.bencodez.votingplugin.votereminding.VoteReminding;
-import com.vexsoftware.votifier.Votifier;

 import lombok.Getter;
 import lombok.Setter;
@@ -224,45 +225,23 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		}
 	}

-	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 (configFile.isFailedToRead() || configVoteSites.isFailedToRead()) {
+		if (configFile.isFailedToRead() || configVoteSites.isFailedToRead() || specialRewardsConfig.isFailedToRead()
+				|| bungeeSettings.isFailedToRead() || gui.isFailedToRead()) {
 			ymlError = true;
-		} else if (!configFile.isFailedToRead() && !configVoteSites.isFailedToRead()) {
+		} else {
 			ymlError = false;
 		}

-		if (configFile.isFailedToRead()) {
+		if (ymlError) {
 			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {

 				@Override
 				public void run() {
-					plugin.getLogger().severe("Failed to load Config.yml");
+					plugin.getLogger().severe("Failed to load a file, check startup log");
 				}
 			}, 10);
 		}
-
-		if (configVoteSites.isFailedToRead()) {
-			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
-
-				@Override
-				public void run() {
-					plugin.getLogger().severe("Failed to load VoteSites.yml");
-				}
-
-			}, 10);
-		}
 	}

 	public void convertDataStorage(UserStorage from, UserStorage to) {
@@ -506,17 +485,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					}
 				}, 1000, 1000 * 60 * configFile.getDelayBetweenUpdates());

-				getTimer().schedule(new TimerTask() {
-
-					@Override
-					public void run() {
-						if (plugin != null) {
-							coolDownCheck.checkAll();
-						} else {
-							cancel();
-						}
-					}
-				}, 1000 * 60 * 10, 1000 * 60 * 5);
+				coolDownCheck.load();

 				getTimer().schedule(new TimerTask() {

@@ -599,6 +568,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		registerCommands();
 		checkVotifier();
 		registerEvents();
+		loadDirectlyDefined();
 		checkUpdate = new CheckUpdate(this);
 		checkUpdate.startUp();
 		voteReminding = new VoteReminding(this);
@@ -635,9 +605,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {

 		// vote party
 		voteParty = new VoteParty(this);
-		if (specialRewardsConfig.getVotePartyEnabled()) {
-			voteParty.check();
-		}
 		voteParty.register();

 		topVoterHandler.register();
@@ -690,8 +657,11 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
 			getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
 			getMysql().alterColumnType("OfflineRewards", "MEDIUMTEXT");
+			getMysql().alterColumnType("DayVoteStreakLastUpdate", "MEDIUMTEXT");
+			if (getOptions().isPerServerRewards()) {
+				getMysql().alterColumnType("OfflineRewards" + getOptions().getServer(), "MEDIUMTEXT");
+			}
 		}
-
 		// Add rewards
 		RewardHandler.getInstance().addInjectedReward(new RewardInjectInt("Points", 0) {

@@ -706,10 +676,10 @@ public class VotingPluginMain extends AdvancedCorePlugin {

 					@Override
 					public void setValue(Player player, Number value) {
-						Reward reward = (Reward) getInv().getData("Reward");
-						reward.getConfig().set("Points", value.intValue());
+						RewardEditData reward = (RewardEditData) getInv().getData("Reward");
+						reward.setValue("Points", value.intValue());
 					}
-				})).validator(new RewardInjectValidator() {
+				}.addLore("Give player voting points"))).validator(new RewardInjectValidator() {

 					@Override
 					public void onValidate(Reward reward, RewardInject inject, ConfigurationSection data) {
@@ -748,6 +718,11 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			});
 		}

+		if (plugin.getConfigFile().isFormatAlternateBroadcastEnabled()) {
+			broadcastHandler = new BroadcastHandler(plugin, plugin.getConfigFile().getFormatAlternateBroadcastDelay());
+			plugin.debug("Using alternate broadcast method");
+		}
+
 		plugin.getLogger().info("Enabled VotingPlugin " + plugin.getDescription().getVersion());
 		if (getProfile().equals("dev")) {
 			plugin.getLogger().warning("Using dev build, this is not a stable build, use at your own risk");
@@ -774,7 +749,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			if (!contains) {
 				issues = false;
 				plugin.getLogger().warning("No vote has been recieved from " + site.getServiceSite()
-						+ ", may be an invalid service site. Vote on the site and look in console for a service site, if you get nothing then there is an issue with votifier");
+						+ ", may be an invalid service site. Please read: https://github.com/BenCodez/VotingPlugin/wiki/Votifier-Troubleshooting");
 			}
 		}

@@ -788,16 +763,442 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 				}
 			}, 30l);
 		}
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+	}
+
+	@Getter
+	private BroadcastHandler broadcastHandler;
+
+	public void loadDirectlyDefined() {
+		RewardHandler.getInstance().getDirectlyDefinedRewards().clear();
+		// AllSites reward
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("AllSites") {

 			@Override
-			public void run() {
-				if (!checkVotifierLoaded()) {
-					plugin.getLogger().warning("Detected votifier not loaded properly, check startup for details");
-				}
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
 			}
 		});

+		// FirstVote
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("FirstVote") {
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
+		});
+
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteReminding.Rewards") {
+
+			@Override
+			public void setData(String path, Object value) {
+				getConfigFile().setValue(path, value);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getConfigFile().getData();
+			}
+
+			@Override
+			public void save() {
+				getConfigFile().saveData();
+			}
+
+			@Override
+			public void createSection(String key) {
+				getConfigFile().saveData();
+			}
+		});
+
+		// vote cooldown ended
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteCoolDownEndedReward") {
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
+		});
+
+		// any site rewards
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("AnySiteRewards") {
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
+		});
+
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("EverySiteReward") {
+
+			@Override
+			public void setData(String path, Object value) {
+				getConfigVoteSites().setValue(path, value);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getConfigVoteSites().getData();
+			}
+
+			@Override
+			public void save() {
+				getConfigVoteSites().saveData();
+			}
+
+			@Override
+			public void createSection(String key) {
+				getConfigVoteSites().createSection(key);
+			}
+		});
+
+		// login rewards
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("LoginRewards") {
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
+		});
+
+		// logout rewards
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("LogoutRewards") {
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
+		});
+
+		// VoteParty
+		addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteParty.Rewards") {
+
+			@Override
+			public void setData(String path, Object value) {
+				getSpecialRewardsConfig().setValue(path, value);
+			}
+
+			@Override
+			public ConfigurationSection getFileData() {
+				return getSpecialRewardsConfig().getData();
+			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
+		});
+
+		// Cumulative rewards
+		for (String num : getSpecialRewardsConfig().getCumulativeVotes()) {
+			addDirectlyDefinedRewards(new DirectlyDefinedReward("Cumulative." + num + ".Rewards") {
+
+				@Override
+				public void setData(String path, Object value) {
+					getSpecialRewardsConfig().setValue(path, value);
+				}
+
+				@Override
+				public ConfigurationSection getFileData() {
+					return getSpecialRewardsConfig().getData();
+				}
+
+				@Override
+				public void save() {
+					getSpecialRewardsConfig().saveData();
+				}
+
+				@Override
+				public void createSection(String key) {
+					getSpecialRewardsConfig().createSection(key);
+				}
+			});
+		}
+
+		// Milestones rewards
+		for (String num : getSpecialRewardsConfig().getMilestoneVotes()) {
+			addDirectlyDefinedRewards(new DirectlyDefinedReward("MileStones." + num + ".Rewards") {
+
+				@Override
+				public void setData(String path, Object value) {
+					getSpecialRewardsConfig().setValue(path, value);
+				}
+
+				@Override
+				public ConfigurationSection getFileData() {
+					return getSpecialRewardsConfig().getData();
+				}
+
+				@Override
+				public void save() {
+					getSpecialRewardsConfig().saveData();
+				}
+
+				@Override
+				public void createSection(String key) {
+					getSpecialRewardsConfig().createSection(key);
+				}
+			});
+		}
+
+		// VoteSites
+		for (VoteSite site : plugin.getVoteSites()) {
+			addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteSites." + site.getKey() + ".Rewards") {
+
+				@Override
+				public void setData(String path, Object value) {
+					getConfigVoteSites().setValue(path, value);
+				}
+
+				@Override
+				public ConfigurationSection getFileData() {
+					return getConfigVoteSites().getData();
+				}
+
+				@Override
+				public void save() {
+					getConfigVoteSites().saveData();
+				}
+
+				@Override
+				public void createSection(String key) {
+					getConfigVoteSites().createSection(key);
+				}
+			});
+		}
+
+		// vote streaks
+		String[] types = new String[] { "Day", "Week", "Month" };
+		for (String type : types) {
+			for (String str : plugin.getSpecialRewardsConfig().getVoteStreakVotes(type)) {
+				addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteStreak." + type + "." + str + ".Rewards") {
+
+					@Override
+					public void setData(String path, Object value) {
+						getSpecialRewardsConfig().setValue(path, value);
+					}
+
+					@Override
+					public ConfigurationSection getFileData() {
+						return getSpecialRewardsConfig().getData();
+					}
+
+					@Override
+					public void save() {
+						getSpecialRewardsConfig().saveData();
+					}
+
+					@Override
+					public void createSection(String key) {
+						getSpecialRewardsConfig().createSection(key);
+					}
+				});
+			}
+		}
+
+		for (String path : plugin.getSpecialRewardsConfig().getMonthlyPossibleRewardPlaces()) {
+			addDirectlyDefinedRewards(
+					new DirectlyDefinedReward(plugin.getSpecialRewardsConfig().getMonthlyAwardRewardsPath(path)) {
+
+						@Override
+						public void setData(String path, Object value) {
+							getSpecialRewardsConfig().setValue(path, value);
+						}
+
+						@Override
+						public ConfigurationSection getFileData() {
+							return getSpecialRewardsConfig().getData();
+						}
+
+						@Override
+						public void save() {
+							getSpecialRewardsConfig().saveData();
+						}
+
+						@Override
+						public void createSection(String key) {
+							getSpecialRewardsConfig().createSection(key);
+						}
+					});
+		}
+
+		for (String path : plugin.getSpecialRewardsConfig().getWeeklyPossibleRewardPlaces()) {
+			addDirectlyDefinedRewards(
+					new DirectlyDefinedReward(plugin.getSpecialRewardsConfig().getWeeklyAwardRewardsPath(path)) {
+
+						@Override
+						public void setData(String path, Object value) {
+							getSpecialRewardsConfig().setValue(path, value);
+						}
+
+						@Override
+						public ConfigurationSection getFileData() {
+							return getSpecialRewardsConfig().getData();
+						}
+
+						@Override
+						public void save() {
+							getSpecialRewardsConfig().saveData();
+						}
+
+						@Override
+						public void createSection(String key) {
+							getSpecialRewardsConfig().createSection(key);
+						}
+					});
+		}
+
+		for (String path : plugin.getSpecialRewardsConfig().getDailyPossibleRewardPlaces()) {
+			addDirectlyDefinedRewards(
+					new DirectlyDefinedReward(plugin.getSpecialRewardsConfig().getDailyAwardRewardsPath(path)) {
+
+						@Override
+						public void setData(String path, Object value) {
+							getSpecialRewardsConfig().setValue(path, value);
+						}
+
+						@Override
+						public ConfigurationSection getFileData() {
+							return getSpecialRewardsConfig().getData();
+						}
+
+						@Override
+						public void save() {
+							getSpecialRewardsConfig().saveData();
+						}
+
+						@Override
+						public void createSection(String key) {
+							getSpecialRewardsConfig().createSection(key);
+						}
+					});
+		}
+
+		for (String identifier : plugin.getGui().getChestShopIdentifiers()) {
+			addDirectlyDefinedRewards(new DirectlyDefinedReward("CHEST.Shop." + identifier + ".Rewards") {
+
+				@Override
+				public void setData(String path, Object value) {
+					getGui().setValue(path, value);
+				}
+
+				@Override
+				public ConfigurationSection getFileData() {
+					return getGui().getData();
+				}
+
+				@Override
+				public void save() {
+					getGui().saveData();
+				}
+
+				@Override
+				public void createSection(String key) {
+					getGui().createSection(key);
+				}
+			});
+		}
+
+	}
+
+	private void addDirectlyDefinedRewards(DirectlyDefinedReward directlyDefinedReward) {
+		RewardHandler.getInstance().addDirectlyDefined(directlyDefinedReward);
 	}

 	/*
@@ -897,11 +1298,15 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		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);
-		if (!NMSManager.getInstance().isVersion("1.12")) {
-			pm.registerEvents(new PlayerCommandSendListener(this), this);
+		if (!plugin.getConfigFile().isDisableInteractEvent()) {
+			pm.registerEvents(new PlayerInteract(this), this);
 		}
+
+		pm.registerEvents(new VotingPluginUpdateEvent(this), this);
+		/*
+		 * if (!NMSManager.getInstance().isVersion("1.12")) { pm.registerEvents(new
+		 * PlayerCommandSendListener(this), this); }
+		 */
 		coolDownCheck = new CoolDownCheck(this);
 		pm.registerEvents(coolDownCheck, this);

@@ -936,12 +1341,17 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		bungeeSettings.reloadData();
 		checkYMLError();

+		if (broadcastHandler != null) {
+			broadcastHandler.schelude(getConfigFile().getFormatAlternateBroadcastDelay());
+		}
+
 		updateAdvancedCoreHook();
 		plugin.loadVoteSites();
+		loadDirectlyDefined();
 		reloadAdvancedCore(userStorage);
 		getOptions().setServer(bungeeSettings.getServer());
 		placeholders.load();
-		coolDownCheck.checkAll();
+
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {

 			@Override
@@ -1048,6 +1458,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		setConfigData(configFile.getData());
 		if (bungeeSettings.isUseBungeecoord()) {
 			getOptions().setClearCacheOnJoin(true);
+			getOptions().setPerServerRewards(getBungeeSettings().isPerServerRewards());
 		}
 	}

@@ -1057,13 +1468,15 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		for (VotingPluginUser user : users) {
 			HashMap<VoteSite, LocalDateTime> times = new HashMap<VoteSite, LocalDateTime>();
 			for (VoteSite voteSite : plugin.getVoteSites()) {
-				long time = user.getTime(voteSite);
-				if ((LocalDateTime.now().getDayOfMonth() == MiscUtils.getInstance().getDayFromMili(time))
-						&& (LocalDateTime.now().getMonthValue() == MiscUtils.getInstance().getMonthFromMili(time))
-						&& (LocalDateTime.now().getYear() == MiscUtils.getInstance().getYearFromMili(time))) {
-
-					times.put(voteSite, LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault()));
+				if (!voteSite.isHidden()) {
+					long time = user.getTime(voteSite);
+					if ((LocalDateTime.now().getDayOfMonth() == MiscUtils.getInstance().getDayFromMili(time))
+							&& (LocalDateTime.now().getMonthValue() == MiscUtils.getInstance().getMonthFromMili(time))
+							&& (LocalDateTime.now().getYear() == MiscUtils.getInstance().getYearFromMili(time))) {

+						times.put(voteSite,
+								LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault()));
+					}
 				}
 			}
 			if (times.keySet().size() > 0) {
@@ -0,0 +1,67 @@
+package com.bencodez.votingplugin.broadcast;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.misc.MiscUtils;
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.user.UserManager;
+
+public class BroadcastHandler {
+	ConcurrentLinkedQueue<String> votedPlayers = new ConcurrentLinkedQueue<String>();
+	private Timer timer;
+	private VotingPluginMain plugin;
+
+	public BroadcastHandler(VotingPluginMain plugin, int delay) {
+		this.plugin = plugin;
+		schelude(delay);
+	}
+
+	public void schelude(int delay) {
+		if (timer != null) {
+			timer.cancel();
+		} else {
+			timer = new Timer();
+		}
+		timer.schedule(new TimerTask() {
+
+			@Override
+			public void run() {
+				check();
+			}
+		}, 1000 * 60, 1000 * 60 * delay);
+	}
+
+	public void onVote(String player) {
+		votedPlayers.add(player);
+	}
+
+	public void check() {
+		int size = votedPlayers.size();
+		if (size > 0) {
+			for (int i = 0; i < size; i++) {
+				votedPlayers.poll();
+			}
+			String bc = StringParser.getInstance()
+					.colorize(plugin.getConfigFile().getFormatAlternateBroadcastBroadcast());
+			HashMap<String, String> placeholders = new HashMap<String, String>();
+			placeholders.put("numberofplayers", "" + size);
+			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);
+		}
+	}
+}
@@ -0,0 +1,53 @@
+package com.bencodez.votingplugin.bungee;
+
+import java.util.regex.Pattern;
+
+import lombok.Getter;
+
+public class BungeeMessageData {
+
+	// Message string
+	// alltimetotal//monthtotal//weeklytotal//dailytotal//points//milestonecount
+
+	@Getter
+	private int allTimeTotal = 0;
+	@Getter
+	private int monthTotal = 0;
+	@Getter
+	private int weeklyTotal = 0;
+	@Getter
+	private int dailyTotal = 0;
+	@Getter
+	private int points = 0;
+	@Getter
+	private int milestoneCount = 0;
+
+	public BungeeMessageData(String str) {
+		String[] data = str.split(Pattern.quote("//"));
+		if (data.length >= 6) {
+			allTimeTotal = Integer.parseInt(data[0]);
+			monthTotal = Integer.parseInt(data[1]);
+			weeklyTotal = Integer.parseInt(data[2]);
+			dailyTotal = Integer.parseInt(data[3]);
+			points = Integer.parseInt(data[4]);
+			milestoneCount = Integer.parseInt(data[5]);
+		}
+	}
+
+	@Override
+	public String toString() {
+		return allTimeTotal + "//" + monthTotal + "//" + weeklyTotal + "//" + dailyTotal + "//" + points + "//"
+				+ milestoneCount;
+	}
+
+	public BungeeMessageData(int allTimeTotal, int monthTotal, int weeklyTotal, int dailyTotal, int points,
+			int milestoneCount) {
+		this.allTimeTotal = allTimeTotal;
+		this.monthTotal = monthTotal;
+		this.weeklyTotal = weeklyTotal;
+		this.dailyTotal = dailyTotal;
+		this.points = points;
+		this.milestoneCount = milestoneCount;
+	}
+
+}
@@ -0,0 +1,7 @@
+package com.bencodez.votingplugin.bungee;
+
+public class BungeeVersion {
+	public static int getPluginMessageVersion() {
+		return 1;
+	}
+}
@@ -29,6 +29,18 @@ public class Config {
 		return getData().getBoolean("Broadcast", false);
 	}

+	public boolean getWaitForUserOnline() {
+		return getData().getBoolean("WaitForUserOnline", false);
+	}
+
+	public boolean getBungeeManageTotals() {
+		return getData().getBoolean("BungeeManageTotals", true);
+	}
+
+	public boolean getAllowUnJoined() {
+		return getData().getBoolean("AllowUnJoined", false);
+	}
+
 	public String getBungeeHost() {
 		return getData().getString("BungeeServer.Host", "");
 	}
@@ -0,0 +1,94 @@
+package com.bencodez.votingplugin.bungee;
+
+import java.io.File;
+import java.io.IOException;
+
+import lombok.Getter;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.config.Configuration;
+import net.md_5.bungee.config.ConfigurationProvider;
+import net.md_5.bungee.config.YamlConfiguration;
+
+public class NonVotedPlayersCache {
+	private VotingPluginBungee bungee;
+	@Getter
+	private Configuration data;
+
+	public NonVotedPlayersCache(VotingPluginBungee bungee) {
+		this.bungee = bungee;
+	}
+
+	public void addPlayer(ProxiedPlayer proxiedPlayer) {
+		if (!bungee.getMysql().containsKeyQuery(proxiedPlayer.getUniqueId().toString())) {
+			addPlayer(proxiedPlayer.getUniqueId().toString(), proxiedPlayer.getName());
+		}
+	}
+
+	private void addPlayer(String uuid, String playerName) {
+		getData().set("NonVotedPlayers." + playerName + ".UUID", uuid);
+		getData().set("NonVotedPlayers." + playerName + ".LastTime", System.currentTimeMillis());
+	}
+
+	public String playerExists(String playerName) {
+		if (getData().getSection("NonVotedPlayers").getKeys().contains(playerName)) {
+			return getData().getString("NonVotedPlayers." + playerName + ".UUID", "");
+		}
+		return "";
+	}
+
+	private void remove(String player) {
+		bungee.debug("Removing nonvotedplayer: " + player);
+		getData().set("NonVotedPlayers." + player, null);
+	}
+
+	public void check() {
+		for (String player : getData().getSection("NonVotedPlayers").getKeys()) {
+			long time = getData().getLong("NonVotedPlayers." + player + ".LastTime", 0);
+			if ((System.currentTimeMillis() - time) > 1000 * 60 * 60 * 24 * 5) {
+				remove(player);
+			} else {
+				String uuid = getData().getString("NonVotedPlayers." + player + ".UUID", "");
+				if (!uuid.isEmpty()) {
+					if (bungee.getMysql().containsKeyQuery(uuid)) {
+						remove(player);
+					}
+				} else {
+					remove(player);
+				}
+			}
+		}
+		save();
+	}
+
+	public void load() {
+		if (!bungee.getDataFolder().exists()) {
+			bungee.getDataFolder().mkdir();
+		}
+
+		File file = new File(bungee.getDataFolder(), "nonvotedplayerscache.yml");
+
+		if (!file.exists()) {
+			try {
+				file.createNewFile();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		try {
+			data = ConfigurationProvider.getProvider(YamlConfiguration.class)
+					.load(new File(bungee.getDataFolder(), "nonvotedplayerscache.yml"));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void save() {
+		try {
+			ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
+					new File(bungee.getDataFolder(), "nonvotedplayerscache.yml"));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+}
@@ -26,4 +26,9 @@ public class OfflineBungeeVote {
 		this.text = text;
 	}

+	@Override
+	public String toString() {
+		return "VoteCache:" + playerName + "/" + uuid + "/" + service + "/" + time + "/" + realVote + "/" + text;
+	}
+
 }
@@ -0,0 +1,23 @@
+package com.bencodez.votingplugin.bungee;
+
+import com.vexsoftware.votifier.bungee.events.VotifierEvent;
+import com.vexsoftware.votifier.model.Vote;
+
+import net.md_5.bungee.event.EventHandler;
+
+public class VoteEventBungee implements net.md_5.bungee.api.plugin.Listener {
+	private VotingPluginBungee plugin;
+
+	public VoteEventBungee(VotingPluginBungee plugin) {
+		this.plugin = plugin;
+	}
+
+	@EventHandler
+	public void onVote(VotifierEvent event) {
+		Vote vote = event.getVote();
+		plugin.getLogger().info("Vote received " + vote.getUsername() + " from service site " + vote.getServiceName());
+
+		plugin.vote(vote.getUsername(), vote.getServiceName(), true);
+
+	}
+}
@@ -29,20 +29,20 @@ import com.bencodez.advancedcore.bungeeapi.sockets.SocketReceiver;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.vexsoftware.votifier.bungee.events.VotifierEvent;
-import com.vexsoftware.votifier.model.Vote;

 import lombok.Getter;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.connection.Server;
 import net.md_5.bungee.api.event.PluginMessageEvent;
+import net.md_5.bungee.api.event.PostLoginEvent;
 import net.md_5.bungee.api.event.ServerConnectedEvent;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.event.EventHandler;

-public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.plugin.Listener {
+public class VotingPluginBungee extends Plugin {

 	private HashMap<String, ArrayList<OfflineBungeeVote>> cachedOnlineVotes = new HashMap<String, ArrayList<OfflineBungeeVote>>();

@@ -65,35 +65,60 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl

 	private VoteCache voteCacheFile;

+	private NonVotedPlayersCache nonVotedPlayersCache;
+
 	public void checkCachedVotes(String server) {
 		if (getProxy().getServerInfo(server) != null) {
 			if (!getProxy().getServerInfo(server).getPlayers().isEmpty()) {
 				if (cachedVotes.containsKey(server) && !config.getBlockedServers().contains(server)) {
 					ArrayList<OfflineBungeeVote> c = cachedVotes.get(server);
+					ArrayList<OfflineBungeeVote> newSet = new ArrayList<OfflineBungeeVote>();
 					if (!c.isEmpty()) {
 						for (OfflineBungeeVote cache : c) {
-							sendPluginMessageServer(server, "Vote", cache.getPlayerName(), cache.getUuid(),
-									cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
-									"" + cache.isRealVote(), cache.getText());
+							boolean toSend = true;
+							if (getConfig().getWaitForUserOnline()) {
+								ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(cache.getUuid()));
+								if (p == null || !p.isConnected()) {
+									toSend = false;
+								} else if (p != null && p.isConnected()
+										&& !p.getServer().getInfo().getName().equals(server)) {
+									toSend = false;
+								}
+
+							}
+							if (toSend) {
+								sendPluginMessageServer(server, "Vote", cache.getPlayerName(), cache.getUuid(),
+										cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
+										"" + cache.isRealVote(), cache.getText(),
+										"" + getConfig().getBungeeManageTotals(),
+										"" + BungeeVersion.getPluginMessageVersion());
+							} else {
+								debug("Not sending vote because user isn't on server " + server + ": "
+										+ cache.toString());
+								newSet.add(cache);
+							}
 						}
-						cachedVotes.put(server, new ArrayList<OfflineBungeeVote>());
+						cachedVotes.put(server, newSet);
 					}
 				}
 			}
 		}
+
 	}

-	public void checkOnlineVotes(ProxiedPlayer player, String uuid) {
+	public void checkOnlineVotes(ProxiedPlayer player, String uuid, String server) {
 		if (player != null && player.isConnected() && cachedOnlineVotes.containsKey(uuid)) {
 			ArrayList<OfflineBungeeVote> c = cachedOnlineVotes.get(uuid);
 			if (!c.isEmpty()) {
-				String server = getProxy().getPlayer(UUID.fromString(uuid)).getServer().getInfo().getName();
+				if (server == null) {
+					server = getProxy().getPlayer(UUID.fromString(uuid)).getServer().getInfo().getName();
+				}
 				if (!config.getBlockedServers().contains(server)) {
 					for (OfflineBungeeVote cache : c) {
-
 						sendPluginMessageServer(server, "VoteOnline", cache.getPlayerName(), cache.getUuid(),
 								cache.getService(), "" + cache.getTime(), Boolean.FALSE.toString(),
-								"" + cache.isRealVote(), cache.getText());
+								"" + cache.isRealVote(), cache.getText(), "" + getConfig().getBungeeManageTotals(),
+								"" + BungeeVersion.getPluginMessageVersion());
 					}
 					cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
 				}
@@ -143,9 +168,14 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 		if (p != null && p.isConnected()) {
 			return p.getUniqueId().toString();
 		}
-		String str = mysql.getUUID(playerName);
-		if (str != null) {
-			return str;
+		if (mysql != null) {
+			String str = mysql.getUUID(playerName);
+			if (str != null) {
+				return str;
+			}
+		}
+		if (nonVotedPlayersCache != null) {
+			return nonVotedPlayersCache.playerExists(playerName);
 		}
 		return "";
 	}
@@ -170,7 +200,7 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 				return num;
 			}
 		}
-		return -1;
+		return 0;
 	}

 	private int mysqlUpdate(ArrayList<Column> cols, String uuid, String column, int toAdd) {
@@ -199,53 +229,80 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 					num++;
 				}
 			}
+			nonVotedPlayersCache.save();
 		}
 	}

+	private boolean votifierEnabled = true;
+
 	@Override
 	public void onEnable() {
-		getProxy().getPluginManager().registerListener(this, this);
+		try {
+			Class.forName("com.vexsoftware.votifier.bungee.events.VotifierEvent");
+		} catch (ClassNotFoundException e) {
+			votifierEnabled = false;
+			getLogger().warning("Votifier event not found, not loading votifier event");
+		}
+		if (votifierEnabled) {
+			try {
+				getProxy().getPluginManager().registerListener(this, new VoteEventBungee(this));
+			} catch (Exception e) {
+			}
+		}
 		config = new Config(this);
 		config.load();

-		mysql = new BungeeMySQL("VotingPlugin_Users", config.getData());
+		try {
+			mysql = new BungeeMySQL("VotingPlugin_Users", config.getData());

-		// column types
-		getMysql().alterColumnType("TopVoterIgnore", "VARCHAR(5)");
-		getMysql().alterColumnType("CheckWorld", "VARCHAR(5)");
-		getMysql().alterColumnType("Reminded", "VARCHAR(5)");
-		getMysql().alterColumnType("DisableBroadcast", "VARCHAR(5)");
-		getMysql().alterColumnType("LastOnline", "VARCHAR(20)");
-		getMysql().alterColumnType("PlayerName", "VARCHAR(30)");
-		getMysql().alterColumnType("DailyTotal", "INT DEFAULT '0'");
-		getMysql().alterColumnType("WeeklyTotal", "INT DEFAULT '0'");
-		getMysql().alterColumnType("DayVoteStreak", "INT DEFAULT '0'");
-		getMysql().alterColumnType("BestDayVoteStreak", "INT DEFAULT '0'");
-		getMysql().alterColumnType("WeekVoteStreak", "INT DEFAULT '0'");
-		getMysql().alterColumnType("BestWeekVoteStreak", "INT DEFAULT '0'");
-		getMysql().alterColumnType("VotePartyVotes", "INT DEFAULT '0'");
-		getMysql().alterColumnType("MonthVoteStreak", "INT DEFAULT '0'");
-		getMysql().alterColumnType("Points", "INT DEFAULT '0'");
-		getMysql().alterColumnType("HighestDailyTotal", "INT DEFAULT '0'");
-		getMysql().alterColumnType("AllTimeTotal", "INT DEFAULT '0'");
-		getMysql().alterColumnType("HighestMonthlyTotal", "INT DEFAULT '0'");
-		getMysql().alterColumnType("MilestoneCount", "INT DEFAULT '0'");
-		getMysql().alterColumnType("MonthTotal", "INT DEFAULT '0'");
-		getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
-		getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
-		getMysql().alterColumnType("OfflineRewards", "MEDIUMTEXT");
+			// column types
+			getMysql().alterColumnType("TopVoterIgnore", "VARCHAR(5)");
+			getMysql().alterColumnType("CheckWorld", "VARCHAR(5)");
+			getMysql().alterColumnType("Reminded", "VARCHAR(5)");
+			getMysql().alterColumnType("DisableBroadcast", "VARCHAR(5)");
+			getMysql().alterColumnType("LastOnline", "VARCHAR(20)");
+			getMysql().alterColumnType("PlayerName", "VARCHAR(30)");
+			getMysql().alterColumnType("DailyTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("WeeklyTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("DayVoteStreak", "INT DEFAULT '0'");
+			getMysql().alterColumnType("BestDayVoteStreak", "INT DEFAULT '0'");
+			getMysql().alterColumnType("WeekVoteStreak", "INT DEFAULT '0'");
+			getMysql().alterColumnType("BestWeekVoteStreak", "INT DEFAULT '0'");
+			getMysql().alterColumnType("VotePartyVotes", "INT DEFAULT '0'");
+			getMysql().alterColumnType("MonthVoteStreak", "INT DEFAULT '0'");
+			getMysql().alterColumnType("Points", "INT DEFAULT '0'");
+			getMysql().alterColumnType("HighestDailyTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("AllTimeTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("HighestMonthlyTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("MilestoneCount", "INT DEFAULT '0'");
+			getMysql().alterColumnType("MonthTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
+			getMysql().alterColumnType("OfflineRewards", "MEDIUMTEXT");
+			getMysql().alterColumnType("DayVoteStreakLastUpdate", "MEDIUMTEXT");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}

 		getProxy().getPluginManager().registerCommand(this, new VotingPluginBungeeCommand(this));

 		method = BungeeMethod.getByName(config.getBungeeMethod());
+		if (method == null) {
+			method = BungeeMethod.PLUGINMESSAGING;
+		}
+
+		this.getProxy().registerChannel("vp:vp");

 		if (method.equals(BungeeMethod.MYSQL)) {
-			this.getProxy().registerChannel("vp:vp");
+			// this.getProxy().registerChannel("vp:vp");

 		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
 			voteCacheFile = new VoteCache(this);
 			voteCacheFile.load();

+			nonVotedPlayersCache = new NonVotedPlayersCache(this);
+			nonVotedPlayersCache.load();
+
 			try {
 				for (String server : voteCacheFile.getServers()) {
 					ArrayList<OfflineBungeeVote> vote = new ArrayList<OfflineBungeeVote>();
@@ -287,12 +344,21 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 					}

 					for (String player : cachedOnlineVotes.keySet()) {
-						checkOnlineVotes(getProxy().getPlayer(UUID.fromString(player)), player);
+						checkOnlineVotes(getProxy().getPlayer(UUID.fromString(player)), player, null);
 					}
 				}
-			}, 15l, TimeUnit.SECONDS);
+			}, 15l, 30l, TimeUnit.SECONDS);

-			this.getProxy().registerChannel("vp:vp");
+			getProxy().getScheduler().schedule(this, new Runnable() {
+
+				@Override
+				public void run() {
+					if (nonVotedPlayersCache != null) {
+						debug("Checking nonvotedplayers.yml...");
+						nonVotedPlayersCache.check();
+					}
+				}
+			}, 1l, 60l, TimeUnit.MINUTES);
 		} else if (method.equals(BungeeMethod.SOCKETS)) {
 			encryptionHandler = new EncryptionHandler(new File(getDataFolder(), "secretkey.key"));

@@ -355,6 +421,12 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 		if (!ev.getTag().equals("vp:vp".toLowerCase())) {
 			return;
 		}
+
+		ev.setCancelled(true);
+
+		if (!(ev.getSender() instanceof Server))
+			return;
+
 		ByteArrayInputStream instream = new ByteArrayInputStream(ev.getData());
 		DataInputStream in = new DataInputStream(instream);
 		try {
@@ -362,15 +434,31 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 			DataOutputStream out = new DataOutputStream(outstream);
 			String subchannel = in.readUTF();
 			int size = in.readInt();
-			out.writeUTF(subchannel);
-			out.writeInt(size);
-			for (int i = 0; i < size; i++) {
-				out.writeUTF(in.readUTF());
-			}
-			for (String send : getProxy().getServers().keySet()) {
-				if (getProxy().getServers().get(send).getPlayers().size() > 0) {
-					getProxy().getServers().get(send).sendData("vp:vp".toLowerCase(),
-							outstream.toByteArray());
+
+			// check for status message returns
+			if (subchannel.equalsIgnoreCase("statusokay")) {
+				String server = in.readUTF();
+				getLogger().info("Status okay for " + server);
+				return;
+			} else if (subchannel.equalsIgnoreCase("login")) {
+				String player = in.readUTF();
+				ProxiedPlayer p = getProxy().getPlayer(player);
+				String server = p.getServer().getInfo().getName();
+				checkCachedVotes(server);
+				checkOnlineVotes(p, p.getUniqueId().toString(), server);
+				return;
+			} else {
+
+				// reforward message
+				out.writeUTF(subchannel);
+				out.writeInt(size);
+				for (int i = 0; i < size; i++) {
+					out.writeUTF(in.readUTF());
+				}
+				for (String send : getProxy().getServers().keySet()) {
+					if (getProxy().getServers().get(send).getPlayers().size() > 0) {
+						getProxy().getServers().get(send).sendData("vp:vp".toLowerCase(), outstream.toByteArray());
+					}
 				}
 			}
 		} catch (Exception e) {
@@ -378,6 +466,13 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 		}
 	}

+	@EventHandler
+	public void onLogin(PostLoginEvent event) {
+		if (nonVotedPlayersCache != null) {
+			nonVotedPlayersCache.addPlayer(event.getPlayer());
+		}
+	}
+
 	@EventHandler
 	public void onServerConnected(ServerConnectedEvent event) {
 		final String server = event.getServer().getInfo().getName();
@@ -387,21 +482,12 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 			@Override
 			public void run() {
 				checkCachedVotes(server);
-				checkOnlineVotes(event.getPlayer(), uuid);
+				checkOnlineVotes(event.getPlayer(), uuid, server);
 			}

 		}, 2, TimeUnit.SECONDS);
 	}

-	@EventHandler
-	public void onVote(VotifierEvent event) {
-		Vote vote = event.getVote();
-		getLogger().info("Vote received " + vote.getUsername() + " from service site " + vote.getServiceName());
-
-		vote(vote.getUsername(), vote.getServiceName(), true);
-
-	}
-
 	private UUID parseUUIDFromString(String uuidAsString) {
 		String[] parts = { "0x" + uuidAsString.substring(0, 8), "0x" + uuidAsString.substring(8, 12),
 				"0x" + uuidAsString.substring(12, 16), "0x" + uuidAsString.substring(16, 20),
@@ -434,8 +520,7 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 				out.writeUTF(message);
 			}
 			if (getProxy().getServers().get(server).getPlayers().size() > 0) {
-				getProxy().getServers().get(server).sendData("vp:vp".toLowerCase(),
-						byteOutStream.toByteArray(), false);
+				getProxy().getServers().get(server).sendData("vp:vp".toLowerCase(), byteOutStream.toByteArray(), false);
 			}
 			out.close();
 		} catch (Exception e) {
@@ -458,11 +543,12 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 		}
 	}

-	public void sendSocketVote(String name, String service) {
+	public void sendSocketVote(String name, String service, BungeeMessageData text) {
 		String uuid = getUUID(name);

 		if (config.getSendVotesToAllServers()) {
-			sendServerMessage("bungeevote", uuid, name, service);
+			sendServerMessage("bungeevote", uuid, name, service, text.toString(),
+					"" + getConfig().getBungeeManageTotals());
 			if (config.getBroadcast()) {
 				sendServerMessage("BungeeBroadcast", service, uuid, name);
 			}
@@ -480,7 +566,8 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 				server = config.getFallBack();
 			}

-			sendServerMessageServer(server, "bungeevoteonline", uuid, name, service);
+			sendServerMessageServer(server, "bungeevoteonline", uuid, name, service, text.toString(),
+					"" + getConfig().getBungeeManageTotals());
 			if (config.getBroadcast()) {
 				sendServerMessage("BungeeBroadcast", service, uuid, name);
 			}
@@ -490,89 +577,144 @@ public class VotingPluginBungee extends Plugin implements net.md_5.bungee.api.pl
 	}

 	public void status(CommandSender sender) {
-		sendServerMessage("status");
+		if (method.equals(BungeeMethod.SOCKETS)) {
+			sendServerMessage("status");
+		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			for (String s : getProxy().getServers().keySet()) {
+				if (!config.getBlockedServers().contains(s)) {
+					ServerInfo info = getProxy().getServerInfo(s);
+					if (info.getPlayers().isEmpty()) {
+						getLogger().info("No players on server " + s + " to send test status message");
+					} else {
+						// send
+						getLogger().info("Sending request for status message on " + s);
+						sendPluginMessageServer(s, "Status", s);
+					}
+				} else {
+					getLogger().info("Ignoring blocked server " + s);
+				}
+			}
+		}
 	}

 	public void vote(String player, String service, boolean realVote) {
-		if (player == null || player.isEmpty()) {
-			getLogger().info("No name from vote on " + service);
-			return;
-		}
-		if (method.equals(BungeeMethod.SOCKETS)) {
-			sendSocketVote(player, service);
-		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+		try {
+			if (player == null || player.isEmpty()) {
+				getLogger().info("No name from vote on " + service);
+				return;
+			}
+
 			String uuid = getUUID(player);
 			if (uuid.isEmpty()) {
-				UUID u = null;
-				try {
-					u = fetchUUID(player);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-				if (u == null) {
-					debug("Failed to get uuid for " + player);
+				if (config.getAllowUnJoined()) {
+					UUID u = null;
+					try {
+						u = fetchUUID(player);
+					} catch (Exception e) {
+						if (getConfig().getDebug()) {
+							e.printStackTrace();
+						}
+					}
+					if (u == null) {
+						debug("Failed to get uuid for " + player);
+						return;
+					}
+					uuid = u.toString();
+				} else {
+					getLogger().info("Ignoring vote from " + player);
 					return;
 				}
-				uuid = u.toString();
 			}

 			player = getProperName(uuid, player);

-			if (!mysql.getUuids().contains(uuid)) {
-				mysql.update(uuid, "PlayerName", player, DataType.STRING);
+			BungeeMessageData text = null;
+
+			if (getConfig().getBungeeManageTotals()) {
+
+				if (!mysql.getUuids().contains(uuid)) {
+					mysql.update(uuid, "PlayerName", player, DataType.STRING);
+				}
+
+				ArrayList<Column> data = mysql.getExactQuery(new Column("uuid", uuid, DataType.STRING));
+
+				text = new BungeeMessageData(mysqlUpdate(data, uuid, "AllTimeTotal", 1),
+						mysqlUpdate(data, uuid, "MonthTotal", 1), mysqlUpdate(data, uuid, "WeeklyTotal", 1),
+						mysqlUpdate(data, uuid, "DailyTotal", 1), mysqlUpdate(data, uuid, "Points", 1),
+						mysqlUpdate(data, uuid, "MilestoneCount", 1));
+			} else {
+				text = new BungeeMessageData(0, 0, 0, 0, 0, 0);
 			}

-			ArrayList<Column> data = mysql.getExactQuery(new Column("uuid", uuid, DataType.STRING));
-
-			String text = mysqlUpdate(data, uuid, "AllTimeTotal", 1) + "//" + mysqlUpdate(data, uuid, "MonthTotal", 1)
-					+ "//" + mysqlUpdate(data, uuid, "WeeklyTotal", 1) + "//" + mysqlUpdate(data, uuid, "DailyTotal", 1)
-					+ "//" + mysqlUpdate(data, uuid, "Points", 1) + "//" + mysqlUpdate(data, uuid, "MilestoneCount", 1);
+			/*
+			 * String text = mysqlUpdate(data, uuid, "AllTimeTotal", 1) + "//" +
+			 * mysqlUpdate(data, uuid, "MonthTotal", 1) + "//" + mysqlUpdate(data, uuid,
+			 * "WeeklyTotal", 1) + "//" + mysqlUpdate(data, uuid, "DailyTotal", 1) + "//" +
+			 * mysqlUpdate(data, uuid, "Points", 1) + "//" + mysqlUpdate(data, uuid,
+			 * "MilestoneCount", 1);
+			 */

 			long time = LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();

-			if (config.getSendVotesToAllServers()) {
-				for (String s : getProxy().getServers().keySet()) {
-					if (!config.getBlockedServers().contains(s)) {
-						ServerInfo info = getProxy().getServerInfo(s);
-						if (info.getPlayers().isEmpty()) {
-							// cache
-							if (!cachedVotes.containsKey(s)) {
-								cachedVotes.put(s, new ArrayList<OfflineBungeeVote>());
+			if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+
+				if (config.getSendVotesToAllServers()) {
+					for (String s : getProxy().getServers().keySet()) {
+						if (!config.getBlockedServers().contains(s)) {
+							ServerInfo info = getProxy().getServerInfo(s);
+							boolean forceCache = false;
+							ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
+							if ((p == null || !p.isConnected()) && getConfig().getWaitForUserOnline()) {
+								forceCache = true;
+								debug("Forcing vote to cache");
 							}
-							ArrayList<OfflineBungeeVote> list = cachedVotes.get(s);
-							list.add(new OfflineBungeeVote(player, uuid, service, time, realVote, text));
-							cachedVotes.put(s, list);
+							if (info.getPlayers().isEmpty() || forceCache) {
+								// cache
+								if (!cachedVotes.containsKey(s)) {
+									cachedVotes.put(s, new ArrayList<OfflineBungeeVote>());
+								}
+								ArrayList<OfflineBungeeVote> list = cachedVotes.get(s);
+								list.add(new OfflineBungeeVote(player, uuid, service, time, realVote, text.toString()));
+								cachedVotes.put(s, list);

-							debug("Caching vote for " + player + " on " + service + " for " + s);
+								debug("Caching vote for " + player + " on " + service + " for " + s);

-						} else {
-							// send
-							sendPluginMessageServer(s, "Vote", player, uuid, service, "" + time,
-									Boolean.TRUE.toString(), "" + realVote, text);
+							} else {
+								// send
+								sendPluginMessageServer(s, "Vote", player, uuid, service, "" + time,
+										Boolean.TRUE.toString(), "" + realVote, text.toString(),
+										"" + getConfig().getBungeeManageTotals(),
+										"" + BungeeVersion.getPluginMessageVersion());
+							}
 						}
 					}
-				}
-			} else {
-				ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
-				if (p != null && p.isConnected()
-						&& !config.getBlockedServers().contains(p.getServer().getInfo().getName())) {
-					sendPluginMessageServer(p.getServer().getInfo().getName(), "VoteOnline", player, uuid, service,
-							"" + time, Boolean.TRUE.toString(), "" + realVote, text);
 				} else {
-					if (!cachedOnlineVotes.containsKey(uuid)) {
-						cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
+					ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
+					if (p != null && p.isConnected()
+							&& !config.getBlockedServers().contains(p.getServer().getInfo().getName())) {
+						sendPluginMessageServer(p.getServer().getInfo().getName(), "VoteOnline", player, uuid, service,
+								"" + time, Boolean.TRUE.toString(), "" + realVote, text.toString(),
+								"" + getConfig().getBungeeManageTotals(), "" + BungeeVersion.getPluginMessageVersion());
+					} else {
+						if (!cachedOnlineVotes.containsKey(uuid)) {
+							cachedOnlineVotes.put(uuid, new ArrayList<OfflineBungeeVote>());
+						}
+						ArrayList<OfflineBungeeVote> list = cachedOnlineVotes.get(uuid);
+						if (list == null) {
+							list = new ArrayList<OfflineBungeeVote>();
+						}
+						list.add(new OfflineBungeeVote(player, uuid, service, time, realVote, text.toString()));
+						cachedOnlineVotes.put(uuid, list);
+						debug("Caching online vote for " + player + " on " + service);
 					}
-					ArrayList<OfflineBungeeVote> list = cachedOnlineVotes.get(uuid);
-					if (list == null) {
-						list = new ArrayList<OfflineBungeeVote>();
-					}
-					list.add(new OfflineBungeeVote(player, uuid, service, time, realVote, text));
-					cachedOnlineVotes.put(uuid, list);
-					debug("Caching online vote for " + player + " on " + service);
 				}
+			} else if (method.equals(BungeeMethod.SOCKETS)) {
+				sendSocketVote(player, service, text);
 			}
-
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
+
 	}

 }
@@ -31,10 +31,14 @@ public class VotingPluginBungeeCommand extends Command {
 				if (args[0].equalsIgnoreCase("status")) {
 					if (bungee.getMethod().equals(BungeeMethod.SOCKETS)) {
 						sender.sendMessage(new TextComponent(
-								"Checking status, waiting for response, check console, only for socket method"));
+								"Checking status, waiting for response, check console, method: sockets"));
+						bungee.status(sender);
+					} else if (bungee.getMethod().equals(BungeeMethod.PLUGINMESSAGING)){
+						sender.sendMessage(new TextComponent(
+								"Checking status, waiting for response, check console, method: plugin messaging"));
 						bungee.status(sender);
 					} else {
-						sender.sendMessage(new TextComponent("Not using socket method, command unavailable"));
+						sender.sendMessage(new TextComponent("Not using socket/pluginmessage method, command unavailable"));
 					}
 				}
 				if (args[0].equalsIgnoreCase("help")) {
@@ -6,6 +6,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Set;
+import java.util.regex.Pattern;

 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -14,6 +15,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.permissions.Permission;

 import com.bencodez.advancedcore.DebugLevel;
 import com.bencodez.advancedcore.api.command.CommandHandler;
@@ -43,6 +45,10 @@ import com.bencodez.votingplugin.commands.gui.admin.AdminVoteHelp;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVotePerms;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVotePlaceholders;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVotePlaceholdersPlayer;
+import com.bencodez.votingplugin.commands.gui.admin.AdminVoteVoteParty;
+import com.bencodez.votingplugin.commands.gui.admin.cumulative.AdminVoteCumulative;
+import com.bencodez.votingplugin.commands.gui.admin.milestones.AdminVoteMilestones;
+import com.bencodez.votingplugin.commands.gui.admin.voteshop.AdminVoteVoteShop;
 import com.bencodez.votingplugin.commands.gui.player.VoteBest;
 import com.bencodez.votingplugin.commands.gui.player.VoteGUI;
 import com.bencodez.votingplugin.commands.gui.player.VoteHelp;
@@ -97,21 +103,35 @@ public class CommandLoader {

 	public BInventoryButton getBackButton(VotingPluginUser user) {
 		ConfigurationSection sec = plugin.getGui().getCHESTBackButton();
+		boolean a = false;
+
 		ItemBuilder item;
 		if (sec != null) {
 			item = new ItemBuilder(sec);
+			a = sec.getBoolean("OpenVoteURL", false);
 		} else {
 			item = new ItemBuilder(Material.BARRIER, 1).setName("&8Back to VoteGUI");
 		}

+		final boolean openVoteURL = a;
 		BInventoryButton b = new BInventoryButton(item) {

 			@Override
 			public void onClick(ClickEvent event) {
-				new VoteGUI(plugin, event.getWhoClicked(), user)
-						.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
+				if (!openVoteURL) {
+					new VoteGUI(plugin, event.getWhoClicked(), user)
+							.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
+				} else {
+					new VoteURL(plugin, event.getWhoClicked(), user, true).open();
+				}
 			}
+			
 		};
+		
+		// set item to end of the GUI
+		if (sec != null && sec.getBoolean("EndOfGUI")) {
+			b.setSlot(-2);
+		}

 		if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
 			b.dontClose();
@@ -252,6 +272,23 @@ public class CommandLoader {
 			}
 		});

+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "ResetMilestoneCount" },
+						"VotingPlugin.Commands.AdminVote.ResetMilestoneCount|" + adminPerm,
+						"Resets milestone count to alltimetotal") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						sendMessage(sender, "&cStarting to clear milestonecounts...");
+						for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+							user.setMilestoneCount(0);
+						}
+						sendMessage(sender, "&cFinished");
+
+					}
+				});
+
 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "ResyncMilestonesAlreadyGiven" },
 						"VotingPlugin.Commands.AdminVote.ResyncMilestonesGiven|" + adminPerm,
@@ -307,18 +344,20 @@ public class CommandLoader {
 					}
 				});

-		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "ResyncMilestones", "(player)" },
-				"VotingPlugin.Commands.AdminVote.SetResyncMilestones|" + adminPerm, "Resync Milestones") {
+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "ResyncMilestones", "(player)" },
+						"VotingPlugin.Commands.AdminVote.SetResyncMilestones|" + adminPerm,
+						"Resync Milestones to alltimetotal for player") {

-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
-				user.setMilestoneCount(user.getTotal(TopVoter.AllTime));
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
+						user.setMilestoneCount(user.getTotal(TopVoter.AllTime));

-				sendMessage(sender, "&cResynced milestones for " + args[1]);
+						sendMessage(sender, "&cResynced milestones for " + args[1]);

-			}
-		});
+					}
+				});

 		plugin.getAdminVoteCommand()
 				.add(new CommandHandler(new String[] { "User", "(player)", "AddPoints", "(number)" },
@@ -354,7 +393,6 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				new AdminVoteHelp(plugin, sender, 1).open();
-				;
 			}
 		});

@@ -396,17 +434,61 @@ public class CommandLoader {
 			}
 		});

+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Edit", "VoteShop" },
+				"VotingPlugin.Commands.AdminVote.Edit.VoteShop", "Edit VoteShop", false) {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				new AdminVoteVoteShop(plugin, sender).open(GUIMethod.CHEST);
+			}
+		});
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Edit", "MileStones" },
+				"VotingPlugin.Commands.AdminVote.Edit.MileStones", "Edit milestones rewards", false) {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				new AdminVoteMilestones(plugin, sender).open(GUIMethod.CHEST);
+			}
+		});
+		
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Edit", "Cumulative" },
+				"VotingPlugin.Commands.AdminVote.Edit.Cumulative", "Edit cumulative rewards", false) {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				new AdminVoteCumulative(plugin, sender).open(GUIMethod.CHEST);
+			}
+		});
+		
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Edit", "VoteParty" },
+				"VotingPlugin.Commands.AdminVote.Edit.VoteParty", "Edit voteparty", false) {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				new AdminVoteVoteParty(plugin, sender).open(GUIMethod.CHEST);
+			}
+		});
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Perms" },
 				"VotingPlugin.Commands.AdminVote.Perms|" + adminPerm, "List permissions") {

 			@Override
 			public void execute(CommandSender sender, String[] args) {
-				new AdminVotePerms(plugin, sender).open();
+				new AdminVotePerms(plugin, sender, 1).open();
+			}
+		});
+
+		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Perms", "(Number)" },
+				"VotingPlugin.Commands.AdminVote.Perms|" + adminPerm, "List permissions") {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				new AdminVotePerms(plugin, sender, Integer.parseInt(args[1])).open();
 			}
 		});

 		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "Perms", "(Player)" },
+				.add(new CommandHandler(new String[] { "PermsPlayer", "(Player)" },
 						"VotingPlugin.Commands.AdminVote.Perms.Other|" + adminPerm,
 						"List permissions from the plugin the player has") {

@@ -417,7 +499,7 @@ public class CommandLoader {
 				});

 		plugin.getAdminVoteCommand()
-				.add(new CommandHandler(new String[] { "Perms", "(Player)", "(Number)" },
+				.add(new CommandHandler(new String[] { "PermsPlayer", "(Player)", "(Number)" },
 						"VotingPlugin.Commands.AdminVote.Perms.Other|" + adminPerm,
 						"List permissions from the plugin the player has") {

@@ -427,6 +509,30 @@ public class CommandLoader {
 					}
 				});

+		plugin.getAdminVoteCommand()
+				.add(new CommandHandler(new String[] { "Perms", "(Number)", "(Player)" },
+						"VotingPlugin.Commands.AdminVote.Perms.Other|" + adminPerm,
+						"List permissions from the plugin the specificed player has") {
+
+					@Override
+					public void execute(CommandSender sender, String[] args) {
+						new AdminVotePerms(plugin, sender, Integer.parseInt(args[1]), args[2]).open();
+					}
+				});
+
+		if (plugin.getOptions().getDebug().equals(DebugLevel.DEV)) {
+			plugin.getAdminVoteCommand()
+					.add(new CommandHandler(new String[] { "PermsDebug" }, "VotingPlugin.Commands.AdminVote.PermsDebug",
+							"Dev permission list, generate this list, requires dev debug") {
+
+						@Override
+						public void execute(CommandSender sender, String[] args) {
+							sendMessage(sender, ArrayUtils.getInstance()
+									.convert(new AdminVotePerms(plugin, sender, 0).listPermsDev(sender)));
+						}
+					});
+		}
+
 		plugin.getAdminVoteCommand().add(new CommandHandler(new String[] { "Reload" },
 				"VotingPlugin.Commands.AdminVote.Reload|" + adminPerm, "Reload plugin, will not reload user storage") {

@@ -507,6 +613,7 @@ public class CommandLoader {
 					});

 				}
+
 				sendMessage(sender,
 						"Using AdvancedCore " + plugin.getVersion() + "' built on '" + plugin.getBuildTime());
 			}
@@ -714,8 +821,6 @@ public class CommandLoader {
 				plugin.getServer().getPluginManager().callEvent(voteEvent);

 				if (plugin.isYmlError()) {
-					sendMessage(sender,
-							"&4" + plugin.getName() + " v" + plugin.getDescription().getVersion() + " reloaded!");
 					sendMessage(sender, "&3Detected yml error, please check server log for details");
 				}

@@ -1019,7 +1124,7 @@ public class CommandLoader {

 					@Override
 					public void execute(CommandSender sender, String[] args) {
-						plugin.getVoteParty().giveRewards();
+						plugin.getVoteParty().giveRewards(plugin.getBungeeSettings().isUseBungeecoord());
 					}
 				});

@@ -1055,7 +1160,8 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
-						plugin.getSpecialRewards().giveMilestoneVoteReward(user, user.isOnline(), parseInt(args[3]));
+						plugin.getSpecialRewards().giveMilestoneVoteReward(user, user.isOnline(), parseInt(args[3]),
+								plugin.getBungeeSettings().isUseBungeecoord());
 						sendMessage(sender, "&cMilestone " + args[3] + " forced");
 					}
 				});
@@ -1116,7 +1222,7 @@ public class CommandLoader {
 						public void execute(CommandSender sender, String[] args) {
 							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
 							plugin.getSpecialRewards().giveVoteStreakReward(user, user.isOnline(), str, args[4],
-									parseInt(args[4]));
+									parseInt(args[4]), plugin.getBungeeSettings().isUseBungeecoord());
 							sendMessage(sender, "&cVoteStreak " + str + " " + args[4] + " forced");
 						}
 					});
@@ -1129,7 +1235,8 @@ public class CommandLoader {
 					@Override
 					public void execute(CommandSender sender, String[] args) {
 						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
-						plugin.getSpecialRewards().giveCumulativeVoteReward(user, user.isOnline(), parseInt(args[3]));
+						plugin.getSpecialRewards().giveCumulativeVoteReward(user, user.isOnline(), parseInt(args[3]),
+								plugin.getBungeeSettings().isUseBungeecoord());
 						sendMessage(sender, "&cCumulative " + args[3] + " forced");
 					}
 				});
@@ -1140,7 +1247,8 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
-				plugin.getSpecialRewards().giveAllSitesRewards(user, user.isOnline());
+				plugin.getSpecialRewards().giveAllSitesRewards(user, user.isOnline(),
+						plugin.getBungeeSettings().isUseBungeecoord());
 				sendMessage(sender, "&cAllSites forced");
 			}
 		});
@@ -1151,7 +1259,8 @@ public class CommandLoader {
 			@Override
 			public void execute(CommandSender sender, String[] args) {
 				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(args[1]);
-				plugin.getSpecialRewards().giveFirstVoteRewards(user, user.isOnline());
+				plugin.getSpecialRewards().giveFirstVoteRewards(user, user.isOnline(),
+						plugin.getBungeeSettings().isUseBungeecoord());
 				sendMessage(sender, "&cFirstVote forced");
 			}
 		});
@@ -1196,18 +1305,40 @@ public class CommandLoader {
 			return;
 		}
 		for (CommandHandler cmdHandle : plugin.getVoteCommand()) {
-			if (cmdHandle.getArgs().length > 0) {
+			int argLength = cmdHandle.getArgs().length;
+			String arg0 = "";
+			if (argLength > 0) {
+				arg0 = cmdHandle.getArgs()[0];
+			}
+			String[] perms = cmdHandle.getPerm().split(Pattern.quote("|"));
+			try {
+				if (perms.length > 1) {
+					// has another perm
+					plugin.devDebug("Adding child perm " + perms[0] + " to " + perms[1] + " from /vote" + arg0);
+					Permission p = Bukkit.getPluginManager().getPermission(perms[1]);
+					p.getChildren().put(perms[0], true);
+					p.recalculatePermissibles();
+				}
+			} catch (Exception e) {
+				plugin.debug("Failed to set permission for /vote" + arg0);
+			}
+			if (argLength > 0) {
 				String[] args = cmdHandle.getArgs()[0].split("&");
+
 				for (String arg : args) {
 					commands.put("vote" + arg, cmdHandle);
+
 					try {
 						plugin.getCommand("vote" + arg).setExecutor(new CommandAliases(cmdHandle, false));

 						plugin.getCommand("vote" + arg)
 								.setTabCompleter(new AliasesTabCompleter().setCMDHandle(cmdHandle, false));
-						if (plugin.getConfigFile().isDisableAdvancedTab()) {
-							plugin.getCommand("vote" + arg).setPermission(cmdHandle.getPerm().split("|")[0]);
+
+						String currentPerm = plugin.getCommand("vote" + arg).getPermission();
+						if (currentPerm == null || currentPerm.length() > perms[0].length()) {
+							plugin.getCommand("vote" + arg).setPermission(perms[0]);
 						}
+
 						for (String str : plugin.getCommand("vote" + arg).getAliases()) {
 							commands.put(str, cmdHandle);
 						}
@@ -1215,23 +1346,44 @@ public class CommandLoader {
 						plugin.devDebug("Failed to load command and tab completer for /vote" + arg);
 					}
 				}
-
 			}
 		}

 		for (CommandHandler cmdHandle : plugin.getAdminVoteCommand()) {
-			if (cmdHandle.getArgs().length > 0) {
+			int argLength = cmdHandle.getArgs().length;
+			String arg0 = "";
+			if (argLength > 0) {
+				arg0 = cmdHandle.getArgs()[0];
+			}
+			String[] perms = cmdHandle.getPerm().split(Pattern.quote("|"));
+			try {
+				if (perms.length > 1) {
+					// has another perm
+					plugin.devDebug("Adding child perm " + perms[0] + " to " + perms[1] + " from /adminvote" + arg0);
+					Permission p = Bukkit.getPluginManager().getPermission(perms[1]);
+					p.getChildren().put(perms[0], true);
+					p.recalculatePermissibles();
+				}
+			} catch (Exception e) {
+				plugin.debug("Failed to set permission for /adminvote" + arg0);
+			}
+
+			if (argLength > 0) {
 				String[] args = cmdHandle.getArgs()[0].split("&");
 				for (String arg : args) {
 					commands.put("adminvote" + arg, cmdHandle);
+
 					try {
 						plugin.getCommand("adminvote" + arg).setExecutor(new CommandAliases(cmdHandle, true));

 						plugin.getCommand("adminvote" + arg)
 								.setTabCompleter(new AliasesTabCompleter().setCMDHandle(cmdHandle, true));
-						if (plugin.getConfigFile().isDisableAdvancedTab()) {
-							plugin.getCommand("adminvote" + arg).setPermission(cmdHandle.getPerm().split("|")[0]);
+
+						String currentPerm = plugin.getCommand("adminvote" + arg).getPermission();
+						if (currentPerm == null || currentPerm.length() > perms[0].length()) {
+							plugin.getCommand("adminvote" + arg).setPermission(perms[0]);
 						}
+
 						for (String str : plugin.getCommand("adminvote" + arg).getAliases()) {
 							commands.put(str, cmdHandle);
 						}
@@ -1391,6 +1543,28 @@ public class CommandLoader {
 			}
 		});

+		ArrayList<String> topVoter = new ArrayList<String>();
+		for (TopVoter top : TopVoter.values()) {
+			topVoter.add(top.toString());
+		}
+
+		TabCompleteHandler.getInstance().addTabCompleteOption(new TabCompleteHandle("(topvoter)", topVoter) {
+
+			@Override
+			public void reload() {
+				ArrayList<String> topVoter = new ArrayList<String>();
+				for (TopVoter top : TopVoter.values()) {
+					topVoter.add(top.toString());
+				}
+				setReplace(topVoter);
+
+			}
+
+			@Override
+			public void updateReplacements() {
+			}
+		});
+
 		TabCompleteHandler.getInstance().addTabCompleteOption(new TabCompleteHandle("(VoteShop)", sites) {

 			@Override
@@ -1515,7 +1689,7 @@ public class CommandLoader {
 										if (user.removePoints(points)) {

 											RewardHandler.getInstance().giveReward(user,
-													plugin.getConfigFile().getData(),
+													plugin.getGui().getData(),
 													plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
 													new RewardOptions().setPlaceholders(placeholders));

@@ -1543,6 +1717,16 @@ public class CommandLoader {
 			});
 		}

+		plugin.getVoteCommand().add(new CommandHandler(new String[] { "URL", "(SiteName)" },
+				"VotingPlugin.Commands.Vote.URL.VoteSite", "Open VoteURL GUI for VoteSite", false) {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				new VoteURLVoteSite(plugin, sender, UserManager.getInstance().getVotingPluginUser((Player) sender),
+						args[1]).open();
+			}
+		});
+
 		plugin.getVoteCommand().add(new CommandHandler(new String[] { "URL" },
 				"VotingPlugin.Commands.Vote.URL|" + playerPerm, "Open VoteURL GUI", false) {

@@ -1553,15 +1737,6 @@ public class CommandLoader {

 			}
 		});
-		plugin.getVoteCommand().add(new CommandHandler(new String[] { "URL", "(SiteName)" },
-				"VotingPlugin.Commands.Vote.URL.VoteSite", "Open VoteURL GUI for VoteSite", false) {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				new VoteURLVoteSite(plugin, sender, UserManager.getInstance().getVotingPluginUser((Player) sender),
-						args[1]).open();
-			}
-		});

 		plugin.getVoteCommand().add(new CommandHandler(new String[] { "Last", "(player)" },
 				"VotingPlugin.Commands.Vote.Last.Other|" + modPerm, "See other players last votes") {
@@ -1662,15 +1837,6 @@ public class CommandLoader {
 			}
 		});

-		plugin.getVoteCommand().add(new CommandHandler(new String[] { "GUI" },
-				"VotingPlugin.Commands.Vote.GUI|" + playerPerm, "Open VoteGUI", false) {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				new VoteGUI(plugin, sender, UserManager.getInstance().getVotingPluginUser((Player) sender)).open();
-			}
-		});
-
 		plugin.getVoteCommand().add(new CommandHandler(new String[] { "GUI", "(player)" },
 				"VotingPlugin.Commands.Vote.GUI.Other|" + modPerm, "Open VoteGUI", false) {

@@ -1686,6 +1852,15 @@ public class CommandLoader {
 			}
 		});

+		plugin.getVoteCommand().add(new CommandHandler(new String[] { "GUI" },
+				"VotingPlugin.Commands.Vote.GUI|" + playerPerm, "Open VoteGUI", false) {
+
+			@Override
+			public void execute(CommandSender sender, String[] args) {
+				new VoteGUI(plugin, sender, UserManager.getInstance().getVotingPluginUser((Player) sender)).open();
+			}
+		});
+
 		if (plugin.getGui().isLastMonthGUI()) {
 			plugin.getVoteCommand()
 					.add(new CommandHandler(new String[] { "LastMonthTop" },
@@ -1710,6 +1885,34 @@ public class CommandLoader {
 			}
 		});

+		for (final TopVoter top : TopVoter.values()) {
+			String argName = top.toString();
+			String perm = top.toString();
+			if (argName.equals(TopVoter.AllTime.toString())) {
+				argName = "All";
+				perm = "All";
+			}
+
+			plugin.getVoteCommand().add(new CommandHandler(new String[] { "Top", argName },
+					"VotingPlugin.Commands.Vote.Top." + perm + "|" + playerPerm, "Open page of Top Voters") {
+
+				@Override
+				public void execute(CommandSender sender, String[] args) {
+					new VoteTopVoter(plugin, sender, null, top, 1).open(GUIMethod.CHAT);
+				}
+			});
+
+			plugin.getVoteCommand().add(new CommandHandler(new String[] { "Top", argName, "(number)" },
+					"VotingPlugin.Commands.Vote.Top." + perm + "|" + playerPerm, "Open page of Top Voters") {
+
+				@Override
+				public void execute(CommandSender sender, String[] args) {
+					int page = Integer.parseInt(args[2]);
+					new VoteTopVoter(plugin, sender, null, top, page).open(GUIMethod.CHAT);
+				}
+			});
+		}
+
 		plugin.getVoteCommand().add(new CommandHandler(new String[] { "Top", "(number)" },
 				"VotingPlugin.Commands.Vote.Top|" + playerPerm, "Open page of Top Voters") {

@@ -1721,47 +1924,6 @@ public class CommandLoader {
 			}
 		});

-		plugin.getVoteCommand().add(new CommandHandler(new String[] { "Top", "(number)", "Monthly" },
-				"VotingPlugin.Commands.Vote.Top.Monthly|" + playerPerm, "Open page of Top Voters") {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				int page = Integer.parseInt(args[1]);
-				new VoteTopVoter(plugin, sender, null, TopVoter.Monthly, page).open(GUIMethod.CHAT);
-			}
-		});
-
-		plugin.getVoteCommand().add(new CommandHandler(new String[] { "Top", "(number)", "All" },
-				"VotingPlugin.Commands.Vote.Top.All|" + playerPerm, "Open page of Top Voters All Time") {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				int page = Integer.parseInt(args[1]);
-				new VoteTopVoter(plugin, sender, null, TopVoter.AllTime, page).open(GUIMethod.CHAT);
-			}
-		});
-
-		plugin.getVoteCommand().add(new CommandHandler(new String[] { "Top", "(number)", "Weekly" },
-				"VotingPlugin.Commands.Vote.Top.Weekly|" + playerPerm, "Open page of Top Voters") {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				int page = Integer.parseInt(args[1]);
-				new VoteTopVoter(plugin, sender, null, TopVoter.Weekly, page).open(GUIMethod.CHAT);
-
-			}
-		});
-
-		plugin.getVoteCommand().add(new CommandHandler(new String[] { "Top", "(number)", "Daily" },
-				"VotingPlugin.Commands.Vote.Top.Daily|" + playerPerm, "Open page of Top Voters") {
-
-			@Override
-			public void execute(CommandSender sender, String[] args) {
-				int page = Integer.parseInt(args[1]);
-				new VoteTopVoter(plugin, sender, null, TopVoter.Daily, page).open(GUIMethod.CHAT);
-			}
-		});
-
 		plugin.getVoteCommand()
 				.add(new CommandHandler(new String[] { "Party" }, "VotingPlugin.Commands.Vote.Party|" + playerPerm,
 						"View current amount of votes and how many more needed") {
@@ -1935,7 +2097,13 @@ public class CommandLoader {
 						if (sender instanceof Player) {
 							user = UserManager.getInstance().getVotingPluginUser((Player) sender);
 						}
-						new VoteURL(plugin, sender, user, true).open();
+						if (plugin.getConfigFile().isUseVoteGUIMainCommand() && sender instanceof Player) {
+							// vote gui command
+							new VoteGUI(plugin, sender, user).open();
+						} else {
+							new VoteURL(plugin, sender, user, true).open();
+						}
+
 					}
 				});

@@ -8,6 +8,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;

+import com.bencodez.advancedcore.api.gui.GUIMethod;
 import com.bencodez.advancedcore.api.inventory.BInventory;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
@@ -17,13 +18,20 @@ import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueBo
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueList;
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueNumber;
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueString;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.misc.PlayerUtils;
+import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.valuerequest.InputMethod;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
 import com.bencodez.advancedcore.api.valuerequest.listeners.StringListener;
+import com.bencodez.advancedcore.command.gui.RewardEditGUI;
 import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.commands.gui.admin.AdminVoteVoteParty;
+import com.bencodez.votingplugin.commands.gui.admin.cumulative.AdminVoteCumulative;
+import com.bencodez.votingplugin.commands.gui.admin.milestones.AdminVoteMilestones;
+import com.bencodez.votingplugin.commands.gui.admin.voteshop.AdminVoteVoteShop;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
 import com.bencodez.votingplugin.objects.VoteSite;

@@ -65,7 +73,74 @@ public class AdminGUI {
 			}
 		});

-		buttons.add(new BInventoryButton("&cReload Plugin", new String[] {}, new ItemStack(Material.STONE, 1)) {
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.CHEST, 1).setName("&cEdit VoteShop")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteVoteShop(plugin, clickEvent.getPlayer()).open(GUIMethod.CHEST);
+			}
+		});
+
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.DIAMOND_BLOCK, 1).setName("&cEdit Milestones")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteMilestones(plugin, clickEvent.getPlayer()).open(GUIMethod.CHEST);
+			}
+		});
+
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.COBBLESTONE, 1).setName("&cEdit Cumulative")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteCumulative(plugin, clickEvent.getPlayer()).open(GUIMethod.CHEST);
+			}
+		});
+
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.STONE, 1).setName("&cEdit VoteParty")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteVoteParty(plugin, clickEvent.getPlayer()).open(GUIMethod.CHEST);
+			}
+		});
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.STONE, 1).setName("&cEdit FirstVote reward")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+						RewardHandler.getInstance().getDirectlyDefined("FirstVote"));
+			}
+		});
+
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.STONE, 1).setName("&cEdit AllSites reward")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+						RewardHandler.getInstance().getDirectlyDefined("AllSites"));
+			}
+		});
+		
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.STONE, 1).setName("&cEdit AnySiteRewards")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+						RewardHandler.getInstance().getDirectlyDefined("AnySiteRewards"));
+			}
+		});
+		
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.STONE, 1).setName("&cEdit EverySiteReward")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+						RewardHandler.getInstance().getDirectlyDefined("EverySiteReward"));
+			}
+		});
+
+		buttons.add(new BInventoryButton("&cReload Plugin", new String[] {}, new ItemStack(Material.BUCKET, 1)) {

 			@Override
 			public void onClick(ClickEvent event) {
@@ -97,6 +172,7 @@ public class AdminGUI {
 			lore.add("ServiceSite: " + voteSite.getServiceSite());
 			lore.add("VoteURL: " + voteSite.getVoteURL());
 			lore.add("VoteDelay: " + voteSite.getVoteDelay());
+			lore.add("VoteDelayMin: " + voteSite.getVoteDelayMin());

 			inv.addButton(count, new BInventoryButton(voteSite.getKey(), ArrayUtils.getInstance().convert(lore),
 					new ItemStack(Material.STONE)) {
@@ -200,6 +276,17 @@ public class AdminGUI {
 				plugin.reload();
 			}
 		}));
+		
+		inv.addButton(new EditGUIButton(new EditGUIValueNumber("VoteDelayMin", voteSite.getVoteDelay()) {
+
+			@Override
+			public void setValue(Player player, Number num) {
+				VoteSite voteSite = (VoteSite) getInv().getMeta(player, "VoteSite");
+				String siteName = voteSite.getKey();
+				plugin.getConfigVoteSites().setVoteDelay(siteName, num.intValue());
+				plugin.reload();
+			}
+		}));

 		inv.addButton(new EditGUIButton(new EditGUIValueBoolean("Enabled", voteSite.isEnabled()) {

@@ -246,6 +333,15 @@ public class AdminGUI {
 							plugin.reload();
 						}
 					}));
+		} else {
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.DISPENSER, 1).setName("&cRewards")) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(), RewardHandler.getInstance()
+							.getDirectlyDefined("VoteSites." + voteSite.getKey() + ".Rewards"));
+				}
+			});
 		}

 		inv.openInventory(player);
@@ -0,0 +1,72 @@
+package com.bencodez.votingplugin.commands.gui.admin;
+
+import java.util.ArrayList;
+
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.gui.GUIHandler;
+import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.votingplugin.VotingPluginMain;
+
+public abstract class AdminVoteConfirmation extends GUIHandler {
+
+	@SuppressWarnings("unused")
+	private VotingPluginMain plugin;
+	private String title;
+
+	public AdminVoteConfirmation(VotingPluginMain plugin, CommandSender player, String title) {
+		super(player);
+		this.plugin = plugin;
+		this.title = title;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender sender) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+
+	}
+
+	public abstract void onConfirm(Player p);
+
+	public abstract void onDeny(Player p);
+
+	@Override
+	public void onChest(Player player) {
+		BInventory inv = new BInventory(title);
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.EMERALD_BLOCK).setName("&aConfirm")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				onConfirm(clickEvent.getPlayer());
+			}
+		});
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.REDSTONE_BLOCK).setName("&aCancel")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				onDeny(clickEvent.getPlayer());
+			}
+		});
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}
@@ -67,9 +67,7 @@ public class AdminVoteHelp extends GUIHandler {
 		boolean requirePerms = plugin.getConfigFile().getFormatCommandsVoteHelpRequirePermission();

 		for (CommandHandler cmdHandle : plugin.getAdminVoteCommand()) {
-			if (requirePerms && sender.hasPermission(cmdHandle.getPerm())) {
-				unsorted.put(cmdHandle.getHelpLineCommand("/adminvote"), cmdHandle.getHelpLine("/adminvote"));
-			} else {
+			if (!requirePerms || cmdHandle.hasPerm(sender)) {
 				unsorted.put(cmdHandle.getHelpLineCommand("/adminvote"), cmdHandle.getHelpLine("/adminvote"));
 			}
 		}
@@ -1,6 +1,8 @@
 package com.bencodez.votingplugin.commands.gui.admin;

 import java.util.ArrayList;
+import java.util.Set;
+import java.util.regex.Pattern;

 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -19,9 +21,10 @@ public class AdminVotePerms extends GUIHandler {
 	private String playerName;
 	private VotingPluginMain plugin;

-	public AdminVotePerms(VotingPluginMain plugin, CommandSender player) {
+	public AdminVotePerms(VotingPluginMain plugin, CommandSender player, int page) {
 		super(player);
 		this.plugin = plugin;
+		this.page = page;
 	}

 	public AdminVotePerms(VotingPluginMain plugin, CommandSender player, int page, String playerName) {
@@ -38,17 +41,18 @@ public class AdminVotePerms extends GUIHandler {

 	public String[] listPerms(CommandSender sender) {
 		ArrayList<String> msg = new ArrayList<String>();
-		msg.add("&c&lCommand : Permissions (seperated by |)");

 		for (CommandHandler handle : plugin.getVoteCommand()) {
 			if (sender instanceof Player) {
 				if (handle.hasPerm(sender)) {
-					msg.add("&a" + handle.getHelpLineCommand("/vote") + " : " + handle.getPerm() + " : true");
+					msg.add("&6" + handle.getHelpLineCommand("/vote") + " : "
+							+ handle.getPerm().split(Pattern.quote("|"))[0] + " : &atrue");
 				} else {
-					msg.add("&c" + handle.getHelpLineCommand("/vote") + " : " + handle.getPerm() + " : false");
+					msg.add("&6" + handle.getHelpLineCommand("/vote") + " : "
+							+ handle.getPerm().split(Pattern.quote("|"))[0] + " : &cfalse");
 				}
 			} else {
-				msg.add(handle.getHelpLineCommand("/vote") + " : " + handle.getPerm());
+				msg.add(handle.getHelpLineCommand("/vote") + " : " + handle.getPerm().split(Pattern.quote("|"))[0]);
 			}

 		}
@@ -56,30 +60,57 @@ public class AdminVotePerms extends GUIHandler {
 		for (CommandHandler handle : plugin.getAdminVoteCommand()) {
 			if (sender instanceof Player) {
 				if (handle.hasPerm(sender)) {
-					msg.add("&a" + handle.getHelpLineCommand("/av") + " : " + handle.getPerm() + " : true");
+					msg.add("&6" + handle.getHelpLineCommand("/av") + " : "
+							+ handle.getPerm().split(Pattern.quote("|"))[0] + " : &atrue");
 				} else {
-					msg.add("&c" + handle.getHelpLineCommand("/av") + " : " + handle.getPerm() + " : false");
+					msg.add("&6" + handle.getHelpLineCommand("/av") + " : "
+							+ handle.getPerm().split(Pattern.quote("|"))[0] + " : &cfalse");
 				}
 			} else {
-				msg.add(handle.getHelpLineCommand("/av") + " : " + handle.getPerm());
+				msg.add(handle.getHelpLineCommand("/av") + " : " + handle.getPerm().split(Pattern.quote("|"))[0]);
 			}
 		}

 		for (Permission perm : plugin.getDescription().getPermissions()) {
 			if (sender instanceof Player) {
-				if (sender.hasPermission(perm)) {
-					msg.add("&a" + perm.getName() + " : true");
+				Set<String> child = perm.getChildren().keySet();
+				if (child.size() > 0) {
+					if (sender.hasPermission(perm)) {
+						msg.add("&6" + perm.getName() + " : &atrue");
+					} else {
+						msg.add("&6" + perm.getName() + " : &cfalse");
+					}
 				} else {
-					msg.add("&c" + perm.getName() + " : false");
+					if (sender.hasPermission(perm)) {
+						msg.add("&6" + perm.getName() + " : &atrue");
+					} else {
+						msg.add("&6" + perm.getName() + " : &cfalse");
+					}
 				}
+
 			} else {
 				msg.add(perm.getName());
 			}
 		}

-		msg = ArrayUtils.getInstance().colorize(msg);
+		int pagesize = plugin.getConfigFile().getFormatPageSize();

-		return ArrayUtils.getInstance().convert(msg);
+		int maxPage = msg.size() / pagesize;
+		if ((msg.size() % pagesize) != 0) {
+			maxPage++;
+		}
+
+		ArrayList<String> text = new ArrayList<String>();
+
+		text.add("&c&lCommand : Permissions " + page + "/" + maxPage);
+
+		for (int i = pagesize * page - pagesize; i < msg.size() && i < pagesize * page; i++) {
+			text.add(msg.get(i));
+		}
+
+		text = ArrayUtils.getInstance().colorize(text);
+
+		return ArrayUtils.getInstance().convert(text);
 	}

 	public ArrayList<String> listPerms(CommandSender sender, String player, int page) {
@@ -91,26 +122,39 @@ public class AdminVotePerms extends GUIHandler {

 			for (CommandHandler handle : plugin.getVoteCommand()) {
 				if (handle.hasPerm(p)) {
-					msg.add("&a" + handle.getHelpLineCommand("/vote") + " : " + handle.getPerm() + " : true");
+					msg.add("&6" + handle.getHelpLineCommand("/vote") + " : "
+							+ handle.getPerm().split(Pattern.quote("|"))[0] + " : &atrue");
 				} else {
-					msg.add("&c" + handle.getHelpLineCommand("/vote") + " : " + handle.getPerm() + " : false");
+					msg.add("&6" + handle.getHelpLineCommand("/vote") + " : "
+							+ handle.getPerm().split(Pattern.quote("|"))[0] + " : &cfalse");
 				}

 			}

 			for (CommandHandler handle : plugin.getAdminVoteCommand()) {
 				if (handle.hasPerm(p)) {
-					msg.add("&a" + handle.getHelpLineCommand("/av") + " : " + handle.getPerm() + " : true");
+					msg.add("&6" + handle.getHelpLineCommand("/av") + " : "
+							+ handle.getPerm().split(Pattern.quote("|"))[0] + " : &atrue");
 				} else {
-					msg.add("&c" + handle.getHelpLineCommand("/av") + " : " + handle.getPerm() + " : false");
+					msg.add("&6" + handle.getHelpLineCommand("/av") + " : "
+							+ handle.getPerm().split(Pattern.quote("|"))[0] + " : &cfalse");
 				}
 			}

 			for (Permission perm : plugin.getDescription().getPermissions()) {
-				if (p.hasPermission(perm)) {
-					msg.add("&a" + perm.getName() + " : true");
+				Set<String> child = perm.getChildren().keySet();
+				if (child.size() > 0) {
+					if (p.hasPermission(perm)) {
+						msg.add("&6" + perm.getName() + " : &atrue");
+					} else {
+						msg.add("&6" + perm.getName() + " : &cfalse");
+					}
 				} else {
-					msg.add("&c" + perm.getName() + " : false");
+					if (p.hasPermission(perm)) {
+						msg.add("&6" + perm.getName() + " : &atrue");
+					} else {
+						msg.add("&6" + perm.getName() + " : &cfalse");
+					}
 				}
 			}

@@ -123,7 +167,7 @@ public class AdminVotePerms extends GUIHandler {
 				maxPage++;
 			}

-			text.add("&c&lCommand : Permissions (seperated by |) " + page + "/" + maxPage);
+			text.add("&c&lCommand : Permissions for " + player + " " + page + "/" + maxPage);

 			for (int i = pagesize * page - pagesize; i < msg.size() && i < pagesize * page; i++) {
 				text.add(msg.get(i));
@@ -135,6 +179,34 @@ public class AdminVotePerms extends GUIHandler {

 	}

+	public String[] listPermsDev(CommandSender sender) {
+		ArrayList<String> msg = new ArrayList<String>();
+		msg.add("Command");
+		msg.add("  Permissions (seperated by |");
+		msg.add("  Help messasge");
+		msg.add("  ");
+
+		for (CommandHandler handle : plugin.getVoteCommand()) {
+			msg.add(handle.getHelpLineCommand("/vote"));
+			msg.add("  " + handle.getPerm());
+			msg.add("  " + handle.getHelpMessage());
+		}
+
+		for (CommandHandler handle : plugin.getAdminVoteCommand()) {
+			msg.add(handle.getHelpLineCommand("/av"));
+			msg.add("  " + handle.getPerm());
+			msg.add("  " + handle.getHelpMessage());
+		}
+
+		for (Permission perm : plugin.getDescription().getPermissions()) {
+			msg.add(perm.getName() + " : " + perm.getDescription());
+		}
+
+		msg = ArrayUtils.getInstance().colorize(msg);
+
+		return ArrayUtils.getInstance().convert(msg);
+	}
+
 	@Override
 	public void onBook(Player player) {
 	}
@@ -43,9 +43,9 @@ public class AdminVotePlaceholders extends GUIHandler {
 				identifier += "#";
 			}
 			if (placeholder.hasDescription()) {
-				msg = "%VotingPlugin_" + identifier + "% - " + placeholder.getDescription();
+				msg = "VotingPlugin_" + identifier + " - " + placeholder.getDescription();
 			} else {
-				msg = "%VotingPlugin_" + identifier + "%";
+				msg = "VotingPlugin_" + identifier + "";
 			}

 			Layout layout = new Layout(new ArrayList<String>(Arrays.asList("[Json]")));
@@ -61,9 +61,9 @@ public class AdminVotePlaceholders extends GUIHandler {
 				identifier += "#";
 			}
 			if (placeholder.hasDescription()) {
-				msg = "%VotingPlugin_" + identifier + "% - " + placeholder.getDescription();
+				msg = "VotingPlugin_" + identifier + " - " + placeholder.getDescription();
 			} else {
-				msg = "%VotingPlugin_" + identifier + "%";
+				msg = "VotingPlugin_" + identifier + "";
 			}

 			Layout layout = new Layout(new ArrayList<String>(Arrays.asList("[Json]")));
@@ -87,9 +87,9 @@ public class AdminVotePlaceholders extends GUIHandler {
 				identifier += "#";
 			}
 			if (placeholder.hasDescription()) {
-				msg.add("%VotingPlugin_" + identifier + "% - " + placeholder.getDescription());
+				msg.add("VotingPlugin_" + identifier + " - " + placeholder.getDescription());
 			} else {
-				msg.add("%VotingPlugin_" + identifier + "%");
+				msg.add("VotingPlugin_" + identifier + "");
 			}
 		}

@@ -99,9 +99,9 @@ public class AdminVotePlaceholders extends GUIHandler {
 				identifier += "#";
 			}
 			if (placeholder.hasDescription()) {
-				msg.add("%VotingPlugin_" + identifier + "% - " + placeholder.getDescription());
+				msg.add("VotingPlugin_" + identifier + " - " + placeholder.getDescription());
 			} else {
-				msg.add("%VotingPlugin_" + identifier + "%");
+				msg.add("VotingPlugin_" + identifier + "");
 			}
 		}

@@ -82,7 +82,7 @@ public class AdminVotePlaceholdersPlayer extends GUIHandler {
 			if (identifier.endsWith("_")) {
 				identifier += "1";
 			}
-			msg.add("%VotingPlugin_" + identifier + "% = "
+			msg.add("VotingPlugin_" + identifier + " = "
 					+ placeholder.placeholderRequest(user.getOfflinePlayer(), placeholderUser, identifier));
 		}

@@ -92,7 +92,7 @@ public class AdminVotePlaceholdersPlayer extends GUIHandler {
 				identifier += "1";
 			}

-			msg.add("%VotingPlugin_" + identifier + "% = "
+			msg.add("VotingPlugin_" + identifier + " = "
 					+ placeholder.placeholderRequest(user.getOfflinePlayer(), placeholderUser, identifier));
 		}
 		sendMessage(msg);
@@ -0,0 +1,226 @@
+package com.bencodez.votingplugin.commands.gui.admin;
+
+import java.util.ArrayList;
+
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.gui.GUIHandler;
+import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.inventory.editgui.EditGUI;
+import com.bencodez.advancedcore.api.inventory.editgui.EditGUIButton;
+import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueBoolean;
+import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueList;
+import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueNumber;
+import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueString;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.advancedcore.api.rewards.RewardHandler;
+import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
+import com.bencodez.advancedcore.api.valuerequest.listeners.NumberListener;
+import com.bencodez.advancedcore.command.gui.RewardEditGUI;
+import com.bencodez.votingplugin.VotingPluginMain;
+
+public class AdminVoteVoteParty extends GUIHandler {
+
+	private VotingPluginMain plugin;
+
+	public AdminVoteVoteParty(VotingPluginMain plugin, CommandSender player) {
+		super(player);
+		this.plugin = plugin;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender sender) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+
+	}
+
+	private void setPathData(String path, Object value) {
+		plugin.getSpecialRewardsConfig().getData().set("VoteParty." + path, value);
+		plugin.getSpecialRewardsConfig().saveData();
+		plugin.reload();
+	}
+
+	@Override
+	public void onChest(Player player) {
+		EditGUI inv = new EditGUI("Edit VoteParty");
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteParty");
+
+		// to add
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
+				new EditGUIValueBoolean("Enabled", plugin.getSpecialRewardsConfig().getVotePartyEnabled()) {
+
+					@Override
+					public void setValue(Player player, boolean name) {
+						setPathData(getKey(), name);
+					}
+				}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.EMERALD, 1),
+				new EditGUIValueNumber("VotesRequired", plugin.getSpecialRewardsConfig().getVotePartyVotesRequired()) {
+
+					@Override
+					public void setValue(Player player, Number num) {
+						setPathData(getKey(), num.intValue());
+					}
+				}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.LADDER, 1), new EditGUIValueNumber(
+				"IncreaseVotesRquired", plugin.getSpecialRewardsConfig().getVotePartyIncreaseVotesRquired()) {
+
+			@Override
+			public void setValue(Player player, Number num) {
+				setPathData(getKey(), num.intValue());
+			}
+		}));
+
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.LADDER).setName("&cCurrent increase amount")
+				.addLoreLine("&cCurrent value: " + plugin.getServerData().getVotePartyExtraRequired())) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new ValueRequestBuilder(new NumberListener() {
+
+					@Override
+					public void onInput(Player player, Number value) {
+						plugin.getServerData().setVotePartyExtraRequired(value.intValue());
+					}
+				}, new Number[] { 0, 10, 50, 100 })
+						.currentValue("" + plugin.getServerData().getVotePartyExtraRequired()).allowCustomOption(true)
+						.request(clickEvent.getPlayer());
+				;
+			}
+		});
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.EMERALD, 1), new EditGUIValueNumber(
+				"UserVotesRequired", plugin.getSpecialRewardsConfig().getVotePartyUserVotesRequired()) {
+
+			@Override
+			public void setValue(Player player, Number num) {
+				setPathData(getKey(), num.intValue());
+			}
+		}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean("GiveAllPlayers",
+				plugin.getSpecialRewardsConfig().getVotePartyGiveAllPlayers()) {
+
+			@Override
+			public void setValue(Player player, boolean name) {
+				setPathData(getKey(), name);
+			}
+		}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
+				new EditGUIValueBoolean("ResetEachDay", plugin.getSpecialRewardsConfig().getVotePartyResetEachDay()) {
+
+					@Override
+					public void setValue(Player player, boolean name) {
+						setPathData(getKey(), name);
+					}
+				}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
+				new EditGUIValueBoolean("ResetWeekly", plugin.getSpecialRewardsConfig().getVotePartyResetWeekly()) {
+
+					@Override
+					public void setValue(Player player, boolean name) {
+						setPathData(getKey(), name);
+					}
+				}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
+				new EditGUIValueBoolean("ResetMonthly", plugin.getSpecialRewardsConfig().getVotePartyResetMontly()) {
+
+					@Override
+					public void setValue(Player player, boolean name) {
+						setPathData(getKey(), name);
+					}
+				}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean("OnlyOncePerDay",
+				plugin.getSpecialRewardsConfig().getVotePartyOnlyOncePerDay()) {
+
+			@Override
+			public void setValue(Player player, boolean name) {
+				setPathData(getKey(), name);
+			}
+		}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean(
+				"ResetExtraVotesMonthly", plugin.getSpecialRewardsConfig().isVotePartyResetExtraVotesMonthly()) {
+
+			@Override
+			public void setValue(Player player, boolean name) {
+				setPathData(getKey(), name);
+			}
+		}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean("CountFakeVotes",
+				plugin.getSpecialRewardsConfig().getVotePartyCountFakeVotes()) {
+
+			@Override
+			public void setValue(Player player, boolean name) {
+				setPathData(getKey(), name);
+			}
+		}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean("CountOfflineVotes",
+				plugin.getSpecialRewardsConfig().getVotePartyCountOfflineVotes()) {
+
+			@Override
+			public void setValue(Player player, boolean name) {
+				setPathData(getKey(), name);
+			}
+		}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
+				new EditGUIValueString("Broadcast", plugin.getSpecialRewardsConfig().getVotePartyBroadcast()) {
+
+					@Override
+					public void setValue(Player player, String name) {
+						setPathData(getKey(), name);
+					}
+				}));
+
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
+				new EditGUIValueList("Commands", plugin.getSpecialRewardsConfig().getVotePartyCommands()) {
+
+					@Override
+					public void setValue(Player player, ArrayList<String> value) {
+						setPathData(getKey(), value);
+					}
+				}));
+
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.DISPENSER, 1).setName("&cRewards")
+				.addLoreLine("&aUse this for per player rewards, also set online only rewards here as well")
+				.addLoreLine("&cTo set rewards to be given to players online only, set RewardType to ONLINE")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+						RewardHandler.getInstance().getDirectlyDefined("VoteParty.Rewards"));
+			}
+		});
+
+		// implement item reward?
+
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}
@@ -0,0 +1,106 @@
+package com.bencodez.votingplugin.commands.gui.admin.cumulative;
+
+import java.util.ArrayList;
+
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.gui.GUIHandler;
+import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.rewards.RewardHandler;
+import com.bencodez.advancedcore.api.valuerequest.InputMethod;
+import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
+import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
+import com.bencodez.advancedcore.api.valuerequest.listeners.NumberListener;
+import com.bencodez.advancedcore.command.gui.RewardEditGUI;
+import com.bencodez.votingplugin.VotingPluginMain;
+
+public class AdminVoteCumulative extends GUIHandler {
+
+	private VotingPluginMain plugin;
+
+	public AdminVoteCumulative(VotingPluginMain plugin, CommandSender player) {
+		super(player);
+		this.plugin = plugin;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender sender) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+
+	}
+
+	@Override
+	public void onChest(Player player) {
+		BInventory inv = new BInventory("Edit Cumulative");
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.Cumulative");
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&cEdit existing cumulative rewards")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				ArrayList<Integer> nums = new ArrayList<Integer>();
+				for (String num : plugin.getSpecialRewardsConfig().getCumulativeVotes()) {
+					if (StringParser.getInstance().isInt(num)) {
+						nums.add(Integer.parseInt(num));
+					}
+				}
+				Number[] options = new Number[nums.size()];
+				for (int i = 0; i < nums.size(); i++) {
+					options[i] = nums.get(i);
+				}
+				new ValueRequestBuilder(new NumberListener() {
+
+					@Override
+					public void onInput(Player player, Number value) {
+						RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+								RewardHandler.getInstance().getDirectlyDefined("Cumulative." + value.intValue() + ".Rewards"));
+					}
+				}, options).allowCustomOption(false).usingMethod(InputMethod.INVENTORY).request(clickEvent.getPlayer());;
+			}
+		});
+
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.EMERALD_BLOCK).setName("&aAdd cumulative reward")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new ValueRequest().requestNumber(player, new NumberListener() {
+
+					@Override
+					public void onInput(Player player, Number value) {
+						plugin.getSpecialRewardsConfig().setCumulative(value.intValue());
+						plugin.reload();
+					}
+				});
+			}
+		});
+
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.REDSTONE_BLOCK).setName("&cRemove cumulative")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteCumulativeRemove(plugin, clickEvent.getPlayer()).open();
+			}
+		});
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}
@@ -0,0 +1,77 @@
+package com.bencodez.votingplugin.commands.gui.admin.cumulative;
+
+import java.util.ArrayList;
+
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.gui.GUIHandler;
+import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.commands.gui.admin.AdminVoteConfirmation;
+
+public class AdminVoteCumulativeRemove extends GUIHandler {
+
+	private VotingPluginMain plugin;
+
+	public AdminVoteCumulativeRemove(VotingPluginMain plugin, CommandSender player) {
+		super(player);
+		this.plugin = plugin;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender sender) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+
+	}
+
+	@Override
+	public void onChest(Player player) {
+		BInventory inv = new BInventory("Remove cumulative");
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.Cumulative");
+		for (final String votes : plugin.getSpecialRewardsConfig().getCumulativeVotes()) {
+			inv.addButton(new BInventoryButton(
+					new ItemBuilder(Material.PAPER, 1).setName(votes).addLoreLine("&c&lClick to remove")) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					new AdminVoteConfirmation(plugin, clickEvent.getPlayer(), "Remove cumulative " + votes + "?") {
+
+						@Override
+						public void onDeny(Player p) {
+							new AdminVoteCumulative(plugin, p);
+						}
+
+						@Override
+						public void onConfirm(Player p) {
+							plugin.getSpecialRewardsConfig().removeCumulative(votes);
+							p.sendMessage("Removed cumulative " + votes);
+							plugin.reload();
+						}
+					}.open();;
+
+				}
+			});
+		}
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}
@@ -0,0 +1,77 @@
+package com.bencodez.votingplugin.commands.gui.admin.milestones;
+
+import java.util.ArrayList;
+
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.gui.GUIHandler;
+import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.commands.gui.admin.AdminVoteConfirmation;
+
+public class AdminVoteMilestoneRemove extends GUIHandler {
+
+	private VotingPluginMain plugin;
+
+	public AdminVoteMilestoneRemove(VotingPluginMain plugin, CommandSender player) {
+		super(player);
+		this.plugin = plugin;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender sender) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+
+	}
+
+	@Override
+	public void onChest(Player player) {
+		BInventory inv = new BInventory("Remove milestones");
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.MileStones");
+		for (final String votes : plugin.getSpecialRewardsConfig().getMilestoneVotes()) {
+			inv.addButton(new BInventoryButton(
+					new ItemBuilder(Material.PAPER, 1).setName(votes).addLoreLine("&c&lClick to remove")) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					new AdminVoteConfirmation(plugin, clickEvent.getPlayer(), "Remove milestone " + votes + "?") {
+
+						@Override
+						public void onDeny(Player p) {
+							new AdminVoteMilestones(plugin, p);
+						}
+
+						@Override
+						public void onConfirm(Player p) {
+							plugin.getSpecialRewardsConfig().removeMilestone(votes);
+							p.sendMessage("Removed milestone " + votes);
+							plugin.reload();
+						}
+					}.open();;
+
+				}
+			});
+		}
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}
@@ -0,0 +1,108 @@
+package com.bencodez.votingplugin.commands.gui.admin.milestones;
+
+import java.util.ArrayList;
+
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.gui.GUIHandler;
+import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.rewards.RewardHandler;
+import com.bencodez.advancedcore.api.valuerequest.InputMethod;
+import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
+import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
+import com.bencodez.advancedcore.api.valuerequest.listeners.NumberListener;
+import com.bencodez.advancedcore.command.gui.RewardEditGUI;
+import com.bencodez.votingplugin.VotingPluginMain;
+
+public class AdminVoteMilestones extends GUIHandler {
+
+	private VotingPluginMain plugin;
+
+	public AdminVoteMilestones(VotingPluginMain plugin, CommandSender player) {
+		super(player);
+		this.plugin = plugin;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender sender) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+
+	}
+
+	@Override
+	public void onChest(Player player) {
+		BInventory inv = new BInventory("Edit MileStones");
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.MileStones");
+		inv.addButton(
+				new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&cEdit existing milestone rewards")) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						ArrayList<Integer> nums = new ArrayList<Integer>();
+						for (String num : plugin.getSpecialRewardsConfig().getMilestoneVotes()) {
+							if (StringParser.getInstance().isInt(num)) {
+								nums.add(Integer.parseInt(num));
+							}
+						}
+						Number[] options = new Number[nums.size()];
+						for (int i = 0; i < nums.size(); i++) {
+							options[i] = nums.get(i);
+						}
+						new ValueRequestBuilder(new NumberListener() {
+
+							@Override
+							public void onInput(Player player, Number value) {
+								RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+										RewardHandler.getInstance()
+												.getDirectlyDefined("MileStones." + value.intValue() + ".Rewards"));
+							}
+						}, options).allowCustomOption(false).usingMethod(InputMethod.INVENTORY).request(clickEvent.getPlayer());;
+					}
+				});
+
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.EMERALD_BLOCK).setName("&aAdd milestone")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new ValueRequest().requestNumber(player, new NumberListener() {
+
+					@Override
+					public void onInput(Player player, Number value) {
+						plugin.getSpecialRewardsConfig().setMilestone(value.intValue());
+						plugin.reload();
+					}
+				});
+			}
+		});
+
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.REDSTONE_BLOCK).setName("&cRemove milestone")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteMilestoneRemove(plugin, clickEvent.getPlayer()).open();
+			}
+		});
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}
@@ -0,0 +1,84 @@
+package com.bencodez.votingplugin.commands.gui.admin.voteshop;
+
+import java.util.ArrayList;
+
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.gui.GUIHandler;
+import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
+import com.bencodez.advancedcore.api.valuerequest.listeners.StringListener;
+import com.bencodez.votingplugin.VotingPluginMain;
+
+public class AdminVoteVoteShop extends GUIHandler {
+
+	private VotingPluginMain plugin;
+
+	public AdminVoteVoteShop(VotingPluginMain plugin, CommandSender player) {
+		super(player);
+		this.plugin = plugin;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender sender) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+
+	}
+
+	@Override
+	public void onChest(Player player) {
+		BInventory inv = new BInventory("Edit VoteShop");
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteShop");
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.DIAMOND).setName("&cEdit existing item")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteVoteShopItems(plugin, clickEvent.getPlayer()).open(GUIMethod.CHEST);
+			}
+		});
+
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.EMERALD_BLOCK).setName("&aAdd voteshop item")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new ValueRequest().requestString(player, new StringListener() {
+
+					@Override
+					public void onInput(Player player, String value) {
+						plugin.getGui().createShop(value);
+						plugin.reload();
+					}
+				});
+			}
+		});
+
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.REDSTONE_BLOCK).setName("&cRemove item")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteVoteShopItemRemove(plugin, clickEvent.getPlayer()).open();
+			}
+		});
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}
@@ -0,0 +1,138 @@
+package com.bencodez.votingplugin.commands.gui.admin.voteshop;
+
+import java.util.ArrayList;
+
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.gui.GUIHandler;
+import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.editgui.EditGUI;
+import com.bencodez.advancedcore.api.inventory.editgui.EditGUIButton;
+import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueList;
+import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueNumber;
+import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueString;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.advancedcore.api.rewards.RewardHandler;
+import com.bencodez.advancedcore.command.gui.RewardEditGUI;
+import com.bencodez.votingplugin.VotingPluginMain;
+
+public class AdminVoteVoteShopItem extends GUIHandler {
+
+	private VotingPluginMain plugin;
+	private String identifier;
+
+	public AdminVoteVoteShopItem(VotingPluginMain plugin, CommandSender player, String identifier) {
+		super(player);
+		this.plugin = plugin;
+		this.identifier = identifier;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender sender) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+
+	}
+
+	private void setPathData(String path, Object value) {
+		plugin.getGui().getData().set("CHEST.Shop." + identifier + "." + path, value);
+		plugin.getGui().saveData();
+		plugin.reload();
+	}
+
+	@Override
+	public void onChest(Player player) {
+		EditGUI inv = new EditGUI("Edit VoteShop Item: " + identifier);
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteShop");
+		// to add
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueString("Identifier_Name",
+				plugin.getGui().getChestShopIdentifierIdentifierName(identifier)) {
+
+			@Override
+			public void setValue(Player player, String name) {
+				setPathData(getKey(), name);
+			}
+		}));
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.OAK_DOOR, 1),
+				new EditGUIValueString("Permission", plugin.getGui().getChestVoteShopPermission(identifier)) {
+
+					@Override
+					public void setValue(Player player, String name) {
+						setPathData(getKey(), name);
+					}
+				}));
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.EMERALD, 1),
+				new EditGUIValueNumber("Cost", plugin.getGui().getChestShopIdentifierCost(identifier)) {
+
+					@Override
+					public void setValue(Player player, Number num) {
+						setPathData(getKey(), num.intValue());
+					}
+				}));
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.BARRIER, 1),
+				new EditGUIValueNumber("Limit", plugin.getGui().getChestShopIdentifierLimit(identifier)) {
+
+					@Override
+					public void setValue(Player player, Number num) {
+						setPathData(getKey(), num.intValue());
+					}
+				}));
+
+		// display item
+		ConfigurationSection displayItemData = plugin.getGui().getChestShopIdentifierSection(identifier);
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.valueOf(displayItemData.getString("Material")), 1),
+				new EditGUIValueString("Material", displayItemData.getString("Material")) {
+
+					@Override
+					public void setValue(Player player, String name) {
+						setPathData(getKey(), name);
+					}
+				}));
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
+				new EditGUIValueString("Name", displayItemData.getString("Name")) {
+
+					@Override
+					public void setValue(Player player, String name) {
+						setPathData(getKey(), name);
+					}
+				}));
+		inv.addButton(new EditGUIButton(new ItemBuilder(Material.BOOK, 1),
+				new EditGUIValueList("Lore", displayItemData.getStringList("Lore")) {
+
+					@Override
+					public void setValue(Player player, ArrayList<String> value) {
+						setPathData(getKey(), value);
+					}
+				}));
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.DISPENSER, 1).setName("&cRewards")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+						RewardHandler.getInstance().getDirectlyDefined("CHEST.Shop." + identifier + ".Rewards"));
+			}
+		});
+
+		// implement item reward?
+
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}
@@ -0,0 +1,79 @@
+package com.bencodez.votingplugin.commands.gui.admin.voteshop;
+
+import java.util.ArrayList;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.gui.GUIHandler;
+import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.commands.gui.admin.AdminVoteConfirmation;
+
+public class AdminVoteVoteShopItemRemove extends GUIHandler {
+
+	private VotingPluginMain plugin;
+
+	public AdminVoteVoteShopItemRemove(VotingPluginMain plugin, CommandSender player) {
+		super(player);
+		this.plugin = plugin;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender sender) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+
+	}
+
+	@Override
+	public void onChest(Player player) {
+		BInventory inv = new BInventory("Edit VoteShop Remove Item");
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteShop");
+		
+		for (final String identifier : plugin.getGui().getChestShopIdentifiers()) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier))
+							.addLoreLine("&c&lClick to remove")) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new AdminVoteConfirmation(plugin, clickEvent.getPlayer(),
+									"Remove shop item " + identifier + "?") {
+
+								@Override
+								public void onDeny(Player p) {
+									new AdminVoteVoteShop(plugin, p).open();
+								}
+
+								@Override
+								public void onConfirm(Player p) {
+									plugin.getGui().removeShop(identifier);
+									p.sendMessage("Removed " + identifier);
+									plugin.reload();
+								}
+							}.open();;
+
+						}
+					}.addData("ident", identifier));
+		}
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}
@@ -0,0 +1,65 @@
+package com.bencodez.votingplugin.commands.gui.admin.voteshop;
+
+import java.util.ArrayList;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.gui.GUIHandler;
+import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.votingplugin.VotingPluginMain;
+
+public class AdminVoteVoteShopItems extends GUIHandler {
+
+	private VotingPluginMain plugin;
+
+	public AdminVoteVoteShopItems(VotingPluginMain plugin, CommandSender player) {
+		super(player);
+		this.plugin = plugin;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender sender) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+
+	}
+
+	@Override
+	public void onChest(Player player) {
+		BInventory inv = new BInventory("Edit VoteShop Items");
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteShop");
+		
+		for (String identifier : plugin.getGui().getChestShopIdentifiers()) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new AdminVoteVoteShopItem(plugin, clickEvent.getPlayer(), (String) getData("ident"))
+									.open(GUIMethod.CHEST);
+							;
+						}
+					}.addData("ident", identifier));
+		}
+
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}
@@ -11,8 +11,9 @@ import com.bencodez.advancedcore.api.inventory.BInventory;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.rewards.RewardHandler;
+import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.user.UserManager;
@@ -62,7 +63,14 @@ public class VoteGUI extends GUIHandler {
 					lore = plugin.getTopVoterHandler().topVoterAllTime(1);
 				}
 			} else if (slot.equalsIgnoreCase("today")) {
-				lore = new VoteToday(plugin, player, user, 1).voteToday();
+				String[] today = new VoteToday(plugin, player, user, 1).voteTodayGUI();
+				ArrayList<String> list = new ArrayList<String>();
+				if (today.length > 0) {
+					for (int i = today.length - 1; i < today.length && list.size() < 10 && i >= 0; i--) {
+						list.add(today[i]);
+					}
+				}
+				lore = ArrayUtils.getInstance().convert(list);
 			} else if (slot.equalsIgnoreCase("help")) {
 				lore = new String[] { "Click to view help" };
 			}
@@ -112,14 +120,8 @@ public class VoteGUI extends GUIHandler {

 	@Override
 	public void onChest(Player player) {
-		if ((!player.getName().equals(user.getPlayerName())
-				&& !player.hasPermission("VotingPlugin.Commands.Vote.GUI.Other")
-				&& !player.hasPermission("VotingPlugin.Mod"))
-				|| (!player.hasPermission("VotingPlugin.Commands.Vote.GUI")
-						&& !player.hasPermission("VotingPlugin.Player"))) {
-			player.sendMessage(
-					StringParser.getInstance().colorize(VotingPluginMain.plugin.getOptions().getFormatNoPerms()));
-			return;
+		if (this.user == null) {
+			user = UserManager.getInstance().getVotingPluginUser((Player) player);
 		}
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteGUIName());
 		if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
@@ -171,6 +173,13 @@ public class VoteGUI extends GUIHandler {
 							new VoteTopVoterLastMonth(plugin, player, user).open(GUIMethod.CHEST);
 						}
 					}
+
+					if (RewardHandler.getInstance().hasRewards(plugin.getGui().getData(),
+							plugin.getGui().getChestVoteGUISlotRewardsPath(slot))) {
+						RewardHandler.getInstance().giveReward(UserManager.getInstance().getVotingPluginUser(player),
+								plugin.getGui().getData(), plugin.getGui().getChestVoteGUISlotRewardsPath(slot),
+								new RewardOptions().addPlaceholder("identifier", slot));
+					}
 				}

 				@Override
@@ -38,12 +38,10 @@ public class VoteHelp extends GUIHandler {
 		boolean requirePerms = plugin.getConfigFile().getFormatCommandsVoteHelpRequirePermission();

 		for (CommandHandler cmdHandle : plugin.getVoteCommand()) {
-			if (requirePerms && sender.hasPermission(cmdHandle.getPerm())) {
+			if (!requirePerms || cmdHandle.hasPerm(sender)) {
 				unsorted.put(cmdHandle.getHelpLineCommand("/vote"),
 						cmdHandle.getHelpLine("/vote", plugin.getConfigFile().getFormatCommandsVoteHelpLine()));
-			} else {
-				unsorted.put(cmdHandle.getHelpLineCommand("/vote"), cmdHandle.getHelpLine("/vote"));
-			}
+			} 
 		}
 		ArrayList<String> unsortedList = new ArrayList<String>();
 		unsortedList.addAll(unsorted.keySet());
@@ -38,7 +38,9 @@ public class VoteLast extends GUIHandler {
 				"%player%", playerName));

 		for (VoteSite voteSite : plugin.getVoteSites()) {
-			msg.add(user.voteCommandLastLine(voteSite));
+			if (!voteSite.isHidden()) {
+				msg.add(user.voteCommandLastLine(voteSite));
+			}
 		}

 		return ArrayUtils.getInstance().colorize(msg);
@@ -59,20 +61,23 @@ public class VoteLast extends GUIHandler {
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteLastName());
 		inv.addPlaceholder("player", user.getPlayerName());
 		for (VoteSite site : plugin.getVoteSites()) {
-			inv.addButton(inv.getNextSlot(), new UpdatingBInventoryButton(site.getItem().setName(site.getDisplayName())
-					.setLore(user.voteCommandLastLine(site)).setAmountNone(1), 1000, 1000) {
+			if (!site.isHidden()) {
+				inv.addButton(inv.getNextSlot(),
+						new UpdatingBInventoryButton(site.getItem().setName(site.getDisplayName())
+								.setLore(user.voteCommandLastLine(site)).setAmountNone(1), 1000, 1000) {

-				@Override
-				public void onClick(ClickEvent clickEvent) {
+							@Override
+							public void onClick(ClickEvent clickEvent) {

-				}
+							}

-				@Override
-				public ItemBuilder onUpdate(Player p) {
-					return site.getItem().setName(site.getDisplayName()).setLore(user.voteCommandLastLine(site))
-							.setAmountNone(1);
-				}
-			});
+							@Override
+							public ItemBuilder onUpdate(Player p) {
+								return site.getItem().setName(site.getDisplayName())
+										.setLore(user.voteCommandLastLine(site)).setAmountNone(1);
+							}
+						});
+			}
 		}

 		if (plugin.getGui().getChestVoteLastBackButton()) {
@@ -42,15 +42,17 @@ public class VoteNext extends GUIHandler {
 				.replaceIgnoreCase(plugin.getConfigFile().getFormatCommandsVoteNextTitle(), "%player%", playerName)));

 		for (VoteSite voteSite : plugin.getVoteSites()) {
+			if (!voteSite.isHidden()) {

-			String msgLine = plugin.getConfigFile().getFormatCommandsVoteNextLayout();
+				String msgLine = plugin.getConfigFile().getFormatCommandsVoteNextLayout();

-			msgLine = StringParser.getInstance().replaceIgnoreCase(msgLine, "%info%",
-					user.voteCommandNextInfo(voteSite));
-
-			msgLine = StringParser.getInstance().replaceIgnoreCase(msgLine, "%SiteName%", voteSite.getDisplayName());
-			msg.add(StringParser.getInstance().colorize(msgLine));
+				msgLine = StringParser.getInstance().replaceIgnoreCase(msgLine, "%info%",
+						user.voteCommandNextInfo(voteSite));

+				msgLine = StringParser.getInstance().replaceIgnoreCase(msgLine, "%SiteName%",
+						voteSite.getDisplayName());
+				msg.add(StringParser.getInstance().colorize(msgLine));
+			}
 		}
 		return msg;
 	}
@@ -1,8 +1,10 @@
 package com.bencodez.votingplugin.commands.gui.player;

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

 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -15,6 +17,7 @@ import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.user.UUID;
 import com.bencodez.advancedcore.nms.NMSManager;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
@@ -48,15 +51,21 @@ public class VoteToday extends GUIHandler {
 			maxPage++;
 		}

-		msg.add("&cToday's Votes " + page + "/" + maxPage);
-		msg.add("&cPlayerName : VoteSite : Time");
+		HashMap<String, String> placeholders = new HashMap<String, String>();
+		placeholders.put("page", "" + page);
+		placeholders.put("maxpage", "" + maxPage);
+		
+		for (String m : plugin.getConfigFile().getFormatCommandsVoteTodayTitle()) {
+			msg.add(m);
+		}
+		
 		page--;

 		for (int i = pagesize * page; (i < voteToday.length) && (i < ((page + 1) * pagesize)); i++) {
 			msg.add(voteToday[i]);
 		}

-		return ArrayUtils.getInstance().colorize(msg);
+		return ArrayUtils.getInstance().colorize(ArrayUtils.getInstance().replacePlaceHolder(msg, placeholders));
 	}

 	@Override
@@ -94,12 +103,12 @@ public class VoteToday extends GUIHandler {
 				item.setName(StringParser.getInstance().replacePlaceHolder(plugin.getGui().getChestVoteTodayIconTitle(),
 						"player", user.getPlayerName()));
 				item.setLore(msg);
+				final String uuid = user.getUUID();
 				inv.addButton(inv.getNextSlot(), new BInventoryButton(item) {

 					@Override
 					public void onClick(ClickEvent clickEvent) {
-						VotingPluginUser user = UserManager.getInstance()
-								.getVotingPluginUser(clickEvent.getClickedItem().getItemMeta().getDisplayName());
+						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
 						new VoteGUI(plugin, player, user)
 								.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
 					}
@@ -139,4 +148,31 @@ public class VoteToday extends GUIHandler {
 		return ArrayUtils.getInstance().convert(msg);
 	}

+	public String[] voteTodayGUI() {
+		ArrayList<String> msg = new ArrayList<String>();
+		for (VotingPluginUser user : plugin.getVoteToday().keySet()) {
+
+			LocalDateTime mostRecent = null;
+			VoteSite mostRecentSite = null;
+			for (Entry<VoteSite, LocalDateTime> entry : plugin.getVoteToday().get(user).entrySet()) {
+				if (mostRecent == null || entry.getValue().isAfter(mostRecent)) {
+					mostRecent = entry.getValue();
+					mostRecentSite = entry.getKey();
+				}
+			}
+			if (mostRecent != null) {
+				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(plugin.getConfigFile().getFormatTimeFormat());
+				String timeString = mostRecent.format(formatter);
+				HashMap<String, String> placeholders = new HashMap<String, String>();
+				placeholders.put("player", user.getPlayerName());
+				placeholders.put("votesite", mostRecentSite.getKey());
+				placeholders.put("time", timeString);
+				msg.add(StringParser.getInstance()
+						.replacePlaceHolder(plugin.getConfigFile().getFormatCommandsVoteTodayLine(), placeholders));
+			}
+		}
+		msg = ArrayUtils.getInstance().colorize(msg);
+		return ArrayUtils.getInstance().convert(msg);
+	}
+
 }
@@ -102,9 +102,13 @@ public class VoteTopVoter extends GUIHandler {

 					@Override
 					public void onClick(ClickEvent clickEvent) {
-						VotingPluginUser user = (VotingPluginUser) getData("User");
-						new VoteGUI(plugin, player, user)
-								.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
+						if (plugin.getGui().getChestVoteTopOpenMainGUIOnClick()) {
+							VotingPluginUser user = (VotingPluginUser) getData("User");
+							new VoteGUI(plugin, player, user)
+									.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
+						} else {
+							getInv().forceClose(clickEvent.getPlayer());
+						}
 					}
 				}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey()));
 				pos++;
@@ -13,12 +13,14 @@ import com.bencodez.advancedcore.api.bookgui.Layout;
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
 import com.bencodez.advancedcore.api.inventory.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.messages.MessageBuilder;
 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.topvoter.TopVoter;
@@ -59,16 +61,18 @@ public class VoteURL extends GUIHandler {
 		if (plugin.getConfigFile().getFormatCommandsVoteAutoInputSites()) {
 			int counter = 0;
 			for (VoteSite voteSite : plugin.getVoteSites()) {
-				counter++;
-				String voteURL = voteSite.getVoteURL(json);
-				MessageBuilder message = new MessageBuilder(plugin.getConfigFile().getFormatCommandsVoteURLS());
-				message.replacePlaceholder("num", Integer.toString(counter)).replacePlaceholder("url", voteURL)
-						.replacePlaceholder("SiteName", voteSite.getDisplayName());
-				if (user != null && user.getPlayerName() != null) {
-					message.replacePlaceholder("player", "" + user.getPlayerName()).replacePlaceholder("Next",
-							"" + user.voteCommandNextInfo(voteSite));
+				if (!voteSite.isHidden()) {
+					counter++;
+					String voteURL = voteSite.getVoteURL(json);
+					MessageBuilder message = new MessageBuilder(plugin.getConfigFile().getFormatCommandsVoteURLS());
+					message.replacePlaceholder("num", Integer.toString(counter)).replacePlaceholder("url", voteURL)
+							.replacePlaceholder("SiteName", voteSite.getDisplayName());
+					if (user != null && user.getPlayerName() != null) {
+						message.replacePlaceholder("player", "" + user.getPlayerName()).replacePlaceholder("Next",
+								"" + user.voteCommandNextInfo(voteSite));
+					}
+					sites.add(message.colorize().getText());
 				}
-				sites.add(message.colorize().getText());
 			}
 		}
 		if (user != null) {
@@ -102,19 +106,26 @@ public class VoteURL extends GUIHandler {
 		if (!builderAll.hasCustomLore()) {
 			builderAll.setLore("&cClick Me");
 		}
+		int slot = plugin.getGui().getChestVoteURLAllUrlsButtonSlot();
+		if (slot >= 0) {
+			builderAll.setSlot(slot);
+		}
 		return builderAll;
 	}

 	private ItemBuilder getItemVoteSite(VoteSite voteSite) {
 		ItemBuilder builder = new ItemBuilder(plugin.getGui().getChestVoteURLAlreadyVotedItemSection());
+		
 		if (user.canVoteSite(voteSite)) {
 			builder = new ItemBuilder(plugin.getGui().getChestVoteURLCanVoteItemSection());
+			builder.setName(plugin.getGui().getChestVoteURLGUISiteNameCanVote().replace("%Name%", voteSite.getDisplayName()));
 		} else {
+			builder.setName(plugin.getGui().getChestVoteURLGUISiteName().replace("%Name%", voteSite.getDisplayName()));
 			builder.addLoreLine(
 					plugin.getGui().getChestVoteURLNextVote().replace("%Info%", user.voteCommandNextInfo(voteSite)));
 		}

-		builder.setName(plugin.getGui().getChestVoteURLGUISiteName().replace("%Name%", voteSite.getDisplayName()));
+		
 		return builder;
 	}

@@ -151,12 +162,10 @@ public class VoteURL extends GUIHandler {
 	public void onChest(Player player) {
 		// normal GUI
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteURLName());
-
-		int count = 0;
 		if (plugin.getGui().getChestVoteURLViewAllUrlsButtonEnabled()) {
 			ItemBuilder builderAll = getItemAll();

-			inv.addButton(count, new UpdatingBInventoryButton(builderAll, 1000, 1000) {
+			inv.addButton(new UpdatingBInventoryButton(builderAll, 1000, 1000) {

 				@Override
 				public void onClick(ClickEvent event) {
@@ -170,38 +179,53 @@ public class VoteURL extends GUIHandler {
 					return getItemAll();
 				}
 			});
-
-			count++;
 		}

+		int startSlot = plugin.getGui().getChestVoteURLAllUrlsButtonStartSlot();
 		for (final VoteSite voteSite : plugin.getVoteSites()) {
-			ItemBuilder builder = getItemVoteSite(voteSite);
+			if (!voteSite.isHidden()) {
+				ItemBuilder builder = getItemVoteSite(voteSite);
+				if (startSlot >= 0) {
+					builder.setSlot(startSlot);
+					startSlot++;
+				}

-			inv.addButton(count, new UpdatingBInventoryButton(builder, 1000, 1000) {
+				inv.addButton(new UpdatingBInventoryButton(builder, 1000, 1000) {

-				@Override
-				public void onClick(ClickEvent event) {
-					Player player = event.getPlayer();
-					if (player != null) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
-						user.sendMessage(StringParser.getInstance().replacePlaceHolder(
-								StringParser.getInstance()
-										.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
-												plugin.getGui().getChestVoteURLURLText(), "voteurl",
-												voteSite.getVoteURL()), "sitename", voteSite.getDisplayName()),
-								"player", player.getName()));
+					@Override
+					public void onClick(ClickEvent event) {
+						Player player = event.getPlayer();
+						if (player != null) {
+							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
+							user.sendMessage(StringParser.getInstance().replacePlaceHolder(StringParser.getInstance()
+									.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
+											plugin.getGui().getChestVoteURLURLText(), "voteurl", voteSite.getVoteURL()),
+											"sitename", voteSite.getDisplayName()),
+									"player", player.getName()));
+
+						}

 					}

-				}
+					@Override
+					public ItemBuilder onUpdate(Player player) {
+						return getItemVoteSite(voteSite);
+					}
+
+				});
+			}
+		}
+
+		for (final String str : plugin.getGui().getChestVoteURLExtraItems()) {
+			inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestVoteURLExtraItemsItem(str))) {

 				@Override
-				public ItemBuilder onUpdate(Player player) {
-					return getItemVoteSite(voteSite);
+				public void onClick(ClickEvent clickEvent) {
+					new RewardBuilder(plugin.getGui().getData(), "CHEST.VoteURL.ExtraItems." + str + ".Rewards")
+							.setGiveOffline(false).send(clickEvent.getPlayer());
+					;
 				}
-
 			});
-			count++;
 		}

 		if (plugin.getGui().getChestVoteURLBackButton()) {
@@ -25,6 +25,14 @@ public class BungeeSettings extends YMLFile {
 	@Getter
 	private boolean bungeeDebug = false;

+	@ConfigDataBoolean(path = "VotifierBypass")
+	@Getter
+	private boolean votifierBypass = false;
+
+	@ConfigDataBoolean(path = "TriggerVotifierEvent")
+	@Getter
+	private boolean triggerVotifierEvent = false;
+
 	@ConfigDataString(path = "BungeeMethod")
 	@Getter
 	private String bungeeMethod = "PLUGINMESSAGING";
@@ -41,6 +49,10 @@ public class BungeeSettings extends YMLFile {
 	@Getter
 	private boolean removeInvalidUsers = false;

+	@ConfigDataBoolean(path = "PerServerRewards")
+	@Getter
+	private boolean perServerRewards = false;
+
 	@ConfigDataString(path = "Server")
 	@Getter
 	private String server = "PleaseSet";
@@ -7,6 +7,7 @@ import java.util.Set;

 import org.bukkit.configuration.ConfigurationSection;

+import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.yml.YMLFile;
 import com.bencodez.advancedcore.api.yml.annotation.AnnotationHandler;
 import com.bencodez.advancedcore.api.yml.annotation.ConfigDataBoolean;
@@ -36,6 +37,14 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean allowUnjoined = false;

+	@ConfigDataBoolean(path = "UseVoteGUIMainCommand")
+	@Getter
+	private boolean useVoteGUIMainCommand = false;
+
+	@ConfigDataBoolean(path = "ExtraAllSitesCheck")
+	@Getter
+	private boolean extraAllSitesCheck = false;
+
 	@ConfigDataBoolean(path = "AllowUnJoinedCheckServer")
 	@Getter
 	private boolean allowUnJoinedCheckServer = true;
@@ -124,10 +133,26 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean formatCommandsVoteForceLinks = true;

+	@ConfigDataBoolean(path = "DisableInteractEvent")
+	@Getter
+	private boolean disableInteractEvent = false;
+
 	@ConfigDataString(path = "Format.Commands.Vote.Last.LastVoted")
 	@Getter
 	private String formatCommandsVoteLastLastVoted = "%times% ago";

+	@ConfigDataString(path = "Format.AlternateBroadcast.Broadcast")
+	@Getter
+	private String formatAlternateBroadcastBroadcast = "&6[&4Broadcast&6] &2%numberofplayers% voted in the last half hour! /vote";
+
+	@ConfigDataInt(path = "Format.AlternateBroadcast.Delay")
+	@Getter
+	private int formatAlternateBroadcastDelay = 30;
+
+	@ConfigDataBoolean(path = "Format.AlternateBroadcast.Enabled")
+	@Getter
+	private boolean formatAlternateBroadcastEnabled = false;
+
 	@ConfigDataString(path = "Format.Commands.Vote.Last.Line", defaultValue = "&3%SiteName%: &6%timeSince% ago")
 	@Getter
 	private String formatCommandsVoteLastLine;
@@ -144,6 +169,11 @@ public class Config extends YMLFile {
 	@Getter
 	private String formatCommandsVoteTodayLine = "&6%player% : %VoteSite% : %Time%";

+	@ConfigDataListString(path = "Format.Commands.Vote.Today.Title")
+	@Getter
+	private ArrayList<String> formatCommandsVoteTodayTitle = ArrayUtils.getInstance()
+			.convert(new String[] { "&cToday's Votes %page%/%maxpage%", "&cPlayerName : VoteSite : Time" });
+
 	@ConfigDataString(path = "Format.Commands.Vote.ToggleBroadcasts.Disabled")
 	@Getter
 	private String formatCommandsVoteToggleBroadcastDisabled = "&cYou will no longer see vote broadcasts";
@@ -203,6 +233,10 @@ public class Config extends YMLFile {
 	@Getter
 	private int MaxiumNumberOfTopVotersToLoad = -1;

+	@ConfigDataInt(path = "DelayLoginEvent")
+	@Getter
+	private int delayLoginEvent = 0;
+
 	@ConfigDataBoolean(path = "OverrideVersionDisable")
 	@Getter
 	private boolean overrideVersionDisable = false;
@@ -223,6 +257,10 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean usePrimaryAccountForPlaceholders = false;

+	@ConfigDataBoolean(path = "DisableCoolDownCheck")
+	@Getter
+	private boolean disableCoolDownCheck = false;
+
 	@ConfigDataListString(path = "VotingBroadcastBlacklist")
 	@Getter
 	private ArrayList<String> votingBroadcastBlacklist = new ArrayList<String>();
@@ -639,6 +677,14 @@ public class Config extends YMLFile {
 		return getData().getBoolean("LoadTopVoter.AllTime", true);
 	}

+	@ConfigDataBoolean(path = "UseVoteStreaks")
+	@Getter
+	private boolean useVoteStreaks = true;
+
+	@ConfigDataBoolean(path = "UseHighestTotals")
+	@Getter
+	private boolean useHighestTotals = true;
+
 	public boolean getLoadTopVoterDaily() {
 		return getData().getBoolean("LoadTopVoter.Daily", false);
 	}
@@ -691,15 +737,6 @@ public class Config extends YMLFile {
 		return getData().getBoolean("StoreTopVoters.Daily");
 	}

-	/**
-	 * Gets the store top voters monthly.
-	 *
-	 * @return the store top voters monthly
-	 */
-	public boolean getStoreTopVotersMonthly() {
-		return getData().getBoolean("StoreTopVoters.Monthly");
-	}
-
 	/**
 	 * Gets the store top voters weekly.
 	 *
@@ -128,7 +128,7 @@ public class ConfigVoteSites extends YMLFile {
 	 * @return the vote delay
 	 */
 	public int getVoteDelay(String siteName) {
-		return getData(siteName).getInt("VoteDelay");
+		return getData(siteName).getInt("VoteDelay", 24);
 	}

 	public int getVoteDelayMin(String siteName) {
@@ -144,6 +144,14 @@ public class ConfigVoteSites extends YMLFile {
 	public boolean getVoteSiteEnabled(String siteName) {
 		return getData(siteName).getBoolean("Enabled");
 	}
+	
+	public boolean getVoteSiteHidden(String siteName) {
+		return getData(siteName).getBoolean("Hidden");
+	}
+	
+	public boolean getVoteSiteIgnoreCanVote(String siteName) {
+		return getData(siteName).getBoolean("IgnoreCanVote");
+	}

 	/**
 	 * Gets the vote site file.
@@ -143,9 +143,10 @@ public class GUI extends YMLFile {
 	private boolean lastMonthGUI = false;

 	private VotingPluginMain plugin;
-	
+
 	public String getCHESTVoteShopPurchase(String identifier) {
-		return getData().getString("CHEST.Shop." + identifier +".PurchaseMessage", plugin.getConfigFile().getFormatShopPurchaseMsg());
+		return getData().getString("CHEST.Shop." + identifier + ".PurchaseMessage",
+				plugin.getConfigFile().getFormatShopPurchaseMsg());
 	}

 	public GUI(VotingPluginMain plugin) {
@@ -217,6 +218,10 @@ public class GUI extends YMLFile {
 		return getData().getString("CHEST.VoteGUI." + slot + ".Command", "");
 	}

+	public String getChestVoteGUISlotRewardsPath(String slot) {
+		return "CHEST.VoteGUI." + slot + ".Rewards";
+	}
+
 	/**
 	 * Gets the vote GUI slot lore.
 	 *
@@ -352,7 +357,7 @@ public class GUI extends YMLFile {
 	}

 	public boolean getChestVoteTopBackButton() {
-		return getData().getBoolean("CHEST.VoteToday.BackButton");
+		return getData().getBoolean("CHEST.VoteTop.BackButton");
 	}

 	public String getChestVoteTopItemLore() {
@@ -363,6 +368,10 @@ public class GUI extends YMLFile {
 		return getData().getString("CHEST.VoteTop.Item.Name", "&3&l%position%: &3%player%");
 	}

+	public boolean getChestVoteTopOpenMainGUIOnClick() {
+		return getData().getBoolean("CHEST.VoteTop.OpenMainGUIOnClick", true);
+	}
+
 	public String getChestVoteTopName() {
 		return getData().getString("CHEST.VoteTop.Name", "VoteTop %topvoter%");
 	}
@@ -427,6 +436,25 @@ public class GUI extends YMLFile {
 		return getData().getConfigurationSection("CHEST.VoteURL.AlreadyVotedItem");
 	}

+	public int getChestVoteURLAllUrlsButtonSlot() {
+		return getData().getInt("CHEST.VoteURL.AllUrlsButton.Slot", -1);
+	}
+
+	public int getChestVoteURLAllUrlsButtonStartSlot() {
+		return getData().getInt("CHEST.VoteURL.StartSlot", -1);
+	}
+
+	public Set<String> getChestVoteURLExtraItems() {
+		if (getData().isConfigurationSection("CHEST.VoteURL.ExtraItems")) {
+			return getData().getConfigurationSection("CHEST.VoteURL.ExtraItems").getKeys(false);
+		}
+		return new HashSet<String>();
+	}
+
+	public ConfigurationSection getChestVoteURLExtraItemsItem(String item) {
+		return getData().getConfigurationSection("CHEST.VoteURL.ExtraItems." + item);
+	}
+
 	public boolean getChestVoteURLBackButton() {
 		return getData().getBoolean("CHEST.VoteURL.BackButton");
 	}
@@ -452,6 +480,10 @@ public class GUI extends YMLFile {
 		return getData().getString("CHEST.VoteURL.SiteName", "&c%Name%");
 	}

+	public String getChestVoteURLGUISiteNameCanVote() {
+		return getData().getString("CHEST.VoteURL.SiteNameCanVote", "&a%Name%");
+	}
+
 	public String getChestVoteURLName() {
 		return getData().getString("CHEST.VoteURL.Name", "&cVoteURL");
 	}
@@ -506,4 +538,25 @@ public class GUI extends YMLFile {
 		return getData().getBoolean("CHEST.Shop." + identifier + ".RequireConfirmation",
 				isChestVoteShopRequireConfirmation());
 	}
+
+	public void createShop(String value) {
+		ConfigurationSection shopData = getData().createSection("CHEST.Shop." + value);
+		shopData.set("Identifier_Name", value);
+		shopData.set("Material", "STONE");
+		shopData.set("Amount", 1);
+		shopData.set("Name", "&cPlaceholder item");
+		shopData.set("Cost", 1);
+		shopData.set("Permission", "");
+		shopData.set("CloseGUI", true);
+		shopData.set("RequireConfirmation", false);
+
+		shopData.set("Rewards.Items.Item1.Material", "STONE");
+		shopData.set("Rewards.Items.Item1.Amount", 1);
+		saveData();
+	}
+
+	public void removeShop(String value) {
+		getData().set("CHEST.Shop." + value, null);
+		saveData();
+	}
 }
@@ -43,6 +43,10 @@ public class SpecialRewardsConfig extends YMLFile {
 	@Getter
 	private boolean votePartyResetExtraVotesMonthly = false;

+	@ConfigDataBoolean(path = "VoteParty.ResetCount")
+	@Getter
+	private boolean votePartyResetCount = true;
+
 	@Getter
 	private String votePartyRewardsPath = "VoteParty.Rewards";

@@ -229,10 +233,18 @@ public class SpecialRewardsConfig extends YMLFile {
 		return getData().getBoolean("VoteParty.ResetEachDay");
 	}

+	public boolean getVotePartyOnlyOncePerDay() {
+		return getData().getBoolean("VoteParty.OnlyOncePerDay");
+	}
+
 	public boolean getVotePartyResetMontly() {
 		return getData().getBoolean("VoteParty.ResetMonthly");
 	}

+	public boolean getVotePartyResetWeekly() {
+		return getData().getBoolean("VoteParty.ResetWeekly");
+	}
+
 	public int getVotePartyUserVotesRequired() {
 		return getData().getInt("VoteParty.UserVotesRequired");
 	}
@@ -292,4 +304,26 @@ public class SpecialRewardsConfig extends YMLFile {
 	public void onFileCreation() {
 		plugin.saveResource("SpecialRewards.yml", true);
 	}
+
+	public void setMilestone(int intValue) {
+		getData().set("Milestones." + intValue + ".Enabled", true);
+		getData().set("Milestones." + intValue + ".Rewards.Messages.Player", "&aYou got %milestone% milestone votes!");
+		saveData();
+	}
+
+	public void removeMilestone(String votes) {
+		getData().set("MileStones." + votes, null);
+		saveData();
+	}
+
+	public void removeCumulative(String votes) {
+		getData().set("Cumulative." + votes, null);
+		saveData();
+	}
+
+	public void setCumulative(int intValue) {
+		getData().set("Cumulative." + intValue + ".Enabled", true);
+		getData().set("Cumulative." + intValue + ".Rewards.Messages.Player", "&aYou got %cumulative% cumulative votes!");
+		saveData();
+	}
 }
@@ -32,27 +32,43 @@ public class CoolDownCheck implements Listener {
 		this.plugin = plugin;
 	}

-	public void checkAll() {
-		plugin.getTimer().schedule(new TimerTask() {
+	public void load() {
+		checkAll();
+	}

-			@Override
-			public void run() {
-				if (VotingPluginMain.plugin != null) {
-					for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-						if (VotingPluginMain.plugin != null) {
-							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-							if (user.getUserData().hasData() && user.hasLoggedOnBefore()) {
-								user.checkCoolDownEvents();
+	public void checkAll() {
+		if (!plugin.getConfigFile().isDisableCoolDownCheck() && RewardHandler.getInstance()
+				.hasRewards(plugin.getSpecialRewardsConfig().getData(), "VoteCoolDownEndedReward")) {
+			plugin.getTimer().schedule(new TimerTask() {
+
+				@Override
+				public void run() {
+					if (VotingPluginMain.plugin != null) {
+						if (!plugin.getConfigFile().isDisableCoolDownCheck() && RewardHandler.getInstance()
+								.hasRewards(plugin.getSpecialRewardsConfig().getData(), "VoteCoolDownEndedReward")) {
+							for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+								if (VotingPluginMain.plugin != null) {
+									VotingPluginUser user = UserManager.getInstance()
+											.getVotingPluginUser(new UUID(uuid));
+									if (user.getUserData().hasData() && user.hasLoggedOnBefore()) {
+										user.checkCoolDownEvents();
+									}
+								} else {
+									cancel();
+								}
 							}
 						} else {
+							plugin.debug("Not enabling cooldown check reward");
 							cancel();
 						}
+					} else {
+						cancel();
 					}
-				} else {
-					cancel();
 				}
-			}
-		}, 1000 * 60 * 3);
+			}, 1000 * 60 * 5, 1000 * 60 * 30);
+		} else {
+			plugin.debug("Not enabling cooldown check reward");
+		}

 	}

@@ -239,4 +239,17 @@ public class ServerData {
 	public void updateValues() {
 		setVersion();
 	}
+
+	public boolean isLastVotePartySameDay() {
+		int num = getData().getInt("LastVoteParty", 0);
+		if (num != plugin.getTimeChecker().getTime().getDayOfYear()) {
+			return true;
+		}
+		return false;
+	}
+
+	public void updateLastVoteParty() {
+		getData().set("LastVoteParty", plugin.getTimeChecker().getTime().getDayOfYear());
+		saveData();
+	}
 }
@@ -3,7 +3,9 @@ package com.bencodez.votingplugin.events;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;

+import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.objects.VoteSite;
+import com.bencodez.votingplugin.user.VotingPluginUser;

 import lombok.Getter;
 import lombok.Setter;
@@ -36,7 +38,7 @@ public class PlayerVoteEvent extends Event {

 	@Getter
 	@Setter
-	private String bungeeTextTotals;
+	private BungeeMessageData bungeeTextTotals;

 	@Getter
 	@Setter
@@ -66,6 +68,14 @@ public class PlayerVoteEvent extends Event {
 	@Setter
 	private VoteSite voteSite;

+	@Getter
+	@Setter
+	private VotingPluginUser votingPluginUser;
+	
+	@Getter
+	@Setter
+	private boolean wasOnline;
+
 	public PlayerVoteEvent(VoteSite voteSite, String voteUsername, String serviceSite, boolean realVote) {
 		super(true);
 		this.player = voteUsername;
@@ -0,0 +1,15 @@
+package com.bencodez.votingplugin.listeners;
+
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.events.PlayerVoteEvent;
+import com.vexsoftware.votifier.model.Vote;
+import com.vexsoftware.votifier.model.VotifierEvent;
+
+public class BungeeVotifierEvent {
+	public void send(VotingPluginMain plugin, PlayerVoteEvent event) {
+		plugin.debug("Triggering vote event");
+		VotifierEvent e = new VotifierEvent(
+				new Vote(event.getServiceSite(), event.getPlayer(), "VotingPlugin", "" + event.getTime()));
+		plugin.getServer().getPluginManager().callEvent(e);
+	}
+}
@@ -1,52 +0,0 @@
-package com.bencodez.votingplugin.listeners;
-
-import java.util.ArrayList;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerCommandSendEvent;
-
-import com.bencodez.votingplugin.VotingPluginMain;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class PlayerJoinEvent.
- */
-public class PlayerCommandSendListener implements Listener {
-
-	@SuppressWarnings("unused")
-	private VotingPluginMain plugin;
-
-	public PlayerCommandSendListener(VotingPluginMain plugin) {
-		this.plugin = plugin;
-	}
-
-	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-	public void onTab(PlayerCommandSendEvent event) {
-		if (plugin.getConfigFile().isDisableAdvancedTab()) {
-			return;
-		}
-		ArrayList<String> removeCmds = new ArrayList<String>();
-		if (!VotingPluginMain.plugin.getAdvancedTab().containsKey(event.getPlayer().getUniqueId())) {
-			ArrayList<String> whiteListed = new ArrayList<String>();
-			for (String cmd : event.getCommands()) {
-				if (plugin.getCommandLoader().isVotingPluginCommand(event.getPlayer(), cmd)) {
-					if (!plugin.getCommandLoader().hasPermission(event.getPlayer(), cmd)
-							&& !whiteListed.contains(cmd)) {
-						removeCmds.add(cmd);
-						// plugin.debug("removed " + cmd);
-					} else {
-						removeCmds.remove(cmd);
-						whiteListed.add(cmd);
-						// plugin.debug("has " + cmd);
-					}
-				}
-			}
-			VotingPluginMain.plugin.getAdvancedTab().put(event.getPlayer().getUniqueId(), removeCmds);
-		} else {
-			removeCmds = VotingPluginMain.plugin.getAdvancedTab().get(event.getPlayer().getUniqueId());
-		}
-		event.getCommands().removeAll(removeCmds);
-	}
-}
@@ -39,44 +39,51 @@ public class PlayerInteract implements Listener {
 	 */
 	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 	public void onPlayerInteract(PlayerInteractEvent event) {
-		Player player = event.getPlayer();
-		if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-			// plugin.debug("Checking for sign click");
-			if (event.getClickedBlock().getState() instanceof Sign) {
-				// plugin.debug(player.getName() + " right clicked a sign");
-				for (SignHandler sign : plugin.getSigns().getSigns()) {
-					if (sign.isLocationSame(event.getClickedBlock().getLocation())) {
-						// plugin.debug(player.getName() +
-						// " right clicked a top voter sign, sending message");
-						UserManager.getInstance().getVotingPluginUser(player).sendMessage(sign.getRightClickMessage());
+		if (plugin.getConfigFile().isDisableInteractEvent()) {
+			return;
+		}
+		if (plugin.getSigns().getSigns().size() > 0) {
+			Player player = event.getPlayer();
+			if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+				// plugin.debug("Checking for sign click");
+				if (event.getClickedBlock().getState() instanceof Sign) {
+					// plugin.debug(player.getName() + " right clicked a sign");
+					for (SignHandler sign : plugin.getSigns().getSigns()) {
+						if (sign.isLocationSame(event.getClickedBlock().getLocation())) {
+							// 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());
+							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().getSigns()) {
-						if (sign.getSign().equals(sign1)) {
-							sign.setSkullLocation(event.getClickedBlock().getLocation());
-							sign.storeSign();
-							sign.checkSkulls();
-							player.sendMessage("Skull set");
+				} 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().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);
 					}
-					PlayerUtils.getInstance().setPlayerMeta(player, "skullset", null);
 				}
 			}
+
 		}
 	}
 }
@@ -42,15 +42,29 @@ public class PlayerJoinEvent implements Listener {
 				&& VotingPluginMain.plugin.getMysql() == null)) {
 			return;
 		}
-		Player player = event.getPlayer();

+		int delay = plugin.getConfigFile().getDelayLoginEvent();
+		if (delay <= 0) {
+			login(event.getPlayer());
+		} else {
+			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					login(event.getPlayer());
+				}
+			}, delay);
+		}
+
+	}
+
+	private void login(Player player) {
 		VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
 		if (player.isOp() && plugin.isYmlError()) {
 			user.sendMessage("&cVotingPlugin: Detected yml error, please check console for details");
 		}

 		boolean data = user.getData().hasData();
-
 		// run remind
 		user.loginMessage();

@@ -56,9 +56,18 @@ public class PlayerVoteListener implements Listener {
 			}
 		}

+		if (playerName.isEmpty()) {
+			plugin.getLogger().warning("Empty player name for vote");
+			return;
+		}
+
 		if (event.isBungee()) {
 			plugin.debug("BungeePlayerVote forcebungee: " + event.isForceBungee() + ", bungeetotals: "
 					+ event.getBungeeTextTotals());
+
+			if (plugin.getBungeeSettings().isTriggerVotifierEvent()) {
+				new BungeeVotifierEvent().send(plugin, event);
+			}
 		}

 		VoteSite voteSite = event.getVoteSite();
@@ -78,7 +87,12 @@ public class PlayerVoteListener implements Listener {
 			return;
 		}

-		VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(playerName);
+		VotingPluginUser user = null;
+		if (event.getVotingPluginUser() != null) {
+			user = event.getVotingPluginUser();
+		} else {
+			user = UserManager.getInstance().getVotingPluginUser(playerName);
+		}
 		user.updateName(true);

 		if (plugin.getConfigFile().isClearCacheOnVote() || plugin.getBungeeSettings().isUseBungeecoord()) {
@@ -93,7 +107,7 @@ public class PlayerVoteListener implements Listener {
 		synchronized (object) {

 			// vote party
-			plugin.getVoteParty().vote(user, event.isRealVote());
+			plugin.getVoteParty().vote(user, event.isRealVote(), event.isForceBungee());

 			// broadcast vote if enabled in config
 			if (plugin.getConfigFile().isBroadcastVotesEnabled()
@@ -103,6 +117,10 @@ public class PlayerVoteListener implements Listener {
 				}
 			}

+			if (plugin.getBroadcastHandler() != null) {
+				plugin.getBroadcastHandler().onVote(playerName);
+			}
+
 			// update last vote time
 			if (event.getTime() != 0) {
 				user.setTime(voteSite, event.getTime());
@@ -123,7 +141,7 @@ public class PlayerVoteListener implements Listener {
 			}

 			// check first vote rewards
-			plugin.getSpecialRewards().checkFirstVote(user);
+			plugin.getSpecialRewards().checkFirstVote(user, event.isForceBungee());

 			if (user.isReminded()) {
 				user.setReminded(false);
@@ -133,7 +151,12 @@ public class PlayerVoteListener implements Listener {

 			if (((user.isOnline() || voteSite.isGiveOffline())
 					&& VotingPluginMain.plugin.getOptions().isProcessRewards()) || event.isBungee()) {
-				user.playerVote(voteSite, true, false, event.isForceBungee());
+				boolean online = true;
+				if (event.isBungee()) {
+					online = event.isWasOnline();
+				}
+				user.playerVote(voteSite, online, false, event.isForceBungee());
+				user.sendVoteEffects(online);
 				user.closeInv();
 			} else {
 				user.addOfflineVote(voteSite.getKey());
@@ -151,12 +174,12 @@ public class PlayerVoteListener implements Listener {
 				user.addPoints();
 			}

-			user.checkDayVoteStreak();
+			user.checkDayVoteStreak(event.isForceBungee());

 			// other rewards
-			plugin.getSpecialRewards().checkAllSites(user);
-			plugin.getSpecialRewards().checkCumualativeVotes(user, event.getBungeeTextTotals());
-			plugin.getSpecialRewards().checkMilestone(user, event.getBungeeTextTotals());
+			plugin.getSpecialRewards().checkAllSites(user, event.isForceBungee());
+			plugin.getSpecialRewards().checkCumualativeVotes(user, event.getBungeeTextTotals(), event.isForceBungee());
+			plugin.getSpecialRewards().checkMilestone(user, event.getBungeeTextTotals(), event.isForceBungee());

 			if (plugin.getBungeeSettings().isUseBungeecoord()) {
 				if (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.MYSQL)) {
@@ -9,8 +9,8 @@ import org.bukkit.event.Listener;

 import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
-import com.bencodez.votingplugin.objects.VoteSite;
 import com.vexsoftware.votifier.model.Vote;
 import com.vexsoftware.votifier.model.VotifierEvent;

@@ -44,6 +44,10 @@ public class VotiferEvent implements Listener {
 		final String voteSite = vote.getServiceName();
 		final String IP = vote.getAddress();
 		final String voteUsername = vote.getUsername().trim();
+		if (IP.equals("VotingPlugin")) {
+			// ignore own plugin calls of event
+			return;
+		}
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {

 			@Override
@@ -68,6 +72,14 @@ public class VotiferEvent implements Listener {

 			@Override
 			public void run() {
+
+				if (plugin.getBungeeSettings().isUseBungeecoord() && !plugin.getBungeeSettings().isVotifierBypass()
+						&& (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)
+								|| plugin.getBungeeHandler().getMethod().equals(BungeeMethod.SOCKETS))) {
+					plugin.getLogger().severe(
+							"Ignoring vote from votifier since pluginmessaging or socket bungee method is enabled");
+					return;
+				}
 				String voteSiteName = plugin.getVoteSiteName(voteSite);

 				ArrayList<String> sites = plugin.getConfigVoteSites().getVoteSitesNames();
@@ -84,13 +96,9 @@ public class VotiferEvent implements Listener {
 					plugin.getLogger().warning("VoteSite with service site '" + voteSiteName
 							+ "' does not exist, attempting to generaterate...");
 					plugin.getConfigVoteSites().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));
+							.info("Current known service sites: " + ArrayUtils.getInstance().makeStringList(plugin.getServerData().getServiceSites()));
 				}

 				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName), voteUsername,
@@ -36,6 +36,10 @@ public class VoteSite {
 	@Setter
 	private boolean enabled;

+	@Getter
+	@Setter
+	private boolean hidden;
+
 	@Getter
 	@Setter
 	private boolean giveOffline;
@@ -79,6 +83,10 @@ public class VoteSite {
 	@Getter
 	@Setter
 	private boolean waitUntilVoteDelay;
+	
+	@Getter
+	@Setter
+	private boolean ignoreCanVote;

 	public VoteSite(VotingPluginMain plugin, String siteName) {
 		this.plugin = plugin;
@@ -97,6 +105,9 @@ public class VoteSite {
 	 * @param checkBungee check bungee broadcast
 	 */
 	public void broadcastVote(VotingPluginUser user, boolean checkBungee) {
+		if (plugin.getConfigFile().isFormatAlternateBroadcastEnabled()) {
+			return;
+		}
 		if (!user.isVanished()) {
 			if (checkBungee && plugin.getBungeeSettings().isBungeeBroadcast()
 					&& plugin.getBungeeSettings().isUseBungeecoord()) {
@@ -147,9 +158,9 @@ public class VoteSite {
 	 */
 	public ItemBuilder getItem() {
 		if (item == null) {
-			plugin.getLogger().warning("Invalid item section in site: " + key);
-			return new ItemBuilder(Material.STONE, 1).setName("&cInvalid item for site: " + key)
-					.setLore("&cInvalid item for site: " + key);
+			plugin.getLogger().warning("Invalid display item section in site: " + key);
+			return new ItemBuilder(Material.STONE, 1).setName("&cInvalid display item for site: " + key)
+					.setLore("&cInvalid display item for site: " + key);
 		} else {
 			return new ItemBuilder(item);
 		}
@@ -223,6 +234,8 @@ public class VoteSite {
 		giveOffline = plugin.getConfigVoteSites().getVoteSiteGiveOffline(key);
 		waitUntilVoteDelay = plugin.getConfigVoteSites().getWaitUntilVoteDelay(key);
 		timeOffSet = plugin.getConfigVoteSites().getTimeOffSet(key);
+		hidden = plugin.getConfigVoteSites().getVoteSiteHidden(key);
+		ignoreCanVote = plugin.getConfigVoteSites().getVoteSiteIgnoreCanVote(key);
 	}

 	public boolean isVaidServiceSite() {
@@ -1,5 +1,6 @@
 package com.bencodez.votingplugin.specialrewards;

+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Set;

@@ -10,6 +11,7 @@ import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.events.PlayerSpecialRewardEvent;
 import com.bencodez.votingplugin.events.SpecialRewardType;
 import com.bencodez.votingplugin.topvoter.TopVoter;
@@ -27,21 +29,28 @@ public class SpecialRewards {
 		this.plugin = plugin;
 	}

-	/**
-	 * Check all sites.
-	 *
-	 * @param user the user
-	 * @return true, if successful
-	 */
-	public boolean checkAllSites(VotingPluginUser user) {
+	public boolean checkAllSites(VotingPluginUser user, boolean forceBungee) {
 		boolean checkAllVotes = user.checkAllVotes();
+		if (checkAllVotes
+				&& (plugin.getConfigFile().isExtraAllSitesCheck() || plugin.getBungeeSettings().isUseBungeecoord())) {
+			int currentDay = LocalDateTime.now().getDayOfYear();
+			int day = user.getGottenAllSitesDay();
+			if (currentDay == day) {
+				checkAllVotes = false;
+				plugin.debug("Not giving allsites, already gotten today");
+			} else {
+				user.setGottenAllSitesDay(currentDay);
+			}
+
+		}
 		if (checkAllVotes) {
-			giveAllSitesRewards(user, user.isOnline());
+			giveAllSitesRewards(user, user.isOnline(), forceBungee);
 		}
 		return checkAllVotes;
 	}

-	public boolean checkCumualativeVotes(VotingPluginUser user, String bungeeTextTotals) {
+	public boolean checkCumualativeVotes(VotingPluginUser user, BungeeMessageData bungeeMessageData,
+			boolean forceBungee) {
 		boolean gotCumulativeAny = false;
 		Set<String> votes = plugin.getSpecialRewardsConfig().getCumulativeVotes();
 		for (String vote : votes) {
@@ -53,35 +62,30 @@ public class SpecialRewards {
 									plugin.getSpecialRewardsConfig().getCumulativeRewardsPath(votesRequired))) {
 						boolean gotCumulative = false;
 						int total = 0;
-						boolean useBungeeTotalNum = false;
-						String[] data = new String[] { "0", "0", "0", "0" };
-						if (bungeeTextTotals != null) {
-							data = bungeeTextTotals.split("//");
-							useBungeeTotalNum = true;
-						}
+						boolean useBungeeTotalNum = bungeeMessageData != null;
 						if (plugin.getSpecialRewardsConfig().getCumulativeVotesInSameDay(votesRequired)) {
 							if (!useBungeeTotalNum) {
 								total = user.getTotal(TopVoter.Daily);
 							} else {
-								total = Integer.parseInt(data[3]);
+								total = bungeeMessageData.getDailyTotal();
 							}
 						} else if (plugin.getSpecialRewardsConfig().getCumulativeVotesInSameWeek(votesRequired)) {
 							if (!useBungeeTotalNum) {
 								total = user.getTotal(TopVoter.Weekly);
 							} else {
-								total = Integer.parseInt(data[2]);
+								total = bungeeMessageData.getWeeklyTotal();
 							}
 						} else if (plugin.getSpecialRewardsConfig().getCumulativeVotesInSameMonth(votesRequired)) {
 							if (!useBungeeTotalNum) {
 								total = user.getTotal(TopVoter.Monthly);
 							} else {
-								total = Integer.parseInt(data[1]);
+								total = bungeeMessageData.getMonthTotal();
 							}
 						} else {
 							if (!useBungeeTotalNum) {
 								total = user.getTotal(TopVoter.AllTime);
 							} else {
-								total = Integer.parseInt(data[0]);
+								total = bungeeMessageData.getAllTimeTotal();
 							}
 						}

@@ -93,8 +97,8 @@ public class SpecialRewards {

 						if (gotCumulative) {
 							gotCumulativeAny = true;
-							giveCumulativeVoteReward(user, user.isOnline(), votesRequired);
-							plugin.debug(user.getPlayerName() + " got cumulative " + votesRequired);
+							plugin.debug(user.getPlayerName() + " got cumulative " + votesRequired + ", current total: " + total);
+							giveCumulativeVoteReward(user, user.isOnline(), votesRequired, forceBungee);
 						} else {
 							plugin.devDebug(user.getPlayerName() + " not able to get cumulative " + votesRequired);
 						}
@@ -107,17 +111,11 @@ public class SpecialRewards {
 		return gotCumulativeAny;
 	}

-	/**
-	 * Check first vote.
-	 *
-	 * @param user the user
-	 * @return true, if successful
-	 */
-	public boolean checkFirstVote(VotingPluginUser user) {
+	public boolean checkFirstVote(VotingPluginUser user, boolean forceBungee) {
 		if (RewardHandler.getInstance().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getFirstVoteRewardsPath())) {
 			if (!user.hasGottenFirstVote()) {
-				giveFirstVoteRewards(user, user.isOnline());
+				giveFirstVoteRewards(user, user.isOnline(), forceBungee);
 				return true;
 			}

@@ -125,17 +123,14 @@ public class SpecialRewards {
 		return false;
 	}

-	public boolean checkMilestone(VotingPluginUser user, String bungeeTextTotals) {
+	public boolean checkMilestone(VotingPluginUser user, BungeeMessageData bungeeMessageData, boolean forceBungee) {
 		int milestoneCount = user.getMilestoneCount();
-		if (bungeeTextTotals != null) {
-			String[] data = bungeeTextTotals.split("//");
-			if (data.length > 4) {
-				try {
-					milestoneCount = Integer.parseInt(data[5]);
-				} catch (Exception e) {
-					e.printStackTrace();
-					milestoneCount = user.getMilestoneCount();
-				}
+		if (bungeeMessageData != null) {
+			try {
+				milestoneCount = bungeeMessageData.getMilestoneCount();
+			} catch (Exception e) {
+				e.printStackTrace();
+				milestoneCount = user.getMilestoneCount();
 			}
 		}
 		if (plugin.getConfigFile().isPreventRepeatMilestones()) {
@@ -175,7 +170,7 @@ public class SpecialRewards {

 						int userVotesTotal = milestoneCount;
 						if (userVotesTotal >= votesRequired && !user.hasGottenMilestone(votesRequired)) {
-							giveMilestoneVoteReward(user, user.isOnline(), votesRequired);
+							giveMilestoneVoteReward(user, user.isOnline(), votesRequired, forceBungee);
 							user.setHasGotteMilestone(votesRequired, true);
 							plugin.debug(user.getPlayerName() + " got milestone " + votesRequired);

@@ -189,7 +184,7 @@ public class SpecialRewards {
 		return gotMilestone;
 	}

-	public boolean checkVoteStreak(VotingPluginUser user, String type) {
+	public boolean checkVoteStreak(VotingPluginUser user, String type, boolean forceBungee) {
 		boolean gotReward = false;

 		Set<String> streaks = plugin.getSpecialRewardsConfig().getVoteStreakVotes(type);
@@ -216,14 +211,16 @@ public class SpecialRewards {
 						}
 						if (!multiple) {
 							if (curStreak == streakRequired) {
-								giveVoteStreakReward(user, user.isOnline(), type, "" + streakRequired, curStreak);
+								giveVoteStreakReward(user, user.isOnline(), type, "" + streakRequired, curStreak,
+										forceBungee);
 								gotReward = true;
 								plugin.debug(
 										user.getPlayerName() + " got VoteStreak " + streakRequired + " for " + type);
 							}
 						} else {
 							if (curStreak != 0 && curStreak % streakRequired == 0) {
-								giveVoteStreakReward(user, user.isOnline(), type, streakRequired + "-", curStreak);
+								giveVoteStreakReward(user, user.isOnline(), type, streakRequired + "-", curStreak,
+										forceBungee);
 								gotReward = true;
 								plugin.debug(
 										user.getPlayerName() + " got VoteStreak " + streakRequired + "* for " + type);
@@ -239,13 +236,7 @@ public class SpecialRewards {

 	}

-	/**
-	 * Give all sites rewards.
-	 *
-	 * @param user   the user
-	 * @param online the online
-	 */
-	public void giveAllSitesRewards(VotingPluginUser user, boolean online) {
+	public void giveAllSitesRewards(VotingPluginUser user, boolean online, boolean forceBungee) {
 		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user, SpecialRewardType.ALLSITE);
 		Bukkit.getPluginManager().callEvent(event);

@@ -253,17 +244,11 @@ public class SpecialRewards {
 			return;
 		}
 		RewardHandler.getInstance().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
-				plugin.getSpecialRewardsConfig().getAllSitesRewardPath(), new RewardOptions().setOnline(online));
+				plugin.getSpecialRewardsConfig().getAllSitesRewardPath(),
+				new RewardOptions().setServer(forceBungee).setOnline(online));
 	}

-	/**
-	 * Give cumulative vote reward.
-	 *
-	 * @param user       the user
-	 * @param online     the online
-	 * @param cumulative the cumulative
-	 */
-	public void giveCumulativeVoteReward(VotingPluginUser user, boolean online, int cumulative) {
+	public void giveCumulativeVoteReward(VotingPluginUser user, boolean online, int cumulative, boolean forceBungee) {
 		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user,
 				SpecialRewardType.CUMMULATIVE.setAmount(cumulative));
 		Bukkit.getPluginManager().callEvent(event);
@@ -273,17 +258,11 @@ public class SpecialRewards {
 		}

 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
-				plugin.getSpecialRewardsConfig().getCumulativeRewardsPath(cumulative)).setOnline(online)
-						.withPlaceHolder("Cumulative", "" + cumulative).send(user);
+				plugin.getSpecialRewardsConfig().getCumulativeRewardsPath(cumulative)).setServer(forceBungee)
+						.setOnline(online).withPlaceHolder("Cumulative", "" + cumulative).send(user);
 	}

-	/**
-	 * Give first vote rewards.
-	 *
-	 * @param user   the user
-	 * @param online the online
-	 */
-	public void giveFirstVoteRewards(VotingPluginUser user, boolean online) {
+	public void giveFirstVoteRewards(VotingPluginUser user, boolean online, boolean forceBungee) {
 		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user, SpecialRewardType.FIRSTVOTE);
 		Bukkit.getPluginManager().callEvent(event);

@@ -291,17 +270,11 @@ public class SpecialRewards {
 			return;
 		}
 		RewardHandler.getInstance().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
-				plugin.getSpecialRewardsConfig().getFirstVoteRewardsPath(), new RewardOptions().setOnline(online));
+				plugin.getSpecialRewardsConfig().getFirstVoteRewardsPath(),
+				new RewardOptions().setServer(forceBungee).setOnline(online));
 	}

-	/**
-	 * Give milestone vote reward.
-	 *
-	 * @param user      the user
-	 * @param online    the online
-	 * @param milestone the milestone
-	 */
-	public void giveMilestoneVoteReward(VotingPluginUser user, boolean online, int milestone) {
+	public void giveMilestoneVoteReward(VotingPluginUser user, boolean online, int milestone, boolean forceBungee) {
 		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user,
 				SpecialRewardType.MILESTONE.setAmount(milestone));
 		Bukkit.getPluginManager().callEvent(event);
@@ -311,10 +284,11 @@ public class SpecialRewards {
 		}
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getMilestoneRewardsPath(milestone)).setOnline(online)
-						.withPlaceHolder("Milestone", "" + milestone).send(user);
+						.withPlaceHolder("Milestone", "" + milestone).setServer(forceBungee).send(user);
 	}

-	public void giveVoteStreakReward(VotingPluginUser user, boolean online, String type, String string, int votes) {
+	public void giveVoteStreakReward(VotingPluginUser user, boolean online, String type, String string, int votes,
+			boolean forceBungee) {
 		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user,
 				SpecialRewardType.VOTESTREAK.setType(type).setAmount(votes));
 		Bukkit.getPluginManager().callEvent(event);
@@ -324,7 +298,8 @@ public class SpecialRewards {
 		}
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getVoteStreakRewardsPath(type, string)).setOnline(online)
-						.withPlaceHolder("Type", type).withPlaceHolder("Streak", "" + votes).send(user);
+						.withPlaceHolder("Type", type).setServer(forceBungee).withPlaceHolder("Streak", "" + votes)
+						.send(user);
 	}

 }
@@ -91,4 +91,20 @@ public enum TopVoter {
 		}
 		return TopVoter.AllTime;
 	}
+
+	public String getColumnName() {
+		switch (this) {
+		case AllTime:
+			return "AllTimeTotal";
+		case Daily:
+			return "DailyTotal";
+		case Monthly:
+			return "MonthTotal";
+		case Weekly:
+			return "WeeklyTotal";
+		default:
+			return null;
+		
+		}
+	}
 }
@@ -18,12 +18,14 @@ import org.bukkit.event.Listener;

 import com.bencodez.advancedcore.api.messages.StringParser;
 import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.time.TimeType;
 import com.bencodez.advancedcore.api.time.events.DateChangedEvent;
 import com.bencodez.advancedcore.api.time.events.DayChangeEvent;
 import com.bencodez.advancedcore.api.time.events.MonthChangeEvent;
 import com.bencodez.advancedcore.api.time.events.PreDateChangedEvent;
 import com.bencodez.advancedcore.api.time.events.WeekChangeEvent;
 import com.bencodez.advancedcore.api.user.UUID;
+import com.bencodez.advancedcore.api.user.UserStorage;
 import com.bencodez.advancedcore.api.yml.YMLFileHandler;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.UserManager;
@@ -104,7 +106,12 @@ public class TopVoterHandler implements Listener {
 	public void onDateChanged(DateChangedEvent event) {
 		plugin.setUpdate(true);
 		plugin.update();
-		loadLastMonth();
+		if (event.getTimeType().equals(TimeType.MONTH)) {
+			loadLastMonth();
+		}
+		if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
+			plugin.getMysql().clearCache();
+		}
 	}

 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -112,14 +119,18 @@ public class TopVoterHandler implements Listener {
 		synchronized (VotingPluginMain.plugin) {
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-				if (!user.voteStreakUpdatedToday(LocalDateTime.now().minusDays(1))) {
-					if (user.getDayVoteStreak() != 0) {
-						user.setDayVoteStreak(0);
+				if (plugin.getConfigFile().isUseVoteStreaks()) {
+					if (!user.voteStreakUpdatedToday(LocalDateTime.now().minusDays(1))) {
+						if (user.getDayVoteStreak() != 0) {
+							user.setDayVoteStreak(0);
+						}
 					}
 				}

-				if (user.getHighestDailyTotal() < user.getTotal(TopVoter.Daily)) {
-					user.setHighestDailyTotal(user.getTotal(TopVoter.Daily));
+				if (plugin.getConfigFile().isUseHighestTotals()) {
+					if (user.getHighestDailyTotal() < user.getTotal(TopVoter.Daily)) {
+						user.setHighestDailyTotal(user.getTotal(TopVoter.Daily));
+					}
 				}
 				for (String shopIdent : plugin.getGui().getChestShopIdentifiers()) {
 					if (plugin.getGui().getChestVoteShopResetDaily(shopIdent)) {
@@ -163,6 +174,10 @@ public class TopVoterHandler implements Listener {
 			}

 			resetTotals(TopVoter.Daily);
+
+			if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
+				plugin.getMysql().clearCache();
+			}
 		}
 	}

@@ -171,15 +186,18 @@ public class TopVoterHandler implements Listener {
 		synchronized (VotingPluginMain.plugin) {
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-				if (user.getTotal(TopVoter.Monthly) == 0 && user.getMonthVoteStreak() != 0) {
-					user.setMonthVoteStreak(0);
-				} else {
-					if (!plugin.getSpecialRewardsConfig().isVoteStreakRequirementUsePercentage()
-							|| user.hasPercentageTotal(TopVoter.Monthly,
-									plugin.getSpecialRewardsConfig().getVoteStreakRequirementMonth(),
-									LocalDateTime.now().minusDays(1))) {
-						user.addMonthVoteStreak();
-						plugin.getSpecialRewards().checkVoteStreak(user, "Month");
+				if (plugin.getConfigFile().isUseVoteStreaks()) {
+					if (user.getTotal(TopVoter.Monthly) == 0 && user.getMonthVoteStreak() != 0) {
+						user.setMonthVoteStreak(0);
+					} else {
+						if (!plugin.getSpecialRewardsConfig().isVoteStreakRequirementUsePercentage()
+								|| user.hasPercentageTotal(TopVoter.Monthly,
+										plugin.getSpecialRewardsConfig().getVoteStreakRequirementMonth(),
+										LocalDateTime.now().minusDays(1))) {
+							user.addMonthVoteStreak();
+							plugin.getSpecialRewards().checkVoteStreak(user, "Month",
+									plugin.getBungeeSettings().isUseBungeecoord());
+						}
 					}
 				}

@@ -191,15 +209,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 (plugin.getConfigFile().isUseHighestTotals()) {
+					if (user.getHighestMonthlyTotal() < user.getTotal(TopVoter.Monthly)) {
+						user.setHighestMonthlyTotal(user.getTotal(TopVoter.Monthly));
+					}
 				}
 			}

-			if (plugin.getConfigFile().getStoreTopVotersMonthly()) {
-				plugin.getLogger().info("Saving TopVoters Monthly");
-				storeTopVoters(TopVoter.Monthly);
-			}
+			plugin.getLogger().info("Saving TopVoters Monthly");
+			storeTopVoters(TopVoter.Monthly);

 			try {
 				if (plugin.getSpecialRewardsConfig().isEnableMonthlyAwards()) {
@@ -233,8 +251,6 @@ public class TopVoterHandler implements Listener {
 				e.printStackTrace();
 			}

-			resetTotals(TopVoter.Monthly);
-
 			if (plugin.getSpecialRewardsConfig().getResetMilestonesMonthly()) {
 				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 					VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
@@ -243,6 +259,12 @@ public class TopVoterHandler implements Listener {
 				}

 			}
+
+			resetTotals(TopVoter.Monthly);
+
+			if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
+				plugin.getMysql().clearCache();
+			}
 		}
 	}

@@ -257,14 +279,17 @@ public class TopVoterHandler implements Listener {
 		synchronized (VotingPluginMain.plugin) {
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-				if (user.getTotal(TopVoter.Weekly) == 0 && user.getWeekVoteStreak() != 0) {
-					user.setWeekVoteStreak(0);
-				} else {
-					if (!plugin.getSpecialRewardsConfig().isVoteStreakRequirementUsePercentage()
-							|| user.hasPercentageTotal(TopVoter.Weekly,
-									plugin.getSpecialRewardsConfig().getVoteStreakRequirementWeek(), null)) {
-						user.addWeekVoteStreak();
-						plugin.getSpecialRewards().checkVoteStreak(user, "Week");
+				if (plugin.getConfigFile().isUseVoteStreaks()) {
+					if (user.getTotal(TopVoter.Weekly) == 0 && user.getWeekVoteStreak() != 0) {
+						user.setWeekVoteStreak(0);
+					} else {
+						if (!plugin.getSpecialRewardsConfig().isVoteStreakRequirementUsePercentage()
+								|| user.hasPercentageTotal(TopVoter.Weekly,
+										plugin.getSpecialRewardsConfig().getVoteStreakRequirementWeek(), null)) {
+							user.addWeekVoteStreak();
+							plugin.getSpecialRewards().checkVoteStreak(user, "Week",
+									plugin.getBungeeSettings().isUseBungeecoord());
+						}
 					}
 				}

@@ -274,8 +299,10 @@ public class TopVoterHandler implements Listener {
 					}
 				}

-				if (user.getHighestWeeklyTotal() < user.getTotal(TopVoter.Weekly)) {
-					user.setHighestWeeklyTotal(user.getTotal(TopVoter.Weekly));
+				if (plugin.getConfigFile().isUseHighestTotals()) {
+					if (user.getHighestWeeklyTotal() < user.getTotal(TopVoter.Weekly)) {
+						user.setHighestWeeklyTotal(user.getTotal(TopVoter.Weekly));
+					}
 				}
 			}

@@ -313,6 +340,10 @@ public class TopVoterHandler implements Listener {
 				e.printStackTrace();
 			}
 			resetTotals(TopVoter.Weekly);
+
+			if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
+				plugin.getMysql().clearCache();
+			}
 		}
 	}

@@ -321,11 +352,15 @@ public class TopVoterHandler implements Listener {
 	}

 	public void resetTotals(TopVoter topVoter) {
-		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-			VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-			if (user.getTotal(topVoter) != 0) {
-				user.resetTotals(topVoter);
+		if (!plugin.getStorageType().equals(UserStorage.MYSQL)) {
+			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
+				if (user.getTotal(topVoter) != 0) {
+					user.resetTotals(topVoter);
+				}
 			}
+		} else {
+			plugin.getMysql().wipeColumnData(topVoter.getColumnName());
 		}
 	}

@@ -370,17 +405,19 @@ public class TopVoterHandler implements Listener {
 		} else if (top.equals(TopVoter.Weekly)) {
 			fileName += "_" + week;
 		}
-		fileName += ".yml";
+		fileName += "_" + System.currentTimeMillis() + ".yml";

 		YMLFileHandler file = new YMLFileHandler(plugin, new File(plugin.getDataFolder(), fileName));
 		file.setup();
-		ArrayList<String> topVoters = new ArrayList<String>();
-		int count = 1;
-		for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(top).entrySet()) {
-			topVoters.add(count + ": " + entry.getKey().getPlayerName() + ": " + entry.getValue());
-			count++;
+		for (TopVoter cTop : TopVoter.values()) {
+			ArrayList<String> topVoters = new ArrayList<String>();
+			int count = 1;
+			for (Entry<VotingPluginUser, Integer> entry : plugin.getTopVoter(cTop).entrySet()) {
+				topVoters.add(count + ": " + entry.getKey().getPlayerName() + ": " + entry.getValue());
+				count++;
+			}
+			file.getData().set(cTop.toString(), topVoters);
 		}
-		file.getData().set(top.toString(), topVoters);
 		file.saveData();
 	}

@@ -412,7 +449,7 @@ public class TopVoterHandler implements Listener {
 		String title = plugin.getConfigFile().getFormatCommandVoteTopTitle();
 		title = title.replace("%page%", "" + page);
 		title = title.replace("%maxpages%", "" + pageSize);
-		title = title.replace("%Top%", "All Time");
+		title = title.replace("%Top%", plugin.getConfigFile().getFormatTopVoterAllTime());
 		msg.add(StringParser.getInstance().colorize(title));

 		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
@@ -451,7 +488,7 @@ public class TopVoterHandler implements Listener {
 		String title = plugin.getConfigFile().getFormatCommandVoteTopTitle();
 		title = title.replace("%page%", "" + page);
 		title = title.replace("%maxpages%", "" + pageSize);
-		title = title.replace("%Top%", "Daily");
+		title = title.replace("%Top%", plugin.getConfigFile().getFormatTopVoterDaily());
 		msg.add(StringParser.getInstance().colorize(title));

 		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
@@ -490,7 +527,7 @@ public class TopVoterHandler implements Listener {
 		String title = plugin.getConfigFile().getFormatCommandVoteTopTitle();
 		title = title.replace("%page%", "" + page);
 		title = title.replace("%maxpages%", "" + pageSize);
-		title = title.replace("%Top%", "Monthly");
+		title = title.replace("%Top%", plugin.getConfigFile().getFormatTopVoterMonthly());
 		msg.add(StringParser.getInstance().colorize(title));

 		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
@@ -610,7 +647,7 @@ public class TopVoterHandler implements Listener {
 		String title = plugin.getConfigFile().getFormatCommandVoteTopTitle();
 		title = title.replace("%page%", "" + page);
 		title = title.replace("%maxpages%", "" + pageSize);
-		title = title.replace("%Top%", "Weekly");
+		title = title.replace("%Top%", plugin.getConfigFile().getFormatTopVoterWeekly());
 		msg.add(StringParser.getInstance().colorize(title));

 		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
@@ -26,7 +26,7 @@ public class UserManager {
 	public UserManager() {
 		super();
 	}
-	
+
 	public ArrayList<String> getAllUUIDs() {
 		return com.bencodez.advancedcore.api.user.UserManager.getInstance().getAllUUIDs();
 	}
@@ -39,8 +39,13 @@ public class UserManager {
 		return getVotingPluginUser(new UUID(uuid.toString()));
 	}

+	@SuppressWarnings("deprecation")
+	public VotingPluginUser getVotingPluginUser(java.util.UUID uuid, String playerName) {
+		return new VotingPluginUser(plugin, new UUID(uuid.toString()), playerName);
+	}
+
 	public VotingPluginUser getVotingPluginUser(OfflinePlayer player) {
-		return getVotingPluginUser(player.getName());
+		return getVotingPluginUser(player.getUniqueId(), player.getName());
 	}

 	public VotingPluginUser getVotingPluginUser(Player player) {
@@ -25,6 +25,7 @@ import com.bencodez.advancedcore.api.rewards.RewardHandler;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.advancedcore.api.user.UUID;
 import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.bungee.BungeeMessageData;
 import com.bencodez.votingplugin.bungee.BungeeMethod;
 import com.bencodez.votingplugin.events.PlayerReceivePointsEvent;
 import com.bencodez.votingplugin.events.PlayerVoteCoolDownEndEvent;
@@ -59,6 +60,12 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		this.plugin = plugin;
 	}

+	@Deprecated
+	public VotingPluginUser(VotingPluginMain plugin, UUID uuid, String playerName) {
+		super(plugin, uuid, playerName);
+		this.plugin = plugin;
+	}
+
 	@Deprecated
 	public VotingPluginUser(VotingPluginMain plugin, UUID uuid, boolean loadName) {
 		super(plugin, uuid, loadName);
@@ -81,12 +88,6 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		setMonthVoteStreak(getMonthVoteStreak() + 1);
 	}

-	public void addOfflineOtherReward(String reward) {
-		ArrayList<String> offlineOtherRewards = getOfflineOtherRewards();
-		offlineOtherRewards.add(reward);
-		setOfflineOtherRewards(offlineOtherRewards);
-	}
-
 	public void addOfflineVote(String voteSiteName) {
 		ArrayList<String> offlineVotes = getOfflineVotes();
 		offlineVotes.add(voteSiteName);
@@ -150,7 +151,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		setWeekVoteStreak(getWeekVoteStreak() + 1);
 	}

-	public void bungeeVote(String service) {
+	public void bungeeVote(String service, BungeeMessageData text, boolean setTotals) {
 		if (plugin.getBungeeSettings().isUseBungeecoord()) {
 			VotingPluginMain.plugin.debug("Bungee vote for " + getPlayerName() + " on " + service);

@@ -158,6 +159,9 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 					true);
 			voteEvent.setBungee(true);
 			voteEvent.setForceBungee(true);
+			voteEvent.setAddTotals(setTotals);
+			voteEvent.setBungeeTextTotals(text);
+			voteEvent.setVotingPluginUser(this);
 			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {

 				@Override
@@ -168,14 +172,17 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		}
 	}

-	public void bungeeVoteOnline(String service) {
+	public void bungeeVoteOnline(String service, BungeeMessageData text, boolean setTotals) {
 		if (plugin.getBungeeSettings().isUseBungeecoord()) {
 			VotingPluginMain.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);
+			voteEvent.setForceBungee(true);
+			voteEvent.setAddTotals(setTotals);
+			voteEvent.setBungeeTextTotals(text);
+			voteEvent.setVotingPluginUser(this);
 			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {

 				@Override
@@ -186,17 +193,20 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		}
 	}

-	public void bungeeVotePluginMessaging(String service, long time, String bungeeTextTotals) {
+	public void bungeeVotePluginMessaging(String service, long time, BungeeMessageData text, boolean setTotals,
+			boolean wasOnline) {
 		if (plugin.getBungeeSettings().isUseBungeecoord()) {
 			VotingPluginMain.plugin.debug("Pluginmessaging vote for " + getPlayerName() + " on " + service);

 			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(service), getPlayerName(), service,
 					true);
 			voteEvent.setBungee(true);
+			voteEvent.setVotingPluginUser(this);
 			voteEvent.setForceBungee(true);
 			voteEvent.setTime(time);
-			voteEvent.setAddTotals(false);
-			voteEvent.setBungeeTextTotals(bungeeTextTotals);
+			voteEvent.setAddTotals(setTotals);
+			voteEvent.setBungeeTextTotals(text);
+			voteEvent.setWasOnline(wasOnline);
 			Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {

 				@Override
@@ -224,14 +234,32 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance

 	public boolean canVoteAny() {
 		for (VoteSite voteSite : plugin.getVoteSites()) {
-			boolean canVote = canVoteSite(voteSite);
-			if (canVote) {
-				return true;
+			if (!voteSite.isIgnoreCanVote()) {
+				boolean canVote = canVoteSite(voteSite);
+				if (canVote) {
+					return true;
+				}
 			}
 		}
 		return false;
 	}

+	public int getGottenAllSitesDay() {
+		if (plugin.getBungeeSettings().isUseBungeecoord()) {
+			return getData().getInt("AllSitesLast_" + plugin.getBungeeSettings().getServer(), 0, true);
+		} else {
+			return getData().getInt("AllSitesLast", 0, true);
+		}
+	}
+
+	public void setGottenAllSitesDay(int day) {
+		if (plugin.getBungeeSettings().isUseBungeecoord()) {
+			getData().setInt("AllSitesLast_" + plugin.getBungeeSettings().getServer(), day);
+		} else {
+			getData().setInt("AllSitesLast", day);
+		}
+	}
+
 	/**
 	 * Can vote site.
 	 *
@@ -251,13 +279,13 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance

 			if (!voteSite.isVoteDelayDaily()) {
 				double votedelay = voteSite.getVoteDelay();
+				double voteDelayMin = voteSite.getVoteDelayMin();

-				if (votedelay == 0) {
+				if (votedelay == 0 && voteDelayMin == 0) {
 					return false;
 				}

-				LocalDateTime nextvote = lastVote.plusHours((long) votedelay)
-						.plusMinutes((long) voteSite.getVoteDelayMin());
+				LocalDateTime nextvote = lastVote.plusHours((long) votedelay).plusMinutes((long) voteDelayMin);

 				return now.isAfter(nextvote);
 			} else {
@@ -322,12 +350,12 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		}
 	}

-	public void checkDayVoteStreak() {
+	public void checkDayVoteStreak(boolean forceBungee) {
 		if (!voteStreakUpdatedToday(LocalDateTime.now())) {
 			if (!plugin.getSpecialRewardsConfig().isVoteStreakRequirementUsePercentage() || hasPercentageTotal(
 					TopVoter.Daily, plugin.getSpecialRewardsConfig().getVoteStreakRequirementDay(), null)) {
 				addDayVoteStreak();
-				plugin.getSpecialRewards().checkVoteStreak(this, "Day");
+				plugin.getSpecialRewards().checkVoteStreak(this, "Day", forceBungee);
 				setDayVoteStreakLastUpdate(System.currentTimeMillis());
 			}
 		}
@@ -493,10 +521,6 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		return getData().getInt("MonthVoteStreak", isWaitForCache());
 	}

-	public ArrayList<String> getOfflineOtherRewards() {
-		return getUserData().getStringList("OfflineOtherRewards");
-	}
-
 	public ArrayList<String> getOfflineVotes() {
 		return getUserData().getStringList("OfflineVotes");
 	}
@@ -610,57 +634,6 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 						.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")) {
-				plugin.getSpecialRewards().giveFirstVoteRewards(this, false);
-			} else if (str.equalsIgnoreCase("AllSites")) {
-				plugin.getSpecialRewards().giveAllSitesRewards(this, false);
-			} else if (str.equalsIgnoreCase("VoteParty")) {
-				plugin.getVoteParty().giveReward(this, false);
-			} else if (str.contains("Cumulative")) {
-				String st = str.substring("Cumulative".length());
-				if (StringParser.getInstance().isInt(st)) {
-					int votesRequired = Integer.parseInt(st);
-					if (votesRequired != 0) {
-						if (plugin.getSpecialRewardsConfig().getCumulativeRewardEnabled(votesRequired)) {
-							plugin.getSpecialRewards().giveCumulativeVoteReward(this, false, votesRequired);
-						}
-					}
-				}
-			} else if (str.contains("MileStone")) {
-				String st = str.substring("MileStone".length());
-				if (StringParser.getInstance().isInt(st)) {
-					int votesRequired = Integer.parseInt(st);
-					if (votesRequired > 0) {
-						if (plugin.getSpecialRewardsConfig().getMilestoneRewardEnabled(votesRequired)) {
-							plugin.getSpecialRewards().giveMilestoneVoteReward(this, true, votesRequired);
-						}
-					}
-				}
-			} else if (str.contains("VoteStreak")) {
-				String[] args = str.split("_");
-				if (args.length > 2) {
-					String type = args[1];
-					String st = args[2];
-
-					if (plugin.getSpecialRewardsConfig().getVoteStreakRewardEnabled(type, st)) {
-						plugin.getSpecialRewards().giveVoteStreakReward(this, false, type, "" + st, -1);
-					}
-
-				}
-			} else {
-				plugin.debug("Reward handle for " + str + " does not exist!");
-			}
-
-		}
-		if (!offlineRewards.isEmpty()) {
-			setOfflineOtherRewards(new ArrayList<String>());
-		}
-	}
-
 	public void giveWeeklyTopVoterAward(int place, String path) {
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getWeeklyAwardRewardsPath(path)).withPlaceHolder("place", "" + place)
@@ -757,7 +730,7 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 			ArrayList<String> offlineVotes = getOfflineVotes();
 			// plugin.debug(ArrayUtils.getInstance().makeStringList(offlineVotes));
 			if (offlineVotes.size() > 0) {
-				sendVoteEffects(true);
+				sendVoteEffects(false);
 				setOfflineVotes(new ArrayList<String>());
 			}

@@ -769,8 +742,6 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 					plugin.debug("Site doesn't exist: " + offlineVotes.get(i));
 				}
 			}
-
-			giveOfflineOtherRewards();
 		}
 	}

@@ -15,6 +15,7 @@ import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.time.events.DayChangeEvent;
 import com.bencodez.advancedcore.api.time.events.MonthChangeEvent;
+import com.bencodez.advancedcore.api.time.events.WeekChangeEvent;
 import com.bencodez.advancedcore.api.user.UUID;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.events.VotePartyEvent;
@@ -55,25 +56,30 @@ public class VoteParty implements Listener {
 		}
 	}

-	/**
-	 * Check.
-	 */
-	public void check() {
-		if (getTotalVotes() >= getVotesRequired()) {
-			setTotalVotes(getTotalVotes() - getVotesRequired());
+	public void check(boolean forceBungee) {
+		if (getTotalVotes() >= getVotesRequired() && ((plugin.getSpecialRewardsConfig().getVotePartyOnlyOncePerDay()
+				&& plugin.getServerData().isLastVotePartySameDay())
+				|| !plugin.getSpecialRewardsConfig().getVotePartyOnlyOncePerDay())) {
+			if (plugin.getSpecialRewardsConfig().isVotePartyResetCount()) {
+				setTotalVotes(getTotalVotes() - getVotesRequired());
+			}

 			VotePartyEvent event = new VotePartyEvent();
 			Bukkit.getPluginManager().callEvent(event);
 			if (event.isCancelled()) {
 				return;
 			}
-			MiscUtils.getInstance().broadcast(plugin.getSpecialRewardsConfig().getVotePartyBroadcast());
-			giveRewards();
+
+			giveRewards(forceBungee);

 			if (plugin.getSpecialRewardsConfig().getVotePartyIncreaseVotesRquired() > 0) {
 				plugin.getServerData().setVotePartyExtraRequired(plugin.getServerData().getVotePartyExtraRequired()
 						+ plugin.getSpecialRewardsConfig().getVotePartyIncreaseVotesRquired());
 			}
+
+			if (plugin.getSpecialRewardsConfig().getVotePartyOnlyOncePerDay()) {
+				plugin.getServerData().updateLastVoteParty();
+			}
 		}

 	}
@@ -144,27 +150,27 @@ public class VoteParty implements Listener {
 		return required;
 	}

-	public void giveReward(VotingPluginUser user) {
+	public void giveReward(VotingPluginUser user, boolean useBungee) {
 		if (plugin.getSpecialRewardsConfig().getVotePartyUserVotesRequired() > 0) {
 			if (user.getVotePartyVotes() < plugin.getSpecialRewardsConfig().getVotePartyUserVotesRequired()) {
 				return;
 			}
 		}
-		giveReward(user, user.isOnline());
+		giveReward(user, user.isOnline(), useBungee);
 	}

-	public void giveReward(VotingPluginUser user, boolean online) {
+	public void giveReward(VotingPluginUser user, boolean online, boolean useBungee) {
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
-				plugin.getSpecialRewardsConfig().getVotePartyRewardsPath()).setOnline(online)
+				plugin.getSpecialRewardsConfig().getVotePartyRewardsPath())
+						.setOnline(online)
 						.withPlaceHolder("VotesRequired",
 								"" + plugin.getSpecialRewardsConfig().getVotePartyVotesRequired())
-						.send(user);
+						.setServer(useBungee).send(user);
 	}

-	/**
-	 * Give rewards.
-	 */
-	public void giveRewards() {
+	public void giveRewards(boolean forceBungee) {
+		MiscUtils.getInstance().broadcast(plugin.getSpecialRewardsConfig().getVotePartyBroadcast());
+
 		for (final String cmd : plugin.getSpecialRewardsConfig().getVotePartyCommands()) {
 			Bukkit.getScheduler().runTask(plugin, new Runnable() {

@@ -180,30 +186,37 @@ public class VoteParty implements Listener {
 			plugin.debug("Trying to give all players vote party");
 			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-				giveReward(user);
+				giveReward(user, forceBungee);
 			}
 		} else {
-			plugin.debug("Trying to give all online players vote party");
+			plugin.debug("Trying to give all voted players vote party");
 			plugin.debug(ArrayUtils.getInstance().makeStringList(getVotedUsers()));
 			for (String uuid : getVotedUsers()) {
 				VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
-				giveReward(user);
+				giveReward(user, forceBungee);
 			}
 		}
-		reset();
+		reset(false);
 	}

 	@EventHandler
 	public void onDayChange(DayChangeEvent event) {
 		if (plugin.getSpecialRewardsConfig().getVotePartyResetEachDay()) {
-			reset();
+			reset(true);
+		}
+	}
+
+	@EventHandler
+	public void onWeekChange(WeekChangeEvent event) {
+		if (plugin.getSpecialRewardsConfig().getVotePartyResetWeekly()) {
+			reset(true);
 		}
 	}

 	@EventHandler
 	public void onMonthChange(MonthChangeEvent event) {
 		if (plugin.getSpecialRewardsConfig().getVotePartyResetMontly()) {
-			reset();
+			reset(true);
 		}

 		if (plugin.getSpecialRewardsConfig().isVotePartyResetExtraVotesMonthly()) {
@@ -215,9 +228,11 @@ public class VoteParty implements Listener {
 		plugin.getServer().getPluginManager().registerEvents(this, plugin);
 	}

-	public void reset() {
+	public void reset(boolean override) {
+		if (override) {
+			setTotalVotes(0);
+		}
 		setVotedUsers(new ArrayList<String>());
-		setTotalVotes(0);
 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 			VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(new UUID(uuid));
 			if (user.getVotePartyVotes() != 0) {
@@ -247,13 +262,13 @@ public class VoteParty implements Listener {
 		plugin.getServerData().saveData();
 	}

-	public synchronized void vote(VotingPluginUser user, boolean realVote) {
+	public synchronized void vote(VotingPluginUser user, boolean realVote, boolean forceBungee) {
 		if (plugin.getSpecialRewardsConfig().getVotePartyEnabled()) {
 			if (plugin.getSpecialRewardsConfig().getVotePartyCountFakeVotes() || realVote) {
 				if (plugin.getSpecialRewardsConfig().getVotePartyCountOfflineVotes() || user.isOnline()) {
 					addTotal(user);
 					addVotePlayer(user);
-					check();
+					check(forceBungee);
 				}
 			}
 		}
@@ -95,7 +95,8 @@ public class VoteReminding {
 			if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders() && user.hasPrimaryAccount()) {
 				user = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
 			}
-			if ((!UserManager.getInstance().getAllUUIDs().contains(user.getUUID()) || user.canVoteAll())
+			if ((!UserManager.getInstance().getAllUUIDs().contains(user.getUUID()) || (user.canVoteAll()
+					|| (user.canVoteAny() && user.hasPermission("VotingPlugin.Login.RemindVotes.Any"))))
 					&& user.shouldBeReminded()) {
 				giveReward(user);
 				if (user.getData().hasData()) {
Author	SHA1	Message	Date
BenCodez	f581ce26fb	Update version number to 6.3	2021-04-25 13:53:14 -04:00
BenCodez	0cc06a0b1f	Remove unused file	2021-04-25 12:45:31 -04:00
BenCodez	27dfa7e481	Improvements to interact event & more	2021-04-24 21:07:38 -04:00
BenCodez	0659fd8b84	Bug fix	2021-04-24 07:53:25 -04:00
BenCodez	8512eef6c0	Another little bug fix	2021-04-23 21:54:16 -04:00
BenCodez	e860195847	Bug fix	2021-04-23 21:43:22 -04:00
BenCodez	3c34798d1a	Fixed bug regarding help command permissions	2021-04-23 19:09:58 -04:00
BenCodez	1275a10de5	Add config option	2021-04-23 18:28:38 -04:00
BenCodez	99c2e9aa1f	Fix broadcast handler	2021-04-22 16:56:16 -04:00
BenCodez	d3b0787f90	Bug fix for /vote shop (item) command	2021-04-21 17:34:05 -04:00
BenCodez	faad7d3b85	Little fix	2021-04-20 20:21:24 -04:00
BenCodez	099596fdde	Add config option for geyser support	2021-04-20 17:34:33 -04:00
BenCodez	ab202ffe1c	Add option to trigger votifier event	2021-04-20 17:14:07 -04:00
BenCodez	b935d7f578	Add alternate broadcast method	2021-04-19 18:54:09 -04:00
BenCodez	d505d197ba	Change default option	2021-04-18 14:38:38 -04:00
BenCodez	12c9aab745	Bug fix	2021-04-18 14:14:56 -04:00
BenCodez	3c10cb2340	Update to reward api changes	2021-04-17 21:54:52 -04:00
BenCodez	f57cc3bc06	Add option to move backbutton to end of GUI	2021-04-14 19:22:19 -04:00
BenCodez	eb4afec6db	Undo placeholder change	2021-04-12 17:05:44 -04:00
BenCodez	35b4df196d	Little change	2021-04-11 15:34:07 -04:00
BenCodez	038e8fb98a	increase column size	2021-04-10 20:03:31 -04:00
BenCodez	b84a14f849	Change top voter placeholder parsing	2021-04-09 17:02:09 -04:00
BenCodez	eeda3875e4	Add option to disable player interact event	2021-04-09 16:52:41 -04:00
BenCodez	a584a78734	Parse top voter placeholders as current player	2021-04-08 18:40:37 -04:00
BenCodez	e408c07f85	Update version number	2021-04-07 17:01:28 -04:00
Ben	4700684f03	Fix yml error	2021-04-07 04:48:56 -04:00
BenCodez	8ef7631eed	Add option to ignore can vote per votesite	2021-04-04 16:13:59 -04:00
BenCodez	825d736a58	Update version number	2021-04-04 14:29:22 -04:00
BenCodez	b3f5aac192	Bug fix with cumulative remove	2021-04-04 14:22:07 -04:00
BenCodez	e06b21d69c	Check if bungee votifier event exists before enabling event	2021-04-04 12:27:12 -04:00
BenCodez	9dc3a99885	Add config options	2021-04-03 15:32:59 -04:00
BenCodez	18145b8340	Add missing config options	2021-04-03 15:32:01 -04:00
Ben	f25bbf3437	Update stale.yml	2021-04-02 17:01:54 -04:00
BenCodez	2d53ae7452	Fix a few issues with reward GUI editing	2021-04-02 16:44:46 -04:00
BenCodez	0f67c0db36	Add missing classes from commit	2021-04-02 14:58:33 -04:00
BenCodez	436dc01edd	Add ability to edit voteparty, milestones, cumulative & more via gui's	2021-04-02 14:53:02 -04:00
BenCodez	a1bee2fa05	Remove unneeded maven dependency	2021-03-27 19:05:43 -04:00
BenCodez	78ab2de0e9	Update version number	2021-03-27 17:45:10 -04:00
BenCodez	76823d74f1	Add ability to edit voteshop rewards	2021-03-23 19:30:49 -04:00
BenCodez	db51306ef9	Modify cooldown check handling	2021-03-21 19:36:08 -04:00
BenCodez	b95f2beaf5	Add directly defined reward handling	2021-03-21 16:17:17 -04:00
BenCodez	7be07b0102	Increase message on bungee votes debug	2021-03-18 17:24:20 -04:00
BenCodez	6eeee7ca02	Disable VoteCoolDown background task by default if no rewards set	2021-03-18 17:19:58 -04:00
BenCodez	7bbddc9a8a	Auto disable cooldown check if needed	2021-03-17 17:05:37 -04:00
BenCodez	ac994ac864	Update version number	2021-03-14 12:51:20 -04:00
BenCodez	1aca211e71	Increase delay for cooldown check	2021-03-14 12:27:55 -04:00
BenCodez	c7d0b09706	Little changes to addition	2021-03-13 21:56:22 -05:00
BenCodez	5999b778b3	Add option to delay login event	2021-03-13 21:53:40 -05:00
BenCodez	04d21ccb4e	Additional little bug fix regarding bungee online/offline reward handles	2021-03-13 21:19:05 -05:00
BenCodez	3ba63bfaec	Bug fix	2021-03-13 21:17:55 -05:00
BenCodez	eeb7d3da1d	Add option to disable cooldown check	2021-03-13 08:03:58 -05:00
BenCodez	cfaae26c16	Bug fix	2021-03-12 16:33:23 -05:00
BenCodez	5806e6adad	Change default value of config option	2021-03-10 19:10:41 -05:00
BenCodez	6718b49e49	Fix placeholders getting parsed when they shouldn't	2021-03-06 19:42:31 -05:00
BenCodez	403fe20f68	Update version number	2021-03-06 19:32:43 -05:00
BenCodez	2dd6ef4da5	Add config option	2021-03-06 15:29:48 -05:00
BenCodez	42fd72723d	Add option to change backbutton to voteurl	2021-03-06 14:18:44 -05:00
BenCodez	8ea599d739	Add try/catch as failsafe	2021-03-04 17:03:38 -05:00
BenCodez	104baa80eb	Add /av resetmilestonecount	2021-03-03 16:50:11 -05:00
BenCodez	9c700268a6	Bug fix	2021-03-02 20:29:38 -05:00
BenCodez	e158f43c11	Remove config option for storing monthly votes, always store montly top	2021-03-01 19:25:03 -05:00
BenCodez	617f8a9a7d	Add class	2021-03-01 19:10:38 -05:00
BenCodez	63edc5bf4f	Implement bungee version	2021-03-01 19:09:45 -05:00
BenCodez	492dca7a22	Add option	2021-02-28 10:50:47 -05:00
BenCodez	69a6485317	Add option to disable clicking top voters skulls opening VoteGUI	2021-02-28 10:50:11 -05:00
BenCodez	1b75dfb886	Add ability to edit voteshop with GUI's	2021-02-27 20:42:09 -05:00
BenCodez	652deabf83	Fix issue with votedelay not being able to be 0	2021-02-24 18:54:10 -05:00
BenCodez	1c4b0c687b	Add different text colors for voteurl sites	2021-02-24 17:01:25 -05:00
BenCodez	80455d68e2	Update version number	2021-02-21 14:31:00 -05:00
BenCodez	0d8dd6eb60	Changes to allsites reward checks	2021-02-21 13:52:31 -05:00
BenCodez	7cfd3e5a94	Fix hidden votesite option, a lot of other fixes from recent changes	2021-02-21 13:44:46 -05:00
BenCodez	46d9b07db3	Modify voteurl a little more	2021-02-20 17:39:56 -05:00
BenCodez	ac4f5a4b02	Modify VoteURL to be more configurable	2021-02-20 17:35:08 -05:00
BenCodez	5bfa59508a	Keep bungee from failing to load on bungee without votifier	2021-02-20 17:16:57 -05:00
BenCodez	9d53af3059	Organize config file	2021-02-17 19:33:40 -05:00
BenCodez	82c32c6ed1	Little fix for spigot setting totals on bungee methods	2021-02-17 19:12:15 -05:00
BenCodez	af5b4231c2	Add option for what server handles totals	2021-02-17 19:11:08 -05:00
BenCodez	00c1830ced	Add option to hide votesites	2021-02-17 18:37:00 -05:00
BenCodez	335888d0ad	Add option for extra allsites check, works per server	2021-02-15 17:19:27 -05:00
BenCodez	397f71020c	Modify yml error messages	2021-02-14 12:49:35 -05:00
BenCodez	31ea9f8413	Add WaitForUserOnline, modify bungee handling	2021-02-13 21:12:16 -05:00
BenCodez	bfcbcb8802	Broadcast on force voteparty command	2021-02-13 13:40:20 -05:00
BenCodez	30bf07edc7	Actually set per server rewards option	2021-02-12 18:50:41 -05:00
BenCodez	be3de852ce	Add per server rewards option	2021-02-12 18:49:28 -05:00
BenCodez	d9f3c4a465	Add bypass option for votifier	2021-02-12 17:53:16 -05:00
BenCodez	b3c3a30ea4	Bug fix	2021-02-11 20:39:33 -05:00
BenCodez	f785b1256d	Bug fix	2021-02-11 20:13:48 -05:00
BenCodez	5b4d93197c	Update version number	2021-02-07 13:41:40 -05:00
BenCodez	d1d159ba90	Modify socket method to work more like pluginmessaging	2021-02-07 13:13:56 -05:00
BenCodez	8501c351dd	Background check votes on bungee	2021-02-06 21:45:01 -05:00
BenCodez	a61d8bbd04	Ignore votes from votifier when using bungeemethod pluginmessaging	2021-02-06 19:04:11 -05:00
BenCodez	ccd39ebc89	Permission fixes	2021-02-06 15:57:32 -05:00
BenCodez	da04ddad7d	Improve status command to show blocked servers	2021-02-05 22:13:03 -05:00
BenCodez	498210d709	Bungee change	2021-02-05 21:53:30 -05:00
BenCodez	c128bec2af	Add ability to execute rewards on clicking vote gui	2021-02-05 19:32:02 -05:00
BenCodez	84ce9275f0	Little change to help with perms	2021-02-04 16:47:35 -05:00
BenCodez	66bdd9b5c7	Add option	2021-02-03 18:32:23 -05:00
BenCodez	b02ab916cd	Store all top voters on top voter storing	2021-02-02 19:23:44 -05:00
BenCodez	a2068da36b	Update spigot api version	2021-02-01 17:42:09 -05:00
BenCodez	83c43331a9	Update version number	2021-02-01 17:02:59 -05:00
BenCodez	afe68ef229	Little change	2021-02-01 16:53:45 -05:00
BenCodez	7eec56ee2a	Changed to top voter file storing	2021-02-01 16:49:10 -05:00
BenCodez	2ed462b61c	Little change for default value	2021-01-31 12:31:34 -05:00
Ben	dd142d20fe	Merge pull request #1106 from Gadsee/patch-1 Prevent clients from sending plugin messages	2021-01-30 21:48:05 -05:00
Gadsee	8a340dc292	Add missing import	2021-01-31 03:21:05 +01:00
Deko	e77201613e	Prevent clients from sending plugin messages Clients can send data over the plugin message channels the same way servers can. Canceling the event and returning if the message was not sent by the Server fixes the issue. In the worst case scenario, the server will crash if the client sends invalid data, due to how this plugin attempts to continually load the message.	2021-01-31 03:15:20 +01:00
BenCodez	710ad17f47	Update version number	2021-01-30 20:06:58 -05:00
BenCodez	a617625b87	Improve status command for pluginmessaging	2021-01-30 18:06:50 -05:00
BenCodez	e8a5319544	Changes to bungee messaging, weekly voteparty reset	2021-01-30 17:34:24 -05:00
BenCodez	86e737892a	Little fix for vote party reset count	2021-01-28 16:43:40 -05:00
BenCodez	3fd7a40421	Remove unneeded check	2021-01-27 17:05:20 -05:00
BenCodez	a70e5aa54c	Add option to not reset vote party total	2021-01-26 16:56:13 -05:00
BenCodez	593aae1e67	Fix issue with no player names	2021-01-26 16:52:38 -05:00
BenCodez	e88849854b	Bug fix	2021-01-26 16:47:52 -05:00
BenCodez	738fd5645e	Change warning messages for votesite display item & service site issue	2021-01-24 20:36:10 -05:00
BenCodez	22ac364f8a	Add option	2021-01-24 14:15:46 -05:00
BenCodez	5d78d3a734	Change debug values	2021-01-24 14:11:26 -05:00
BenCodez	e83b12a248	Add ability for vote party once a day only	2021-01-23 20:45:08 -05:00
BenCodez	0f50998519	Update version number to 6.1	2021-01-23 18:01:37 -05:00
BenCodez	1768d4490f	Command changes	2021-01-23 17:42:21 -05:00
BenCodez	2a3635b805	Add option to main vote gui run on /vote	2021-01-23 16:41:59 -05:00
BenCodez	a5be973fd4	Fix back to main GUI button	2021-01-22 21:04:02 -05:00
BenCodez	c8a76f38f9	Votetoday back button to votegui bug fix	2021-01-22 20:30:20 -05:00
BenCodez	273edaf101	Little bug fix	2021-01-22 19:12:54 -05:00
BenCodez	d1a90676fc	Changes to /av perms	2021-01-19 19:40:43 -05:00
BenCodez	ff6119050d	Add nonvotedplayerscache, allows allowunjoined option on bungee	2021-01-18 17:44:00 -05:00
BenCodez	0a0b95097d	Changes to month/week/day changes to reduce impact of server restarts	2021-01-17 16:21:13 -05:00
BenCodez	ace42a5a1f	Little fixes	2021-01-13 17:11:25 -05:00
BenCodez	1a23648b91	Add package relocation to prevent conflicts	2021-01-09 14:50:00 -05:00
BenCodez	65b5a46525	Changes to permission handling, advanced tab is disabled	2021-01-08 17:34:54 -05:00
BenCodez	462d99c0e5	Little change	2021-01-04 18:57:23 -05:00
BenCodez	04636dd5af	Little change	2021-01-03 12:29:38 -05:00
BenCodez	d5b5b6cec0	Command changes	2021-01-02 16:47:08 -05:00
BenCodez	921fdac8bb	Little change	2020-12-27 17:09:34 -05:00
BenCodez	6b9bc60785	Bug fix	2020-12-27 16:51:25 -05:00
BenCodez	ff01c73193	Little changes	2020-12-26 09:14:59 -05:00
BenCodez	a6cb4c3a8c	Bug fix	2020-12-25 12:43:32 -05:00
BenCodez	43d33277ba	Little fix	2020-12-25 11:41:12 -05:00
BenCodez	9badb50075	Little change	2020-12-22 19:44:29 -05:00