Update version number to 7.0

- Updated VoteMilestoneLimit to use TimeUnit for duration parsing.
- Removed unused VoteSiteTest class and added new tests for VoteSite and
VoteSiteManager.
- Introduced VoteSiteAdditionalTest and NextSiteTest for enhanced
coverage.
- Adjusted configuration handling in tests to ensure proper mocking.

.github/FUNDING.yml

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

.github/workflows/maven.yml

@@ -0,0 +1,41 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support documentation.
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: write   # required for dependency submission
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Build with Maven
+        run: mvn -B -f VotingPlugin/pom.xml package
+
+      # Only submit dependency snapshot on push (not on pull_request)
+      - name: Submit Dependency Snapshot
+        if: github.event_name == 'push'
+        uses: advanced-security/maven-dependency-submission-action@v5
+        with:
+          directory: VotingPlugin   # path to pom.xml
+          # optional: maven-args: "-DskipTests"

README.md

@@ -2,10 +2,6 @@
 Plugin on SpigotMC
 https://www.spigotmc.org/resources/votingplugin.15358/
 
-## License
-### Creative Commons Arttribution 3.0 Unported
-https://github.com/BenCodez/VotingPlugin/blob/master/VotingPlugin/Resources/LICENSE.txt
-
 ### Maven:
 
     <repository>

VotingPlugin/.github/agents/test.agent.md

@@ -0,0 +1,5 @@
+---
+description: Describe what this custom agent does and when to use it.
+tools: []
+---
+Write instructions for this custom agent. These will guide Copilot on how to respond when this mode is selected.

VotingPlugin/.gitignore

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

VotingPlugin/Resources/BungeeSettings.yml

@@ -1,125 +0,0 @@
-##########################################
-# Bungee Setup 
-# Only if using votingplugin bungee to send votes
-# REQUIRES RESTART FOR CHANGES TO TAKE EFFECT
-##########################################
-
-# Plugin using bungee, requires plugin on bungee server
-UseBungeecord: false
-
-# What type of bungee setup
-# Requires restart and set on all servers
-# https://github.com/BenCodez/VotingPlugin/wiki/Bungeecord-Setups
-# Available:
-# SOCKETS
-# PLUGINMESSAGING (Recommended)
-# MYSQL
-# REDIS
-BungeeMethod: PLUGINMESSAGING
-
-# Use Redis for between server communication, set BungeeMethod to REDIS to use this
-Redis:
-  Host: localhost
-  Port: 6379
-  Username: ''
-  Password: ''
-
-# Enables more debug messages for communication between servers
-# Use /votingpluginbungee status for testing communication
-BungeeDebug: false
-
-# Get the plugin to broadcast to all servers
-# If false you need to enable 
-# Only use for global rewards (one per network), otherwise you will get double broadcasts
-BungeeBroadcast: false
-
-# For pluginmessaging method only
-# Whether to broadcast on cached votes
-BungeeBroadcastAlways: false
-
-# If true, the server won't broadcast votes
-# To be used in conjuction with Broadcast setting on bungee
-DisableBroadcast: 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, milestones work per server
-# Please note totals still sync, but milestones can be claimed on each server
-# Needs to be set across all needed servers
-PerServerMilestones: false
-
-# If true, points will be given on a per server level
-# Points will be added when server gets vote from bungee
-PerServerPoints: false
-
-# If true, plugin will trigger VotifierEvent
-# Should allow some compability with other plugins
-TriggerVotifierEvent: false
-
-# If enabled plugin will give extra allsites reward if deterimned that it should
-# E.g. user votes offline for 7 days, they will only get 1 allsites reward by default
-# When enabled, they should get 7
-# Only applies to PLUGINMESSAGING
-# Recommend enabling ExtraAllSitesCheck in config.yml as well
-GiveExtraAllSitesRewards: false
-
-# What server this is in bungee (must match)
-# Also can be applied to rewards
-Server: PleaseSet
-
-# Rewards from bungee vote party
-# Gives to only players only
-# Use regular voteparty rewards otherwise
-# Can edit via /av gui
-BungeeVotePartyRewards: {}
-
-# List of commands to run on bungee party
-# This runs a one time command only
-BungeeVotePartyGlobalCommands: []
-
-####################################################################################
-# Global mysql data handle for between server commmunications
-# This is NOT required for bungee voting to work
-# This is still a WIP, use with caution
-# This will create a different table then from users storing server info to process
-#
-# If you use this you need to enable this on BungeeSettings.yml on each server with votingplugin
-# Make sure server name is set correctly in BungeeSettings.yml or this will not work correctly
-# 
-# Please use PLUGINMESSAGING for this, SOCKETS should work as well, but not fully tested
-#
-# This will make votes cache until time change has finished processing
-# In the event a server is offline or time change fails, the time change process
-# will continue after a set amount of time (in essense skipping a specific server)
-# This will also respect blocked servers in bungeeconfig.yml
-GlobalData:
-  Enabled: false
-  # Use existing mysql connection from config.yml
-  UseMainMySQL: true
-  # Mysql settings only used if above is false
-  Host: ''
-  # Default port is 3306
-  Port: 3306 
-  Database: ''
-  Username: ''
-  Password: ''
-  # Max number of connections
-  MaxConnections: 1
-  # Must be the same on all servers
-  Prefix: ''
-  #UseSSL: true
-  #PublicKeyRetrieval: false
-  #Attempt to use mariadb driver
-  #UseMariaDB: false
-
-##########################################
-# For socket setup
-# Recommend to try PLUGINMESSAGING setup first
-# Options hidden by default to avoid confusion
-##########################################
-# Options available here:
-# https://github.com/BenCodez/VotingPlugin/wiki/Bungee-Setup-SOCKETS

VotingPlugin/Resources/Config.yml

@@ -1,756 +0,0 @@
-# VotingPlugin by BenCodez
-# Main Config
-# See wiki for help: 
-# https://github.com/BenCodez/VotingPlugin/wiki
-# Config is sorted in sections
-# Use Control + F to search with Notepad++
-
-
-###########################################
-# User storage
-###########################################
-# Valid Options:
-# - SQLITE 
-# - MYSQL
-DataStorage: SQLITE
-
-# Information for mysql
-# See the end of the config for cache options
-MySQL:
-  Host: ''
-  # Default port is 3306
-  Port: 3306 
-  Database: ''
-  Username: ''
-  Password: ''
-  # Max number of connections
-  MaxConnections: 1
-  # Table name prefix, for use with mutliple servers
-  # Don't use with PLUGINMESSAGING bungee setup
-  Prefix: ''
-  #UseSSL: true
-  #PublicKeyRetrieval: false
-  #MaxLifeTime: -1
-  #Additional info on connection string
-  #Line: ''
-  #Attempt to use mariadb driver
-  #UseMariaDB: false
-
-
-###########################################
-# VoteReminding
-###########################################
-
-# Configuration for VoteReminding
-# By default this should be all setup to work
-# as long as vote delays are done properly in votesites.yml
-VoteReminding:
-  # Enable vote reminding
-  # This will remind player when he can vote on all sites
-  # Requires VoteDelays to be setup properly
-  # Use /vote next to see when you can be reminded
-  # Players require the perm "VotingPlugin.Login.RemindVotes" or "VotingPlugin.Player"
-  # To remind if any votesite is available (rather than all) use the permission "VotingPlugin.Login.RemindVotes.Any"
-  Enabled: true
-
-  # Will remind player on login if he can vote
-  RemindOnLogin: true
-  
-  # Whether or not to remind only once when the player can vote
-  # Does not apply to login reminds.
-  RemindOnlyOnce: true
-
-  # Delay to remind votes in minutes
-  # Set to -1 to disable
-  RemindDelay: 30
-
-  # Run rewards
-  # and have the default message
-  # Can add titles and more in the reward
-  # This can also be edited via /av gui
-  Rewards:
-    Messages:
-      Player: '&aYou have %sitesavailable% sites to vote on still!'
-    Title:
-      Enabled: false
-      Title: '&cRemember to vote!'
-      SubTitle: '&aType /vote'
-      FadeIn: 10
-      ShowTime: 50
-      FadeOut: 10
-    ActionBar:
-      Message: '&cRemember to vote'
-      Delay: 30
-    
-###########################################
-# Format options
-###########################################
-    
-# Common PlacesHolders:
-# Special PlaceHolders will be commented where available
-# %player% = player name  
-# %SiteName% = vote site name
-#
-# Set Message to '' (2 ') to disable message
-
-Format:
-  # CommandHandler help message
-  # Mainly used in admin help page, see below for /vote help
-  HelpLine: '&6%Command% - &6%HelpMessage%'
-
-  # Broadcast vote message
-  # Set to an empty message to disable
-  # Use %NewLine% for a new line
-  BroadcastMsg: '&6[&4Broadcast&6] &2Thanks &c%player% &2for voting on %SiteName%'
-  # If true uses broadcast setting below for offline votes
-  OnlyOneOfflineBroadcast: false
-  OfflineBroadcast: '&6[&4Broadcast&6] &2Thanks &c%player% &2for voting on %numberofvotes% times!'
-  
-  # Broadcast only when player is online
-  BroadcastWhenOnline: false
-  
-  # Broadcast every x number of minutes with number of players that voted
-  AlternateBroadcast:
-    Enabled: false
-    # Use %players% for all players names
-    # Use %numberofplayers% for number of players that voted
-    Broadcast: '&6[&4Broadcast&6] &2%numberofplayers% voted in the last half hour! /vote'
-    # Delay in minutes
-    Delay: 30
-  
-  Commands:
-    # Format for /vote
-    # %num% = the number of the site, for a numbered list
-    # %url% = site URL
-    Vote: 
-      Text:
-      - '&3&lVote for our server!'
-      
-      # If you want to want to use the feature below where the plugin will
-      # automaticly list the sites then set the message in the text above
-      AutoInputSites: true
-      # For each VoteSite
-      # make sure to set VoteURL in your VoteSites
-      # Requires above to be true
-      # Text will be sent before this
-      Sites: '&3%num%: &6&l%SiteName% &6- %url%'
-      
-      # If true, links will always be forced as urls
-      ForceLinks: true
-      
-      # Format for /vote next
-      Next: 
-        # First line
-        Title: '&3&l%player% Next Votes:'
-        
-        # How each line is setup for each vote site
-        # %info% = Info - See Below 
-        # %SiteName% = site name from vote
-        Layout: '&3%SiteName%: &6%info%'
-        
-        Info:
-          # Message when player can vote
-          CanVote: 'Go Vote!'
-          # Time until vote msg
-          # %hours% = hours until next vote
-          # %minutes% = minutes until next vote
-          TimeUntilVote: '%hours% Hours and %minutes% Minutes'
-          # If there is an error finding out time until next vote
-          Error: '&cCould not caculate time until next vote!'
-          # For sites that have this, requires votedelaydaily to be set to true in the site
-          VoteDelayDaily: '%hours% Hours and %minutes% Minutes'
-          
-       # Format for /vote last
-      Last:
-        # First line
-        Title: '&3&l%player% Last Vote Times:'
-        # Lines for each vote site
-        # %time% = time, using timeformat below
-        # %timesince% = time since vote
-        Line: '&3%SiteName%: &6%timeSince%'
-        # Spelling of TimeType can be changed under Format.Commands.TimeFormats
-        TimeFormat: '%amount% %TimeType%'
-        LastVoted: '%times% ago'
-        NeverVoted: 'Never voted'
-        # Whether or not to include seconds into last voted time
-        IncludeSeconds: true
-        
-      # Format for /vote total
-      Total:
-      - '&3&l%player% Total Votes:'
-      - '&3&lDaily Total: &6&l%DailyTotal%'
-      - '&3&lWeekly Total: &6&l%WeeklyTotal%'
-      - '&3&lMonthly Total: &6&l%MonthlyTotal%'
-      - '&3&lAllTime Total: &6&l%AllTimeTotal%'
-        
-      # Format for /vote total all  
-      TotalAll:
-      - '&3&lServer Total Votes:'
-      - '&3&lDaily Total: &6&l%DailyTotal%'
-      - '&3&lWeekly Total: &6&l%WeeklyTotal%'
-      - '&3&lMonthly Total: &6&l%MonthlyTotal%'
-      - '&3&lAllTime Total: &6&l%AllTimeTotal%'
-        
-      # Format for /vote top
-      Top:
-        # First line
-        # %page% = current page
-        # %maxpages% = max number of pages
-        # %Top% = Monthly/Weekly/Daily (depending on command)
-        Title: '&3Top %Top% Voters %page%/%maxpages%'
-        # Line for each player in that page
-        Line: '&c%num%: &6%player%, %votes%'
-        
-      # Format for /vote help
-      Help:
-        # Title of /vote help
-        Title: '&6&lVoting Player Help'
-        # Format for help message in /v help
-        Line: '&6%Command% - &6%HelpMessage%'
-        # Hover color for help message
-        # Hex format: #HEXCOLOR
-        HoverColor: AQUA
-        # Require permission to see command in /v help or /av help
-        RequirePermission: true
-        
-      Best:
-        Title: '&3&l%player% Best Votes'
-        Lines:
-        - '&3Highest Daily Total: &3&l%HighestDailyTotal%'
-        - '&3Highest Week Total: &3&l%HighestWeeklyTotal%'
-        - '&3Highest Month Total: &3&l%HighestMonthlyTotal%'
-        
-      Streak:
-        Title: '&3&l%player% Vote Streak'
-        Lines:
-        - '&3Current Daily Streak: &3&l%DailyStreak%'
-        - '&3Current Week Streak: &3&l%WeeklyStreak%'
-        - '&3Current Month Streak: &3&l%MonthlyStreak%'
-        - '&3&lHighest Streaks:'
-        - '&3Highest Daily Streak: &3&l%BestDailyStreak%'
-        - '&3Highest Week Streak: &3&l%BestWeeklyStreak%'
-        - '&3Highest Month Streak: &3&l%BestMonthlyStreak%'
-        
-      Today:
-        Title:
-        - "&cToday's Votes %page%/%maxpage%"
-        - '&cPlayerName : VoteSite : Time'
-        Line: '&6%player% : %VoteSite% : %Time%'
-        
-      # PlaceHolders:
-      # %VotesRequired% = VotesRequired
-      # %NeededVotes% = Number of votes needed to reach VotesRequired
-      # %Votes% = Number of votes
-      Party:
-      - '&cCurrently at &6%Votes%&c, &6%NeededVotes% &cmore votes to go to reach &6%VotesRequired%'
-      
-      # %Points% = player points
-      Points: '&a%Player% currently has &a&l%Points%&a Points!'
-      
-      # /vote givepoints command
-      # Transfer between players command
-      # Enable command below
-      GivePoints:
-        NotEnoughPoints: '&cNot enough points'
-        NotJoinedServer: '&c%player% has not joined the server'
-        NumberLowerThanZero: '&cNumber of points needs to be greater than 0'
-        TransferFrom: '&c%transfer% points given to %touser%'
-        TransferTo: '&cYou received %transfer% points from %fromuser%'
-      
-      ToggleBroadcasts:
-        Enabled: '&cYou will now see vote broadcasts'
-        Disabled: '&cYou will no longer see vote broadcasts'
-        
-      ToggleReminders:
-        Enabled: '&cVote reminders enabled'
-        Disabled: '&cVote reminders disabled'
-  
-  # Msg on top voter award, will only send message if that place has a reward set
-  # %place% = place - 1,2,3,etc
-  TopVoterAwardMsg: '&aYou came in %place% in top voters of the month! Here is an award!'
-  
-  # Time 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'
-    Hour: 'Hour'
-    Hours: 'Hours'
-    Minute: 'Minute'
-    Minutes: 'Minutes'
-    Second: 'Second'
-    Seconds: 'Seconds'
-  
-  # Format for signs
-  # SiteName may be all, depending on sign
-  # %position% = position of player, set by sign
-  # %votes% = Number of votes
-  Signs:
-    TopVoterSign:
-      Line1: 'TopVoter: %SiteName%'
-      Line2: '#%position%'
-      Line3: '%player%'
-      Line4: '%votes% Votes'
-    # Message when right clicking sign, uses same placeholders as above
-    RightClickMessage: '&c&l%player% &cis &c&l%position% &cwith &c&l%votes% &cvotes in &c&l%SiteName%'
-      
-  # Message when player tries to run command without required permissions
-  NoPerms: '&cYou do not have enough permission!'
-  
-  # Message when player types a command but does not input a number where needed
-  NotNumber: '&cError on &6%arg%&c, number expected!'
-  
-  # Shop messages when using the /vote shop
-  ShopPurchase: '&aYou bought the %Identifier% for %Points% Points!'
-  ShopFailed: '&cYou do not have %Points% points to purchase this!'
-  ShopNotPurchasable: '&cThis item is not buyable!'
-  
-  # User not exist message, from commands such as /vote next (player)
-  UserNotExist: '&cUser does not exist: %player%'
-  
-  # Prev/Next page tems in GUIs
-  PrevItem:
-    Material: 'BLACK_STAINED_GLASS_PANE'
-    Amount: 1
-    Name: '&aPrevious Page'
-    
-  NextItem:
-    Material: 'BLACK_STAINED_GLASS_PANE'
-    Amount: 1
-    Name: '&aNext Page'
-  
-  InvFull: '&cInventory full'
-  
-  # Display text
-  # Used in /vote top (GUI)
-  TopVoter:
-    Daily: 'Daily'
-    Weekly: 'Weekly'
-    Monthly: 'Monthly'
-    AllTime: 'AllTime'
-  
-  # Invalid command messages
-  InvalidCommand:
-    Vote: '&4No valid arguments, see /vote help!'
-    AdminVote: '&4No valid arguments, see /adminvote help!'
-    
-# Playernames to not be broadcasted when voting
-# case sensitive
-VotingBroadcastBlacklist: []
-
-# Playernames to not be broadcasted when broadcast comes from reward file
-# case sensitive
-BroadcastBlacklist: []
-
-###########################################
-# Top Voter
-# Top voter rewards available in specialrewards.yml
-###########################################
-
-# Top voter blacklist
-# Hide these names from top voter lists
-BlackList:
-- 'Notch'
-
-# If true players with the permission 'VotingPlugin.TopVoter.Ignore' will act 
-# as if there name was added on the the blacklist above
-# This also applies for players with op
-TopVoterIgnorePermission: false
-
-# /vote top default data displayed
-# Valid Options: AllTime, Monthly, Weekly, Daily
-VoteTopDefault: Monthly
-
-# Whether or not to have ties on top voter rewards
-TopVoterAwardsTies: true
-
-# These are required to be enabled in order for top voter awards to work
-LoadTopVoter:
-  AllTime: true
-  Monthly: true
-  Weekly: false
-  Daily: false
-  
-# Maxium number of players to show on top voter
-# Set to -1 for no limit
-MaxiumNumberOfTopVotersToLoad: 1000
-
-# 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:
-  Weekly: false
-  Daily: false
-  
-# Limit monthly votes to number of days of a month multipled by the number of sites
-LimitMonthlyVotes: false
-
-###########################################
-# Debug
-###########################################
-
-# Debug levels:
-# NONE
-# INFO
-# EXTRA
-DebugLevel: NONE
-
-# Debug info ingame
-# Players with permission "VotingPlugin.Debug"
-# will see debug info if debug is true
-DebugInGame: false
-
-# Will log debug messages to VotingPlugin/Log/log.txt
-# Only needed for extreme cases
-#LogDebugToFile: false
-  
-# Whether or not to log every vote to a file
-# Use this if you wanna track player votes
-# Not recommended though
-LogVotesToFile: false
-
-###########################################
-# Placeholderapi placeholders settings
-###########################################
-
-# When enabled the command /vote setprimaryaccount (playername)
-# will be shown (after restart)
-# Primary account will be used instead of the players account to get
-# placeholder and other data such as vote reminding
-# Mainly to be used for alts and such
-UsePrimaryAccountForPlaceholders: false
-
-# Valid Options:
-# AUTOALL - Auto cache placeholders after they have been used and cache all players placeholder all the time
-# AUTO - Auto cache after they have been used and cache online players placeholders (Recommended)
-# SPECIFIC - Only cache certain placeholders for online players
-# SPECIFICALL - Only cache certain placeholders for all players
-# NONE - Don't cache any placeholders
-PlaceholderCacheLevel: AUTO
-
-# Placeholder controls
-# Add _process to end of placeholder to force a return value rather than . or .. if no cached value is ready
-# Add _nocache to end of placeholder to skip cache and retrive a live value, uses a direct mysql connection, do not use on main thread
-#
-
-# Set which placeholders to cache at all times
-# Use for placeholders to are pulled constantly or on the main thread
-# Mainly aimed for scoreboards that pull placeholders often
-# Placeholders may auto cache in certain conditions (if enabled above)
-# Will use additional memory, but not a lot
-# Still in early stages, please report bugs
-# Please remove VotingPlugin_ from the placeholder listed here
-CachedPlaceholders: []
-#- Total_AllTime
-
-# When enabled, javascript will be parsed on placeholders (from placeholderapi)
-# allows more fancy placeholders with math for example
-UseJavascriptPlaceholders: false
-
-# Custom placeholder returns
-# For the example below use %votingplugin_custom_enoughpoints_5%
-# DO NOT USE ON MAIN THREAD IF POSSIBLE
-# Keep everything lowercase
-# Example:
-#CustomPlaceholderReturns:
-#  'enoughpoints_5':
-#    'true': 'User has enough points'
-#    'false': 'User does not have enough points'
-CustomPlaceholderReturns: {}
-
-###########################################
-# Login options
-###########################################
-
-# If true vanished players are treated as if they are offline
-TreatVanishAsOffline: false
-
-# Delays login event, delays vote reminding and more
-# In miliseconds, 1000 = 1 second
-DelayLoginEvent: 0
-
-# Wait until user is logged in with AuthMe
-# Requires AuthMe or LoginSecurity
-WaitUntilLoggedIn: true
-
-###########################################
-# Disable/Enable features
-###########################################
-
-# If true, cooldown check is disabled
-DisableCoolDownCheck: false
-
-# If true, disable PlayerInteractEvent (for clicking signs and skulls)
-DisableInteractEvent: false
-
-# Disable this on a hub server for example
-# Still processes rewards for offline rewards (just won't give any)
-ProcessRewards: true
-
-# Set to true to disable no service site message on voting
-# You should never have to touch this if everything is setup properly
-# Will also disable a few other warnings about vote sites
-DisableNoServiceSiteMessage: false
-
-# Count fake votes
-# If true fake votes will give points and totals
-CountFakeVotes: true
-
-# Whether or not to disable update checks
-DisableUpdateChecking: false
-
-# Enable per site cooldown events, requires more resources to use
-# Requires restart
-PerSiteCoolDownEvents: false
-
-# Queue votes during a time change (doesn't apply to bungee voting)
-# Votes will be given when time change is completed
-QueueVotesDuringTimeChange: false
-
-# If true, plugin will automaticly generate votesites
-# Disable this if you experience issues with sites being created randomly
-# Most cases this will work all the time
-AutoCreateVoteSites: true
-
-# Set this to false to disable the plugin adding totals
-# Not really recommended
-AddTotals: true
-
-# Disabling this prevents offline votes from adding totals to users
-AddTotalsOffline: true
-
-# If false, votestreaks will be disabled
-UseVoteStreaks: true
-
-# If false, storing best totals will be disabled
-UseHighestTotals: true
-
-# Geyser/Bedrock player support
-# Set prefix used for voting
-# Players should vote with prefix
-# https://github.com/BenCodez/VotingPlugin/wiki/Bedrock-Player-Support
-BedrockPlayerPrefix: '.'
-
-# Whether or not to create daily backups. (Only the most recent ones get kept)
-CreateBackups: true
-
-# Automaticly download the latest version
-# Will require a restart to actually update
-# Note: It takes 30-40 minutes before being able to download the latest build
-# You can also use /av download
-AutoDownload: false
-
-# If false plugin will use offline player UUIDs
-OnlineMode: true
-
-# Disable checking on world change
-# May improve performance
-#DisableCheckOnWorldChange: false
-
-# Disable javascript processing in messages/rewards
-DisableJavascript: false
-
-# If true, number of vote shop purchases will be tracked
-# Data will be tracked in serverdata.yml, may change in the future
-# No commands to view data currently 
-TrackShopPurchases: false
-
-# Limits about of offline votesites
-# Does not currently work with bungee votes from votingplugin
-OfflineVotesLimit:
-  # Enable or disable
-  Enabled: false
-  # Limit of votes per votesite
-  Amount: 5
-  
-# Default worlds set for all rewards
-DefaultRewardWorlds: []
-
-# Default blackedlisted worlds set for all rewards
-DefaultRewardBlackListedWorlds: []
-
-###########################################
-# Skull settings
-###########################################
-
-# Preload skulls to improve performance for vote top
-# when using skulls as the item to display players
-# If false, skulls will be cached as they are used
-# assuming loadskulls is enabled
-PreloadSkulls: false
-
-# Setting to false disables saving skulls in a cache to improve speeds
-# Will reduce ram usage (very little) if disabled, but slow GUI speeds when using skulls
-LoadSkulls: true
-
-###########################################
-# Extra checks on vote
-###########################################
-
-# If true, allsites will have an extra check to prevent duplicate allsites from being given
-ExtraAllSitesCheck: false
-
-# This is an extra safe guard to prevent milestones 
-# from being executed more than once
-# Shoudn't be needed, but enable if you have trouble with milestones
-PreventRepeatMilestones: false
-
-# Number of points to give on vote
-# Set to 0 to give no points
-PointsOnVote: 1
-
-# May need to enable this for bungee setups
-# Let players who never joined before vote
-# Recommend: False (Will prevent creating random user data)
-AllowUnjoined: false
-
-# Use server lookup for when allowunjoined is set to false
-# Recommend leaving enabled unless you face issues
-AllowUnJoinedCheckServer: true
-
-##############################################
-# Command/Permission settings
-##############################################
-
-# Give VotingPlugin.Player by default
-# Requires restart to take affect
-GiveDefaultPermission: true
-
-# Permissions given by VotingPlugin.Player by default
-# Permissions listed here will no be accessible with the default permission
-DisabledDefaultPermissions: []
-
-# If true, /vote will open /vote gui by default
-UseVoteGUIMainCommand: false
-
-# Disable checking permissions on tab complete
-# Could increase performance slightly, but probably not
-DisableAdvancedTab: false
-
-# Load command aliases, such as /avgui
-# Requires restart to take effect
-LoadCommandAliases: true
-
-# Use vault for permission checks
-# May not work on some plugins
-UseVaultPermissions: false
-
-# List of disabled commands from /vote
-# List the specific permission
-# E.g:
-# - PERMISSION
-DisabledCommands: []
-
-# If true, permissions will be handled differently
-MultiplePermissionsCheck: false
-
-# Allow transfer of vote points between players
-# Requires restart for command to load
-# Command: /vote givepoints (player) (points)
-AllowVotePointTransfers: false
-
-AddCustomCommands: false
-
-# Injects custom command to /vote
-# Requires AddCustomCommand: true to be set
-CustomCommands:
-  # identifier, not specific name
-  command1:
-    Args:
-    - token
-    # Message to send on command
-    Message: 'token message'
-    # Permission for this command
-    Permission: 'votingplugin.commands.vote.token'
-    # help message
-    HelpMessage: 'See tokens'
-    # Forces player to run this command
-    Commands:
-    - tokencommand
-
-##############################################
-# Background task settings
-##############################################
-
-# Only update in the background when needed when set to false
-AlwaysUpdate: false
-
-# Update in the background only if players are online
-UpdateWithPlayersOnlineOnly: false
-
-# Delay between background updates like signs and more
-# Default: 3 Minutes
-# Longer times result in longer wait in stuff updating after a vote, like topvoter
-DelayBetweenUpdates: 3
-
-# Enable to true for extra player checks
-# Recommend leaving this to false
-ExtraBackgroundUpdate: false
-
-##########################################
-# Inventory controls
-##########################################
-
-# Click sound when using gui
-# Set to none for no sound
-ClickSound: 
-  Sound: 'UI_BUTTON_CLICK'
-  Volume: 1.0
-  Pitch: 1.0
-
-# If true, items given for rewards are dropped on the ground
-# If false, items will be given when there is space
-DropOnFullInv: true
-
-# This will prevent spam clicking GUI's to prevent exploits
-# Number is time in between clicking in milliseconds
-SpamClickTime: 100
-# Message to send when inventory forced closed when spam clicking
-# Uncomment to use
-#SpamClickMessage: '&cDetected spam clicking GUI, closing to prevent exploits'
-
-# Will force GUI's to close on every click
-AlwaysCloseInventory: false
-
-# Close inventory on player vote
-# This is to prevent any possible exploits
-CloseInventoryOnVote: true
-
-# This will close GUI's if you shift click them rather than a regular
-# This can help prevent exploits
-CloseGUIOnShiftClick: false
-
-###########################################
-# Purge settings
-###########################################
-# Remove old player files
-# Happens on startup or /av purge
-PurgeOldData: false
-
-# Minimum number of days offline in order to purge
-PurgeMin: 90
-
-##########################################
-# Extra options
-# Options below don't need to be touched
-##########################################
-
-# If enabled, data is repulled from storage on vote shop purchase
-# This prevents possible exploits with vote shop
-ExtraVoteShopCheck: true
-
-# Options for request api
-# Current methods:
-# ANVIL
-# BOOK
-# CHAT
-# This is mainly used for admin gui's to type in values
-RequestAPI:
-  DefaultMethod: 'Anvil'
-  DisabledMethods: []
-

VotingPlugin/Resources/SpecialRewards.yml

@@ -1,241 +0,0 @@
-# To disable reward set value to {}
-# or remove entirely
-# Eg:
-# FirstVote: {} (All in one line)
-# Rewards will be given if there is a reward to give, otherwise they will be ignored
-
-# First vote rewards
-FirstVote: 
-  Messages:
-    Player: '&aYou voted for your first time!'
-    
-# First vote of the day reward
-FirstVoteToday: {}
-
-# All vote rewards
-# One time reward for voting on all sites in one day
-# Enable ExtraAllSitesCheck if you get double rewards
-AllSites: 
-  Messages:
-    Player: '&aYou voted on all sites in 1 day!'
-    
-# Give a reward for voting on all sites minus 1
-# Similar to allsites
-#AlmostAllSites:
-#  Messages:
-#    Player: '&aYou almost voted on all sites in 1 day!'
-
-
-# If true only cumulative reward at a time can be given
-# The cumulative rewards will go in order as listed under Cumulative, so if true
-# the first cumulative (in the order as listed) that can be given will, then will ignore the rest
-OnlyOneCumulative: false
-# NOTE: This is not a 1 time reward, that's what milestones are for!
-# If total votes (Can be changed) divided by cumulative amount 
-# and with no remainder (So divides perfectly) then a reward is given
-Cumulative:
-  # Number of votes required
-  # Allows multiple cumulative rewards
-  # Number be be around ' (E.g. '1')
-  # Can have multiple listed here
-  '20':
-    Enabled: false
-    # Whether or not votes must be made in same day/week
-    # Useful if you want to require a certain number of voting sites to be voted on
-    # for a daily/weekly reward instead of all of them
-    # Valid options
-    # AllTime
-    # Monthly
-    # Weekly
-    # Daily
-    TotalToUse: AllTime
-    # Blacklist recurring votes
-    #BlackList:
-    #- 40
-    # Whether or not to gives cumulative reward for every x number of votes, default: true
-    #Recurring: true
-    Rewards: 
-      Messages:
-        Player: '&aYou got %cumulative% cumulative votes!'
-
-# Vote party configuration
-VoteParty:
-  # Wether or not vote party is enabled
-  Enabled: false
-  # Number of votes required to give rewards
-  VotesRequired: 20
-  # Increase the amount of votes required on each vote party reached
-  #IncreaseVotesRquired: 10
-  # If true, players who did not vote to reach the votes required will 
-  # recieve the reward
-  # If false, only players who voted get rewards
-  GiveAllPlayers: false
-  # If true, give online players the vote party reward
-  # Can also use RewardType: ONLINE if you wanted
-  GiveOnlinePlayersOnly: true
-  # 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
-  # If true, will give voteparty once per week only
-  OnlyOncePerWeek: false
-  # Reset extra votes
-  ResetExtraVotesMonthly: false
-  # Count votes from /av vote?
-  CountFakeVotes: true
-  # Number of user votes that apply to vote party total the user needs to get rewards
-  UserVotesRequired: 0
-  # Count offline votes
-  CountOfflineVotes: true
-  # Broadcast when vote party reached
-  Broadcast: '&cReached the vote party amount!'
-  # Send a broadcast at a certain number of votes left and send a vote reminder
-  VoteReminderBroadcast: '%votesrequired% left to go, go vote!'
-  # List of votes required amounts for when to send vote party reminders
-  VoteReminderAtVotes: []
-  # List of commands to execute, these only execute once.
-  # %player% does not work here
-  GlobalCommands: []
-  # List of commands to execute once
-  # Only run will run
-  GlobalRandomCommand: []
-  # Rewards to give per player
-  Rewards: 
-    # Uncomment below for online players to be rewarded only
-    #RewardType: ONLINE
-    Commands:
-    - say %player%
-    Items:
-      DIAMOND:
-        Material: 'DIAMOND'
-        Amount: 1
-  
-# Reset milestones at end of the month
-ResetMilestonesMonthly: false
-  
-# One time reward to be given (unless you reset it somehow)
-MileStones:
-  # Number of votes required
-  # Allows multiple milestones
-  # Number be around ' (E.g. '1')
-  # Can have multiple listed here
-  '20':
-    Enabled: false
-    Rewards: 
-      Messages:
-        Player: '&aYou got %milestone% milestone votes!'
-   
-VoteStreak:
-  # Valid options: Day, Week, Month
-  Day:
-    # Number of days in a row
-    # Each day requires one vote
-    # Add a - to give a reward for every multiple (e.g. 2- = 2,4,6,8, and so on)
-    # This may not work perfectly on bungee setups at this time
-    '2':
-      # Enabled or not
-      Enabled: false
-      # Rewards to give
-      Rewards:
-        Messages:
-          Player: "&aYou voted for %Streak% %Type%'s in a row!"
-  Week:
-    # Number of weeks in a row
-    # Requires atleast one vote per week
-    '2':
-      # Enabled or not
-      Enabled: false
-      # Rewards to give
-      Rewards:
-        Messages:
-          Player: "&aYou voted for %Streak% %Type%'s in a row!"
-  Month:
-    # Number of months in a row
-    # Requires atleast 1 vote per month
-    '2':
-      # Enabled or not
-      Enabled: false
-      # Rewards to give
-      Rewards:
-        Messages:
-          Player: "&aYou voted for %Streak% %Type%'s in a row!"
-  Requirement:
-    # Require certain percentage of votes
-    UsePercentage: false
-    # Percentage requirements of votes
-    # 50 = %50
-    Day: 50
-    Week: 50
-    Month: 50
-    
-# Reward given when all votesites are available to vote on
-# Don't use this unless you really need it
-# Little performance intensive
-# Recommend add RewardType: ONLINE for it to only work online
-VoteCoolDownEndedReward: []
-
-# ONLY USE THIS FOR TITLES/SOUNDS AND OTHER EFFECTS
-# IT WILL ONLY RUN ONE TIME FOR ANY NUMBER OF OFFLINE VOTES (3 offline votes = 1 AnySiteReward)
-# Any reward files listed here are ran on vote of any site
-# It is recommended to add rewards to each site instead of here
-# Using forceoffline won't work here
-# Use EverySiteReward in VoteSites.yml for a global reward for each site
-AnySiteRewards: {}
-
-# Rewards to run when player logs in
-LoginRewards: {}
-
-# Rewards to run when player logs off
-# Will queue until player logs in unless forceoffline is enabled
-LogoutRewards: {}
-
-EnableMonthlyAwards: true
-
-# TopVoter Placeholders:
-#%place% - place in topvoter
-#%topvoter% - topvoter type
-#%votes% - current total votes related to top voter
-
-# Rewards to give
-MonthlyAwards:
-  # Position. 1 is first in top voter, 2 is second, etc...
-  # Using 1-10 will reward players in first to tenth place with the same reward
-  1:
-    Rewards:
-      Messages:
-        Player: '&aYou came in first place in %TopVoter%!'
-  2:
-    Rewards:
-      Messages:
-        Player: '&aYou came in second place in %TopVoter%!'
-    
-EnableWeeklyAwards: false
-# Rewards to give on weekly top voter
-WeeklyAwards:
-  # Position. 1 is first in top voter, 2 is second, etc...
-  1:
-    Rewards:
-      Messages:
-        Player: '&aYou came in first place in %TopVoter%!'
-  2:
-    Rewards:
-      Messages:
-        Player: '&aYou came in second place in %TopVoter%!'
-    
-EnableDailyRewards: false
-# Rewards to give on daily top voter
-DailyAwards:
-  # Position. 1 is first in top voter, 2 is second, etc...
-  1:
-    # Reward files to give
-    Rewards:
-      Messages:
-        Player: '&aYou came in first place in %TopVoter%!'
-  2:
-    Rewards:
-      Messages:
-        Player: '&aYou came in second place in %TopVoter%!'

VotingPlugin/Resources/VoteSites.yml

@@ -1,133 +0,0 @@
-VoteSites:
-  # VoteSite key
-  # Used for saving data for votesites
-  # Use a short name if you can
-  # No spaces or dots
-  ExampleVoteSite:
-    # Enable voteSite
-    # If false, votesite will not be loaded by plugin
-    # Default: false
-    Enabled: false
-    
-    # Display name of voting site
-    Name: 'ExampleVoteSite'
-          
-    # Priority of this site
-    # 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)
-    # Usually is the main part of the url(e.g. PlanetMinecraft.com), but not always
-    # See console when you vote (it will notify you if the plugin didn't find a votingsite matching the service site
-    ServiceSite: 'PlanetMinecraft.com'
-
-    # vote url for /vote
-    # Format for this can be set in Config.yml
-    # Do not include colors here
-    # If you need to force a url set the url as this:
-    # VoteURL: '[Text="ANY TEXT TO CLICK ON HERE",url="URLHERE"]'
-    VoteURL: 'link to vote URL here, used in /vote'
-
-    # Time between votes in hours (used for /vote next)
-    # Most sites are 24 hours
-    VoteDelay: 24
-    
-    # Use to have a minute votedelay
-    #VoteDelayMin: 30
-    
-    # Require waiting until votedelay time has pasted in order to accept vote
-    # Recommend: false
-    WaitUntilVoteDelay: false
-    
-    # Reset vote delay each day (for certain sites that do this)
-    # Recommend: false
-    VoteDelayDaily: false
-    
-    # Replaces offset, set the exact hour based on server time
-    # Include server time offset when setting this
-    # 2 = 2 am server time
-    # Use 1-24
-    #VoteDelayDailyHour: 14
-    
-    # If true, rewards can be executed offline (requires ForceOffline to be true in the reward)
-    # Setting this to true will execute the reward offline while the player is offline
-    # This basiclly disables offline voting if set to true, don't misinterpret this option
-    ForceOffline: false
-    
-    # VoteSite Material for some GUI's
-    # Removing this may result in an error, required on each site
-    DisplayItem:
-      Material: 'DIAMOND'
-      Amount: 1
-      
-    # Reward to run when cooldown ends for this votesite
-    # Enable PerSiteCoolDownEvents in Config.yml to use this
-    #CoolDownEndRewards:
-    #  Messages:
-    #    Player: '&aTime to go vote on site1'
-
-    # Rewards to give
-    # https://github.com/BenCodez/AdvancedCore/wiki/Rewards
-    Rewards:
-      # Execute console commands
-      Commands:
-      - 'say hello'
-      # Send player a message
-      Messages:
-        Player: 'You voted'
-  # Site 2 example
-  Site2:
-    Enabled: false
-    Name: 'Site2'
-    ServiceSite: 'PlanetMinecraft.com'
-    VoteURL: 'link to vote URL here, used in /vote'
-    VoteDelay: 24
-    DisplayItem:
-      Material: 'DIAMOND'
-      Amount: 1
-    Rewards:
-      Commands:
-      - 'say hello'
-      # Advanced example
-      # 50% chance for reward1, if reward1 not given then 20% chance to get reward2, if reward2 not given then fallback
-      AdvancedPriority:
-        # Similar to priority, but no need to have to use reward files
-        # Add requirements under each reward
-        # Will go in order from list here and try to run each of the following rewards...
-        # This name can be anything, but they need to be different
-        Reward1:
-          Chance: 50
-          # Any other requirement here
-          # If any requirement fails, the next reward will be attempted
-          # Use permission requirement for rank based rewards
-          #RequirePermission: true
-          #Permission: 'permhere'
-          Messages:
-            Player: 'You got first reward'
-        Reward2:
-          Chance: 20
-          Messages:
-            Player: 'You got second reward'
-        # Fallback, 100% chance, after other rewards fail chances
-        Fallback:
-          Messages:
-            Player: 'You got unlucky'
-            
-      # Give 1 diamond regardless of above
-      Items:
-        item1:
-          Material: DIAMOND
-          Amount: 1
-
-      Messages:
-        Player: 'You voted'
-    
-# Reward for any site
-# Similar to AnySiteReward
-# This requires the site to be configured in order to get the reward.
-EverySiteReward: {}

VotingPlugin/Resources/bungeeconfig.yml

@@ -1,189 +0,0 @@
-# Set bungeecoord to true on servers on the network (In VotingPlugin)
-# Set server name in each server related to what it is on bungee
-#
-# MYSQL Required on all setups
-# MYSQL INFO --------------------------
-Host: ''
-# Default port is 3306
-Port: 3306 
-Database: ''
-Username: ''
-Password: ''
-# Max number of connections
-MaxConnections: 1
-# Table name prefix, for use with mutliple servers
-# Don't use with PLUGINMESSAGING bungee setup
-Prefix: ''
-#UseSSL: true
-#PublicKeyRetrieval: false
-#Attempt to use mariadb driver
-#UseMariaDB: false
-
-
-####################################################################################
-# Global mysql data handle for between server commmunications
-# This is NOT required for bungee voting to work
-# This is still a WIP, use with caution
-# This will create a different table then from users storing server info to process
-#
-# If you use this you need to enable this on BungeeSettings.yml on each server with votingplugin
-# Make sure server name is set correctly in BungeeSettings.yml or this will not work correctly
-# 
-# Please use PLUGINMESSAGING for this, SOCKETS should work as well, but not fully tested
-#
-# This will make votes cache until time change has finished processing
-# In the event a server is offline or time change fails, the time change process
-# will continue after a set amount of time (in essense skipping a specific server)
-# This will also respect blocked servers
-GlobalData:
-  Enabled: false
-  # Use existing connection above
-  UseMainMySQL: true
-  # Mysql settings only used if above is false
-  Host: ''
-  # Default port is 3306
-  Port: 3306 
-  Database: ''
-  Username: ''
-  Password: ''
-  # Max number of connections
-  MaxConnections: 1
-  # Must be the same on all servers
-  Prefix: ''
-  #UseSSL: true
-  #PublicKeyRetrieval: false
-  #Attempt to use mariadb driver
-  #UseMariaDB: false
-  
-# Time offset for time changes
-# Must match on all servers
-TimeHourOffSet: 0
-
-####################################################################################
-
-Debug: false
-# Have a reward on each server
-# If false, will send to online server only
-SendVotesToAllServers: true
-# List of servers the plugin won't send the vote to
-# Uses names from bungeecoord config, only needed for non SOCKETS setup
-BlockedServers:
-- hub
-
-
-# Similar to BlockServers
-# If a server is listed then blockedservers is ignored
-WhiteListedServers: []
-
-# What type of bungee setup
-# Requires restart and set on all servers
-# https://github.com/BenCodez/VotingPlugin/wiki/Bungeecoord-Setups
-# Available:
-# SOCKETS 
-# PLUGINMESSAGING (Recommended)
-# MYSQL
-# REDIS
-BungeeMethod: PLUGINMESSAGING
-
-# Use Redis for between server communication, set BungeeMethod to REDIS to use this
-Redis:
-  Host: localhost
-  Port: 6379
-  Username: ''
-  Password: ''
-
-# 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
-
-# Points to give on vote
-PointsOnVote: 1
-
-# If true, bungee will handle adding totals
-# If false, spigot servers will EACH set their own totals
-# If false, AllowUnJoined should be enabled on bungee, spigot servers will handle that
-# Recommeneded to leave enabled, setups with this disabled are currently unsupported
-BungeeManageTotals: true
-
-# Tell servers to broadcast
-# Set DisableBroadcast to true on spigot servers (BungeeSettings.yml) as well
-Broadcast: true
-
-# Geyser/bedrock player settings
-# https://github.com/BenCodez/VotingPlugin/wiki/Bedrock-Player-Support
-BedrockPlayerPrefix: '.'
-
-# Time votes will be cached on proxy
-# -1 means no time limit
-# Time in days
-VoteCacheTime: -1
-
-# Maxium number of votes possible per day
-# Usually matches the amount of votesites
-# Will limit vote totals to match accordingly
-# Only applies for month total
-# Set to -1 to disable
-MaxAmountOfVotesPerDay: -1
-
-VoteParty:
-  # If enabled, will trigger vote party reward 
-  # in BungeeSettings.yml under BungeeVotePartyReward
-  # Only runs rewards for online players
-  Enabled: false
-  # Votes required
-  VotesRequired: 100
-  # Increase amount required on each vote party
-  IncreaseVotesRequired: 0
-  # If false, will only send to servers listed below
-  SendToAllServers: true
-  # Servers to send to, if SendToAllServers is false
-  ServersToSend: []
-  # List of commands to run on bungee server
-  # Set spigot commands in BungeeSettings.yml
-  BungeeCommands: []
-  Broadcast: '&aVote party has been reached!'
-  
-# Online mode for UUIDS
-# Offline mode setups are not fully tested and are not supported currently
-OnlineMode: true
-
-##########################################
-# PLUGINMESSAGING Settings
-##########################################
-
-# Applies to PLUGINMESSAGING only
-# Votes will be forwarded when specific player is online
-WaitForUserOnline: false
-
-
-##########################################
-# Multi-proxy setup
-# This is still a WIP, use with caution
-# Primary server  needs votifier and config option enabled
-# Set socket host on each proxy and primary server set sub proxies
-# All servers should be on pluginmessaging or sockets setup
-##########################################
-
-# Support for redis
-# experimental
-MultiProxySupport: false
-
-# Enable on primary proxy server with votifier
-PrimaryServer: false
-
-# If enabled, player will only get 1 reward on a server on the network
-# Must be enabled on all proxies for this to work
-# Must also disable sendtoallservers
-MultiProxyOneGlobalReward: false
-
-# Set this for each proxy
-MultiProxySocketHost:
-  Host: 0.0.0.0
-  Port: 1234
-
-# Set other sub proxies here
-MultiProxyServers:
-  secondproxy:
-    Host: 0.0.0.0
-    Port: 1235

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

@@ -1,31 +0,0 @@
-package com.Ben12345rocks.VotingPlugin.Objects;
-
-import org.bukkit.entity.Player;
-
-import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.user.VotingPluginUser;
-
-@Deprecated
-public class User {
-	private VotingPluginUser user;
-
-	public User(Player p) {
-		user = VotingPluginMain.plugin.getVotingPluginUserManager().getVotingPluginUser(p);
-	}
-
-	public void addPoints(int points) {
-		user.addPoints(points);
-	}
-
-	public int getPoints() {
-		return user.getPoints();
-	}
-
-	public boolean removePoints(int points) {
-		return user.removePoints(points);
-	}
-
-	public void setPoints(int points) {
-		user.setPoints(points);
-	}
-}

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

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

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

@@ -1,76 +0,0 @@
-package com.bencodez.votingplugin.broadcast;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.MiscUtils;
-import com.bencodez.votingplugin.VotingPluginMain;
-
-public class BroadcastHandler {
-	private VotingPluginMain plugin;
-	private ScheduledExecutorService timer;
-	ConcurrentLinkedQueue<String> votedPlayers = new ConcurrentLinkedQueue<String>();
-
-	public BroadcastHandler(VotingPluginMain plugin, int delay) {
-		this.plugin = plugin;
-		schedule(delay);
-	}
-
-	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());
-			String playersText = "";
-			while (!votedPlayers.isEmpty()) {
-				playersText += votedPlayers.remove();
-				if (!votedPlayers.isEmpty()) {
-					playersText += ", ";
-				}
-			}
-			HashMap<String, String> placeholders = new HashMap<String, String>();
-			placeholders.put("numberofplayers", "" + size);
-			placeholders.put("players", playersText);
-			bc = StringParser.getInstance().replacePlaceHolder(bc, placeholders);
-			ArrayList<Player> players = new ArrayList<Player>();
-			for (Player p : Bukkit.getOnlinePlayers()) {
-				if (!plugin.getVotingPluginUserManager().getVotingPluginUser(p).getDisableBroadcast()) {
-					players.add(p);
-				}
-			}
-
-			MiscUtils.getInstance().broadcast(bc, players);
-		}
-	}
-
-	public void onVote(String player) {
-		votedPlayers.add(player);
-	}
-
-	public void schedule(int delay) {
-		if (timer != null) {
-			timer.shutdownNow();
-			timer = Executors.newScheduledThreadPool(1);
-		} else {
-			timer = Executors.newScheduledThreadPool(1);
-		}
-		timer.scheduleWithFixedDelay(new Runnable() {
-
-			@Override
-			public void run() {
-				check();
-			}
-		}, 60, 60 * delay, TimeUnit.SECONDS);
-	}
-}

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

@@ -1,72 +0,0 @@
-package com.bencodez.votingplugin.bungee;
-
-import java.util.regex.Pattern;
-
-import lombok.Getter;
-import lombok.Setter;
-
-public class BungeeMessageData {
-
-	// Message string
-	// alltimetotal//monthtotal//weeklytotal//dailytotal//points//milestonecount//votepartycurrent//votepartyrequired
-
-	@Getter
-	@Setter
-	private int allTimeTotal = 0;
-	@Getter
-	@Setter
-	private int dailyTotal = 0;
-	@Getter
-	@Setter
-	private int milestoneCount = 0;
-	@Getter
-	@Setter
-	private int monthTotal = 0;
-	@Getter
-	@Setter
-	private int points = 0;
-	@Getter
-	@Setter
-	private int weeklyTotal = 0;
-	@Getter
-	@Setter
-	private int votePartyCurrent = 0;
-	@Getter
-	@Setter
-	private int votePartyRequired = 0;
-
-	public BungeeMessageData(int allTimeTotal, int monthTotal, int weeklyTotal, int dailyTotal, int points,
-			int milestoneCount, int votePartyCurrent, int votePartyRequired) {
-		this.allTimeTotal = allTimeTotal;
-		this.monthTotal = monthTotal;
-		this.weeklyTotal = weeklyTotal;
-		this.dailyTotal = dailyTotal;
-		this.points = points;
-		this.milestoneCount = milestoneCount;
-		this.votePartyCurrent = votePartyCurrent;
-		this.votePartyRequired = votePartyRequired;
-	}
-
-	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]);
-		}
-		if (data.length >= 8) {
-			votePartyCurrent = Integer.parseInt(data[6]);
-			votePartyRequired = Integer.parseInt(data[7]);
-		}
-	}
-
-	@Override
-	public String toString() {
-		return allTimeTotal + "//" + monthTotal + "//" + weeklyTotal + "//" + dailyTotal + "//" + points + "//"
-				+ milestoneCount + "//" + votePartyCurrent + "//" + votePartyRequired;
-	}
-
-}

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

@@ -1,7 +0,0 @@
-package com.bencodez.votingplugin.bungee;
-
-public class BungeeVersion {
-	public static int getPluginMessageVersion() {
-		return 1;
-	}
-}

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

@@ -1,213 +0,0 @@
-package com.bencodez.votingplugin.bungee;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.util.Collection;
-import java.util.List;
-
-import lombok.Getter;
-import net.md_5.bungee.config.Configuration;
-import net.md_5.bungee.config.ConfigurationProvider;
-import net.md_5.bungee.config.YamlConfiguration;
-
-public class Config {
-	private VotingPluginBungee bungee;
-	@Getter
-	private Configuration data;
-
-	public Config(VotingPluginBungee bungee) {
-		this.bungee = bungee;
-	}
-	
-	public String getRedisHost() {
-		return getData().getString("Redis.Host", "");
-	}
-	
-	public int getRedisPort() {
-		return getData().getInt("Redis.Port", 6379);
-	}
-	
-	public String getRedisUsername() {
-		return getData().getString("Redis.Username", "");
-	}
-	
-	
-	public String getRedisPassword() {
-		return getData().getString("Redis.Password", "");
-	}
-	
-
-	public boolean getAllowUnJoined() {
-		return getData().getBoolean("AllowUnJoined", false);
-	}
-
-	public List<String> getBlockedServers() {
-		return getData().getStringList("BlockedServers");
-	}
-
-	public List<String> getWhiteListedServers() {
-		return getData().getStringList("WhiteListedServers");
-	}
-
-	public boolean getBroadcast() {
-		return getData().getBoolean("Broadcast", false);
-	}
-
-	public String getBedrockPlayerPrefix() {
-		return getData().getString("BedrockPlayerPrefix", ".");
-	}
-
-	public boolean getOnlineMode() {
-		return getData().getBoolean("OnlineMode", true);
-	}
-
-	public boolean getGlobalDataEnabled() {
-		return getData().getBoolean("GlobalData.Enabled", false);
-	}
-
-	public boolean getGlobalDataUseMainMySQL() {
-		return getData().getBoolean("GlobalData.UseMainMySQL", true);
-	}
-
-	public String getBungeeHost() {
-		return getData().getString("BungeeServer.Host", "");
-	}
-
-	public boolean getBungeeManageTotals() {
-		return getData().getBoolean("BungeeManageTotals", true);
-	}
-
-	public String getBungeeMethod() {
-		return getData().getString("BungeeMethod", "SOCKETS");
-	}
-
-	public int getBungeePort() {
-		return getData().getInt("BungeeServer.Port", 1297);
-	}
-
-	public boolean getDebug() {
-		return getData().getBoolean("Debug", false);
-	}
-
-	public boolean getMultiProxySupport() {
-		return getData().getBoolean("MultiProxySupport", false);
-	}
-
-	public int getMaxAmountOfVotesPerDay() {
-		return getData().getInt("MaxAmountOfVotesPerDay", -1);
-	}
-
-	public int getMultiProxySocketHostPort() {
-		return getData().getInt("MultiProxySocketHost.Port", 1297);
-	}
-
-	public String getMultiProxySocketHostHost() {
-		return getData().getString("MultiProxySocketHost.Host", "");
-	}
-
-	public boolean getMultiProxyOneGlobalReward() {
-		return getData().getBoolean("MultiProxyOneGlobalReward", false);
-	}
-
-	public Configuration getMultiProxyServersConfiguration(String s) {
-		return getData().getSection("MultiProxyServers." + s);
-	}
-
-	public Collection<String> getMultiProxyServers() {
-		return getData().getSection("MultiProxyServers").getKeys();
-	}
-
-	public boolean getPrimaryServer() {
-		return getData().getBoolean("PrimaryServer", false);
-	}
-
-	public String getFallBack() {
-		return getData().getString("FallBackServer", "");
-	}
-
-	public int getPointsOnVote() {
-		return getData().getInt("PointsOnVote", 1);
-	}
-
-	public boolean getSendVotesToAllServers() {
-		return getData().getBoolean("SendVotesToAllServers");
-	}
-
-	public Configuration getSpigotServerConfiguration(String s) {
-		return getData().getSection("SpigotServers." + s);
-	}
-
-	public Collection<String> getSpigotServers() {
-		return getData().getSection("SpigotServers").getKeys();
-	}
-
-	public boolean getWaitForUserOnline() {
-		return getData().getBoolean("WaitForUserOnline", false);
-	}
-
-	public boolean getVotePartyEnabled() {
-		return getData().getBoolean("VoteParty.Enabled", false);
-	}
-
-	public boolean getVotePartySendToAllServers() {
-		return getData().getBoolean("VoteParty.SendToAllServers", true);
-	}
-
-	public int getVotePartyVotesRequired() {
-		return getData().getInt("VoteParty.VotesRequired", 100);
-	}
-
-	public int getVotePartyIncreaseVotesRequired() {
-		return getData().getInt("VoteParty.IncreaseVotesRequired", 0);
-	}
-
-	public int getVoteCacheTime() {
-		return getData().getInt("VoteCacheTime", -1);
-	}
-
-	public String getVotePartyBroadcast() {
-		return getData().getString("VoteParty.Broadcast", "");
-	}
-
-	public List<String> getVotePartyServersToSend() {
-		return getData().getStringList("VoteParty.ServersToSend");
-	}
-
-	public List<String> getVotePartyBungeeCommands() {
-		return getData().getStringList("VoteParty.BungeeCommands");
-	}
-
-	public void load() {
-		if (!bungee.getDataFolder().exists()) {
-			bungee.getDataFolder().mkdir();
-		}
-
-		File file = new File(bungee.getDataFolder(), "bungeeconfig.yml");
-
-		if (!file.exists()) {
-			try (InputStream in = bungee.getResourceAsStream("bungeeconfig.yml")) {
-				Files.copy(in, file.toPath());
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		try {
-			data = ConfigurationProvider.getProvider(YamlConfiguration.class)
-					.load(new File(bungee.getDataFolder(), "bungeeconfig.yml"));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void save() {
-		try {
-			ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
-					new File(bungee.getDataFolder(), "bungeeconfig.yml"));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-}

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

@@ -1,111 +0,0 @@
-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.JsonConfiguration;
-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());
-		}
-	}
-
-	public void addPlayer(String uuid, String playerName) {
-		getData().set("NonVotedPlayers." + playerName + ".UUID", uuid);
-		getData().set("NonVotedPlayers." + playerName + ".LastTime", System.currentTimeMillis());
-	}
-
-	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 yamlFile = new File(bungee.getDataFolder(), "nonvotedplayerscache.yml");
-		File file = new File(bungee.getDataFolder(), "nonvotedplayerscache.json");
-
-		if (!file.exists()) {
-			try {
-				file.createNewFile();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-
-		if (yamlFile.exists()) {
-			try {
-				data = ConfigurationProvider.getProvider(YamlConfiguration.class)
-						.load(new File(bungee.getDataFolder(), "nonvotedplayerscache.yml"));
-				yamlFile.renameTo(new File(bungee.getDataFolder(), "oldnonvotedplayerscache.yml"));
-				ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
-						new File(bungee.getDataFolder(), "oldnonvotedplayerscache.yml"));
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-
-			save();
-		}
-
-		try {
-			data = ConfigurationProvider.getProvider(JsonConfiguration.class)
-					.load(new File(bungee.getDataFolder(), "nonvotedplayerscache.json"));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	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 save() {
-		try {
-			ConfigurationProvider.getProvider(JsonConfiguration.class).save(data,
-					new File(bungee.getDataFolder(), "nonvotedplayerscache.json"));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-}

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

@@ -1,34 +0,0 @@
-package com.bencodez.votingplugin.bungee;
-
-import lombok.Getter;
-
-public class OfflineBungeeVote {
-
-	@Getter
-	private String playerName;
-	@Getter
-	private boolean realVote;
-	@Getter
-	private String service;
-	@Getter
-	private String text;
-	@Getter
-	private long time;
-	@Getter
-	private String uuid;
-
-	public OfflineBungeeVote(String playerName, String uuid, String service, long time, boolean realVote, String text) {
-		this.playerName = playerName;
-		this.uuid = uuid;
-		this.service = service;
-		this.time = time;
-		this.realVote = realVote;
-		this.text = text;
-	}
-
-	@Override
-	public String toString() {
-		return "VoteCache:" + playerName + "/" + uuid + "/" + service + "/" + time + "/" + realVote + "/" + text;
-	}
-
-}

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

@@ -1,160 +0,0 @@
-package com.bencodez.votingplugin.bungee;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collection;
-
-import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
-
-import lombok.Getter;
-import net.md_5.bungee.config.Configuration;
-import net.md_5.bungee.config.ConfigurationProvider;
-import net.md_5.bungee.config.JsonConfiguration;
-import net.md_5.bungee.config.YamlConfiguration;
-
-public class VoteCache {
-	private VotingPluginBungee bungee;
-	@Getter
-	private Configuration data;
-
-	public VoteCache(VotingPluginBungee bungee) {
-		this.bungee = bungee;
-	}
-
-	public int getVotePartyCurrentVotes() {
-		return getData().getInt("VoteParty.CurrentVotes", 0);
-	}
-
-	public int getVotePartyInreaseVotesRequired() {
-		return getData().getInt("VoteParty.IncreaseVotes", 0);
-	}
-
-	public void setVotePartyCurrentVotes(int amount) {
-		getData().set("VoteParty.CurrentVotes", amount);
-	}
-
-	public void setVotePartyInreaseVotesRequired(int amount) {
-		getData().set("VoteParty.IncreaseVotes", amount);
-	}
-
-	public void setVotePartyCache(String server, int amount) {
-		getData().set("VoteParty.Cache." + server, amount);
-	}
-
-	public int getVotePartyCache(String server) {
-		return getData().getInt("VoteParty.Cache." + server, 0);
-	}
-
-	public void addVote(String server, int num, OfflineBungeeVote voteData) {
-		Configuration section = getData().getSection("VoteCache." + server + "." + num);
-		section.set("Name", voteData.getPlayerName());
-		section.set("Service", voteData.getService());
-		section.set("UUID", voteData.getUuid());
-		section.set("Time", voteData.getTime());
-		section.set("Real", voteData.isRealVote());
-		section.set("Text", voteData.getText());
-	}
-
-	public void addTimedVote(int num, VoteTimeQueue voteTimedQueue) {
-		Configuration section = getData().getSection("TimedVoteCache." + num);
-		section.set("Name", voteTimedQueue.getName());
-		section.set("Service", voteTimedQueue.getService());
-		section.set("Time", voteTimedQueue.getTime());
-	}
-
-	public void addVoteOnline(String player, int num, OfflineBungeeVote voteData) {
-		Configuration section = getData().getSection("OnlineCache." + player + "." + num);
-		section.set("Name", voteData.getPlayerName());
-		section.set("Service", voteData.getService());
-		section.set("UUID", voteData.getUuid());
-		section.set("Time", voteData.getTime());
-		section.set("Real", voteData.isRealVote());
-		section.set("Text", voteData.getText());
-	}
-
-	public void clearData() {
-		getData().set("VoteCache", null);
-		getData().set("OnlineCache", null);
-		save();
-	}
-
-	public Collection<String> getOnlineVotes(String name) {
-		return getData().getSection("OnlineCache." + name).getKeys();
-	}
-
-	public Configuration getOnlineVotes(String name, String num) {
-		return getData().getSection("OnlineCache." + name + "." + num);
-	}
-
-	public Collection<String> getPlayers() {
-		return getData().getSection("OnlineCache").getKeys();
-	}
-
-	public Collection<String> getServers() {
-		return getData().getSection("VoteCache").getKeys();
-	}
-
-	public Configuration getTimedVoteCache(String key) {
-		return getData().getSection("TimedVoteCache." + key);
-	}
-
-	public Collection<String> getTimedVoteCache() {
-		return getData().getSection("TimedVoteCache").getKeys();
-	}
-
-	public Collection<String> getServerVotes(String server) {
-		return getData().getSection("VoteCache." + server).getKeys();
-	}
-
-	public Configuration getServerVotes(String server, String num) {
-		return getData().getSection("VoteCache." + server + "." + num);
-	}
-
-	public void load() {
-		if (!bungee.getDataFolder().exists()) {
-			bungee.getDataFolder().mkdir();
-		}
-
-		File yamlFile = new File(bungee.getDataFolder(), "votecache.yml");
-		
-		File file = new File(bungee.getDataFolder(), "votecache.json");
-
-		if (!file.exists()) {
-			try {
-				file.createNewFile();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		if (yamlFile.exists()) {
-			try {
-				data = ConfigurationProvider.getProvider(YamlConfiguration.class)
-						.load(new File(bungee.getDataFolder(), "votecache.yml"));
-				yamlFile.renameTo(new File(bungee.getDataFolder(), "oldvotecache.yml"));
-				ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
-						new File(bungee.getDataFolder(), "oldvotecache.yml"));
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-			
-			save();
-		}
-		
-		try {
-			data = ConfigurationProvider.getProvider(JsonConfiguration.class)
-					.load(new File(bungee.getDataFolder(), "votecache.json"));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void save() {
-		try {
-			ConfigurationProvider.getProvider(JsonConfiguration.class).save(data,
-					new File(bungee.getDataFolder(), "votecache.json"));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-}

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

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

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

@@ -1,184 +0,0 @@
-package com.bencodez.votingplugin.bungee.velocity;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-import com.bencodez.advancedcore.bungeeapi.velocity.VelocityYMLFile;
-
-import ninja.leaping.configurate.ConfigurationNode;
-
-public class Config extends VelocityYMLFile {
-
-	public Config(File file) {
-		super(file);
-	}
-
-	public boolean getAllowUnJoined() {
-		return getBoolean(getNode("AllowUnJoined"), false);
-	}
-
-	public List<String> getBlockedServers() {
-		return getStringList(getNode("BlockedServers"), new ArrayList<String>());
-	}
-
-	public List<String> getWhiteListedServers() {
-		return getStringList(getNode("WhiteListedServers"), new ArrayList<String>());
-	}
-
-	public boolean getBroadcast() {
-		return getBoolean(getNode("Broadcast"), false);
-	}
-
-	public boolean getOnlineMode() {
-		return getBoolean(getNode("OnlineMode"), true);
-	}
-
-	public boolean getGlobalDataEnabled() {
-		return getBoolean(getNode("GlobalData", "Enabled"), false);
-	}
-
-	public boolean getGlobalDataUseMainMySQL() {
-		return getBoolean(getNode("GlobalData", "UseMainMySQL"), true);
-	}
-
-	public boolean getBungeeManageTotals() {
-		return getBoolean(getNode("BungeeManageTotals"), true);
-	}
-
-	public String getBungeeMethod() {
-		return getString(getNode("BungeeMethod"), "PLUGINMESSAGING");
-	}
-	
-	public String getRedisHost() {
-		return getString(getNode("Redis", "Host"), "");
-	}
-
-	public int getRedisPort() {
-		return getInt(getNode("Redis", "Port"), 6379);
-	}
-	
-	public String getRedisUsername() {
-		return getString(getNode("Redis", "Username"), "");
-	}
-	
-	public String getRedisPassword() {
-		return getString(getNode("Redis", "Password"), "");
-	}
-
-	public String getBungeeHost() {
-		return getString(getNode("BungeeServer", "Host"), "");
-	}
-
-	public int getBungeePort() {
-		return getInt(getNode("BungeeServer", "Port"), 1297);
-	}
-
-	public int getMaxAmountOfVotesPerDay() {
-		return getInt(getNode("MaxAmountOfVotesPerDay"), -1);
-	}
-
-	public int getVoteCacheTime() {
-		return getInt(getNode("VoteCacheTime"), -1);
-	}
-
-	public boolean getDebug() {
-		return getBoolean(getNode("Debug"), false);
-	}
-
-	public String getFallBack() {
-		return getString(getNode("FallBackServer"), "");
-	}
-
-	public ConfigurationNode getMysqlNode() {
-		return getNode("MySQL");
-	}
-
-	public int getPointsOnVote() {
-		return getInt(getNode("PointsOnVote"), 1);
-	}
-
-	public boolean getSendVotesToAllServers() {
-		return getBoolean(getNode("SendVotesToAllServers"), true);
-	}
-
-	public boolean getVotePartyEnabled() {
-		return getBoolean(getVotePartyNode().getNode("Enabled"), false);
-	}
-
-	public ConfigurationNode getVotePartyNode() {
-		return getNode("VoteParty");
-	}
-
-	public boolean getVotePartySendToAllServers() {
-		return getBoolean(getVotePartyNode().getNode("SendToAllServers"), false);
-	}
-
-	public int getVotePartyVotesRequired() {
-		return getInt(getVotePartyNode().getNode("VotesRequired"), 100);
-	}
-
-	public int getVotePartyIncreaseVotesRequired() {
-		return getInt(getVotePartyNode().getNode("IncreaseVotesRequired"), 0);
-	}
-
-	public String getVotePartyBroadcast() {
-		return getString(getVotePartyNode().getNode("Broadcast"), "");
-	}
-
-	public List<String> getVotePartyServersToSend() {
-		return getStringList(getVotePartyNode().getNode("ServersToSend"), new ArrayList<String>());
-	}
-
-	public List<String> getVotePartyBungeeCommands() {
-		return getStringList(getVotePartyNode().getNode("BungeeCommands"), new ArrayList<String>());
-	}
-
-	public ConfigurationNode getSpigotServerConfiguration(String s) {
-		return getNode("SpigotServers", s);
-	}
-
-	public @NonNull Collection<? extends ConfigurationNode> getSpigotServers() {
-		return getNode("SpigotServers").getChildrenMap().values();
-	}
-
-	public boolean getWaitForUserOnline() {
-		return getBoolean(getNode("WaitForUserOnline"), false);
-	}
-
-	public boolean getMultiProxySupport() {
-		return getBoolean(getNode("MultiProxySupport"), false);
-	}
-
-	public boolean getMultiProxyOneGlobalReward() {
-		return getBoolean(getNode("MultiProxyOneGlobalReward"), false);
-	}
-
-	public boolean getPrimaryServer() {
-		return getBoolean(getNode("PrimaryServer"), false);
-	}
-
-	public String getBedrockPlayerPrefix() {
-		return getString(getNode("BedrockPlayerPrefix"), ".");
-	}
-
-	public ConfigurationNode getMultiProxyServers(String s) {
-		return getNode("MultiProxyServers", s);
-	}
-
-	public @NonNull Collection<? extends ConfigurationNode> getMultiProxyServers() {
-		return getNode("MultiProxyServers").getChildrenMap().values();
-	}
-
-	public String getMultiProxySocketHostHost() {
-		return getString(getNode("MultiProxySocketHost", "Host"), "");
-	}
-
-	public int getMultiProxySocketHostPort() {
-		return getInt(getNode("MultiProxySocketHost", "Port"), 1297);
-	}
-
-}

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

@@ -1,63 +0,0 @@
-package com.bencodez.votingplugin.bungee.velocity;
-
-import java.io.File;
-
-import com.bencodez.advancedcore.bungeeapi.velocity.VelocityJSONFile;
-import com.velocitypowered.api.proxy.Player;
-
-public class NonVotedPlayersCache extends VelocityJSONFile {
-
-	private VotingPluginVelocity plugin;
-
-	public NonVotedPlayersCache(File file, VotingPluginVelocity plugin) {
-		super(file);
-		this.plugin = plugin;
-	}
-
-	public void addPlayer(Player player) {
-		if (!plugin.getMysql().containsKeyQuery(player.getUniqueId().toString())) {
-			addPlayer(player.getUniqueId().toString(), player.getUsername());
-		}
-	}
-
-	public void addPlayer(String uuid, String playerName) {
-		getNode("NonVotedPlayers", playerName, "UUID").setValue(uuid);
-		getNode("NonVotedPlayers", playerName, "LastTime").setValue(System.currentTimeMillis());
-		save();
-	}
-
-	public void check() {
-		for (String player : getKeys(getNode("NonVotedPlayers"))) {
-			long time = getNode("NonVotedPlayers", player, "LastTime").getLong(0);
-			if ((System.currentTimeMillis() - time) > 1000 * 60 * 60 * 24 * 5) {
-				remove(player);
-			} else {
-				String uuid = getNode("NonVotedPlayers", player, "UUID").getString("");
-				if (!uuid.isEmpty()) {
-					if (plugin.getMysql().containsKeyQuery(uuid)) {
-						remove(player);
-					}
-				} else {
-					remove(player);
-				}
-			}
-		}
-		save();
-	}
-
-	public String playerExists(String playerName) {
-		if (!getNode("NonVotedPlayers", playerName).isEmpty()) {
-			return getNode("NonVotedPlayers", playerName, "UUID").getString("");
-		}
-		return "";
-	}
-
-	private void remove(String player) {
-		plugin.debug("Removing nonvotedplayer: " + player);
-
-		getNode("NonVotedPlayers", player).setValue(null);
-
-		save();
-	}
-
-}

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

@@ -1,109 +0,0 @@
-package com.bencodez.votingplugin.bungee.velocity;
-
-import java.io.File;
-import java.util.Collection;
-
-import com.bencodez.advancedcore.bungeeapi.velocity.VelocityJSONFile;
-import com.bencodez.votingplugin.bungee.OfflineBungeeVote;
-import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
-
-import ninja.leaping.configurate.ConfigurationNode;
-
-public class VoteCache extends VelocityJSONFile {
-
-	public VoteCache(File file) {
-		super(file);
-	}
-
-	public int getVotePartyCurrentVotes() {
-		return getInt(getNode("VoteParty").getNode("CurrentVotes"), 0);
-	}
-
-	public int getVotePartyInreaseVotesRequired() {
-		return getInt(getNode("VoteParty").getNode("IncreaseVotes"), 0);
-	}
-
-	public void setVotePartyCurrentVotes(int amount) {
-		getNode("VoteParty").getNode("CurrentVotes").setValue(amount);
-	}
-
-	public void setVotePartyInreaseVotesRequired(int amount) {
-		getNode("VoteParty").getNode("IncreaseVotes").setValue(amount);
-	}
-
-	public void setVotePartyCache(String server, int amount) {
-		getNode("VoteParty").getNode("Cache").getNode(server).setValue(amount);
-	}
-
-	public int getVotePartyCache(String server) {
-		return getNode("VoteParty").getNode("Cache").getNode(server).getInt(0);
-	}
-
-	public void addVote(String server, int num, OfflineBungeeVote voteData) {
-		String[] path = new String[] { "VoteCache", server, "" + num };
-
-		getNode(path, "Name").setValue(voteData.getPlayerName());
-		getNode(path, "Service").setValue(voteData.getService());
-		getNode(path, "UUID").setValue(voteData.getUuid());
-		getNode(path, "Time").setValue(voteData.getTime());
-		getNode(path, "Real").setValue(voteData.isRealVote());
-		getNode(path, "Text").setValue(voteData.getText());
-	}
-
-	public void addTimedVote(int num, VoteTimeQueue voteTimedQueue) {
-		String[] path = new String[] { "TimedVoteCache", "" + num };
-		getNode(path, "Name").setValue(voteTimedQueue.getName());
-		getNode(path, "Service").setValue(voteTimedQueue.getService());
-		getNode(path, "Time").setValue(voteTimedQueue.getTime());
-	}
-
-	public void addVoteOnline(String player, int num, OfflineBungeeVote voteData) {
-		String[] path = new String[] { "OnlineCache", player, "" + num };
-
-		getNode(path, "Name").setValue(voteData.getPlayerName());
-		getNode(path, "Service").setValue(voteData.getService());
-		getNode(path, "UUID").setValue(voteData.getUuid());
-		getNode(path, "Time").setValue(voteData.getTime());
-		getNode(path, "Real").setValue(voteData.isRealVote());
-		getNode(path, "Text").setValue(voteData.getText());
-	}
-
-	public void clearData() {
-		getNode("VoteCache").setValue(null);
-		getNode("OnlineCache").setValue(null);
-		save();
-	}
-
-	public Collection<String> getOnlineVotes(String name) {
-		return getKeys(getNode("OnlineCache", name));
-	}
-
-	public ConfigurationNode getTimedVoteCache(String name) {
-		return getNode("TimedVoteCache", name);
-	}
-
-	public ConfigurationNode getOnlineVotes(String name, String num) {
-		return getNode("OnlineCache", name, num);
-	}
-
-	public Collection<String> getPlayers() {
-		return getKeys(getNode("OnlineCache"));
-	}
-
-	public Collection<String> getServers() {
-		return getKeys(getNode("VoteCache"));
-	}
-
-	public Collection<String> getTimedVoteCache() {
-		return getKeys(getNode("TimedVoteCache"));
-	}
-
-	public Collection<String> getServerVotes(String server) {
-		return getKeys(getNode("OnlineCache", server));
-	}
-
-	public ConfigurationNode getServerVotes(String server, String num) {
-		return getNode("VoteCache", server, num);
-	}
-
-}

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

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

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

@@ -1,109 +0,0 @@
-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.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(plugin, player);
-		this.plugin = plugin;
-	}
-
-	@Override
-	public ArrayList<String> getChat(CommandSender sender) {
-		return null;
-	}
-
-	@Override
-	public void onBook(Player player) {
-	}
-
-	@Override
-	public void onChat(CommandSender sender) {
-
-	}
-
-	@Override
-	public void onChest(Player player) {
-		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(),
-										plugin.getRewardHandler()
-												.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);
-	}
-
-}

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

@@ -1,78 +0,0 @@
-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(plugin, player);
-		this.plugin = plugin;
-	}
-
-	@Override
-	public ArrayList<String> getChat(CommandSender sender) {
-		return null;
-	}
-
-	@Override
-	public void onBook(Player player) {
-	}
-
-	@Override
-	public void onChat(CommandSender sender) {
-
-	}
-
-	@Override
-	public void onChest(Player player) {
-		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 onConfirm(Player p) {
-							plugin.getSpecialRewardsConfig().removeCumulative(votes);
-							p.sendMessage("Removed cumulative " + votes);
-							plugin.reload();
-						}
-
-						@Override
-						public void onDeny(Player p) {
-							new AdminVoteCumulative(plugin, p);
-						}
-					}.open();
-
-
-				}
-			});
-		}
-		inv.openInventory(player);
-	}
-
-	@Override
-	public void open() {
-		open(GUIMethod.CHEST);
-	}
-
-}

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

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

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

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

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

@@ -1,92 +0,0 @@
-package com.bencodez.votingplugin.listeners;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerQuitEvent;
-
-import com.bencodez.advancedcore.listeners.AdvancedCoreLoginEvent;
-import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.bungee.BungeeMethod;
-import com.bencodez.votingplugin.user.VotingPluginUser;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class PlayerJoinEvent.
- */
-public class PlayerJoinEvent implements Listener {
-
-	/** The plugin. */
-	private VotingPluginMain plugin;
-
-	/**
-	 * Instantiates a new player join event.
-	 *
-	 * @param plugin the plugin
-	 */
-	public PlayerJoinEvent(VotingPluginMain plugin) {
-		this.plugin = plugin;
-	}
-
-	private void login(Player player) {
-		VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
-		if (player.isOp() && plugin.isYmlError()) {
-			user.sendMessage("&cVotingPlugin: Detected yml error, please check console for details");
-		}
-
-		boolean data = user.getData().hasData();
-		// run remind
-		user.loginMessage();
-
-		if (data) {
-			// give offline vote (if they voted offline)
-			user.offVote();
-		}
-
-		user.loginRewards();
-
-		plugin.getPlaceholders().onUpdate(user, true);
-
-		if (plugin.getBungeeSettings().isUseBungeecoord()
-				&& (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)
-						|| plugin.getBungeeHandler().getMethod().equals(BungeeMethod.REDIS))) {
-			plugin.getBungeeHandler().getGlobalMessageHandler().sendMessage("Login", user.getPlayerName(),
-					user.getUUID(), plugin.getBungeeSettings().getServer());
-		}
-	}
-
-	/**
-	 * On player login.
-	 *
-	 * @param event the event
-	 */
-	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-	public void onPlayerLogin(AdvancedCoreLoginEvent event) {
-		if (event.getPlayer() == null || !plugin.isMySQLOkay()) {
-			return;
-		}
-
-		login(event.getPlayer());
-
-	}
-
-	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-	public void onPlayerQuit(PlayerQuitEvent event) {
-		if (plugin != null && plugin.isEnabled()) {
-			final java.util.UUID uuid = event.getPlayer().getUniqueId();
-			plugin.getLoginTimer().execute(new Runnable() {
-
-				@Override
-				public void run() {
-					VotingPluginMain.plugin.getAdvancedTab().remove(uuid);
-
-					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid);
-					user.dontCache();
-					user.logoutRewards();
-					plugin.getPlaceholders().onLogout(user);
-				}
-			});
-		}
-	}
-}

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

@@ -1,396 +0,0 @@
-package com.bencodez.votingplugin.specialrewards;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.bukkit.Bukkit;
-
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.rewards.RewardBuilder;
-import com.bencodez.advancedcore.api.rewards.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;
-import com.bencodez.votingplugin.user.VotingPluginUser;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class OtherVoteReward.
- */
-public class SpecialRewards {
-
-	private VotingPluginMain plugin;
-
-	public SpecialRewards(VotingPluginMain plugin) {
-		this.plugin = plugin;
-	}
-
-	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(), forceBungee);
-		}
-		return checkAllVotes;
-	}
-
-	public void bungeeAllSitesCheck(VotingPluginUser user, int numberOfVotes, int num) {
-		if (plugin.getBungeeSettings().isGiveExtraAllSitesRewards()) {
-			int numberOfSites = plugin.getVoteSites().size();
-			if (numberOfVotes >= numberOfSites * 2) {
-				if (num > numberOfSites) {
-					if (num % numberOfSites == 0) {
-						// should give extra allsites?
-						if (user.checkAllVotes()) {
-							plugin.debug("Giving extra allsites reward from bungee");
-							giveAllSitesRewards(user, user.isOnline(), true);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	public boolean checkAlmostAllSites(VotingPluginUser user, boolean forceBungee) {
-		boolean checkAllVotes = user.checkAlmostAllVotes();
-		if (checkAllVotes) {
-			int currentDay = LocalDateTime.now().getDayOfYear();
-			int day = user.getGottenAlmostAllSitesDay();
-			if (currentDay == day) {
-				checkAllVotes = false;
-				plugin.debug("Not giving almostallsites, already gotten today");
-			} else {
-				user.setGottenAlmostAllSitesDay(currentDay);
-				giveAlmostAllSitesRewards(user, user.isOnline(), forceBungee);
-			}
-		}
-		return checkAllVotes;
-	}
-
-	public boolean checkCumualativeVotes(VotingPluginUser user, BungeeMessageData bungeeMessageData,
-			boolean forceBungee) {
-		boolean gotCumulativeAny = false;
-		Set<String> votes = plugin.getSpecialRewardsConfig().getCumulativeVotes();
-		for (String vote : votes) {
-			if (StringParser.getInstance().isInt(vote)) {
-				int votesRequired = Integer.parseInt(vote);
-				if (votesRequired != 0) {
-					if (plugin.getSpecialRewardsConfig().getCumulativeRewardEnabled(votesRequired)
-							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
-									plugin.getSpecialRewardsConfig().getCumulativeRewardsPath(votesRequired))) {
-						boolean gotCumulative = false;
-						int total = 0;
-						boolean useBungeeTotalNum = bungeeMessageData != null;
-						String totalToUse = plugin.getSpecialRewardsConfig().getCumulativeVotesTotal(votesRequired);
-						TopVoter top = TopVoter.getTopVoter(totalToUse);
-						if (!useBungeeTotalNum) {
-							total = user.getTotal(top);
-						} else {
-							switch (top) {
-							case AllTime:
-								total = bungeeMessageData.getAllTimeTotal();
-								break;
-							case Daily:
-								total = bungeeMessageData.getDailyTotal();
-								break;
-							case Monthly:
-								total = bungeeMessageData.getMonthTotal();
-								break;
-							case Weekly:
-								total = bungeeMessageData.getWeeklyTotal();
-								break;
-							default:
-								break;
-
-							}
-						}
-
-						List<Integer> blackList = plugin.getSpecialRewardsConfig()
-								.getCumulativeBlackList(votesRequired);
-						boolean blackListed = false;
-						for (Integer num : blackList) {
-							if (num.intValue() == total) {
-								blackListed = true;
-								plugin.extraDebug("Not giving cumulative " + votesRequired + " to "
-										+ user.getPlayerName() + " due to blacklist");
-							}
-						}
-
-						if (plugin.getSpecialRewardsConfig().getCumulativeRecurring(votesRequired)) {
-							if (total != 0 && total >= votesRequired) {
-								if ((total % votesRequired) == 0 && !blackListed) {
-									gotCumulative = true;
-								}
-							}
-						} else {
-							if (total == votesRequired) {
-								gotCumulative = true;
-							}
-						}
-
-						if (gotCumulative) {
-							if (!plugin.getSpecialRewardsConfig().isOnlyOneCumulative() || !gotCumulativeAny) {
-								gotCumulativeAny = true;
-								plugin.debug(user.getPlayerName() + " got cumulative " + votesRequired + ", total: "
-										+ top.toString() + ", current total: " + total);
-								giveCumulativeVoteReward(user, user.isOnline(), votesRequired, forceBungee);
-							} else {
-								plugin.debug("Already got one cumulative");
-							}
-						} else {
-							plugin.devDebug(user.getPlayerName() + " not able to get cumulative " + votesRequired
-									+ ", total required: " + top.toString() + ", current player total: " + total);
-						}
-					}
-				}
-			} else {
-				plugin.debug("Invalid cumulative number: " + vote);
-			}
-		}
-		return gotCumulativeAny;
-	}
-
-	public boolean checkFirstVote(VotingPluginUser user, boolean forceBungee) {
-		if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
-				plugin.getSpecialRewardsConfig().getFirstVoteRewardsPath())) {
-			if (!user.hasGottenFirstVote()) {
-				giveFirstVoteRewards(user, user.isOnline(), forceBungee);
-				return true;
-			}
-
-		}
-		return false;
-	}
-
-	public boolean checkFirstVoteToday(VotingPluginUser user, boolean forceBungee) {
-		if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
-				plugin.getSpecialRewardsConfig().getFirstVoteRewardsPath())) {
-			if (!user.hasGottenFirstVoteToday()) {
-				giveFirstVoteTodayRewards(user, user.isOnline(), forceBungee);
-				return true;
-			}
-
-		}
-		return false;
-	}
-
-	public boolean checkMilestone(VotingPluginUser user, BungeeMessageData bungeeMessageData, boolean forceBungee) {
-		int milestoneCount = user.getMilestoneCount();
-		if (bungeeMessageData != null) {
-			try {
-				milestoneCount = bungeeMessageData.getMilestoneCount();
-			} catch (Exception e) {
-				e.printStackTrace();
-				milestoneCount = user.getMilestoneCount();
-			}
-		}
-		if (plugin.getConfigFile().isPreventRepeatMilestones()) {
-			ArrayList<Integer> nums = new ArrayList<Integer>();
-
-			for (String str : plugin.getSpecialRewardsConfig().getMilestoneVotes()) {
-				try {
-					nums.add(Integer.parseInt(str));
-				} catch (Exception e) {
-					plugin.getLogger().warning("Failed to get number from " + str);
-				}
-			}
-
-			for (int num : nums) {
-				if (milestoneCount > num) {
-					if (!user.hasGottenMilestone(num)) {
-						plugin.getLogger()
-								.info("Milestone " + num + " for " + user.getPlayerName()
-										+ " not already given when it should be, Current AllTimeTotal: "
-										+ user.getTotal(TopVoter.AllTime) + ", Current MileStoneCount: "
-										+ user.getMilestoneCount());
-						user.setHasGotteMilestone(num, true);
-					}
-				}
-			}
-		}
-
-		boolean gotMilestone = false;
-		Set<String> votes = plugin.getSpecialRewardsConfig().getMilestoneVotes();
-		for (String vote : votes) {
-			if (StringParser.getInstance().isInt(vote)) {
-				int votesRequired = Integer.parseInt(vote);
-				if (votesRequired != 0) {
-					if (plugin.getSpecialRewardsConfig().getMilestoneRewardEnabled(votesRequired)
-							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
-									plugin.getSpecialRewardsConfig().getMilestoneRewardsPath(votesRequired))) {
-
-						int userVotesTotal = milestoneCount;
-						if (userVotesTotal >= votesRequired && !user.hasGottenMilestone(votesRequired)) {
-							giveMilestoneVoteReward(user, user.isOnline(), votesRequired, forceBungee);
-							user.setHasGotteMilestone(votesRequired, true);
-							plugin.debug(user.getPlayerName() + " got milestone " + votesRequired);
-
-						}
-					} else {
-						plugin.debug("Milestone " + votesRequired + " not enabled or has no rewards");
-					}
-				}
-			} else {
-				plugin.debug("Invalid milestone number: " + vote);
-			}
-		}
-		return gotMilestone;
-	}
-
-	public boolean checkVoteStreak(VotingPluginUser user, String type, boolean forceBungee) {
-		boolean gotReward = false;
-
-		Set<String> streaks = plugin.getSpecialRewardsConfig().getVoteStreakVotes(type);
-		for (String streak : streaks) {
-			String s = streak.replaceAll("-", "");
-			boolean multiple = false;
-			if (streak.contains("-")) {
-				// multiple
-				multiple = true;
-			}
-			if (StringParser.getInstance().isInt(s)) {
-				int streakRequired = Integer.parseInt(s);
-				if (streakRequired != 0) {
-					if (plugin.getSpecialRewardsConfig().getVoteStreakRewardEnabled(type, streak)
-							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
-									plugin.getSpecialRewardsConfig().getVoteStreakRewardsPath(type, "" + streak))) {
-						int curStreak = 0;
-						if (type.equalsIgnoreCase("day")) {
-							curStreak = user.getDayVoteStreak();
-						} else if (type.equalsIgnoreCase("week")) {
-							curStreak = user.getWeekVoteStreak();
-						} else if (type.equalsIgnoreCase("month")) {
-							curStreak = user.getMonthVoteStreak();
-						}
-						if (!multiple) {
-							if (curStreak == streakRequired) {
-								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,
-										forceBungee);
-								gotReward = true;
-								plugin.debug(
-										user.getPlayerName() + " got VoteStreak " + streakRequired + "* for " + type);
-							}
-						}
-					}
-				}
-			}
-
-		}
-
-		return gotReward;
-
-	}
-
-	public void giveAllSitesRewards(VotingPluginUser user, boolean online, boolean forceBungee) {
-		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user, SpecialRewardType.ALLSITE);
-		Bukkit.getPluginManager().callEvent(event);
-
-		if (event.isCancelled()) {
-			return;
-		}
-		plugin.getRewardHandler().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
-				plugin.getSpecialRewardsConfig().getAllSitesRewardPath(),
-				new RewardOptions().setServer(forceBungee).setOnline(online));
-	}
-
-	public void giveAlmostAllSitesRewards(VotingPluginUser user, boolean online, boolean forceBungee) {
-		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user, SpecialRewardType.ALMOSTALLSITES);
-		Bukkit.getPluginManager().callEvent(event);
-
-		if (event.isCancelled()) {
-			return;
-		}
-		plugin.getRewardHandler().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
-				plugin.getSpecialRewardsConfig().getAlmostAllSitesRewardPath(),
-				new RewardOptions().setServer(forceBungee).setOnline(online));
-	}
-
-	public void giveCumulativeVoteReward(VotingPluginUser user, boolean online, int cumulative, boolean forceBungee) {
-		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user,
-				SpecialRewardType.CUMMULATIVE.setAmount(cumulative));
-		Bukkit.getPluginManager().callEvent(event);
-
-		if (event.isCancelled()) {
-			return;
-		}
-
-		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
-				plugin.getSpecialRewardsConfig().getCumulativeRewardsPath(cumulative)).setServer(forceBungee)
-				.setOnline(online).withPlaceHolder("Cumulative", "" + cumulative).send(user);
-	}
-
-	public void giveFirstVoteRewards(VotingPluginUser user, boolean online, boolean forceBungee) {
-		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user, SpecialRewardType.FIRSTVOTE);
-		Bukkit.getPluginManager().callEvent(event);
-
-		if (event.isCancelled()) {
-			return;
-		}
-		plugin.getRewardHandler().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
-				plugin.getSpecialRewardsConfig().getFirstVoteRewardsPath(),
-				new RewardOptions().setServer(forceBungee).setOnline(online));
-	}
-
-	public void giveFirstVoteTodayRewards(VotingPluginUser user, boolean online, boolean forceBungee) {
-		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user, SpecialRewardType.FIRSTVOTETODAY);
-		Bukkit.getPluginManager().callEvent(event);
-
-		if (event.isCancelled()) {
-			return;
-		}
-		plugin.getRewardHandler().giveReward(user, plugin.getSpecialRewardsConfig().getData(),
-				plugin.getSpecialRewardsConfig().getFirstVoteTodayRewardsPath(),
-				new RewardOptions().setServer(forceBungee).setOnline(online));
-	}
-
-	public void giveMilestoneVoteReward(VotingPluginUser user, boolean online, int milestone, boolean forceBungee) {
-		PlayerSpecialRewardEvent event = new PlayerSpecialRewardEvent(user,
-				SpecialRewardType.MILESTONE.setAmount(milestone));
-		Bukkit.getPluginManager().callEvent(event);
-
-		if (event.isCancelled()) {
-			return;
-		}
-		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
-				plugin.getSpecialRewardsConfig().getMilestoneRewardsPath(milestone)).setOnline(online)
-				.withPlaceHolder("Milestone", "" + milestone).setServer(forceBungee).send(user);
-	}
-
-	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);
-
-		if (event.isCancelled()) {
-			return;
-		}
-		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
-				plugin.getSpecialRewardsConfig().getVoteStreakRewardsPath(type, string)).setOnline(online)
-				.withPlaceHolder("Type", type).setServer(forceBungee).withPlaceHolder("Streak", "" + votes).send(user);
-	}
-
-}

VotingPlugin/src/com/bencodez/votingplugin/votereminding/VoteReminding.java

@@ -1,181 +0,0 @@
-package com.bencodez.votingplugin.votereminding;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-import com.bencodez.advancedcore.api.rewards.RewardBuilder;
-import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.user.VotingPluginUser;
-
-import lombok.Getter;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class VoteReminding.
- */
-public class VoteReminding {
-
-	/** The plugin. */
-	private VotingPluginMain plugin;
-
-	private ScheduledExecutorService timer;
-
-	@Getter
-	private ConcurrentHashMap<UUID, Boolean> remindersEnabled = new ConcurrentHashMap<UUID, Boolean>();
-
-	public VoteReminding(VotingPluginMain plugin) {
-		this.plugin = plugin;
-	}
-
-	public void loadReminds() {
-		List<String> uuidsStr = plugin.getServerData().getDisabledReminders();
-
-		for (String str : uuidsStr) {
-			remindersEnabled.put(UUID.fromString(str), Boolean.FALSE);
-		}
-
-		plugin.getTimer().scheduleAtFixedRate(new Runnable() {
-
-			@Override
-			public void run() {
-				saveReminds();
-			}
-		}, 24, 24, TimeUnit.HOURS);
-	}
-
-	public void saveReminds() {
-		ArrayList<UUID> remindersDisabled = new ArrayList<UUID>();
-		for (Entry<UUID, Boolean> entry : remindersEnabled.entrySet()) {
-			if (remindersEnabled.containsKey(entry.getKey())) {
-				if (!remindersEnabled.get(entry.getKey()).booleanValue()) {
-					remindersDisabled.add(entry.getKey());
-				}
-			}
-		}
-
-		plugin.getServerData().saveDisabledReminders(remindersDisabled);
-	}
-
-	/**
-	 * Check remind.
-	 *
-	 * @param user the user
-	 */
-	public void checkRemind(VotingPluginUser user) {
-		if (user.hasPermission("VotingPlugin.Login.RemindVotes") || user.hasPermission("VotingPlugin.Player")) {
-			if (shouldRemind(user)) {
-				if (!plugin.getConfigFile().isVoteRemindingRemindOnlyOnce()) {
-					runRemind(user);
-				} else if (!user.isReminded()) {
-					runRemind(user);
-				}
-			}
-
-		}
-	}
-
-	private void giveReward(VotingPluginUser user) {
-		new RewardBuilder(plugin.getConfigFile().getData(), plugin.getConfigFile().getVoteRemindingRewardsPath())
-				.withPlaceHolder("sitesavailable", "" + user.getSitesNotVotedOn()).setGiveOffline(false)
-				.disableDefaultWorlds().send(user);
-	}
-
-	/**
-	 * Load remind checking.
-	 */
-	public void loadRemindChecking() {
-		if (timer != null) {
-			timer.shutdownNow();
-		}
-		if (plugin.getConfigFile().getVoteRemindingRemindDelay() > 0) {
-			timer = Executors.newScheduledThreadPool(1);
-			timer.scheduleWithFixedDelay(new Runnable() {
-
-				@Override
-				public void run() {
-					if (plugin != null && plugin.isEnabled()) {
-						for (Player player : Bukkit.getServer().getOnlinePlayers()) {
-							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
-							if (!plugin.getOptions().isTreatVanishAsOffline() || !user.isVanished()) {
-								checkRemind(user);
-							}
-						}
-					} else {
-						timer.shutdown();
-					}
-				}
-			}, 30, plugin.getConfigFile().getVoteRemindingRemindDelay() * 60, TimeUnit.SECONDS);
-		}
-	}
-
-	/**
-	 * Run remind.
-	 *
-	 * @param user the user
-	 */
-	public void runRemind(VotingPluginUser user) {
-		if (plugin.getConfigFile().isVoteRemindingEnabled()) {
-			if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders() && user.hasPrimaryAccount()) {
-				user = plugin.getVotingPluginUserManager().getVotingPluginUser(user.getPrimaryAccount());
-			}
-			giveReward(user);
-			if (user.getData().hasData() && plugin.getConfigFile().isVoteRemindingRemindOnlyOnce()) {
-				user.setReminded(true);
-			}
-
-			plugin.debug(user.getPlayerName() + " was reminded!");
-		}
-	}
-
-	public boolean shouldRemind(VotingPluginUser user) {
-		if (remindersEnabled.containsKey(user.getJavaUUID())) {
-			if (!remindersEnabled.get(user.getJavaUUID()).booleanValue()) {
-
-				return false;
-			}
-		}
-		if (user.shouldBeReminded()) {
-			boolean hasPermAll = user.hasPermission("VotingPlugin.Login.RemindVotes.All");
-			if (hasPermAll) {
-				return user.canVoteAll();
-			} else {
-				return user.canVoteAny();
-			}
-		} else {
-			plugin.debug(user.getUUID() + " no need to remind because plaeyr has VotingPlugin.NoRemind");
-			return false;
-		}
-	}
-
-	public void runRemindLogin(VotingPluginUser user) {
-		if (plugin.getConfigFile().isVoteRemindingEnabled()) {
-			if (user.hasPermission("VotingPlugin.Login.RemindVotes") || user.hasPermission("VotingPlugin.Player")) {
-				if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders() && user.hasPrimaryAccount()) {
-					user = plugin.getVotingPluginUserManager().getVotingPluginUser(user.getPrimaryAccount());
-				}
-				if ((!plugin.getVotingPluginUserManager().getAllUUIDs().contains(user.getUUID())
-						|| shouldRemind(user))) {
-					giveReward(user);
-					if (user.getData().hasData()) {
-						user.setReminded(true);
-					}
-					plugin.debug(user.getPlayerName() + " was reminded!");
-
-				} else {
-					plugin.debug("Not reminding for " + user.getUUID());
-				}
-			} else {
-				plugin.debug(user.getUUID() + " has no permission for reminders");
-			}
-		}
-	}
-}

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

@@ -0,0 +1,700 @@
+// File: com/bencodez/votingplugin/BungeeHandler.java
+package com.bencodez.votingplugin;
+
+import java.io.File;
+import java.sql.SQLException;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Listener;
+import org.eclipse.paho.client.mqttv3.MqttException;
+
+import com.bencodez.advancedcore.api.misc.MiscUtils;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+import com.bencodez.advancedcore.api.time.TimeType;
+import com.bencodez.advancedcore.api.user.UserStorage;
+import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalDataHandler;
+import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalMySQL;
+import com.bencodez.simpleapi.encryption.EncryptionHandler;
+import com.bencodez.simpleapi.servercomm.codec.JsonEnvelope;
+import com.bencodez.simpleapi.servercomm.global.GlobalMessageHandler;
+import com.bencodez.simpleapi.servercomm.global.GlobalMessageListener;
+import com.bencodez.simpleapi.servercomm.mqtt.MqttHandler;
+import com.bencodez.simpleapi.servercomm.mqtt.MqttServerComm;
+import com.bencodez.simpleapi.servercomm.mysql.MySqlMessenger;
+import com.bencodez.simpleapi.servercomm.pluginmessage.PluginMessageHandler;
+import com.bencodez.simpleapi.servercomm.redis.RedisHandler;
+import com.bencodez.simpleapi.servercomm.redis.RedisListener;
+import com.bencodez.simpleapi.servercomm.sockets.ClientHandler;
+import com.bencodez.simpleapi.servercomm.sockets.SocketHandler;
+import com.bencodez.simpleapi.servercomm.sockets.SocketReceiver;
+import com.bencodez.simpleapi.sql.data.DataValue;
+import com.bencodez.simpleapi.sql.data.DataValueBoolean;
+import com.bencodez.simpleapi.sql.mysql.config.MysqlConfigSpigot;
+import com.bencodez.votingplugin.proxy.BungeeMethod;
+import com.bencodez.votingplugin.proxy.VoteTotalsSnapshot;
+import com.bencodez.votingplugin.proxy.VotingPluginWire;
+import com.bencodez.votingplugin.user.VotingPluginUser;
+import com.bencodez.votingplugin.votesites.VoteSite;
+
+import lombok.Getter;
+
+public class BungeeHandler implements Listener {
+	@Getter
+	private ClientHandler clientHandler;
+
+	private EncryptionHandler encryptionHandler;
+
+	@Getter
+	private BungeeMethod method;
+
+	private VotingPluginMain plugin;
+
+	@Getter
+	private int bungeeVotePartyCurrent = -2;
+
+	@Getter
+	private int bungeeVotePartyRequired = -2;
+
+	@Getter
+	private SocketHandler socketHandler;
+
+	private GlobalDataHandler globalDataHandler;
+
+	@Getter
+	private ScheduledExecutorService timer;
+
+	@Getter
+	private RedisHandler redisHandler;
+
+	@Getter
+	private GlobalMessageHandler globalMessageHandler;
+
+	private Thread redisThread;
+
+	@Getter
+	private MySqlMessenger backendMysqlMessenger;
+
+	@Getter
+	private MqttHandler mqttHandler;
+
+	public BungeeHandler(VotingPluginMain plugin) {
+		this.plugin = plugin;
+	}
+
+	public void checkGlobalData() {
+		HashMap<String, DataValue> data = globalDataHandler.getExact(plugin.getBungeeSettings().getServer());
+
+		if (data.containsKey("ForceUpdate")) {
+			boolean b = checkGlobalDataTimeValue(data.get("ForceUpdate"));
+			if (b) {
+				if (plugin.getStorageType().equals(UserStorage.MYSQL)) {
+					plugin.getMysql().clearCacheBasic();
+				}
+				plugin.getUserManager().getDataManager().clearCache();
+				plugin.setUpdate(true);
+				plugin.update();
+				globalDataHandler.setBoolean(plugin.getBungeeSettings().getServer(), "ForceUpdate", false);
+			}
+		}
+
+		boolean forceUpdate = false;
+
+		if (checkGlobalDataTime(TimeType.MONTH, data)) {
+			forceUpdate = true;
+		}
+		if (checkGlobalDataTime(TimeType.WEEK, data)) {
+			forceUpdate = true;
+		}
+		if (checkGlobalDataTime(TimeType.DAY, data)) {
+			forceUpdate = true;
+		}
+
+		if (forceUpdate) {
+			HashMap<String, DataValue> dataToSet = new HashMap<>();
+			dataToSet.put("FinishedProcessing", new DataValueBoolean(true));
+			dataToSet.put("Processing", new DataValueBoolean(false));
+			globalDataHandler.setData(plugin.getBungeeSettings().getServer(), dataToSet);
+		}
+	}
+
+	public boolean checkGlobalDataTime(TimeType type, HashMap<String, DataValue> data) {
+		boolean isProcessing = false;
+		if (data.containsKey(type.toString())) {
+
+			DataValue value = data.get(type.toString());
+			boolean b = checkGlobalDataTimeValue(value);
+			if (b) {
+				long lastUpdated = Long.valueOf(data.get("LastUpdated").getString()).longValue();
+				plugin.debug("LastUpdated: " + lastUpdated);
+				if (LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli() - lastUpdated > 1000 * 60 * 60
+						* 2) {
+					plugin.getLogger().warning("Ignoring bungee time change since it was more than 2 hours ago");
+					globalDataHandler.setBoolean(plugin.getBungeeSettings().getServer(), type.toString(), false);
+					return false;
+				}
+
+				globalDataHandler.setBoolean(plugin.getBungeeSettings().getServer(), "Processing", true);
+				isProcessing = true;
+
+				plugin.debug("Detected time change from bungee: " + type.toString());
+				plugin.getTimeChecker().forceChanged(type, false, true, true);
+				globalDataHandler.setBoolean(plugin.getBungeeSettings().getServer(), type.toString(), false);
+
+				HashMap<String, Object> fields = new HashMap<>();
+				fields.put("server", plugin.getBungeeSettings().getServer());
+				sendSubChannel("TimeChangeFinished", fields);
+			}
+		}
+		return isProcessing;
+	}
+
+	public boolean checkGlobalDataTimeValue(DataValue data) {
+		if (data.isBoolean()) {
+			return data.getBoolean();
+		}
+		return Boolean.valueOf(data.getString());
+	}
+
+	public void close() {
+		if (backendMysqlMessenger != null) {
+			backendMysqlMessenger.shutdown();
+		}
+
+		if (socketHandler != null) {
+			socketHandler.closeConnection();
+		}
+		if (clientHandler != null) {
+			clientHandler.stopConnection();
+		}
+		plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
+		plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
+		if (globalDataHandler != null) {
+			globalDataHandler.getGlobalMysql().close();
+		}
+	}
+
+	public void load() {
+		plugin.debug("Loading bungee handler");
+
+		method = BungeeMethod.getByName(plugin.getBungeeSettings().getBungeeMethod());
+
+		plugin.getLogger().info("Using BungeeMethod: " + method.toString());
+
+		loadGlobalMysql();
+
+		globalMessageHandler = new GlobalMessageHandler() {
+			@Override
+			public void sendMessage(JsonEnvelope envelope) {
+				if (method.equals(BungeeMethod.MYSQL)) {
+					try {
+						backendMysqlMessenger.sendToProxy(envelope);
+					} catch (SQLException e) {
+						e.printStackTrace();
+					}
+				} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+					plugin.getPluginMessaging().sendEnvelope(envelope);
+				} else if (method.equals(BungeeMethod.SOCKETS)) {
+					sendEnvelopeSocket(envelope);
+				} else if (method.equals(BungeeMethod.REDIS)) {
+					redisHandler.publishEnvelope(plugin.getBungeeSettings().getRedisPrefix() + "VotingPlugin",
+							envelope);
+				} else if (method.equals(BungeeMethod.MQTT)) {
+					try {
+						mqttHandler.publishEnvelope(
+								plugin.getBungeeSettings().getMqttPrefix() + "votingplugin/servers/proxy", envelope);
+					} catch (Exception e) {
+						e.printStackTrace();
+					}
+				}
+			}
+		};
+
+		// ==========================
+		// Vote / VoteOnline (wire decode)
+		// ==========================
+
+		globalMessageHandler.addListener(new GlobalMessageListener(VotingPluginWire.SUB_VOTE) {
+			@Override
+			public void onReceive(JsonEnvelope msg) {
+				handleWireVote(msg);
+			}
+		});
+
+		globalMessageHandler.addListener(new GlobalMessageListener(VotingPluginWire.SUB_VOTE_ONLINE) {
+			@Override
+			public void onReceive(JsonEnvelope msg) {
+				handleWireVote(msg);
+			}
+		});
+
+		globalMessageHandler.addListener(new GlobalMessageListener(VotingPluginWire.SUB_VOTE_UPDATE) {
+			@Override
+			public void onReceive(JsonEnvelope msg) {
+				// Wire decode
+				VotingPluginWire.VoteUpdate v = VotingPluginWire.readVoteUpdate(msg);
+
+				String playerUuid = v.uuid;
+				if (playerUuid == null || playerUuid.isEmpty()) {
+					return;
+				}
+
+				plugin.debug("pluginmessaging voteupdate received for " + playerUuid);
+				VotingPluginUser user = plugin.getVotingPluginUserManager()
+						.getVotingPluginUser(UUID.fromString(playerUuid));
+				user.cache();
+
+				user.offVote();
+
+				// Vote party cache update
+				if (v.votePartyCurrent != 0 || bungeeVotePartyCurrent == -2) {
+					bungeeVotePartyCurrent = v.votePartyCurrent;
+				}
+				if (v.votePartyRequired != 0 || bungeeVotePartyRequired == -2) {
+					bungeeVotePartyRequired = v.votePartyRequired;
+				}
+				plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
+				plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
+
+				// Optional: update last vote time for a service
+				String service = v.service;
+				long time = v.time;
+
+				if (service != null && !service.isEmpty() && time > 0) {
+					user.setTime(plugin.getVoteSiteManager().getVoteSite(service, true), time);
+				} else if (service != null && !service.isEmpty() && time <= 0
+						&& plugin.getBungeeSettings().isBungeeDebug()) {
+					plugin.debug("Invalid last vote time received from bungee: " + time);
+				}
+
+				plugin.setUpdate(true);
+			}
+		});
+
+		globalMessageHandler.addListener(new GlobalMessageListener(VotingPluginWire.SUB_BUNGEE_TIME_CHANGE) {
+			@Override
+			public void onReceive(JsonEnvelope msg) {
+				checkGlobalData();
+			}
+		});
+
+		globalMessageHandler.addListener(new GlobalMessageListener(VotingPluginWire.SUB_VOTE_BROADCAST) {
+			@Override
+			public void onReceive(JsonEnvelope msg) {
+				Map<String, String> f = msg.getFields();
+
+				final String uuidStr = nvl(f.get(VotingPluginWire.K_UUID));
+				final String playerNameRaw = nvl(f.get(VotingPluginWire.K_PLAYER));
+				final String service = nvl(f.get(VotingPluginWire.K_SERVICE));
+
+				if (uuidStr.isEmpty() || service.isEmpty()) {
+					return;
+				}
+
+				UUID javaUuid;
+				try {
+					javaUuid = UUID.fromString(uuidStr);
+				} catch (Exception e) {
+					plugin.getLogger().warning("Invalid UUID in VoteBroadcast: " + uuidStr);
+					return;
+				}
+
+				// New fields (May use later)
+				@SuppressWarnings("unused")
+				final long time = readLongSafe(f.get(VotingPluginWire.K_TIME), 0L);
+				@SuppressWarnings("unused")
+				final String totals = nvl(f.get(VotingPluginWire.K_TOTALS));
+
+				VoteSite voteSite = plugin.getVoteSiteManager()
+						.getVoteSite(plugin.getVoteSiteManager().getVoteSiteName(true, service), true);
+
+				if (voteSite == null) {
+					plugin.getLogger().warning("No voting site with the service site: '" + service + "'");
+					return;
+				}
+				if (!voteSite.isEnabled()) {
+					plugin.debug("Votesite: " + voteSite.getKey() + " is not enabled (VoteBroadcast)");
+					return;
+				}
+
+				// Same user retrieval strategy: UUID + (possibly empty) name
+				VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(javaUuid,
+						playerNameRaw);
+
+				// Keep cache/name current like normal vote path does
+				user.cache();
+				user.updateName(true);
+
+				// Same broadcast logic as PlayerVoteListener
+				if (plugin.getBroadcastHandler() == null) {
+					return;
+				}
+
+				if (user.isVanished()) {
+					plugin.debug("Not broadcasting vote for vanished user: " + user.getPlayerName());
+					return;
+				}
+
+				final boolean online = user.isOnline(); // same behavior as non-bungee vote path
+				plugin.getBroadcastHandler().broadcastVote(user.getJavaUUID(), user.getPlayerName(),
+						voteSite.getDisplayName(), online);
+			}
+		});
+
+		globalMessageHandler.addListener(new GlobalMessageListener("Status") {
+			@Override
+			public void onReceive(JsonEnvelope msg) {
+				String server = nvl(msg.getFields().get("server"));
+				HashMap<String, Object> out = new HashMap<>();
+				out.put("server", server);
+				sendSubChannel("statusokay", out);
+			}
+		});
+
+		globalMessageHandler.addListener(new GlobalMessageListener("ServerName") {
+			@Override
+			public void onReceive(JsonEnvelope msg) {
+				String server = nvl(msg.getFields().get("server"));
+				if (!plugin.getOptions().getServer().equals(server)) {
+					plugin.getLogger().warning("Server name doesn't match in BungeeSettings.yml, should be " + server);
+				}
+			}
+		});
+
+		globalMessageHandler.addListener(new GlobalMessageListener("VotePartyBungee") {
+			@Override
+			public void onReceive(JsonEnvelope msg) {
+				for (final String cmd : plugin.getBungeeSettings().getBungeeVotePartyGlobalCommands()) {
+					plugin.getBukkitScheduler().runTask(plugin, new Runnable() {
+						@Override
+						public void run() {
+							Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), cmd);
+						}
+					});
+				}
+				for (Player p : Bukkit.getOnlinePlayers()) {
+					new RewardBuilder(plugin.getBungeeSettings().getData(), "BungeeVotePartyRewards").send(p);
+				}
+			}
+		});
+
+		globalMessageHandler.addListener(new GlobalMessageListener("VotePartyBroadcast") {
+			@Override
+			public void onReceive(JsonEnvelope msg) {
+				String broadcast = nvl(msg.getFields().get("broadcast"));
+				MiscUtils.getInstance().broadcast(broadcast);
+			}
+		});
+
+		if (method.equals(BungeeMethod.MYSQL)) {
+			plugin.registerBungeeChannels(plugin.getBungeeSettings().getPluginMessagingChannel());
+
+			try {
+				backendMysqlMessenger = new MySqlMessenger("VotingPlugin",
+						plugin.getMysql().getMysql().getConnectionManager().getDataSource(),
+						MySqlMessenger.Mode.BACKEND, plugin.getOptions().getServer(), msg -> {
+							if (plugin.getBungeeSettings().isBungeeDebug()) {
+								plugin.debug("Proxy sent envelope: " + msg.envelope.getSubChannel() + " "
+										+ msg.envelope.getFields());
+							}
+							globalMessageHandler.onMessage(msg.envelope);
+						});
+			} catch (SQLException e) {
+				e.printStackTrace();
+			}
+		} else if (method.equals(BungeeMethod.REDIS)) {
+			redisHandler = new RedisHandler(plugin.getBungeeSettings().getRedisHost(),
+					plugin.getBungeeSettings().getRedisPort(), plugin.getBungeeSettings().getRedisUsername(),
+					plugin.getBungeeSettings().getRedisPassword(), plugin.getBungeeSettings().getRedisdbindex()) {
+
+				@Override
+				public void debug(String message) {
+					if (plugin.getBungeeSettings().isBungeeDebug()) {
+						plugin.debug(message);
+					}
+				}
+			};
+
+			redisThread = new Thread(new Runnable() {
+				@Override
+				public void run() {
+					if (plugin.isEnabled()) {
+						RedisListener listener = redisHandler.createEnvelopeListener(
+								plugin.getBungeeSettings().getRedisPrefix() + "VotingPlugin_"
+										+ plugin.getBungeeSettings().getServer(),
+								(ch, env) -> globalMessageHandler.onMessage(env));
+						redisHandler.loadListener(listener);
+					}
+				}
+			});
+			redisThread.start();
+
+		} else if (method.equals(BungeeMethod.PLUGINMESSAGING)) {
+			plugin.registerBungeeChannels(plugin.getBungeeSettings().getPluginMessagingChannel());
+
+			if (plugin.getBungeeSettings().isPluginMessageEncryption()) {
+				encryptionHandler = new EncryptionHandler(plugin.getName(),
+						new File(plugin.getDataFolder(), "secretkey.key"));
+				plugin.getPluginMessaging().setEncryptionHandler(encryptionHandler);
+			}
+
+			plugin.getPluginMessaging().setDebug(plugin.getBungeeSettings().isBungeeDebug());
+
+			plugin.getPluginMessaging().add(new PluginMessageHandler() {
+				@Override
+				public void onReceive(JsonEnvelope envelope) {
+					globalMessageHandler.onMessage(envelope);
+				}
+			});
+
+		} else if (method.equals(BungeeMethod.SOCKETS)) {
+			encryptionHandler = new EncryptionHandler(plugin.getName(),
+					new File(plugin.getDataFolder(), "secretkey.key"));
+
+			clientHandler = new ClientHandler(plugin.getBungeeSettings().getBungeeServerHost(),
+					plugin.getBungeeSettings().getBungeeServerPort(), encryptionHandler,
+					plugin.getBungeeSettings().isBungeeDebug());
+
+			socketHandler = new SocketHandler("vp-socket", plugin.getBungeeSettings().getSpigotServerHost(),
+					plugin.getBungeeSettings().getSpigotServerPort(), encryptionHandler,
+					plugin.getBungeeSettings().isBungeeDebug()) {
+
+				@Override
+				public void log(String str) {
+					plugin.getLogger().info(str);
+				}
+			};
+
+			socketHandler.add(new SocketReceiver() {
+				@Override
+				public void onReceiveEnvelope(JsonEnvelope envelope) {
+					globalMessageHandler.onMessage(envelope);
+				}
+			});
+
+		} else if (method.equals(BungeeMethod.MQTT)) {
+			try {
+				String id = plugin.getBungeeSettings().getMqttClientID();
+				if (id.isEmpty()) {
+					id = plugin.getOptions().getServer();
+				}
+				mqttHandler = new MqttHandler(new MqttServerComm(id, plugin.getBungeeSettings().getMqttBrokerURL(),
+						plugin.getBungeeSettings().getMqttUsername(), plugin.getBungeeSettings().getMqttPassword()), 2);
+
+				mqttHandler.subscribeEnvelopes(
+						plugin.getBungeeSettings().getMqttPrefix() + "votingplugin/servers/"
+								+ plugin.getOptions().getServer(),
+						(topic, envelope) -> globalMessageHandler.onMessage(envelope));
+
+			} catch (MqttException e) {
+				e.printStackTrace();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+
+		bungeeVotePartyCurrent = plugin.getServerData().getBungeeVotePartyCurrent();
+		bungeeVotePartyRequired = plugin.getServerData().getBungeeVotePartyRequired();
+
+		if (plugin.getOptions().getServer().equalsIgnoreCase("pleaseset")) {
+			plugin.getLogger().warning("Server name for bungee voting is not set, please set it");
+		}
+	}
+
+	private static long readLongSafe(String v, long def) {
+		if (v == null)
+			return def;
+		try {
+			return Long.parseLong(v);
+		} catch (Exception ignored) {
+			return def;
+		}
+	}
+
+	/**
+	 * Wire vote handler (Vote + VoteOnline).
+	 */
+	private void handleWireVote(JsonEnvelope msg) {
+		// Strict schema check (wire uses envelope schema, not a "bungeeVersion" field)
+		int schema = msg.getSchema();
+		if (schema != VotingPluginWire.SCHEMA_VERSION) {
+			plugin.getLogger().warning("Incompatible version with bungee/proxy, please update all servers: " + schema
+					+ " != " + VotingPluginWire.SCHEMA_VERSION);
+			return;
+		}
+
+		VotingPluginWire.Vote v = VotingPluginWire.readVote(msg);
+
+		String uuidStr = v.uuid;
+		String player = v.player;
+		String service = v.service;
+
+		if (uuidStr == null || uuidStr.isEmpty()) {
+			return;
+		}
+
+		plugin.debug("wire vote received from " + player + "/" + uuidStr + " on " + service);
+
+		VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuidStr),
+				player);
+
+		VoteTotalsSnapshot text = VoteTotalsSnapshot.parseStorage(v.totals == null ? "" : v.totals);
+
+		bungeeVotePartyCurrent = text.getVotePartyCurrent();
+		bungeeVotePartyRequired = text.getVotePartyRequired();
+		plugin.getPlaceholders().onBungeeVotePartyUpdate();
+		plugin.getServerData().setBungeeVotePartyCurrent(bungeeVotePartyCurrent);
+		plugin.getServerData().setBungeeVotePartyRequired(bungeeVotePartyRequired);
+
+		user.cache();
+
+		boolean bungeeBroadcast = v.broadcast;
+
+		// Wire has no "setTotals" flag; treat as always true (so doNotSetTotals =
+		// false)
+		boolean doNotSetTotals = false;
+
+		user.bungeeVotePluginMessaging(service, v.time, text, doNotSetTotals, v.wasOnline, bungeeBroadcast, v.num);
+
+		if (plugin.getBungeeSettings().isPerServerPoints()) {
+			user.addPoints(plugin.getConfigFile().getPointsOnVote());
+		}
+
+		if (v.manageTotals) {
+			plugin.getServerData().addServiceSite(service);
+		}
+
+		@SuppressWarnings("unused")
+		int _ignored = v.numberOfVotes;
+	}
+
+	public void loadGlobalMysql() {
+		if (plugin.getBungeeSettings().isGloblalDataEnabled()) {
+			if (timer != null) {
+				timer.shutdown();
+				try {
+					timer.awaitTermination(5, TimeUnit.SECONDS);
+				} catch (InterruptedException e) {
+					e.printStackTrace();
+				}
+				timer.shutdownNow();
+			}
+			timer = Executors.newScheduledThreadPool(1);
+			timer.scheduleWithFixedDelay(new Runnable() {
+				@Override
+				public void run() {
+					checkGlobalData();
+				}
+			}, 60, 10, TimeUnit.SECONDS);
+			timer.scheduleWithFixedDelay(new Runnable() {
+				@Override
+				public void run() {
+					globalDataHandler.setString(plugin.getBungeeSettings().getServer(), "LastOnline",
+							"" + LocalDateTime.now().atZone(ZoneOffset.UTC).toInstant().toEpochMilli());
+				}
+			}, 1, 60, TimeUnit.MINUTES);
+
+			if (globalDataHandler != null) {
+				globalDataHandler.getGlobalMysql().close();
+			}
+
+			if (plugin.getBungeeSettings().isGloblalDataUseMainMySQL()
+					&& plugin.getStorageType().equals(UserStorage.MYSQL)) {
+				globalDataHandler = new GlobalDataHandler(
+						new GlobalMySQL("VotingPlugin_GlobalData", plugin.getMysql().getMysql()) {
+							@Override
+							public void debugEx(Exception e) {
+								plugin.debug(e);
+							}
+
+							@Override
+							public void debugLog(String text) {
+								plugin.debug(text);
+							}
+
+							@Override
+							public void info(String text) {
+								plugin.getLogger().info(text);
+							}
+
+							@Override
+							public void logSevere(String text) {
+								plugin.getLogger().severe(text);
+							}
+
+							@Override
+							public void warning(String text) {
+								plugin.getLogger().warning(text);
+							}
+						});
+			} else {
+				globalDataHandler = new GlobalDataHandler(
+						new GlobalMySQL("VotingPlugin_GlobalData", new MysqlConfigSpigot(
+								plugin.getBungeeSettings().getData().getConfigurationSection("GlobalData"))) {
+							@Override
+							public void debugEx(Exception e) {
+								plugin.debug(e);
+							}
+
+							@Override
+							public void debugLog(String text) {
+								plugin.debug(text);
+							}
+
+							@Override
+							public void info(String text) {
+								plugin.getLogger().info(text);
+							}
+
+							@Override
+							public void logSevere(String text) {
+								plugin.getLogger().severe(text);
+							}
+
+							@Override
+							public void warning(String text) {
+								plugin.getLogger().warning(text);
+							}
+						});
+			}
+
+			globalDataHandler.getGlobalMysql().alterColumnType("IgnoreTime", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("MONTH", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("WEEK", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("DAY", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("FinishedProcessing", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("Processing", "VARCHAR(5)");
+			globalDataHandler.getGlobalMysql().alterColumnType("LastUpdated", "MEDIUMTEXT");
+			globalDataHandler.getGlobalMysql().alterColumnType("ForceUpdate", "VARCHAR(5)");
+			plugin.getTimeChecker().setProcessingEnabled(false);
+		}
+	}
+
+	private void sendEnvelopeSocket(JsonEnvelope envelope) {
+		if (clientHandler != null) {
+			clientHandler.sendEnvelope(envelope);
+		}
+	}
+
+	private void sendSubChannel(String subChannel, HashMap<String, Object> fields) {
+		JsonEnvelope.Builder b = JsonEnvelope.builder(subChannel).schema(VotingPluginWire.SCHEMA_VERSION);
+		if (fields != null) {
+			for (Map.Entry<String, Object> e : fields.entrySet()) {
+				b.put(e.getKey(), e.getValue());
+			}
+		}
+		globalMessageHandler.sendMessage(b.build());
+	}
+
+	private static String nvl(String s) {
+		return s == null ? "" : s;
+	}
+}

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

@@ -2,25 +2,36 @@ package com.bencodez.votingplugin;
 
 import java.util.concurrent.Callable;
 
-import com.bencodez.advancedcore.api.metrics.BStatsMetrics;
+import org.bukkit.configuration.ConfigurationSection;
 
+import com.bencodez.simpleapi.metrics.BStatsMetrics;
+
+/**
+ * Registers bStats charts for VotingPlugin.
+ * <p>
+ * Updated for VotingPlugin 7.0:
+ * <ul>
+ * <li>Broadcast: Always logs broadcast_type if VoteBroadcast.Type exists. If Type == NONE, ignores other broadcast
+ * settings.</li>
+ * <li>VoteLogging: Only logs VoteLogging charts when VoteLogging.Enabled is true.</li>
+ * <li>No "Unknown" values are emitted; charts are only registered when their data exists.</li>
+ * <li>VoteMilestones chart is bucketed to reduce cardinality.</li>
+ * </ul>
+ */
 public class VotingPluginMetrics {
 
-	public void load(VotingPluginMain plugin) {
-		BStatsMetrics metrics = new BStatsMetrics(plugin, 38);
+	/**
+	 * Register bStats metrics.
+	 *
+	 * @param plugin VotingPlugin main instance
+	 */
+	public void load(final VotingPluginMain plugin) {
+		if (plugin == null) {
+			return;
+		}
 
-		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_firstvote", new Callable<String>() {
+		final BStatsMetrics metrics = new BStatsMetrics(plugin, 38);
 
-			@Override
-			public String call() throws Exception {
-				if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
-						plugin.getSpecialRewardsConfig().getFirstVoteRewardsPath())) {
-					return "True";
-				} else {
-					return "False";
-				}
-			}
-		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_everysite", new Callable<String>() {
 
 			@Override
@@ -28,50 +39,22 @@ public class VotingPluginMetrics {
 				if (plugin.getRewardHandler().hasRewards(plugin.getConfigVoteSites().getData(),
 						plugin.getConfigVoteSites().getEverySiteRewardPath())) {
 					return "True";
-				} else {
-					return "False";
 				}
+				return "False";
 			}
 		}));
-		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_allsites", new Callable<String>() {
 
-			@Override
-			public String call() throws Exception {
-				if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
-						plugin.getSpecialRewardsConfig().getAllSitesRewardPath())) {
-					return "True";
-				} else {
-					return "False";
-				}
-			}
-		}));
-		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_cumulative", new Callable<String>() {
-
-			@Override
-			public String call() throws Exception {
-				if (plugin.getSpecialRewardsConfig().getCumulativeVotes().size() == 0) {
-					return "False";
-				} else {
-					for (String cum : plugin.getSpecialRewardsConfig().getCumulativeVotes()) {
-						if (plugin.getSpecialRewardsConfig().getCumulativeRewardEnabled(Integer.parseInt(cum))) {
-							return "True";
-						}
-					}
-					return "False";
-				}
-			}
-		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_voteparty", new Callable<String>() {
 
 			@Override
 			public String call() throws Exception {
 				if (!plugin.getSpecialRewardsConfig().isVotePartyEnabled()) {
 					return "False";
-				} else {
-					return "True";
 				}
+				return "True";
 			}
 		}));
+
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("placeholder_cache_level", new Callable<String>() {
 
 			@Override
@@ -79,22 +62,16 @@ public class VotingPluginMetrics {
 				return plugin.getPlaceholders().getCacheLevel().toString();
 			}
 		}));
-		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_milestone", new Callable<String>() {
+
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_votemilestones", new Callable<String>() {
 
 			@Override
 			public String call() throws Exception {
-				if (plugin.getSpecialRewardsConfig().getMilestoneVotes().size() == 0) {
-					return "False";
-				} else {
-					for (String milestone : plugin.getSpecialRewardsConfig().getMilestoneVotes()) {
-						if (plugin.getSpecialRewardsConfig().getMilestoneRewardEnabled(Integer.parseInt(milestone))) {
-							return "True";
-						}
-					}
-					return "False";
-				}
+				int size = plugin.getVoteMilestonesManager().getConfig().getMilestones().size();
+				return bucketCount(size);
 			}
 		}));
+
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_anysitereward", new Callable<String>() {
 
 			@Override
@@ -102,68 +79,19 @@ public class VotingPluginMetrics {
 				if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 						plugin.getSpecialRewardsConfig().getAnySiteRewardsPath())) {
 					return "True";
-				} else {
-					return "False";
-				}
-			}
-		}));
-		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_votestreakday", new Callable<String>() {
-
-			@Override
-			public String call() throws Exception {
-				for (String s : plugin.getSpecialRewardsConfig().getVoteStreakVotes("Day")) {
-
-					if (plugin.getSpecialRewardsConfig().getVoteStreakRewardEnabled("Day", s)
-							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
-									plugin.getSpecialRewardsConfig().getVoteStreakRewardsPath("Day", s))) {
-						return "True";
-					}
-
 				}
 				return "False";
 			}
 		}));
 
-		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_votestreakweek", new Callable<String>() {
-
-			@Override
-			public String call() throws Exception {
-				for (String s : plugin.getSpecialRewardsConfig().getVoteStreakVotes("Week")) {
-
-					if (plugin.getSpecialRewardsConfig().getVoteStreakRewardEnabled("Week", s)
-							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
-									plugin.getSpecialRewardsConfig().getVoteStreakRewardsPath("Week", s))) {
-						return "True";
-					}
-				}
-
-				return "False";
-			}
-		}));
-
-		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_votestreakmonth", new Callable<String>() {
-
-			@Override
-			public String call() throws Exception {
-				for (String s : plugin.getSpecialRewardsConfig().getVoteStreakVotes("Month")) {
-
-					if (plugin.getSpecialRewardsConfig().getVoteStreakRewardEnabled("Month", s)
-							&& plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
-									plugin.getSpecialRewardsConfig().getVoteStreakRewardsPath("Month", s))) {
-						return "True";
-					}
-				}
-
-				return "False";
-			}
-		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("numberofsites", new Callable<String>() {
 
 			@Override
 			public String call() throws Exception {
-				return "" + plugin.getVoteSites().size();
+				return "" + plugin.getVoteSiteManager().getVoteSitesEnabled().size();
 			}
 		}));
+
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("numberofrewards", new Callable<String>() {
 
 			@Override
@@ -171,6 +99,7 @@ public class VotingPluginMetrics {
 				return "" + plugin.getRewardHandler().getRewards().size();
 			}
 		}));
+
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("autocreatevotesites", new Callable<String>() {
 
 			@Override
@@ -179,6 +108,14 @@ public class VotingPluginMetrics {
 			}
 		}));
 
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("config_onlinemode", new Callable<String>() {
+
+			@Override
+			public String call() throws Exception {
+				return "" + plugin.getOptions().isOnlineMode();
+			}
+		}));
+
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("numberofusers", new Callable<String>() {
 
 			@Override
@@ -186,9 +123,11 @@ public class VotingPluginMetrics {
 				int total = plugin.getUserManager().getAllUUIDs().size();
 				if (total > 800000) {
 					return ">800000";
-				} else if (total > 700000) {
+				}
+				if (total > 700000) {
 					return "700000-800000";
-				} else if (total > 600000) {
+				}
+				if (total > 600000) {
 					return "600000-700000";
 				} else if (total > 500000) {
 					return "500000-600000";
@@ -214,6 +153,7 @@ public class VotingPluginMetrics {
 				return plugin.getOptions().getStorageType().toString();
 			}
 		}));
+
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("DisableCheckOnWorldChange", new Callable<String>() {
 
 			@Override
@@ -221,13 +161,7 @@ public class VotingPluginMetrics {
 				return "" + plugin.getOptions().isDisableCheckOnWorldChange();
 			}
 		}));
-		metrics.addCustomChart(new BStatsMetrics.SimplePie("votereminding_enabled", new Callable<String>() {
 
-			@Override
-			public String call() throws Exception {
-				return "" + plugin.getConfigFile().isVoteRemindingEnabled();
-			}
-		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("LoadTopVoter_Monthly", new Callable<String>() {
 
 			@Override
@@ -235,6 +169,7 @@ public class VotingPluginMetrics {
 				return "" + plugin.getConfigFile().isLoadTopVoterMonthly();
 			}
 		}));
+
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("LoadTopVoter_Weekly", new Callable<String>() {
 
 			@Override
@@ -242,6 +177,7 @@ public class VotingPluginMetrics {
 				return "" + plugin.getConfigFile().isLoadTopVoterWeekly();
 			}
 		}));
+
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("LoadTopVoter_Daily", new Callable<String>() {
 
 			@Override
@@ -249,33 +185,19 @@ public class VotingPluginMetrics {
 				return "" + plugin.getConfigFile().isLoadTopVoterDaily();
 			}
 		}));
+
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("bungeemethod", new Callable<String>() {
 
 			@Override
 			public String call() throws Exception {
 				if (plugin.getBungeeSettings().isUseBungeecoord()) {
 					return "" + plugin.getBungeeHandler().getMethod().toString();
-				} else {
-					return "Disabled";
 				}
+				return "Disabled";
 			}
 		}));
+
 		if (plugin.getBungeeSettings().isUseBungeecoord()) {
-			metrics.addCustomChart(new BStatsMetrics.SimplePie("bungeebroadcast", new Callable<String>() {
-
-				@Override
-				public String call() throws Exception {
-					return "" + plugin.getBungeeSettings().isBungeeBroadcast();
-				}
-			}));
-			metrics.addCustomChart(new BStatsMetrics.SimplePie("bungeebroadcastalways", new Callable<String>() {
-
-				@Override
-				public String call() throws Exception {
-					return "" + plugin.getBungeeSettings().isBungeeBroadcastAlways();
-				}
-			}));
-
 			metrics.addCustomChart(new BStatsMetrics.SimplePie("perserverrewards", new Callable<String>() {
 
 				@Override
@@ -374,5 +296,188 @@ public class VotingPluginMetrics {
 				}
 			}));
 		}
+
+		/*
+		 * ---------------------------------------------------------------------
+		 * Broadcast metrics:
+		 * - Always log broadcast_type if VoteBroadcast.Type exists (even if NONE)
+		 * - If Type == NONE, ignore the rest of the broadcast settings
+		 * ---------------------------------------------------------------------
+		 */
+		final ConfigurationSection root = safeConfig(plugin);
+		final ConfigurationSection voteBroadcast = getSection(root, "VoteBroadcast");
+		if (voteBroadcast != null && voteBroadcast.isString("Type")) {
+
+			metrics.addCustomChart(new BStatsMetrics.SimplePie("broadcast_type", new Callable<String>() {
+				@Override
+				public String call() throws Exception {
+					return voteBroadcast.getString("Type");
+				}
+			}));
+
+			final String type = voteBroadcast.getString("Type", null);
+			if (type != null && !"NONE".equalsIgnoreCase(type)) {
+
+				if (voteBroadcast.isString("Duration")) {
+					metrics.addCustomChart(new BStatsMetrics.SimplePie("broadcast_duration", new Callable<String>() {
+						@Override
+						public String call() throws Exception {
+							return voteBroadcast.getString("Duration");
+						}
+					}));
+				}
+
+				if (voteBroadcast.isInt("MaxSitesListed")) {
+					metrics.addCustomChart(new BStatsMetrics.SimplePie("broadcast_max_sites_listed",
+							new Callable<String>() {
+								@Override
+								public String call() throws Exception {
+									return bucketMaxSites(voteBroadcast.getInt("MaxSitesListed"));
+								}
+							}));
+				}
+			}
+		}
+
+		/*
+		 * ---------------------------------------------------------------------
+		 * VoteLogging metrics:
+		 * - Only log when VoteLogging.Enabled is true
+		 * ---------------------------------------------------------------------
+		 */
+		final ConfigurationSection voteLogging = getSection(root, "VoteLogging");
+		if (voteLogging != null && voteLogging.getBoolean("Enabled", false)) {
+
+			if (voteLogging.isInt("PurgeDays")) {
+				metrics.addCustomChart(new BStatsMetrics.SimplePie("votelogging_purgedays", new Callable<String>() {
+					@Override
+					public String call() throws Exception {
+						return bucketPurgeDays(voteLogging.getInt("PurgeDays"));
+					}
+				}));
+			}
+
+			if (voteLogging.isBoolean("UseMainMySQL")) {
+				metrics.addCustomChart(new BStatsMetrics.SimplePie("votelogging_usemainmysql", new Callable<String>() {
+					@Override
+					public String call() throws Exception {
+						return "" + voteLogging.getBoolean("UseMainMySQL");
+					}
+				}));
+			}
+		}
+	}
+
+	/**
+	 * Safely gets the root configuration section.
+	 *
+	 * @param plugin plugin instance
+	 * @return root config section, or null if inaccessible
+	 */
+	private ConfigurationSection safeConfig(final VotingPluginMain plugin) {
+		try {
+			return plugin.getConfigFile().getData();
+		} catch (Exception ignored) {
+			return null;
+		}
+	}
+
+	/**
+	 * Gets a child section safely.
+	 *
+	 * @param root root section
+	 * @param key  child key
+	 * @return child section or null
+	 */
+	private ConfigurationSection getSection(final ConfigurationSection root, final String key) {
+		if (root == null) {
+			return null;
+		}
+		try {
+			return root.getConfigurationSection(key);
+		} catch (Exception ignored) {
+			return null;
+		}
+	}
+
+	/**
+	 * Buckets a milestone count to reduce bStats cardinality.
+	 *
+	 * @param count count
+	 * @return bucket string
+	 */
+	private String bucketCount(final int count) {
+		if (count <= 0) {
+			return "0";
+		}
+		if (count == 1) {
+			return "1";
+		}
+		if (count <= 5) {
+			return "2-5";
+		}
+		if (count <= 10) {
+			return "6-10";
+		}
+		if (count <= 25) {
+			return "11-25";
+		}
+		if (count <= 50) {
+			return "26-50";
+		}
+		if (count <= 100) {
+			return "51-100";
+		}
+		return ">100";
+	}
+
+	/**
+	 * Buckets MaxSitesListed to reduce bStats cardinality.
+	 *
+	 * @param maxSites max sites listed
+	 * @return bucket string
+	 */
+	private String bucketMaxSites(final int maxSites) {
+		if (maxSites <= 0) {
+			return "0";
+		}
+		if (maxSites <= 5) {
+			return "1-5";
+		}
+		if (maxSites <= 10) {
+			return "6-10";
+		}
+		if (maxSites <= 25) {
+			return "11-25";
+		}
+		return ">25";
+	}
+
+	/**
+	 * Buckets purge days to reduce bStats cardinality.
+	 *
+	 * @param purgeDays purge days
+	 * @return bucket string
+	 */
+	private String bucketPurgeDays(final int purgeDays) {
+		if (purgeDays < 0) {
+			return "disabled";
+		}
+		if (purgeDays == 0) {
+			return "0";
+		}
+		if (purgeDays <= 7) {
+			return "1-7";
+		}
+		if (purgeDays <= 30) {
+			return "8-30";
+		}
+		if (purgeDays <= 90) {
+			return "31-90";
+		}
+		if (purgeDays <= 365) {
+			return "91-365";
+		}
+		return ">365";
 	}
 }

VotingPlugin/src/main/java/com/bencodez/votingplugin/broadcast/BroadcastFormat.java

@@ -0,0 +1,102 @@
+package com.bencodez.votingplugin.broadcast;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.StringJoiner;
+
+/**
+ * Defines HOW vote broadcasts are rendered.
+ *
+ * Terminology:
+ * - BroadcastMsg : used when EXACTLY ONE item exists (single-site vote)
+ * - Header       : used ONCE when MULTIPLE items exist (batch/interval)
+ * - ListLine     : used ONCE PER ITEM when MULTIPLE items exist
+ *
+ * Placeholders (always available):
+ * - %player%        : player name (or "Server" for interval summaries)
+ * - %site%          : the current site/item for this line
+ * - %sites_count%   : number of items in the list
+ * - %sites%         : csv of items in the list
+ * - %reason%        : internal reason string ("vote", "batch", "interval", etc)
+ *
+ * Extra context placeholders (INTERVAL_SUMMARY_GLOBAL):
+ * - %players% / %numberofplayers%
+ * - %sites% / %numberofsites%   (note: %sites% is csv; %numberofsites% is count)
+ */
+public final class BroadcastFormat {
+
+	private final String broadcastMsg;
+	private final String header;
+	private final String listLine;
+
+	public BroadcastFormat(String broadcastMsg, String header, String listLine) {
+		this.broadcastMsg = broadcastMsg == null ? "" : broadcastMsg;
+		this.header = header == null ? "" : header;
+		this.listLine = listLine == null ? "" : listLine;
+	}
+
+	public List<String> render(String playerName, List<String> items, String reason) {
+		return render(playerName, items, reason, Collections.<String, String>emptyMap());
+	}
+
+	public List<String> render(String playerName, List<String> items, String reason, Map<String, String> context) {
+		List<String> output = new ArrayList<String>();
+		int count = items == null ? 0 : items.size();
+
+		String csv = "";
+		if (count > 0) {
+			StringJoiner joiner = new StringJoiner(", ");
+			for (String s : items) {
+				if (s != null && !s.isEmpty()) {
+					joiner.add(s);
+				}
+			}
+			csv = joiner.toString();
+		}
+
+		// SINGLE ITEM → BroadcastMsg
+		if (count == 1 && !broadcastMsg.isEmpty()) {
+			output.add(apply(broadcastMsg, playerName, items.get(0), count, csv, reason, context));
+			return output;
+		}
+
+		// MULTI ITEM → Header + ListLine per item
+		if (!header.isEmpty()) {
+			output.add(apply(header, playerName, "", count, csv, reason, context));
+		}
+
+		if (count > 0 && !listLine.isEmpty()) {
+			for (String s : items) {
+				output.add(apply(listLine, playerName, s, count, csv, reason, context));
+			}
+		}
+
+		return output;
+	}
+
+	private String apply(String template,
+			String player,
+			String item,
+			int count,
+			String csv,
+			String reason,
+			Map<String, String> context) {
+
+		String out = template
+				.replace("%player%", player == null ? "" : player)
+				.replace("%site%", item == null ? "" : item)
+				.replace("%sites_count%", String.valueOf(count))
+				.replace("%sites%", csv == null ? "" : csv)
+				.replace("%reason%", reason == null ? "" : reason);
+
+		if (context != null && !context.isEmpty()) {
+			for (Map.Entry<String, String> e : context.entrySet()) {
+				out = out.replace("%" + e.getKey() + "%", e.getValue());
+			}
+		}
+
+		return out;
+	}
+}

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

@@ -0,0 +1,430 @@
+package com.bencodez.votingplugin.broadcast;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringJoiner;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitTask;
+
+import com.bencodez.advancedcore.api.misc.MiscUtils;
+import com.bencodez.simpleapi.messages.MessageAPI;
+import com.bencodez.simpleapi.time.ParsedDuration;
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.user.VotingPluginUser;
+
+/**
+ * Core broadcast logic.
+ *
+ * Decides WHEN to broadcast and builds lines/messages. Uses your existing
+ * "eligible online players" behavior (disable broadcast respected).
+ *
+ * NOTE: Backend servers only.
+ */
+public final class BroadcastHandler {
+
+	private final VotingPluginMain plugin;
+
+	/**
+	 * Only used for day-boundary logic (FIRST_VOTE_OF_DAY).
+	 */
+	private final ZoneId zoneId;
+
+	private volatile BroadcastSettings settings;
+
+	// Per-player cooldown tracking
+	private final ConcurrentHashMap<UUID, Instant> lastBroadcastAt = new ConcurrentHashMap<UUID, Instant>();
+
+	// Batch window tracking
+	private final ConcurrentHashMap<UUID, LinkedHashSet<String>> pendingSites = new ConcurrentHashMap<UUID, LinkedHashSet<String>>();
+	private final ConcurrentHashMap<UUID, BukkitTask> pendingFlush = new ConcurrentHashMap<UUID, BukkitTask>();
+
+	// First vote of day tracking
+	private final ConcurrentHashMap<UUID, LocalDate> firstVoteDay = new ConcurrentHashMap<UUID, LocalDate>();
+
+	// Interval summary tracking (uuid -> set of sites during interval)
+	private final ConcurrentHashMap<UUID, LinkedHashSet<String>> intervalSites = new ConcurrentHashMap<UUID, LinkedHashSet<String>>();
+	private volatile BukkitTask intervalTask;
+
+	public BroadcastHandler(VotingPluginMain plugin, BroadcastSettings settings, ZoneId zoneId) {
+		this.plugin = plugin;
+		this.settings = settings;
+		this.zoneId = zoneId == null ? ZoneId.systemDefault() : zoneId;
+
+		rescheduleIntervalIfNeeded();
+	}
+
+	public void setSettings(BroadcastSettings settings) {
+		this.settings = settings;
+		rescheduleIntervalIfNeeded();
+	}
+
+	/**
+	 * Call whenever a vote is received.
+	 *
+	 * @param uuid       player's uuid
+	 * @param playerName player name (optional; if null/empty, resolved from Bukkit)
+	 * @param siteName   vote site name (display name)
+	 */
+	public void broadcastVote(UUID uuid, String playerName, String siteName, boolean wasOnline) {
+		BroadcastSettings s = settings;
+		if (s == null || s.isDisabled()) {
+			return;
+		}
+
+		// Always collect for interval summaries (even if Type isn't interval right
+		// now).
+		recordInterval(uuid, siteName);
+
+		String name = playerName == null || playerName.isEmpty() ? resolveName(uuid) : playerName;
+
+		VoteBroadcastType type = s.getType();
+
+		// New: types that only broadcast if the voting player is online
+		if (type == VoteBroadcastType.EVERY_VOTE_ONLINE_ONLY) {
+			if (!wasOnline) {
+				return;
+			}
+			broadcastNow(name, single(siteName), "vote_online_only", null);
+			return;
+		}
+
+		if (type == VoteBroadcastType.EVERY_VOTE) {
+			broadcastNow(name, single(siteName), "vote", null);
+
+		} else if (type == VoteBroadcastType.COOLDOWN_PER_PLAYER) {
+			if (checkAndMarkCooldown(uuid, s.getDuration())) {
+				broadcastNow(name, single(siteName), "cooldown", null);
+			}
+
+		} else if (type == VoteBroadcastType.BATCH_WINDOW_PER_PLAYER) {
+			bufferBatch(uuid, name, siteName, s.getDuration());
+
+		} else if (type == VoteBroadcastType.FIRST_VOTE_OF_DAY) {
+			if (markFirstVoteOfDay(uuid)) {
+				broadcastNow(name, single(siteName), "first_day", null);
+			}
+
+		} else if (type == VoteBroadcastType.INTERVAL_SUMMARY_GLOBAL) {
+			// handled by scheduled task
+		}
+	}
+
+	/*
+	 * ======================= Broadcast helpers =======================
+	 */
+
+	private void broadcastNow(String playerName, List<String> sites, String reason, Map<String, String> extraContext) {
+		BroadcastSettings s = settings;
+		if (s == null || s.isDisabled()) {
+			return;
+		}
+
+		List<String> cleaned = applyMaxSites(sites, s);
+		cleaned.sort(new Comparator<String>() {
+			@Override
+			public int compare(String a, String b) {
+				String aa = a == null ? "" : a.toLowerCase(Locale.ROOT);
+				String bb = b == null ? "" : b.toLowerCase(Locale.ROOT);
+				return aa.compareTo(bb);
+			}
+		});
+
+		List<String> lines;
+		if (extraContext == null) {
+			lines = s.getFormat().render(playerName, cleaned, reason);
+		} else {
+			lines = s.getFormat().render(playerName, cleaned, reason, extraContext);
+		}
+
+		for (String line : lines) {
+			broadcastToEligiblePlayers(line);
+		}
+	}
+
+	/**
+	 * Your reliable broadcast style: - only sends to online players - respects
+	 * per-player disable broadcast toggle - runs PlaceholderAPI style per-player
+	 * placeholders (if your PlaceholderUtils does) - supports %newline% / %NewLine%
+	 * splitting
+	 */
+	private void broadcastToEligiblePlayers(String broadcastMsg) {
+		if (broadcastMsg == null || broadcastMsg.isEmpty()) {
+			return;
+		}
+
+		ArrayList<Player> players = new ArrayList<Player>();
+		for (Player p : Bukkit.getOnlinePlayers()) {
+			VotingPluginUser u = plugin.getVotingPluginUserManager().getVotingPluginUser(p);
+			if (u != null && !u.getDisableBroadcast()) {
+				players.add(p);
+			}
+		}
+
+		// If you prefer your manual loop, keep it here (not in main)
+		MiscUtils.getInstance().broadcast(broadcastMsg, players);
+
+		Bukkit.getServer().getConsoleSender().sendMessage(MessageAPI.colorize(broadcastMsg));
+	}
+
+	/*
+	 * ======================= Cooldown logic (fixed millis) =======================
+	 */
+
+	private boolean checkAndMarkCooldown(UUID uuid, ParsedDuration cooldown) {
+		if (cooldown == null || cooldown.isEmpty()) {
+			return true;
+		}
+
+		Instant now = Instant.now();
+		Instant last = lastBroadcastAt.get(uuid);
+
+		if (last == null) {
+			lastBroadcastAt.put(uuid, now);
+			return true;
+		}
+
+		Instant next = cooldown.addTo(last);
+		if (!now.isBefore(next)) {
+			lastBroadcastAt.put(uuid, now);
+			return true;
+		}
+
+		return false;
+	}
+
+	/*
+	 * ======================= Batch window logic (fixed millis)
+	 * =======================
+	 */
+
+	private void bufferBatch(UUID uuid, String playerName, String siteName, ParsedDuration window) {
+		if (siteName != null && !siteName.isEmpty()) {
+			LinkedHashSet<String> set = pendingSites.get(uuid);
+			if (set == null) {
+				LinkedHashSet<String> created = new LinkedHashSet<String>();
+				set = pendingSites.putIfAbsent(uuid, created);
+				if (set == null) {
+					set = created;
+				}
+			}
+			synchronized (set) {
+				set.add(siteName);
+			}
+		}
+
+		if (!pendingFlush.containsKey(uuid)) {
+			BukkitTask task = scheduleBatchFlush(uuid, playerName, window);
+			BukkitTask prev = pendingFlush.putIfAbsent(uuid, task);
+			if (prev != null) {
+				task.cancel();
+			}
+		}
+	}
+
+	private BukkitTask scheduleBatchFlush(final UUID uuid, final String playerName, ParsedDuration window) {
+		long delayMs = window == null ? 1L : window.delayMillisFromNow();
+		long ticks = Math.max(1L, delayMs / 50L);
+
+		return Bukkit.getScheduler().runTaskLater(plugin, new Runnable() {
+			@Override
+			public void run() {
+				try {
+					flushBatch(uuid, playerName);
+				} finally {
+					pendingFlush.remove(uuid);
+				}
+			}
+		}, ticks);
+	}
+
+	private void flushBatch(UUID uuid, String playerName) {
+		Set<String> set = pendingSites.remove(uuid);
+		if (set == null || set.isEmpty()) {
+			return;
+		}
+
+		List<String> list;
+		synchronized (set) {
+			list = new ArrayList<String>(set);
+		}
+		broadcastNow(playerName, list, "batch", null);
+	}
+
+	/*
+	 * ======================= First vote of day (calendar) =======================
+	 */
+
+	private boolean markFirstVoteOfDay(UUID uuid) {
+		LocalDate today = LocalDate.now(zoneId);
+		LocalDate last = firstVoteDay.putIfAbsent(uuid, today);
+
+		if (last == null) {
+			return true;
+		}
+		if (!last.equals(today)) {
+			firstVoteDay.put(uuid, today);
+			return true;
+		}
+		return false;
+	}
+
+	/*
+	 * ======================= Interval summary =======================
+	 */
+
+	private void rescheduleIntervalIfNeeded() {
+		if (intervalTask != null) {
+			intervalTask.cancel();
+			intervalTask = null;
+		}
+
+		BroadcastSettings s = settings;
+		if (s == null || s.getType() != VoteBroadcastType.INTERVAL_SUMMARY_GLOBAL) {
+			return;
+		}
+
+		long delayMs = s.getDuration() == null ? 1L : s.getDuration().delayMillisFromNow();
+		long ticks = Math.max(1L, delayMs / 50L);
+
+		intervalTask = Bukkit.getScheduler().runTaskTimer(plugin, new Runnable() {
+			@Override
+			public void run() {
+				broadcastIntervalSummary();
+			}
+		}, ticks, ticks);
+	}
+
+	private void recordInterval(UUID uuid, String siteName) {
+		if (siteName == null || siteName.isEmpty()) {
+			return;
+		}
+
+		LinkedHashSet<String> set = intervalSites.get(uuid);
+		if (set == null) {
+			LinkedHashSet<String> created = new LinkedHashSet<String>();
+			set = intervalSites.putIfAbsent(uuid, created);
+			if (set == null) {
+				set = created;
+			}
+		}
+		synchronized (set) {
+			set.add(siteName);
+		}
+	}
+
+	/**
+	 * Interval summary supports extra context placeholders: - %players% /
+	 * %numberofplayers% - %sites% / %numberofsites%
+	 */
+	private void broadcastIntervalSummary() {
+		BroadcastSettings s = settings;
+		if (s == null || s.isDisabled() || s.getType() != VoteBroadcastType.INTERVAL_SUMMARY_GLOBAL) {
+			return;
+		}
+
+		ConcurrentHashMap<UUID, LinkedHashSet<String>> snapshot = new ConcurrentHashMap<UUID, LinkedHashSet<String>>(
+				intervalSites);
+		intervalSites.clear();
+
+		if (snapshot.isEmpty()) {
+			return;
+		}
+
+		List<String> entries = new ArrayList<String>();
+		List<String> players = new ArrayList<String>();
+		LinkedHashSet<String> uniqueSites = new LinkedHashSet<String>();
+
+		for (Map.Entry<UUID, LinkedHashSet<String>> entry : snapshot.entrySet()) {
+			LinkedHashSet<String> siteSet = entry.getValue();
+			if (siteSet == null || siteSet.isEmpty()) {
+				continue;
+			}
+
+			String name = resolveName(entry.getKey());
+			players.add(name);
+
+			int siteCount;
+			synchronized (siteSet) {
+				siteCount = siteSet.size();
+				for (String site : siteSet) {
+					if (site != null && !site.isEmpty()) {
+						uniqueSites.add(site);
+					}
+				}
+			}
+
+			entries.add(name + " (" + siteCount + ")");
+		}
+
+		if (entries.isEmpty()) {
+			return;
+		}
+
+		String playersCsv = join(players);
+		String sitesCsv = join(new ArrayList<String>(uniqueSites));
+
+		ConcurrentHashMap<String, String> context = new ConcurrentHashMap<String, String>();
+		context.put("players", playersCsv);
+		context.put("numberofplayers", String.valueOf(players.size()));
+		context.put("sites", sitesCsv);
+		context.put("numberofsites", String.valueOf(uniqueSites.size()));
+
+		broadcastNow("Server", entries, "interval", context);
+	}
+
+	/*
+	 * ======================= Utilities =======================
+	 */
+
+	private List<String> single(String site) {
+		List<String> list = new ArrayList<String>();
+		if (site != null && !site.isEmpty()) {
+			list.add(site);
+		}
+		return list;
+	}
+
+	private List<String> applyMaxSites(List<String> sites, BroadcastSettings s) {
+		if (sites == null) {
+			return new ArrayList<String>();
+		}
+		int max = s.getMaxSitesListed();
+		if (max <= 0 || sites.size() <= max) {
+			return new ArrayList<String>(sites);
+		}
+		return new ArrayList<String>(sites.subList(0, max));
+	}
+
+	private String resolveName(UUID uuid) {
+		try {
+			OfflinePlayer op = Bukkit.getOfflinePlayer(uuid);
+			String name = op == null ? null : op.getName();
+			return name == null || name.isEmpty() ? "Player" : name;
+		} catch (Exception e) {
+			return "Player";
+		}
+	}
+
+	private String join(List<String> list) {
+		StringJoiner joiner = new StringJoiner(", ");
+		for (String s : list) {
+			if (s != null && !s.isEmpty()) {
+				joiner.add(s);
+			}
+		}
+		return joiner.toString();
+	}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/broadcast/BroadcastSettings.java

@@ -0,0 +1,76 @@
+package com.bencodez.votingplugin.broadcast;
+
+import java.util.concurrent.TimeUnit;
+
+import org.bukkit.configuration.ConfigurationSection;
+
+import com.bencodez.simpleapi.time.ParsedDuration;
+
+/**
+ * Immutable broadcast configuration.
+ *
+ * Type: NONE disables broadcasting.
+ */
+public final class BroadcastSettings {
+
+	private final VoteBroadcastType type;
+	private final ParsedDuration duration;
+	private final int maxSitesListed;
+	private final BroadcastFormat format;
+
+	public BroadcastSettings(VoteBroadcastType type, ParsedDuration duration, int maxSitesListed,
+			BroadcastFormat format) {
+		this.type = type == null ? VoteBroadcastType.NONE : type;
+		this.duration = duration == null ? ParsedDuration.empty() : duration;
+		this.maxSitesListed = Math.max(0, maxSitesListed);
+		this.format = format == null ? new BroadcastFormat("", "", "") : format;
+	}
+
+	public VoteBroadcastType getType() {
+		return type;
+	}
+
+	public ParsedDuration getDuration() {
+		return duration;
+	}
+
+	public int getMaxSitesListed() {
+		return maxSitesListed;
+	}
+
+	public BroadcastFormat getFormat() {
+		return format;
+	}
+
+	public boolean isDisabled() {
+		return type == VoteBroadcastType.NONE;
+	}
+
+	/**
+	 * Loads VoteBroadcast settings from config.yml.
+	 *
+	 * Expected structure: VoteBroadcast: Type: EVERY_VOTE Duration: 2m
+	 * MaxSitesListed: 0 Format: BroadcastMsg: '...' Header: '...' ListLine: '...'
+	 */
+	public static BroadcastSettings load(ConfigurationSection sec) {
+		VoteBroadcastType type = VoteBroadcastType.parse(sec == null ? null : sec.getString("Type"),
+				VoteBroadcastType.NONE);
+
+		ParsedDuration duration = ParsedDuration.parse(sec == null ? "2m" : sec.getString("Duration", "2m"),
+				TimeUnit.MINUTES);
+
+		int maxSites = sec == null ? 0 : sec.getInt("MaxSitesListed", 0);
+
+		ConfigurationSection fmt = sec == null ? null : sec.getConfigurationSection("Format");
+
+		String broadcastMsg = fmt == null ? "&6[Vote] &aThanks &e%player% &afor voting on &e%site%&a!"
+				: fmt.getString("BroadcastMsg", "&6[Vote] &aThanks &e%player% &afor voting on &e%site%&a!");
+
+		String header = fmt == null ? "&6[Vote] &a%player% voted! &7(%sites_count%)"
+				: fmt.getString("Header", "&6[Vote] &a%player% voted! &7(%sites_count%)");
+
+		String listLine = fmt == null ? " &7- &e%site%" : fmt.getString("ListLine", " &7- &e%site%");
+
+		return new BroadcastSettings(type, duration, maxSites, new BroadcastFormat(broadcastMsg, header, listLine));
+	}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/broadcast/VoteBroadcastType.java

@@ -0,0 +1,60 @@
+package com.bencodez.votingplugin.broadcast;
+
+import java.util.Locale;
+
+/**
+ * Defines WHEN vote broadcasts occur.
+ *
+ * Set Type: NONE to disable broadcasting entirely.
+ */
+public enum VoteBroadcastType {
+
+	NONE,
+
+	/**
+	 * Broadcast on every vote (even if the player is offline). Uses
+	 * Format.BroadcastMsg (+ optional header/list if you choose).
+	 */
+	EVERY_VOTE,
+
+	/**
+	 * Broadcast on every vote ONLY if the voting player is online. Useful when
+	 * processing offline votes but you don't want global spam for them.
+	 */
+	EVERY_VOTE_ONLINE_ONLY,
+
+	/**
+	 * Broadcast at most once per Duration per player. (Even if they vote multiple
+	 * sites inside the cooldown.)
+	 */
+	COOLDOWN_PER_PLAYER,
+
+	/**
+	 * Batch sites per player for Duration, then broadcast one message listing
+	 * sites.
+	 */
+	BATCH_WINDOW_PER_PLAYER,
+
+	/**
+	 * Broadcast only the first vote of the day per player (calendar day).
+	 */
+	FIRST_VOTE_OF_DAY,
+
+	/**
+	 * Every Duration, broadcast a global summary of who voted and how many sites.
+	 * Uses context placeholders: %players%, %numberofplayers%, %sites%,
+	 * %numberofsites%.
+	 */
+	INTERVAL_SUMMARY_GLOBAL;
+
+	public static VoteBroadcastType parse(String s, VoteBroadcastType def) {
+		if (s == null || s.trim().isEmpty()) {
+			return def;
+		}
+		try {
+			return VoteBroadcastType.valueOf(s.trim().toUpperCase(Locale.ROOT));
+		} catch (Exception ignored) {
+			return def;
+		}
+	}
+}

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

@@ -5,7 +5,7 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
 import com.bencodez.advancedcore.api.command.CommandHandler;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 // TODO: Auto-generated Javadoc
@@ -36,7 +36,7 @@ public class CommandAdminVote implements CommandExecutor {
 		}
 
 		// invalid command
-		sender.sendMessage(StringParser.getInstance().colorize(plugin.getConfigFile().getFormatInvalidCommandAdminVote()));
+		sender.sendMessage(MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandAdminVote()));
 
 		return true;
 	}

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

@@ -7,8 +7,8 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
 import com.bencodez.advancedcore.api.command.CommandHandler;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 // TODO: Auto-generated Javadoc
@@ -40,15 +40,15 @@ public class CommandAliases implements CommandExecutor {
 	@Override
 	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
 
-		ArrayList<String> argsNew = new ArrayList<String>();
+		ArrayList<String> argsNew = new ArrayList<>();
 		argsNew.add(cmdHandle.getArgs()[0]);
 		for (String arg : args) {
 			argsNew.add(arg);
 		}
 		plugin.debug("Attempting cmd...");
-		plugin.debug("Inputed args: " + ArrayUtils.getInstance().makeStringList(argsNew));
+		plugin.debug("Inputed args: " + ArrayUtils.makeStringList(argsNew));
 
-		ArrayList<CommandHandler> handles = new ArrayList<CommandHandler>();
+		ArrayList<CommandHandler> handles = new ArrayList<>();
 		if (adminCommand) {
 			handles.addAll(plugin.getAdminVoteCommand());
 		} else {
@@ -73,7 +73,7 @@ public class CommandAliases implements CommandExecutor {
 						}
 
 						if (argsMatch) {
-							if (cmdHandle.runCommand(sender, ArrayUtils.getInstance().convert(argsNew))) {
+							if (cmdHandle.runCommand(sender, ArrayUtils.convert(argsNew))) {
 								plugin.debug("cmd found, ran cmd");
 								return true;
 							}
@@ -91,9 +91,9 @@ public class CommandAliases implements CommandExecutor {
 
 		// invalid command
 		if (adminCommand) {
-			sender.sendMessage(StringParser.getInstance().colorize(plugin.getConfigFile().getFormatInvalidCommandAdminVote()));
+			sender.sendMessage(MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandAdminVote()));
 		} else {
-			sender.sendMessage(StringParser.getInstance().colorize(plugin.getConfigFile().getFormatInvalidCommandVote()));
+			sender.sendMessage(MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandVote()));
 		}
 		return true;
 	}

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

@@ -5,7 +5,7 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
 import com.bencodez.advancedcore.api.command.CommandHandler;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 // TODO: Auto-generated Javadoc
@@ -61,7 +61,7 @@ public class CommandVote implements CommandExecutor {
 		}
 
 		// invalid command
-		sender.sendMessage(StringParser.getInstance().colorize(plugin.getConfigFile().getFormatInvalidCommandVote()));
+		sender.sendMessage(MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandVote()));
 		return true;
 	}
 

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

@@ -19,21 +19,20 @@ import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueLi
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueNumber;
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueString;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
-import com.bencodez.advancedcore.api.misc.PlayerUtils;
 import com.bencodez.advancedcore.api.valuerequest.InputMethod;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequest;
 import com.bencodez.advancedcore.api.valuerequest.ValueRequestBuilder;
 import com.bencodez.advancedcore.api.valuerequest.listeners.StringListener;
 import com.bencodez.advancedcore.api.yml.editor.ConfigEditor;
 import com.bencodez.advancedcore.command.gui.RewardEditGUI;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.player.PlayerUtils;
 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.milestones.AdminVoteVoteMilestones;
 import com.bencodez.votingplugin.commands.gui.admin.voteshop.AdminVoteVoteShop;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
-import com.bencodez.votingplugin.objects.VoteSite;
+import com.bencodez.votingplugin.votesites.VoteSite;
 
 public class AdminGUI {
 
@@ -49,7 +48,7 @@ public class AdminGUI {
 	 * @return ArrayList of buttons
 	 */
 	public ArrayList<BInventoryButton> adminGUIButtons() {
-		ArrayList<BInventoryButton> buttons = new ArrayList<BInventoryButton>();
+		ArrayList<BInventoryButton> buttons = new ArrayList<>();
 		buttons.add(new BInventoryButton("&cVoteSites",
 				new String[] { "&cOnly enabled sites are listed in this section", "&cMiddle Click to create" },
 				new ItemStack(Material.STONE)) {
@@ -65,7 +64,7 @@ public class AdminGUI {
 							plugin.getConfigVoteSites().generateVoteSite(value);
 							player.sendMessage("Generated site");
 							plugin.reload();
-							openAdminGUIVoteSiteSite(player, plugin.getVoteSite(value, true));
+							openAdminGUIVoteSiteSite(player, plugin.getVoteSiteManager().getVoteSite(value, true));
 						}
 					});
 				} else {
@@ -82,19 +81,11 @@ public class AdminGUI {
 			}
 		});
 
-		buttons.add(new BInventoryButton(new ItemBuilder(Material.DIAMOND_BLOCK, 1).setName("&cEdit Milestones")) {
+		buttons.add(new BInventoryButton(new ItemBuilder(Material.DIAMOND_BLOCK, 1).setName("&cEdit VoteMilestones")) {
 
 			@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);
+				new AdminVoteVoteMilestones(plugin, clickEvent.getPlayer()).open(GUIMethod.CHEST);
 			}
 		});
 
@@ -240,26 +231,27 @@ public class AdminGUI {
 	public void openAdminGUIVoteSites(Player player) {
 		BInventory inv = new BInventory("VoteSites");
 		int count = 0;
-		for (VoteSite voteSite : plugin.getVoteSites()) {
-			ArrayList<String> lore = new ArrayList<String>();
+		for (VoteSite voteSite : plugin.getVoteSiteManager().getVoteSites()) {
+			ArrayList<String> lore = new ArrayList<>();
+			lore.add("Enabled: " + voteSite.isEnabled());
 			lore.add("Priority: " + voteSite.getPriority());
+
 			lore.add("Name: " + voteSite.getDisplayName());
 			lore.add("ServiceSite: " + voteSite.getServiceSite());
 			lore.add("VoteURL: " + voteSite.getVoteURL());
 			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)) {
+			inv.addButton(count,
+					new BInventoryButton(voteSite.getKey(), ArrayUtils.convert(lore), new ItemStack(Material.STONE)) {
 
-				@Override
-				public void onClick(ClickEvent event) {
+						@Override
+						public void onClick(ClickEvent event) {
 
-					Player player = event.getWhoClicked();
-					openAdminGUIVoteSiteSite(player, voteSite);
+							Player player = event.getWhoClicked();
+							openAdminGUIVoteSiteSite(player, voteSite);
 
-				}
-			});
+						}
+					});
 			count++;
 		}
 		inv.openInventory(player);
@@ -279,7 +271,7 @@ public class AdminGUI {
 
 			@Override
 			public void onClick(ClickEvent event) {
-				ArrayList<String> playerNames = new ArrayList<String>();
+				ArrayList<String> playerNames = new ArrayList<>();
 				for (Player p : Bukkit.getOnlinePlayers()) {
 					playerNames.add(p.getName());
 				}
@@ -287,7 +279,7 @@ public class AdminGUI {
 
 					@Override
 					public void onInput(Player player, String value) {
-						Object ob = PlayerUtils.getInstance().getPlayerMeta(player, "VoteSite");
+						Object ob = PlayerUtils.getPlayerMeta(plugin, player, "VoteSite");
 						if (ob != null) {
 							VoteSite site = (VoteSite) ob;
 							PlayerVoteEvent voteEvent = new PlayerVoteEvent(site, value, site.getServiceSite(), false);
@@ -300,8 +292,8 @@ public class AdminGUI {
 							});
 						}
 					}
-				}, ArrayUtils.getInstance().convert(playerNames)).usingMethod(InputMethod.INVENTORY)
-						.allowCustomOption(true).request(event.getWhoClicked());
+				}, ArrayUtils.convert(playerNames)).usingMethod(InputMethod.INVENTORY).allowCustomOption(true)
+						.request(event.getWhoClicked());
 			}
 		});
 
@@ -347,24 +339,13 @@ public class AdminGUI {
 			}
 		}));
 
-		inv.addButton(new EditGUIButton(new EditGUIValueNumber("VoteDelay", voteSite.getVoteDelay()) {
+		inv.addButton(new EditGUIButton(new EditGUIValueString("VoteDelay", voteSite.getVoteDelay()) {
 
 			@Override
-			public void setValue(Player player, Number num) {
+			public void setValue(Player player, String value) {
 				VoteSite voteSite = (VoteSite) getInv().getMeta(player, "VoteSite");
 				String siteName = voteSite.getKey();
-				plugin.getConfigVoteSites().setVoteDelay(siteName, num.intValue());
-				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.getConfigVoteSites().setVoteDelay(siteName, value);
 				plugin.reload();
 			}
 		}));
@@ -375,7 +356,7 @@ public class AdminGUI {
 			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.getConfigVoteSites().setVoteDelayDailyHour(siteName, num.intValue());
 				plugin.reload();
 			}
 		}));

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

@@ -10,7 +10,7 @@ import org.bukkit.entity.Player;
 import com.bencodez.advancedcore.api.command.CommandHandler;
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 import net.md_5.bungee.api.chat.TextComponent;
@@ -35,7 +35,7 @@ public class AdminVoteHelp extends GUIHandler {
 	 */
 	public ArrayList<TextComponent> adminHelp(CommandSender sender, int page) {
 		int pagesize = plugin.getConfigFile().getFormatPageSize();
-		ArrayList<TextComponent> msg = new ArrayList<TextComponent>();
+		ArrayList<TextComponent> msg = new ArrayList<>();
 		ArrayList<TextComponent> text = adminHelpText(sender);
 
 		int maxPage = text.size() / pagesize;
@@ -43,9 +43,9 @@ public class AdminVoteHelp extends GUIHandler {
 			maxPage++;
 		}
 
-		msg.add(StringParser.getInstance().stringToComp("&6&lVotingPlugin Admin Help " + (page) + "/" + maxPage));
-		msg.add(StringParser.getInstance().stringToComp("&6&l() = Needed"));
-		msg.add(StringParser.getInstance().stringToComp("&6&lAliases: adminvote, av"));
+		msg.add(MessageAPI.stringToComp("&6&lVotingPlugin Admin Help " + (page) + "/" + maxPage));
+		msg.add(MessageAPI.stringToComp("&6&l() = Needed"));
+		msg.add(MessageAPI.stringToComp("&6&lAliases: adminvote, av"));
 
 		for (int i = pagesize * (page - 1); (i < text.size()) && (i < ((page) * pagesize)); i++) {
 			msg.add(text.get(i));
@@ -61,8 +61,8 @@ public class AdminVoteHelp extends GUIHandler {
 	 * @return the array list
 	 */
 	public ArrayList<TextComponent> adminHelpText(CommandSender sender) {
-		ArrayList<TextComponent> msg = new ArrayList<TextComponent>();
-		HashMap<String, TextComponent> unsorted = new HashMap<String, TextComponent>();
+		ArrayList<TextComponent> msg = new ArrayList<>();
+		HashMap<String, TextComponent> unsorted = new HashMap<>();
 
 		boolean requirePerms = plugin.getConfigFile().isFormatCommandsVoteHelpRequirePermission();
 
@@ -71,7 +71,7 @@ public class AdminVoteHelp extends GUIHandler {
 				unsorted.put(cmdHandle.getHelpLineCommand("/adminvote"), cmdHandle.getHelpLine("/adminvote"));
 			}
 		}
-		ArrayList<String> unsortedList = new ArrayList<String>();
+		ArrayList<String> unsortedList = new ArrayList<>();
 		unsortedList.addAll(unsorted.keySet());
 		Collections.sort(unsortedList, String.CASE_INSENSITIVE_ORDER);
 		for (String cmd : unsortedList) {

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/admin/AdminVotePerms.java

@@ -12,7 +12,7 @@ import org.bukkit.permissions.Permission;
 import com.bencodez.advancedcore.api.command.CommandHandler;
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 public class AdminVotePerms extends GUIHandler {
@@ -40,7 +40,7 @@ public class AdminVotePerms extends GUIHandler {
 	}
 
 	public String[] listPerms(CommandSender sender) {
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();
 
 		for (CommandHandler handle : plugin.getVoteCommand()) {
 			if (sender instanceof Player) {
@@ -100,7 +100,7 @@ public class AdminVotePerms extends GUIHandler {
 			maxPage++;
 		}
 
-		ArrayList<String> text = new ArrayList<String>();
+		ArrayList<String> text = new ArrayList<>();
 
 		text.add("&c&lCommand : Permissions " + page + "/" + maxPage);
 
@@ -108,17 +108,17 @@ public class AdminVotePerms extends GUIHandler {
 			text.add(msg.get(i));
 		}
 
-		text = ArrayUtils.getInstance().colorize(text);
+		text = ArrayUtils.colorize(text);
 
-		return ArrayUtils.getInstance().convert(text);
+		return ArrayUtils.convert(text);
 	}
 
 	public ArrayList<String> listPerms(CommandSender sender, String player, int page) {
 		Player p = Bukkit.getPlayer(player);
-		ArrayList<String> text = new ArrayList<String>();
+		ArrayList<String> text = new ArrayList<>();
 		if (p != null) {
 
-			ArrayList<String> msg = new ArrayList<String>();
+			ArrayList<String> msg = new ArrayList<>();
 
 			for (CommandHandler handle : plugin.getVoteCommand()) {
 				if (handle.hasPerm(p)) {
@@ -158,7 +158,7 @@ public class AdminVotePerms extends GUIHandler {
 				}
 			}
 
-			msg = ArrayUtils.getInstance().colorize(msg);
+			msg = ArrayUtils.colorize(msg);
 
 			int pagesize = plugin.getConfigFile().getFormatPageSize();
 
@@ -175,12 +175,12 @@ public class AdminVotePerms extends GUIHandler {
 		} else {
 			text.add("&cPlayer not online: " + player);
 		}
-		return ArrayUtils.getInstance().colorize(text);
+		return ArrayUtils.colorize(text);
 
 	}
 
 	public String[] listPermsDev(CommandSender sender) {
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();
 		msg.add("Command");
 		msg.add("  Permissions (seperated by |");
 		msg.add("  Help messasge");
@@ -202,9 +202,9 @@ public class AdminVotePerms extends GUIHandler {
 			msg.add(perm.getName() + " : " + perm.getDescription());
 		}
 
-		msg = ArrayUtils.getInstance().colorize(msg);
+		msg = ArrayUtils.colorize(msg);
 
-		return ArrayUtils.getInstance().convert(msg);
+		return ArrayUtils.convert(msg);
 	}
 
 	@Override

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

@@ -48,7 +48,7 @@ public class AdminVotePlaceholders extends GUIHandler {
 				msg = "votingplugin_" + identifier + "";
 			}
 
-			Layout layout = new Layout(new ArrayList<String>(Arrays.asList("[Json]")));
+			Layout layout = new Layout(new ArrayList<>(Arrays.asList("[Json]")));
 			layout.replaceTextComponent("[Json]", BookUtil.TextBuilder.of(identifier).color(ChatColor.AQUA)
 					.onHover(BookUtil.HoverAction.showText(msg)).build());
 			book.addLayout(layout);
@@ -66,7 +66,7 @@ public class AdminVotePlaceholders extends GUIHandler {
 				msg = "votingplugin_" + identifier + "";
 			}
 
-			Layout layout = new Layout(new ArrayList<String>(Arrays.asList("[Json]")));
+			Layout layout = new Layout(new ArrayList<>(Arrays.asList("[Json]")));
 			layout.replaceTextComponent("[Json]", BookUtil.TextBuilder.of(identifier).color(ChatColor.AQUA)
 					.onHover(BookUtil.HoverAction.showText(msg)).build());
 			book.addLayout(layout);
@@ -79,7 +79,7 @@ public class AdminVotePlaceholders extends GUIHandler {
 
 	@Override
 	public void onChat(CommandSender sender) {
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();
 		msg.add("&cPlaceholders:");
 		for (PlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getPlaceholders()) {
 			String identifier = placeholder.getIdentifier().toLowerCase();

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

@@ -45,7 +45,7 @@ public class AdminVotePlaceholdersPlayer extends GUIHandler {
 			}
 			String value = placeholder.placeholderRequest(user, identifier);
 			String msg = identifier + " = " + value;
-			Layout layout = new Layout(new ArrayList<String>(Arrays.asList("[Json]")));
+			Layout layout = new Layout(new ArrayList<>(Arrays.asList("[Json]")));
 			layout.replaceTextComponent("[Json]", BookUtil.TextBuilder.of(msg).color(ChatColor.AQUA)
 					.onHover(BookUtil.HoverAction.showText(value)).build());
 			book.addLayout(layout);
@@ -60,7 +60,7 @@ public class AdminVotePlaceholdersPlayer extends GUIHandler {
 			String value = placeholder.placeholderRequest(identifier);
 			String msg = identifier + " = " + value;
 
-			Layout layout = new Layout(new ArrayList<String>(Arrays.asList("[Json]")));
+			Layout layout = new Layout(new ArrayList<>(Arrays.asList("[Json]")));
 			layout.replaceTextComponent("[Json]", BookUtil.TextBuilder.of(msg).color(ChatColor.AQUA)
 					.onHover(BookUtil.HoverAction.showText(value)).build());
 			book.addLayout(layout);
@@ -70,12 +70,9 @@ public class AdminVotePlaceholdersPlayer extends GUIHandler {
 
 	@Override
 	public void onChat(CommandSender sender) {
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();
 		msg.add("&cPlaceholders:");
 		VotingPluginUser placeholderUser = user;
-		if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders() && user.hasPrimaryAccount()) {
-			placeholderUser = plugin.getVotingPluginUserManager().getVotingPluginUser(user.getPrimaryAccount());
-		}
 		for (PlaceHolder<VotingPluginUser> placeholder : plugin.getPlaceholders().getPlaceholders()) {
 			String identifier = placeholder.getIdentifier().toLowerCase();
 			if (identifier.endsWith("_")) {

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/admin/AdminVoteTopPoints.java

@@ -0,0 +1,173 @@
+package com.bencodez.votingplugin.commands.gui.admin;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Queue;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Player;
+
+import 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.rewards.RewardBuilder;
+import com.bencodez.advancedcore.api.user.UserDataFetchMode;
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.commands.gui.player.VoteGUI;
+import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
+import com.bencodez.votingplugin.user.VotingPluginUser;
+
+public class AdminVoteTopPoints extends GUIHandler {
+
+	@SuppressWarnings("unused")
+	private int page;
+	private VotingPluginMain plugin;
+	private VotingPluginUser user;
+
+	public AdminVoteTopPoints(VotingPluginMain plugin, CommandSender player, VotingPluginUser user, int page) {
+		super(plugin, player);
+		this.plugin = plugin;
+		this.user = user;
+		this.page = page;
+	}
+
+	@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) {
+		try {
+			Set<Entry<TopVoterPlayer, Integer>> users = null;
+
+			LinkedHashMap<TopVoterPlayer, Integer> topPoints1 = new LinkedHashMap<TopVoterPlayer, Integer>();
+
+			for (String uuid : plugin.getVotingPluginUserManager().getAllUUIDs()) {
+				VotingPluginUser vpUser = plugin.getVotingPluginUserManager()
+						.getVotingPluginUser(UUID.fromString(uuid));
+				vpUser.userDataFetechMode(UserDataFetchMode.NO_CACHE);
+				int points = vpUser.getPoints();
+				if (points > 0) {
+					topPoints1.put(vpUser.getTopVoterPlayer(), points);
+
+				}
+			}
+
+			LinkedHashMap<TopVoterPlayer, Integer> topPoints = plugin.getTopVoterHandler().sortByValues(topPoints1,
+					false);
+
+			users = topPoints.entrySet();
+
+			ConfigurationSection customization = plugin.getGui().getChestVoteTopCustomization();
+			boolean customzationEnabled = false;
+			Queue<Integer> playerSlots = new ConcurrentLinkedQueue<>();
+			if (customization != null) {
+				customzationEnabled = customization.getBoolean("Enabled");
+				List<Integer> customizationPlayerSlots = customization.getIntegerList("PlayerSlots");
+				playerSlots.addAll(customizationPlayerSlots);
+			}
+
+			BInventory inv = new BInventory("Top Points");
+			if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
+				inv.dontClose();
+			}
+
+			int pos = 1;
+			for (Entry<TopVoterPlayer, Integer> entry : users) {
+
+				ItemBuilder playerItem = new ItemBuilder(Material.PAPER);
+
+				if (plugin.getGui().isChestVoteTopUseSkull()) {
+					playerItem = new ItemBuilder(entry.getKey().getPlayerHead());
+				} else {
+					playerItem = new ItemBuilder(Material.valueOf(plugin.getGui().getChestVoteTopPlayerItemMaterial()));
+				}
+
+				playerItem.setLore(new ArrayList<>());
+
+				BInventoryButton button = new BInventoryButton(playerItem
+						.setName(plugin.getGui().getChestVoteTopItemName())
+						.addLoreLine(plugin.getGui().getChestVoteTopItemLore()).addPlaceholder("position", "" + pos)
+						.addPlaceholder("player", entry.getKey().getPlayerName())
+						.addPlaceholder("votes", "" + entry.getValue())) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						if (plugin.getGui().isChestVoteTopOpenMainGUIOnClick()) {
+							TopVoterPlayer user = (TopVoterPlayer) getData("User");
+							new VoteGUI(plugin, player, user.getUser())
+									.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
+						}
+					}
+				}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey());
+
+				if (customzationEnabled && !playerSlots.isEmpty()) {
+					button.setSlot(playerSlots.remove());
+				}
+
+				inv.setCloseInv(plugin.getGui().isChestVoteTopCloseGUIOnClick());
+
+				inv.addButton(button);
+				pos++;
+			}
+
+			if (plugin.getGui().isChestVoteTopBackButton()) {
+				if (customzationEnabled) {
+					inv.addButton(plugin.getCommandLoader().getBackButton(user)
+							.setSlot(customization.getInt("BackButtonSlot", 0)));
+				} else {
+					inv.getPageButtons().add(plugin.getCommandLoader().getBackButton(user).setSlot(1));
+				}
+			}
+
+			String guiPath = "VoteTop.Customization";
+			for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+				inv.addButton(
+						new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+							@Override
+							public void onClick(ClickEvent clickEvent) {
+								plugin.getCommandLoader().processSlotClick(player, user, str);
+								new RewardBuilder(plugin.getGui().getData(),
+										"CHEST." + guiPath + ".ExtraItems." + str + ".Rewards").setGiveOffline(false)
+										.send(clickEvent.getPlayer());
+
+							}
+						});
+			}
+
+			if (customization == null || !customzationEnabled || !customization.getBoolean("RemoveBottomBar")) {
+				inv.setPages(true);
+			}
+			inv.setMaxInvSize(plugin.getGui().getChestVoteTopSize());
+			inv.openInventory(player);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}

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

@@ -12,7 +12,7 @@ import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.editgui.EditGUI;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
-import com.bencodez.votingplugin.objects.VoteSite;
+import com.bencodez.votingplugin.votesites.VoteSite;
 
 public class AdminVoteVotePlayer extends GUIHandler {
 
@@ -44,7 +44,7 @@ public class AdminVoteVotePlayer extends GUIHandler {
 		EditGUI inv = new EditGUI("Trigger vote for " + playerName);
 		inv.requirePermission("VotingPlugin.Commands.AdminVote.Vote|VotingPlugin.Admin");
 
-		for (VoteSite site : plugin.getVoteSites()) {
+		for (VoteSite site : plugin.getVoteSiteManager().getVoteSitesEnabled()) {
 			inv.addButton(new BInventoryButton(site.getItem().setName(site.getKey())) {
 
 				@Override

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

@@ -15,11 +15,11 @@ 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 {
+public class AdminVoteVoteMilestoneRemove extends GUIHandler {
 
 	private VotingPluginMain plugin;
 
-	public AdminVoteMilestoneRemove(VotingPluginMain plugin, CommandSender player) {
+	public AdminVoteVoteMilestoneRemove(VotingPluginMain plugin, CommandSender player) {
 		super(plugin, player);
 		this.plugin = plugin;
 	}
@@ -40,9 +40,9 @@ public class AdminVoteMilestoneRemove extends GUIHandler {
 
 	@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()) {
+		BInventory inv = new BInventory("Remove VoteMilestones");
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteMilestones");
+		for (final String votes : plugin.getVoteMilestonesManager().getConfig().getMilestones().keySet()) {
 			inv.addButton(new BInventoryButton(
 					new ItemBuilder(Material.PAPER, 1).setName(votes).addLoreLine("&c&lClick to remove")) {
 
@@ -52,18 +52,17 @@ public class AdminVoteMilestoneRemove extends GUIHandler {
 
 						@Override
 						public void onConfirm(Player p) {
-							plugin.getSpecialRewardsConfig().removeMilestone(votes);
+							plugin.getSpecialRewardsConfig().removeVoteMilestone(votes);
 							p.sendMessage("Removed milestone " + votes);
 							plugin.reload();
 						}
 
 						@Override
 						public void onDeny(Player p) {
-							new AdminVoteMilestones(plugin, p);
+							new AdminVoteVoteMilestones(plugin, p);
 						}
 					}.open();
 
-
 				}
 			});
 		}

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

@@ -1,6 +1,7 @@
 package com.bencodez.votingplugin.commands.gui.admin.milestones;
 
 import java.util.ArrayList;
+import java.util.Set;
 
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
@@ -12,19 +13,20 @@ 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.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.api.valuerequest.listeners.StringListener;
 import com.bencodez.advancedcore.command.gui.RewardEditGUI;
+import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 
-public class AdminVoteMilestones extends GUIHandler {
+public class AdminVoteVoteMilestones extends GUIHandler {
 
 	private VotingPluginMain plugin;
 
-	public AdminVoteMilestones(VotingPluginMain plugin, CommandSender player) {
+	public AdminVoteVoteMilestones(VotingPluginMain plugin, CommandSender player) {
 		super(plugin, player);
 		this.plugin = plugin;
 	}
@@ -45,36 +47,31 @@ public class AdminVoteMilestones extends GUIHandler {
 
 	@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")) {
+		BInventory inv = new BInventory("Edit VoteMilestones");
+		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteMilestones");
+		inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER)
+				.setName("&cEdit existing vote milestone rewards (Legacy milestones not included)")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				Set<String> keys = plugin.getVoteMilestonesManager().getConfig().getMilestones().keySet();
+				for (String key : keys) {
+					if (key.startsWith("Legacy_")) {
+						keys.remove(key);
+					}
+				}
+				new ValueRequestBuilder(new StringListener() {
 
 					@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(),
-										plugin.getRewardHandler()
-												.getDirectlyDefined("MileStones." + value.intValue() + ".Rewards"));
-							}
-						}, options).allowCustomOption(false).usingMethod(InputMethod.INVENTORY)
-								.request(clickEvent.getPlayer());
-
+					public void onInput(Player player, String value) {
+						RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
+								plugin.getRewardHandler().getDirectlyDefined("VoteMilestones." + value + ".Rewards"));
 					}
-				});
+				}, ArrayUtils.convertSet(keys)).allowCustomOption(false).usingMethod(InputMethod.INVENTORY)
+						.request(clickEvent.getPlayer());
+
+			}
+		});
 
 		inv.addButton(new BInventoryButton(new ItemBuilder(Material.EMERALD_BLOCK).setName("&aAdd milestone")) {
 
@@ -84,7 +81,7 @@ public class AdminVoteMilestones extends GUIHandler {
 
 					@Override
 					public void onInput(Player player, Number value) {
-						plugin.getSpecialRewardsConfig().setMilestone(value.intValue());
+						plugin.getSpecialRewardsConfig().setVoteMilestone(value.intValue());
 						plugin.reload();
 					}
 				});
@@ -95,7 +92,7 @@ public class AdminVoteMilestones extends GUIHandler {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				new AdminVoteMilestoneRemove(plugin, clickEvent.getPlayer()).open();
+				new AdminVoteVoteMilestoneRemove(plugin, clickEvent.getPlayer()).open();
 			}
 		});
 		inv.openInventory(player);

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/admin/votelog/AdminVoteLogEventSelect.java

@@ -0,0 +1,145 @@
+package com.bencodez.votingplugin.commands.gui.admin.votelog;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+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.user.VotingPluginUser;
+import com.bencodez.votingplugin.votelog.VoteLogMysqlTable;
+
+/**
+ * Admin GUI: Select an event filter, then open AdminVoteLogRecent (filtered).
+ */
+public class AdminVoteLogEventSelect extends GUIHandler {
+
+	private final VotingPluginMain plugin;
+	private final VoteLogMysqlTable table;
+	private VotingPluginUser user;
+
+	private final int days;
+	private final int page;
+
+	private static final int PAGE_SIZE = 45;
+
+	public AdminVoteLogEventSelect(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table,
+			VotingPluginUser user, int days) {
+		this(plugin, sender, table, user, days, 0);
+	}
+
+	public AdminVoteLogEventSelect(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table,
+			VotingPluginUser user, int days, int page) {
+		super(plugin, sender);
+		this.plugin = plugin;
+		this.table = table;
+		this.user = user;
+		this.days = days;
+		this.page = Math.max(0, page);
+
+		if (this.user == null && sender instanceof Player) {
+			this.user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender);
+		}
+	}
+
+	@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) {
+		try {
+			String title = "&aVoteLog - Events";
+			if (days > 0) {
+				title += " &7(" + days + "d)";
+			}
+
+			BInventory inv = new BInventory(title);
+			inv.requirePermission("VotingPlugin.Commands.AdminVote.VoteLog");
+
+			if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
+				inv.dontClose();
+			}
+
+			if (table == null) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.BARRIER).setName("&cVoteLog unavailable")
+						.addLoreLine("&7VoteLog MySQL table is not loaded/enabled.")) {
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+					}
+				});
+
+				inv.setPages(true);
+				inv.setMaxInvSize(54);
+				inv.openInventory(player);
+				return;
+			}
+
+			List<VoteLogMysqlTable.VoteLogEvent> events = Arrays.asList(VoteLogMysqlTable.VoteLogEvent.values());
+
+			int start = page * PAGE_SIZE;
+			int end = Math.min(events.size(), start + PAGE_SIZE);
+
+			if (start >= events.size()) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&eNo events")
+						.addLoreLine("&7No events on this page.").addLoreLine("&7Try going back a page.")) {
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+					}
+				});
+			} else {
+				for (int i = start; i < end; i++) {
+					VoteLogMysqlTable.VoteLogEvent ev = events.get(i);
+					inv.addButton(makeEventButton(ev));
+				}
+			}
+
+			// back button
+			if (user != null && plugin.getGui().isChestVoteTopBackButton()) {
+				inv.getPageButtons().add(plugin.getCommandLoader().getBackButton(user).setSlot(7));
+			}
+
+			inv.setPages(true);
+			inv.setMaxInvSize(54);
+			inv.openInventory(player);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	private BInventoryButton makeEventButton(VoteLogMysqlTable.VoteLogEvent ev) {
+		ItemBuilder item = new ItemBuilder(Material.BOOK).setName("&a" + ev.name())
+				.addLoreLine("&7Click to view recent logs filtered by this event")
+				.addLoreLine(days > 0 ? "&7Window: &fLast " + days + " days" : "&7Window: &fAll time");
+
+		return new BInventoryButton(item) {
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteLogRecent(plugin, clickEvent.getPlayer(), table, user, 0, days, ev).open();
+			}
+		};
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/admin/votelog/AdminVoteLogHelpers.java

@@ -0,0 +1,85 @@
+package com.bencodez.votingplugin.commands.gui.admin.votelog;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.bukkit.Material;
+
+import com.bencodez.votingplugin.votelog.VoteLogMysqlTable;
+
+public class AdminVoteLogHelpers {
+	public static Material getMaterialForEvent(VoteLogMysqlTable.VoteLogEvent event, String status) {
+		// Cached entries still override to chest (keeps your current behavior)
+		if ("CACHED".equalsIgnoreCase(status)) {
+			return Material.CHEST;
+		}
+
+		if (event == null) {
+			return Material.PAPER;
+		}
+
+		switch (event) {
+		case VOTE_RECEIVED:
+			return Material.EMERALD;
+
+		case VOTEMILESTONE:
+			return Material.ANVIL;
+
+		case VOTE_STREAK_REWARD:
+			return Material.FIREWORK_ROCKET;
+
+		case TOP_VOTER_REWARD:
+			return Material.GOLD_BLOCK;
+
+		default:
+			return Material.PAPER;
+		}
+	}
+
+	public static String getEventColor(VoteLogMysqlTable.VoteLogEvent event) {
+		if (event == null) {
+			return "&7";
+		}
+
+		switch (event) {
+		case VOTE_RECEIVED:
+			return "&a";
+		case VOTEMILESTONE:
+			return "&6";
+
+		case VOTE_STREAK_REWARD:
+			return "&d";
+
+		case TOP_VOTER_REWARD:
+			return "&c";
+
+		default:
+			return "&7";
+		}
+	}
+
+	public static String safe(String s) {
+		return s == null ? "" : s;
+	}
+
+	public static boolean notEmpty(String s) {
+		return s != null && !s.trim().isEmpty();
+	}
+
+	public static String formatTime(long millis) {
+		try {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			return sdf.format(new Date(millis));
+		} catch (Exception e) {
+			return String.valueOf(millis);
+		}
+	}
+
+	public static String shortUuid(String uuid) {
+		if (uuid == null || uuid.isEmpty()) {
+			return "unknown";
+		}
+		return uuid.length() > 8 ? uuid.substring(0, 8) : uuid;
+	}
+
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/admin/votelog/AdminVoteLogMenu.java

@@ -0,0 +1,188 @@
+package com.bencodez.votingplugin.commands.gui.admin.votelog;
+
+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.user.VotingPluginUser;
+import com.bencodez.votingplugin.votelog.VoteLogMysqlTable;
+
+public class AdminVoteLogMenu extends GUIHandler {
+
+	private final VotingPluginMain plugin;
+	private final VoteLogMysqlTable table;
+	private VotingPluginUser user;
+
+	private final int days; // window used by selectors/stats (0 = all time)
+
+	// Default to "voting" (Vote received)
+	private final VoteLogMysqlTable.VoteLogEvent defaultEvent = VoteLogMysqlTable.VoteLogEvent.VOTE_RECEIVED;
+
+	public AdminVoteLogMenu(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table, int days) {
+		this(plugin, sender, table, null, days);
+	}
+
+	public AdminVoteLogMenu(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table,
+			VotingPluginUser user, int days) {
+		super(plugin, sender);
+		this.plugin = plugin;
+		this.table = table;
+		this.user = user;
+		if (this.user == null && sender instanceof Player) {
+			this.user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender);
+		}
+		this.days = Math.max(0, days);
+	}
+
+	@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) {
+		try {
+			String title = "&aVoteLog - Admin";
+			if (days > 0) {
+				title += " &7(" + days + "d)";
+			}
+
+			BInventory inv = new BInventory(title);
+			inv.requirePermission("VotingPlugin.Commands.AdminVote.VoteLog");
+
+			if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
+				inv.dontClose();
+			}
+
+			if (table == null) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.BARRIER).setName("&cVoteLog unavailable")
+						.addLoreLine("&7VoteLog MySQL table is not loaded/enabled.")) {
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op
+					}
+				});
+				inv.setPages(true);
+				inv.setMaxInvSize(54);
+				inv.openInventory(player);
+				return;
+			}
+
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.NAME_TAG).setName("&aVotes by Player")
+					.addLoreLine("&7List stored player names")
+					.addLoreLine("&7Click a player to view their votelog")) {
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					new AdminVoteLogPlayerSelect(plugin, clickEvent.getPlayer(), table, user, days, 0).open();
+				}
+			});
+
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.NAME_TAG).setName("&aVotes by Player (Online)")
+					.addLoreLine("&7List online players")
+					.addLoreLine("&7Click a player to view their votelog")) {
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					new AdminVoteLogPlayerSelectOnline(plugin, clickEvent.getPlayer(), table, user, days, 0).open();
+				}
+			});
+
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&aVotes by Service")
+					.addLoreLine("&7List all services found")
+					.addLoreLine("&7Click a service to view votelog")) {
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					new AdminVoteLogServiceSelect(plugin, clickEvent.getPlayer(), table, user, days, 0).open();
+				}
+			});
+
+			// NEW: Votes by Server
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.COMPASS).setName("&aVotes by Server")
+					.addLoreLine("&7List all servers found")
+					.addLoreLine("&7Click a server to view votelog")) {
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					new AdminVoteLogServerSelect(plugin, clickEvent.getPlayer(), table, user, days, 0).open();
+				}
+			});
+
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.MAP).setName("&aStats")
+					.addLoreLine("&7Overview counts/uniques/top services")
+					.addLoreLine(days > 0 ? "&7Window: &fLast " + days + " days" : "&7Window: &fAll time")) {
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					new AdminVoteLogStats(plugin, clickEvent.getPlayer(), table, user, days, 10).open();
+				}
+			});
+
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.CLOCK).setName("&aRecent Logs")
+					.addLoreLine("&7Recent logs filtered by event")
+					.addLoreLine("&7Default: &f" + defaultEvent.name())
+					.addLoreLine("&8(Use bottom buttons to switch event)")) {
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					// Open recent with default event filter
+					new AdminVoteLogRecent(plugin, clickEvent.getPlayer(), table, user, 0, days, defaultEvent).open();
+				}
+			});
+
+			addEventSwitchButtons(inv);
+
+			inv.setPages(true);
+			inv.setMaxInvSize(54);
+			inv.openInventory(player);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	private void addEventSwitchButtons(BInventory inv) {
+		inv.getPageButtons().add(new BInventoryButton(new ItemBuilder(Material.LIME_DYE)
+				.setName("&aEvent: &fVOTE_RECEIVED").addLoreLine("&7Show recent vote received events")) {
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteLogRecent(plugin, clickEvent.getPlayer(), table, user, 0, days,
+						VoteLogMysqlTable.VoteLogEvent.VOTE_RECEIVED).open();
+			}
+		}.setSlot(3));
+
+		// More... (open selector)
+		inv.getPageButtons().add(new BInventoryButton(
+				new ItemBuilder(Material.BOOK).setName("&aEvent: &fMore...").addLoreLine("&7Pick any event filter")) {
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteLogEventSelect(plugin, clickEvent.getPlayer(), table, user, days).open();
+			}
+		}.setSlot(4));
+
+		// All events
+		inv.getPageButtons().add(new BInventoryButton(new ItemBuilder(Material.GRAY_DYE).setName("&aEvent: &fALL")
+				.addLoreLine("&7Show recent logs for all events")) {
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteLogRecent(plugin, clickEvent.getPlayer(), table, user, 0, days, null).open();
+			}
+		}.setSlot(5));
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/admin/votelog/AdminVoteLogPlayer.java

@@ -0,0 +1,170 @@
+package com.bencodez.votingplugin.commands.gui.admin.votelog;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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.votelog.VoteLogMysqlTable;
+
+/**
+ * Admin GUI: VoteLog entries for a given player (paged).
+ *
+ * Uses VoteLogMysqlTable instance passed in from CommandLoader.
+ *
+ * Supports input as player name OR uuid string (you decide in CommandLoader
+ * which constructor to call).
+ */
+public class AdminVoteLogPlayer extends GUIHandler {
+
+	private final VotingPluginMain plugin;
+	private final VoteLogMysqlTable table;
+	private final int page;
+
+	private final String playerName;
+
+	private final int days;
+
+	private static final int PAGE_SIZE = 45;
+
+	public AdminVoteLogPlayer(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table, String playerName,
+			int days, int page) {
+		super(plugin, sender);
+		this.plugin = plugin;
+		this.table = table;
+		this.playerName = playerName;
+		this.days = days;
+		this.page = Math.max(0, page);
+
+	}
+
+	@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) {
+		try {
+			String title = "&aVoteLog - Player";
+			if (playerName != null && !playerName.isEmpty()) {
+				title += " &7(" + playerName + ")";
+			}
+
+			BInventory inv = new BInventory(title);
+			inv.requirePermission("VotingPlugin.Commands.AdminVote.VoteLog");
+
+			if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
+				inv.dontClose();
+			}
+
+			if (table == null) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.BARRIER).setName("&cVoteLog unavailable")
+						.addLoreLine("&7VoteLog MySQL table is not loaded/enabled.")) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op
+					}
+				});
+
+				inv.setPages(true);
+				inv.setMaxInvSize(54);
+				inv.openInventory(player);
+				return;
+			}
+
+			int needed = (page + 1) * PAGE_SIZE;
+
+			List<VoteLogMysqlTable.VoteLogEntry> rows = table.getByPlayerName(playerName, days, needed);
+
+			int start = page * PAGE_SIZE;
+			int end = Math.min(rows.size(), start + PAGE_SIZE);
+
+			if (start >= rows.size()) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&eNo entries")
+						.addLoreLine("&7No vote log entries on this page.").addLoreLine("&7Try going back a page.")) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op
+					}
+				});
+			} else {
+				for (int i = start; i < end; i++) {
+					inv.addButton(makeEntryButton(rows.get(i)));
+				}
+			}
+
+			inv.setPages(true);
+			inv.setMaxInvSize(54);
+			inv.openInventory(player);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	private BInventoryButton makeEntryButton(final VoteLogMysqlTable.VoteLogEntry entry) {
+		Material mat = "CACHED".equalsIgnoreCase(entry.status) ? Material.CHEST : Material.EMERALD;
+
+		String timeStr = AdminVoteLogHelpers.formatTime(entry.voteTime);
+		String uuidShort = AdminVoteLogHelpers.shortUuid(entry.playerUuid);
+		String voteShort = AdminVoteLogHelpers.shortUuid(entry.voteId);
+
+		// keep same name/lore layout you already have
+		ItemBuilder item = new ItemBuilder(mat)
+				.setName("&a" + AdminVoteLogHelpers.safe(entry.event) + " &7(" + voteShort + ")");
+
+		if (AdminVoteLogHelpers.notEmpty(entry.playerName) || AdminVoteLogHelpers.notEmpty(entry.playerUuid)) {
+			item.addLoreLine("&7Player: &f" + AdminVoteLogHelpers.safe(entry.playerName) + " &7(" + uuidShort + ")");
+		}
+		if (entry.voteTime > 0) {
+			item.addLoreLine("&7Time: &f" + timeStr);
+		}
+		if (AdminVoteLogHelpers.notEmpty(entry.service)) {
+			item.addLoreLine("&7Service: &f" + AdminVoteLogHelpers.safe(entry.service));
+		}
+		if (AdminVoteLogHelpers.notEmpty(entry.context)) {
+			item.addLoreLine("&7Context: &f" + AdminVoteLogHelpers.safe(entry.context));
+		}
+		if (AdminVoteLogHelpers.notEmpty(entry.status)) {
+			item.addLoreLine("&7Status: &f" + AdminVoteLogHelpers.safe(entry.status));
+		}
+		if (entry.proxyCachedTotal != 0) {
+			item.addLoreLine("&7Cached Total: &f" + entry.proxyCachedTotal);
+		}
+		if (AdminVoteLogHelpers.notEmpty(entry.voteId)) {
+			item.addLoreLine("&7VoteId: &f" + AdminVoteLogHelpers.safe(entry.voteId));
+		}
+
+		return new BInventoryButton(item) {
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				// vote_id is now the correlation id entry.voteId
+				new AdminVoteLogVoteId(plugin, clickEvent.getPlayer(), table, entry.voteId, days, 0).open();
+			}
+		};
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/admin/votelog/AdminVoteLogPlayerSelect.java

@@ -0,0 +1,140 @@
+package com.bencodez.votingplugin.commands.gui.admin.votelog;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.Bukkit;
+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.user.VotingPluginUser;
+import com.bencodez.votingplugin.votelog.VoteLogMysqlTable;
+
+/**
+ * Admin GUI: Select an ONLINE player, then open AdminVoteLogPlayer.
+ */
+public class AdminVoteLogPlayerSelect extends GUIHandler {
+
+	private final VotingPluginMain plugin;
+	private final VoteLogMysqlTable table;
+	private VotingPluginUser user;
+
+	private final int days;
+	private final int page;
+
+	private static final int PAGE_SIZE = 45;
+
+	public AdminVoteLogPlayerSelect(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table,
+			VotingPluginUser user, int days, int page) {
+		super(plugin, sender);
+		this.plugin = plugin;
+		this.table = table;
+		this.user = user;
+		this.days = Math.max(0, days);
+		this.page = Math.max(0, page);
+
+		if (this.user == null && sender instanceof Player) {
+			this.user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender);
+		}
+	}
+
+	@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) {
+		try {
+			String title = "&aVoteLog - Players";
+			if (days > 0) {
+				title += " &7(" + days + "d)";
+			}
+
+			BInventory inv = new BInventory(title);
+			inv.requirePermission("VotingPlugin.Commands.AdminVote.VoteLog");
+
+			if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
+				inv.dontClose();
+			}
+
+			if (table == null) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.BARRIER).setName("&cVoteLog unavailable")
+						.addLoreLine("&7VoteLog MySQL table is not loaded/enabled.")) {
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op
+					}
+				});
+
+				inv.setPages(true);
+				inv.setMaxInvSize(54);
+				inv.openInventory(player);
+				return;
+			}
+
+			List<Player> online = new ArrayList<>(Bukkit.getOnlinePlayers());
+
+			int start = page * PAGE_SIZE;
+			int end = Math.min(online.size(), start + PAGE_SIZE);
+
+			if (start >= online.size()) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&eNo players")
+						.addLoreLine("&7No online players on this page.").addLoreLine("&7Try going back a page.")) {
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op
+					}
+				});
+			} else {
+				for (int i = start; i < end; i++) {
+					Player p = online.get(i);
+					inv.addButton(makePlayerButton(p));
+				}
+			}
+
+			inv.setPages(true);
+			inv.setMaxInvSize(54);
+			inv.openInventory(player);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	private BInventoryButton makePlayerButton(final Player target) {
+		String name = target.getName();
+
+		ItemBuilder item = new ItemBuilder(Material.NAME_TAG).setName("&a" + name)
+				.addLoreLine("&7Click to open votelog for this player")
+				.addLoreLine(days > 0 ? "&7Window: &fLast " + days + " days" : "&7Window: &fAll time");
+
+		return new BInventoryButton(item) {
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteLogPlayer(plugin, clickEvent.getPlayer(), table, name, days, 0).open();
+			}
+		};
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/admin/votelog/AdminVoteLogPlayerSelectOnline.java

@@ -0,0 +1,136 @@
+package com.bencodez.votingplugin.commands.gui.admin.votelog;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.Bukkit;
+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.user.VotingPluginUser;
+import com.bencodez.votingplugin.votelog.VoteLogMysqlTable;
+
+/**
+ * Admin GUI: Select an ONLINE player, then open AdminVoteLogPlayer.
+ */
+public class AdminVoteLogPlayerSelectOnline extends GUIHandler {
+
+	private final VotingPluginMain plugin;
+	private final VoteLogMysqlTable table;
+	private VotingPluginUser user;
+
+	private final int days;
+	private final int page;
+
+	private static final int PAGE_SIZE = 45;
+
+	public AdminVoteLogPlayerSelectOnline(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table,
+			VotingPluginUser user, int days, int page) {
+		super(plugin, sender);
+		this.plugin = plugin;
+		this.table = table;
+		this.user = user;
+		this.days = days;
+		this.page = Math.max(0, page);
+
+		if (this.user == null && sender instanceof Player) {
+			this.user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender);
+		}
+	}
+
+	@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) {
+		try {
+			String title = "&aVoteLog - Players";
+			if (days > 0) {
+				title += " &7(" + days + "d)";
+			}
+
+			BInventory inv = new BInventory(title);
+			inv.requirePermission("VotingPlugin.Commands.AdminVote.VoteLog");
+
+			if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
+				inv.dontClose();
+			}
+
+			if (table == null) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.BARRIER).setName("&cVoteLog unavailable")
+						.addLoreLine("&7VoteLog MySQL table is not loaded/enabled.")) {
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+					}
+				});
+				inv.setPages(true);
+				inv.setMaxInvSize(54);
+				inv.openInventory(player);
+				return;
+			}
+
+			List<Player> online = new ArrayList<>(Bukkit.getOnlinePlayers());
+
+			int start = page * PAGE_SIZE;
+			int end = Math.min(online.size(), start + PAGE_SIZE);
+
+			if (start >= online.size()) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&eNo players")
+						.addLoreLine("&7No online players on this page.").addLoreLine("&7Try going back a page.")) {
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+					}
+				});
+			} else {
+				for (int i = start; i < end; i++) {
+					Player p = online.get(i);
+					inv.addButton(makePlayerButton(p));
+				}
+			}
+
+			inv.setPages(true);
+			inv.setMaxInvSize(54);
+			inv.openInventory(player);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	private BInventoryButton makePlayerButton(Player target) {
+		String name = target.getName();
+
+		ItemBuilder item = new ItemBuilder(Material.NAME_TAG).setName("&a" + name)
+				.addLoreLine("&7Click to open votelog for this player")
+				.addLoreLine(days > 0 ? "&7Window: &fLast " + days + " days" : "&7Window: &fAll time");
+
+		return new BInventoryButton(item) {
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteLogPlayer(plugin, clickEvent.getPlayer(), table, name, days, 0).open();
+			}
+		};
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/admin/votelog/AdminVoteLogRecent.java

@@ -0,0 +1,222 @@
+package com.bencodez.votingplugin.commands.gui.admin.votelog;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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.user.VotingPluginUser;
+import com.bencodez.votingplugin.votelog.VoteLogMysqlTable;
+
+/**
+ * Admin GUI: Recent VoteLog entries (paged).
+ *
+ * Now supports optional event filter + days window.
+ */
+public class AdminVoteLogRecent extends GUIHandler {
+
+	private final VotingPluginMain plugin;
+	private final VoteLogMysqlTable table;
+	private VotingPluginUser user;
+
+	private final int page;
+
+	private final int days; // 0 = all time
+	private final VoteLogMysqlTable.VoteLogEvent event; // null = all events
+
+	private static final int PAGE_SIZE = 45;
+
+	public AdminVoteLogRecent(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table, int page) {
+		this(plugin, sender, table, null, page, 0, null);
+	}
+
+	public AdminVoteLogRecent(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table,
+			VotingPluginUser user, int page) {
+		this(plugin, sender, table, user, page, 0, null);
+	}
+
+	// NEW constructor used by Menu/EventSelect
+	public AdminVoteLogRecent(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table,
+			VotingPluginUser user, int page, int days, VoteLogMysqlTable.VoteLogEvent event) {
+		super(plugin, sender);
+		this.plugin = plugin;
+		this.table = table;
+		this.user = user;
+		if (this.user == null && sender instanceof Player) {
+			this.user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender);
+		}
+		this.page = Math.max(0, page);
+		this.days = Math.max(0, days);
+		this.event = event;
+	}
+
+	@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) {
+		try {
+			String title = "&aVoteLog - Recent";
+			if (event != null) {
+				title += " &7(" + event.name() + ")";
+			}
+			if (days > 0) {
+				title += " &7(" + days + "d)";
+			}
+
+			BInventory inv = new BInventory(title);
+			inv.requirePermission("VotingPlugin.Commands.AdminVote.VoteLog");
+
+			if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
+				inv.dontClose();
+			}
+
+			if (table == null) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.BARRIER).setName("&cVoteLog unavailable")
+						.addLoreLine("&7VoteLog MySQL table is not loaded/enabled.")) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+					}
+				});
+
+				inv.setPages(true);
+				inv.setMaxInvSize(54);
+				inv.openInventory(player);
+				return;
+			}
+
+			int needed = (page + 1) * PAGE_SIZE;
+
+			List<VoteLogMysqlTable.VoteLogEntry> rows;
+			if (event == null) {
+				rows = (days > 0) ? table.getRecentAll(days, needed) : table.getRecent(needed);
+			} else {
+				rows = table.getRecentByEvent(event, days, needed);
+			}
+
+			int start = page * PAGE_SIZE;
+			int end = Math.min(rows.size(), start + PAGE_SIZE);
+
+			if (start >= rows.size()) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&eNo entries")
+						.addLoreLine("&7No vote log entries on this page.").addLoreLine("&7Try going back a page.")) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+					}
+				});
+			} else {
+				for (int i = start; i < end; i++) {
+					inv.addButton(makeEntryButton(rows.get(i)));
+				}
+			}
+
+			addEventSwitchButtons(inv);
+
+			inv.setPages(true);
+			inv.setMaxInvSize(54);
+			inv.openInventory(player);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	private void addEventSwitchButtons(BInventory inv) {
+		inv.getPageButtons().add(new BInventoryButton(new ItemBuilder(Material.LIME_DYE)
+				.setName("&aEvent: &fVOTE_RECEIVED").addLoreLine("&7Show recent vote received events")) {
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteLogRecent(plugin, clickEvent.getPlayer(), table, user, 0, days,
+						VoteLogMysqlTable.VoteLogEvent.VOTE_RECEIVED).open();
+			}
+		}.setSlot(3));
+
+		// More... (open selector)
+		inv.getPageButtons().add(new BInventoryButton(
+				new ItemBuilder(Material.BOOK).setName("&aEvent: &fMore...").addLoreLine("&7Pick any event filter")) {
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteLogEventSelect(plugin, clickEvent.getPlayer(), table, user, days).open();
+			}
+		}.setSlot(4));
+
+		// All events
+		inv.getPageButtons().add(new BInventoryButton(new ItemBuilder(Material.GRAY_DYE).setName("&aEvent: &fALL")
+				.addLoreLine("&7Show recent logs for all events")) {
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteLogRecent(plugin, clickEvent.getPlayer(), table, user, 0, days, null).open();
+			}
+		}.setSlot(5));
+	}
+
+	private BInventoryButton makeEntryButton(final VoteLogMysqlTable.VoteLogEntry entry) {
+		VoteLogMysqlTable.VoteLogEvent event = entry.event != null ? VoteLogMysqlTable.VoteLogEvent.valueOf(entry.event)
+				: null;
+
+		Material mat = AdminVoteLogHelpers.getMaterialForEvent(event, entry.status);
+
+		String eventColor = AdminVoteLogHelpers.getEventColor(event);
+
+		String timeStr = AdminVoteLogHelpers.formatTime(entry.voteTime);
+		String uuidShort = AdminVoteLogHelpers.shortUuid(entry.playerUuid);
+		String voteShort = AdminVoteLogHelpers.shortUuid(entry.voteId);
+
+		ItemBuilder item = new ItemBuilder(mat)
+				.setName(eventColor + AdminVoteLogHelpers.safe(entry.event) + " &7(" + voteShort + ")");
+
+		if (AdminVoteLogHelpers.notEmpty(entry.playerName) || AdminVoteLogHelpers.notEmpty(entry.playerUuid)) {
+			item.addLoreLine("&7Player: &f" + AdminVoteLogHelpers.safe(entry.playerName) + " &7(" + uuidShort + ")");
+		}
+		if (entry.voteTime > 0) {
+			item.addLoreLine("&7Time: &f" + timeStr);
+		}
+		if (AdminVoteLogHelpers.notEmpty(entry.service)) {
+			item.addLoreLine("&7Service: &f" + AdminVoteLogHelpers.safe(entry.service));
+		}
+		if (AdminVoteLogHelpers.notEmpty(entry.context)) {
+			item.addLoreLine("&7Context: &f" + AdminVoteLogHelpers.safe(entry.context));
+		}
+		if (AdminVoteLogHelpers.notEmpty(entry.status)) {
+			item.addLoreLine("&7Status: &f" + AdminVoteLogHelpers.safe(entry.status));
+		}
+		if (entry.proxyCachedTotal != 0) {
+			item.addLoreLine("&7Cached Total: &f" + entry.proxyCachedTotal);
+		}
+		if (AdminVoteLogHelpers.notEmpty(entry.voteId)) {
+			item.addLoreLine("&7VoteId: &f" + AdminVoteLogHelpers.safe(entry.voteId));
+		}
+
+		return new BInventoryButton(item) {
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteLogVoteId(plugin, clickEvent.getPlayer(), table, entry.voteId, days, 0).open();
+			}
+		};
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/admin/votelog/AdminVoteLogServer.java

@@ -0,0 +1,178 @@
+package com.bencodez.votingplugin.commands.gui.admin.votelog;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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.user.VotingPluginUser;
+import com.bencodez.votingplugin.votelog.VoteLogMysqlTable;
+
+/**
+ * Admin GUI: VoteLog entries for a given server (paged).
+ *
+ * Uses VoteLogMysqlTable instance passed in from CommandLoader.
+ */
+public class AdminVoteLogServer extends GUIHandler {
+
+	private final VotingPluginMain plugin;
+	private final VoteLogMysqlTable table;
+	private VotingPluginUser user;
+	private final int page;
+
+	private final String server;
+	private final int days;
+
+	private static final int PAGE_SIZE = 45;
+
+	public AdminVoteLogServer(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table, String server,
+			int days, int page) {
+		super(plugin, sender);
+		this.plugin = plugin;
+		this.table = table;
+		this.server = server;
+		this.days = Math.max(0, days);
+		this.page = Math.max(0, page);
+
+		if (sender instanceof Player) {
+			this.user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender);
+		}
+	}
+
+	public AdminVoteLogServer(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table,
+			VotingPluginUser user, String server, int days, int page) {
+		this(plugin, sender, table, server, days, page);
+		this.user = user;
+		if (this.user == null && sender instanceof Player) {
+			this.user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender);
+		}
+	}
+
+	@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) {
+		try {
+			BInventory inv = new BInventory("&aVoteLog - Server &7(" + AdminVoteLogHelpers.safe(server) + ")");
+			inv.requirePermission("VotingPlugin.Commands.AdminVote.VoteLog");
+
+			if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
+				inv.dontClose();
+			}
+
+			if (table == null) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.BARRIER).setName("&cVoteLog unavailable")
+						.addLoreLine("&7VoteLog MySQL table is not loaded/enabled.")) {
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op
+					}
+				});
+
+				inv.setPages(true);
+				inv.setMaxInvSize(54);
+				inv.openInventory(player);
+				return;
+			}
+
+			int needed = (page + 1) * PAGE_SIZE;
+			List<VoteLogMysqlTable.VoteLogEntry> rows = table.getByServer(server, days, needed);
+
+			int start = page * PAGE_SIZE;
+			int end = Math.min(rows.size(), start + PAGE_SIZE);
+
+			if (start >= rows.size()) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&eNo entries")
+						.addLoreLine("&7No vote log entries on this page.").addLoreLine("&7Try going back a page.")) {
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op
+					}
+				});
+			} else {
+				for (int i = start; i < end; i++) {
+					inv.addButton(makeEntryButton(rows.get(i)));
+				}
+			}
+
+			inv.setPages(true);
+			inv.setMaxInvSize(54);
+			inv.openInventory(player);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	private BInventoryButton makeEntryButton(final VoteLogMysqlTable.VoteLogEntry entry) {
+		VoteLogMysqlTable.VoteLogEvent event =
+				entry.event != null ? VoteLogMysqlTable.VoteLogEvent.valueOf(entry.event) : null;
+
+		Material mat = AdminVoteLogHelpers.getMaterialForEvent(event, entry.status);
+		String eventColor = AdminVoteLogHelpers.getEventColor(event);
+
+		String timeStr = AdminVoteLogHelpers.formatTime(entry.voteTime);
+		String uuidShort = AdminVoteLogHelpers.shortUuid(entry.playerUuid);
+		String voteShort = AdminVoteLogHelpers.shortUuid(entry.voteId);
+
+		ItemBuilder item = new ItemBuilder(mat)
+				.setName(eventColor + AdminVoteLogHelpers.safe(entry.event) + " &7(" + voteShort + ")");
+
+		if (AdminVoteLogHelpers.notEmpty(entry.playerName) || AdminVoteLogHelpers.notEmpty(entry.playerUuid)) {
+			item.addLoreLine("&7Player: &f" + AdminVoteLogHelpers.safe(entry.playerName) + " &7(" + uuidShort + ")");
+		}
+		if (entry.voteTime > 0) {
+			item.addLoreLine("&7Time: &f" + timeStr);
+		}
+		if (AdminVoteLogHelpers.notEmpty(entry.server)) {
+			item.addLoreLine("&7Server: &f" + AdminVoteLogHelpers.safe(entry.server));
+		}
+		if (AdminVoteLogHelpers.notEmpty(entry.service)) {
+			item.addLoreLine("&7Service: &f" + AdminVoteLogHelpers.safe(entry.service));
+		}
+		if (AdminVoteLogHelpers.notEmpty(entry.context)) {
+			item.addLoreLine("&7Context: &f" + AdminVoteLogHelpers.safe(entry.context));
+		}
+		if (AdminVoteLogHelpers.notEmpty(entry.status)) {
+			item.addLoreLine("&7Status: &f" + AdminVoteLogHelpers.safe(entry.status));
+		}
+		if (entry.proxyCachedTotal != 0) {
+			item.addLoreLine("&7Cached Total: &f" + entry.proxyCachedTotal);
+		}
+		if (AdminVoteLogHelpers.notEmpty(entry.voteId)) {
+			item.addLoreLine("&7VoteId: &f" + AdminVoteLogHelpers.safe(entry.voteId));
+		}
+
+		return new BInventoryButton(item) {
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				// vote_id is the correlation id
+				new AdminVoteLogVoteId(plugin, clickEvent.getPlayer(), table, entry.voteId, days, 0).open();
+			}
+		};
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/admin/votelog/AdminVoteLogServerSelect.java

@@ -0,0 +1,137 @@
+package com.bencodez.votingplugin.commands.gui.admin.votelog;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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.user.VotingPluginUser;
+import com.bencodez.votingplugin.votelog.VoteLogMysqlTable;
+
+/**
+ * Admin GUI: Select a server (distinct list), then open AdminVoteLogServer.
+ */
+public class AdminVoteLogServerSelect extends GUIHandler {
+
+	private final VotingPluginMain plugin;
+	private final VoteLogMysqlTable table;
+	private VotingPluginUser user;
+
+	private final int days;
+	private final int page;
+
+	private static final int PAGE_SIZE = 45;
+
+	public AdminVoteLogServerSelect(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table,
+			VotingPluginUser user, int days, int page) {
+		super(plugin, sender);
+		this.plugin = plugin;
+		this.table = table;
+		this.user = user;
+		this.days = Math.max(0, days);
+		this.page = Math.max(0, page);
+
+		if (this.user == null && sender instanceof Player) {
+			this.user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender);
+		}
+	}
+
+	@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) {
+		try {
+			String title = "&aVoteLog - Servers";
+			if (days > 0) {
+				title += " &7(" + days + "d)";
+			}
+
+			BInventory inv = new BInventory(title);
+			inv.requirePermission("VotingPlugin.Commands.AdminVote.VoteLog");
+
+			if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
+				inv.dontClose();
+			}
+
+			if (table == null) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.BARRIER).setName("&cVoteLog unavailable")
+						.addLoreLine("&7VoteLog MySQL table is not loaded/enabled.")) {
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op
+					}
+				});
+
+				inv.setPages(true);
+				inv.setMaxInvSize(54);
+				inv.openInventory(player);
+				return;
+			}
+
+			int needed = (page + 1) * PAGE_SIZE;
+			List<String> servers = table.getDistinctServers(days, needed);
+
+			int start = page * PAGE_SIZE;
+			int end = Math.min(servers.size(), start + PAGE_SIZE);
+
+			if (start >= servers.size()) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&eNo servers")
+						.addLoreLine("&7No servers on this page.").addLoreLine("&7Try going back a page.")) {
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op
+					}
+				});
+			} else {
+				for (int i = start; i < end; i++) {
+					String srv = servers.get(i);
+					inv.addButton(makeServerButton(srv));
+				}
+			}
+
+			inv.setPages(true);
+			inv.setMaxInvSize(54);
+			inv.openInventory(player);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	private BInventoryButton makeServerButton(final String server) {
+		ItemBuilder item = new ItemBuilder(Material.PAPER).setName("&a" + AdminVoteLogHelpers.safe(server))
+				.addLoreLine("&7Click to open votelog for this server")
+				.addLoreLine(days > 0 ? "&7Window: &fLast " + days + " days" : "&7Window: &fAll time");
+
+		return new BInventoryButton(item) {
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteLogServer(plugin, clickEvent.getPlayer(), table, server, days, 0).open();
+			}
+		};
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/admin/votelog/AdminVoteLogService.java

@@ -0,0 +1,178 @@
+package com.bencodez.votingplugin.commands.gui.admin.votelog;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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.user.VotingPluginUser;
+import com.bencodez.votingplugin.votelog.VoteLogMysqlTable;
+
+/**
+ * Admin GUI: VoteLog entries for a given service/site (paged).
+ *
+ * Uses VoteLogMysqlTable instance passed in from CommandLoader.
+ */
+public class AdminVoteLogService extends GUIHandler {
+
+	private final VotingPluginMain plugin;
+	private final VoteLogMysqlTable table;
+	private VotingPluginUser user;
+	private final int page;
+
+	private final String service;
+	private final int days;
+
+	private static final int PAGE_SIZE = 45;
+
+	public AdminVoteLogService(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table, String service,
+			int days, int page) {
+		super(plugin, sender);
+		this.plugin = plugin;
+		this.table = table;
+		this.service = service;
+		this.days = days;
+		this.page = Math.max(0, page);
+
+		if (sender instanceof Player) {
+			this.user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender);
+		}
+	}
+
+	public AdminVoteLogService(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table,
+			VotingPluginUser user, String service, int days, int page) {
+		this(plugin, sender, table, service, days, page);
+		this.user = user;
+		if (this.user == null && sender instanceof Player) {
+			this.user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender);
+		}
+	}
+
+	@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) {
+		try {
+			BInventory inv = new BInventory("&aVoteLog - Service &7(" + AdminVoteLogHelpers.safe(service) + ")");
+			inv.requirePermission("VotingPlugin.Commands.AdminVote.VoteLog");
+
+			if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
+				inv.dontClose();
+			}
+
+			if (table == null) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.BARRIER).setName("&cVoteLog unavailable")
+						.addLoreLine("&7VoteLog MySQL table is not loaded/enabled.")) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op
+					}
+				});
+
+				inv.setPages(true);
+				inv.setMaxInvSize(54);
+				inv.openInventory(player);
+				return;
+			}
+
+			int needed = (page + 1) * PAGE_SIZE;
+			List<VoteLogMysqlTable.VoteLogEntry> rows = table.getByService(service, days, needed);
+
+			int start = page * PAGE_SIZE;
+			int end = Math.min(rows.size(), start + PAGE_SIZE);
+
+			if (start >= rows.size()) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&eNo entries")
+						.addLoreLine("&7No vote log entries on this page.").addLoreLine("&7Try going back a page.")) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op
+					}
+				});
+			} else {
+				for (int i = start; i < end; i++) {
+					inv.addButton(makeEntryButton(rows.get(i)));
+				}
+			}
+
+			inv.setPages(true);
+			inv.setMaxInvSize(54);
+			inv.openInventory(player);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	private BInventoryButton makeEntryButton(final VoteLogMysqlTable.VoteLogEntry entry) {
+		VoteLogMysqlTable.VoteLogEvent event =
+				entry.event != null ? VoteLogMysqlTable.VoteLogEvent.valueOf(entry.event) : null;
+
+		Material mat = AdminVoteLogHelpers.getMaterialForEvent(event, entry.status);
+
+		String eventColor = AdminVoteLogHelpers.getEventColor(event);
+
+		String timeStr = AdminVoteLogHelpers.formatTime(entry.voteTime);
+		String uuidShort = AdminVoteLogHelpers.shortUuid(entry.playerUuid);
+		String voteShort = AdminVoteLogHelpers.shortUuid(entry.voteId);
+
+		ItemBuilder item = new ItemBuilder(mat)
+				.setName(eventColor + AdminVoteLogHelpers.safe(entry.event) + " &7(" + voteShort + ")");
+
+		if (AdminVoteLogHelpers.notEmpty(entry.playerName) || AdminVoteLogHelpers.notEmpty(entry.playerUuid)) {
+			item.addLoreLine("&7Player: &f" + AdminVoteLogHelpers.safe(entry.playerName) + " &7(" + uuidShort + ")");
+		}
+		if (entry.voteTime > 0) {
+			item.addLoreLine("&7Time: &f" + timeStr);
+		}
+		if (AdminVoteLogHelpers.notEmpty(entry.service)) {
+			item.addLoreLine("&7Service: &f" + AdminVoteLogHelpers.safe(entry.service));
+		}
+		if (AdminVoteLogHelpers.notEmpty(entry.context)) {
+			item.addLoreLine("&7Context: &f" + AdminVoteLogHelpers.safe(entry.context));
+		}
+		if (AdminVoteLogHelpers.notEmpty(entry.status)) {
+			item.addLoreLine("&7Status: &f" + AdminVoteLogHelpers.safe(entry.status));
+		}
+		if (entry.proxyCachedTotal != 0) {
+			item.addLoreLine("&7Cached Total: &f" + entry.proxyCachedTotal);
+		}
+		if (AdminVoteLogHelpers.notEmpty(entry.voteId)) {
+			item.addLoreLine("&7VoteId: &f" + AdminVoteLogHelpers.safe(entry.voteId));
+		}
+
+		return new BInventoryButton(item) {
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				// vote_id is the correlation id
+				new AdminVoteLogVoteId(plugin, clickEvent.getPlayer(), table, entry.voteId, days, 0).open();
+			}
+		};
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/admin/votelog/AdminVoteLogServiceSelect.java

@@ -0,0 +1,137 @@
+package com.bencodez.votingplugin.commands.gui.admin.votelog;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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.user.VotingPluginUser;
+import com.bencodez.votingplugin.votelog.VoteLogMysqlTable;
+
+/**
+ * Admin GUI: Select a service (distinct list), then open AdminVoteLogService.
+ */
+public class AdminVoteLogServiceSelect extends GUIHandler {
+
+	private final VotingPluginMain plugin;
+	private final VoteLogMysqlTable table;
+	private VotingPluginUser user;
+
+	private final int days;
+	private final int page;
+
+	private static final int PAGE_SIZE = 45;
+
+	public AdminVoteLogServiceSelect(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table,
+			VotingPluginUser user, int days, int page) {
+		super(plugin, sender);
+		this.plugin = plugin;
+		this.table = table;
+		this.user = user;
+		this.days = Math.max(0, days);
+		this.page = Math.max(0, page);
+
+		if (this.user == null && sender instanceof Player) {
+			this.user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender);
+		}
+	}
+
+	@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) {
+		try {
+			String title = "&aVoteLog - Services";
+			if (days > 0) {
+				title += " &7(" + days + "d)";
+			}
+
+			BInventory inv = new BInventory(title);
+			inv.requirePermission("VotingPlugin.Commands.AdminVote.VoteLog");
+
+			if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
+				inv.dontClose();
+			}
+
+			if (table == null) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.BARRIER).setName("&cVoteLog unavailable")
+						.addLoreLine("&7VoteLog MySQL table is not loaded/enabled.")) {
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op
+					}
+				});
+
+				inv.setPages(true);
+				inv.setMaxInvSize(54);
+				inv.openInventory(player);
+				return;
+			}
+
+			int needed = (page + 1) * PAGE_SIZE;
+			List<String> services = table.getDistinctServices(days, needed);
+
+			int start = page * PAGE_SIZE;
+			int end = Math.min(services.size(), start + PAGE_SIZE);
+
+			if (start >= services.size()) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&eNo services")
+						.addLoreLine("&7No services on this page.").addLoreLine("&7Try going back a page.")) {
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op
+					}
+				});
+			} else {
+				for (int i = start; i < end; i++) {
+					String svc = services.get(i);
+					inv.addButton(makeServiceButton(svc));
+				}
+			}
+
+			inv.setPages(true);
+			inv.setMaxInvSize(54);
+			inv.openInventory(player);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	private BInventoryButton makeServiceButton(final String service) {
+		ItemBuilder item = new ItemBuilder(Material.PAPER).setName("&a" + AdminVoteLogHelpers.safe(service))
+				.addLoreLine("&7Click to open votelog for this service")
+				.addLoreLine(days > 0 ? "&7Window: &fLast " + days + " days" : "&7Window: &fAll time");
+
+		return new BInventoryButton(item) {
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteLogService(plugin, clickEvent.getPlayer(), table, service, days, 0).open();
+			}
+		};
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/admin/votelog/AdminVoteLogServiceSelectAll.java

@@ -0,0 +1,135 @@
+package com.bencodez.votingplugin.commands.gui.admin.votelog;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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.user.VotingPluginUser;
+import com.bencodez.votingplugin.votelog.VoteLogMysqlTable;
+
+/**
+ * Admin GUI: Select a service from DB (distinct services), then open
+ * AdminVoteLogService.
+ */
+public class AdminVoteLogServiceSelectAll extends GUIHandler {
+
+	private final VotingPluginMain plugin;
+	private final VoteLogMysqlTable table;
+	private VotingPluginUser user;
+
+	private final int days;
+	private final int page;
+
+	private static final int PAGE_SIZE = 45;
+
+	public AdminVoteLogServiceSelectAll(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table,
+			VotingPluginUser user, int days, int page) {
+		super(plugin, sender);
+		this.plugin = plugin;
+		this.table = table;
+		this.user = user;
+		this.days = days;
+		this.page = Math.max(0, page);
+
+		if (this.user == null && sender instanceof Player) {
+			this.user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender);
+		}
+	}
+
+	@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) {
+		try {
+			String title = "&aVoteLog - Services";
+			if (days > 0) {
+				title += " &7(" + days + "d)";
+			}
+
+			BInventory inv = new BInventory(title);
+			inv.requirePermission("VotingPlugin.Commands.AdminVote.VoteLog");
+
+			if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
+				inv.dontClose();
+			}
+
+			if (table == null) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.BARRIER).setName("&cVoteLog unavailable")
+						.addLoreLine("&7VoteLog MySQL table is not loaded/enabled.")) {
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+					}
+				});
+				inv.setPages(true);
+				inv.setMaxInvSize(54);
+				inv.openInventory(player);
+				return;
+			}
+
+			int needed = (page + 1) * PAGE_SIZE;
+			List<String> services = table.getDistinctServices(days, needed);
+
+			int start = page * PAGE_SIZE;
+			int end = Math.min(services.size(), start + PAGE_SIZE);
+
+			if (start >= services.size()) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&eNo services")
+						.addLoreLine("&7No services on this page.").addLoreLine("&7Try going back a page.")) {
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+					}
+				});
+			} else {
+				for (int i = start; i < end; i++) {
+					String svc = services.get(i);
+					inv.addButton(makeServiceButton(svc));
+				}
+			}
+
+			inv.setPages(true);
+			inv.setMaxInvSize(54);
+			inv.openInventory(player);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	private BInventoryButton makeServiceButton(String service) {
+		ItemBuilder item = new ItemBuilder(Material.PAPER).setName("&a" + AdminVoteLogHelpers.safe(service))
+				.addLoreLine("&7Click to open votelog for this service")
+				.addLoreLine(days > 0 ? "&7Window: &fLast " + days + " days" : "&7Window: &fAll time");
+
+		return new BInventoryButton(item) {
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new AdminVoteLogService(plugin, clickEvent.getPlayer(), table, service, days, 0).open();
+			}
+		};
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/admin/votelog/AdminVoteLogStats.java

@@ -0,0 +1,211 @@
+package com.bencodez.votingplugin.commands.gui.admin.votelog;
+
+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.user.VotingPluginUser;
+import com.bencodez.votingplugin.votelog.VoteLogMysqlTable;
+
+/**
+ * Admin GUI: VoteLog stats overview.
+ *
+ * Uses VoteLogMysqlTable instance passed in from CommandLoader.
+ *
+ * Shows:
+ * - total / immediate / cached counts (VoteLogCounts)
+ * - unique voters
+ * - top services
+ * - top servers
+ */
+public class AdminVoteLogStats extends GUIHandler {
+
+	private final VotingPluginMain plugin;
+	private final VoteLogMysqlTable table;
+	private VotingPluginUser user;
+
+	private final int days;
+
+	private final int topServicesLimit;
+	private final int topServersLimit;
+
+	public AdminVoteLogStats(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table, int days) {
+		this(plugin, sender, table, null, days, 10, 10);
+	}
+
+	public AdminVoteLogStats(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table,
+			VotingPluginUser user, int days, int topServicesLimit) {
+		this(plugin, sender, table, user, days, topServicesLimit, 10);
+	}
+
+	public AdminVoteLogStats(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table,
+			VotingPluginUser user, int days, int topServicesLimit, int topServersLimit) {
+		super(plugin, sender);
+		this.plugin = plugin;
+		this.table = table;
+		this.user = user;
+		if (this.user == null && sender instanceof Player) {
+			this.user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender);
+		}
+		this.days = Math.max(0, days);
+		this.topServicesLimit = topServicesLimit <= 0 ? 10 : topServicesLimit;
+		this.topServersLimit = topServersLimit <= 0 ? 10 : topServersLimit;
+	}
+
+	@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) {
+		try {
+			String title = "&aVoteLog - Stats";
+			if (days > 0) {
+				title += " &7(" + days + "d)";
+			}
+
+			BInventory inv = new BInventory(title);
+			inv.requirePermission("VotingPlugin.Commands.AdminVote.VoteLog");
+
+			if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
+				inv.dontClose();
+			}
+
+			if (table == null) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.BARRIER).setName("&cVoteLog unavailable")
+						.addLoreLine("&7VoteLog MySQL table is not loaded/enabled.")) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op
+					}
+				});
+
+				inv.setPages(true);
+				inv.setMaxInvSize(54);
+				inv.openInventory(player);
+				return;
+			}
+
+			// counts
+			VoteLogMysqlTable.VoteLogCounts counts = table.getCounts(days);
+			long uniques = table.getUniqueVoters(days);
+
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.BOOK).setName("&aOverview")
+					.addLoreLine("&7Total Votes: &f" + counts.total)
+					.addLoreLine("&7Immediate: &f" + counts.immediate)
+					.addLoreLine("&7Cached: &f" + counts.cached)
+					.addLoreLine("&7Unique Voters: &f" + uniques)
+					.addLoreLine(days > 0 ? "&7Window: &fLast " + days + " days" : "&7Window: &fAll time")) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					// no-op
+				}
+			});
+
+			// top services header
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.MAP).setName("&aTop Services")
+					.addLoreLine("&7Top " + topServicesLimit + " services/sites:")
+					.addLoreLine("&8(Click does nothing)")) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					// no-op
+				}
+			});
+
+			int shownServices = 0;
+			for (VoteLogMysqlTable.ServiceCount sc : table.getTopServices(days, topServicesLimit)) {
+				shownServices++;
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER)
+						.setName("&a#" + shownServices + " &f" + AdminVoteLogHelpers.safe(sc.service))
+						.addLoreLine("&7Votes: &f" + sc.votes)
+						.addLoreLine(days > 0 ? "&7Window: &fLast " + days + " days" : "&7Window: &fAll time")) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op (could open AdminVoteLogService in future)
+					}
+				});
+			}
+
+			if (shownServices == 0) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&eNo service data")
+						.addLoreLine("&7No services found in the log.")) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op
+					}
+				});
+			}
+
+			// top servers header
+			inv.addButton(new BInventoryButton(new ItemBuilder(Material.COMPASS).setName("&aTop Servers")
+					.addLoreLine("&7Top " + topServersLimit + " servers:")
+					.addLoreLine("&8(Click does nothing)")) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					// no-op
+				}
+			});
+
+			int shownServers = 0;
+			for (VoteLogMysqlTable.ServerCount sc : table.getTopServers(days, topServersLimit)) {
+				shownServers++;
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER)
+						.setName("&a#" + shownServers + " &f" + AdminVoteLogHelpers.safe(sc.server))
+						.addLoreLine("&7Votes: &f" + sc.votes)
+						.addLoreLine(days > 0 ? "&7Window: &fLast " + days + " days" : "&7Window: &fAll time")) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op (could open AdminVoteLogServer in future)
+					}
+				});
+			}
+
+			if (shownServers == 0) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&eNo server data")
+						.addLoreLine("&7No servers found in the log.")) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op
+					}
+				});
+			}
+
+			inv.setPages(true);
+			inv.setMaxInvSize(54);
+			inv.openInventory(player);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/admin/votelog/AdminVoteLogVoteId.java

@@ -0,0 +1,231 @@
+package com.bencodez.votingplugin.commands.gui.admin.votelog;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+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.user.VotingPluginUser;
+import com.bencodez.votingplugin.votelog.VoteLogMysqlTable;
+
+/**
+ * Admin GUI: VoteLog entries for a given voteId (paged).
+ *
+ * vote_id is NOT unique; this shows ALL rows for the correlation id.
+ */
+public class AdminVoteLogVoteId extends GUIHandler {
+
+	private final VotingPluginMain plugin;
+	private final VoteLogMysqlTable table;
+	private VotingPluginUser user;
+	private final int page;
+
+	private final String voteId;
+	private final int days;
+
+	private static final int PAGE_SIZE = 45;
+
+	public AdminVoteLogVoteId(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table, String voteId,
+			int days, int page) {
+		super(plugin, sender);
+		this.plugin = plugin;
+		this.table = table;
+		this.voteId = voteId;
+		this.days = days;
+		this.page = Math.max(0, page);
+
+		if (sender instanceof Player) {
+			this.user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender);
+		}
+	}
+
+	public AdminVoteLogVoteId(VotingPluginMain plugin, CommandSender sender, VoteLogMysqlTable table,
+			VotingPluginUser user, String voteId, int days, int page) {
+		this(plugin, sender, table, voteId, days, page);
+		this.user = user;
+		if (this.user == null && sender instanceof Player) {
+			this.user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) sender);
+		}
+	}
+
+	@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) {
+		try {
+			String title = "&aVoteLog - VoteId";
+			if (voteId != null && !voteId.isEmpty()) {
+				title += " &7(" + shortId(voteId) + ")";
+			}
+
+			BInventory inv = new BInventory(title);
+			inv.requirePermission("VotingPlugin.Commands.AdminVote.VoteLog");
+
+			if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
+				inv.dontClose();
+			}
+
+			if (table == null) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.BARRIER).setName("&cVoteLog unavailable")
+						.addLoreLine("&7VoteLog MySQL table is not loaded/enabled.")) {
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op
+					}
+				});
+
+				inv.setPages(true);
+				inv.setMaxInvSize(54);
+				inv.openInventory(player);
+				return;
+			}
+
+			if (voteId == null || voteId.isEmpty()) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&eNo voteId provided")
+						.addLoreLine("&7Missing voteId.")) {
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op
+					}
+				});
+
+				inv.setPages(true);
+				inv.setMaxInvSize(54);
+				inv.openInventory(player);
+				return;
+			}
+
+			int needed = (page + 1) * PAGE_SIZE;
+
+			// vote_id is not unique -> show ALL rows for it (paged)
+			List<VoteLogMysqlTable.VoteLogEntry> rows = table.getByVoteIdAll(voteId, days, needed);
+
+			int start = page * PAGE_SIZE;
+			int end = Math.min(rows.size(), start + PAGE_SIZE);
+
+			if (start >= rows.size()) {
+				inv.addButton(new BInventoryButton(new ItemBuilder(Material.PAPER).setName("&eNo entries")
+						.addLoreLine("&7No vote log entries on this page.").addLoreLine("&7Try going back a page.")) {
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						// no-op
+					}
+				});
+			} else {
+				for (int i = start; i < end; i++) {
+					inv.addButton(makeEntryButton(rows.get(i)));
+				}
+			}
+
+			inv.setPages(true);
+			inv.setMaxInvSize(54);
+			inv.openInventory(player);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	private BInventoryButton makeEntryButton(VoteLogMysqlTable.VoteLogEntry entry) {
+		VoteLogMysqlTable.VoteLogEvent event = entry.event != null ? VoteLogMysqlTable.VoteLogEvent.valueOf(entry.event)
+				: null;
+
+		Material mat = AdminVoteLogHelpers.getMaterialForEvent(event, entry.status);
+
+		String eventColor = AdminVoteLogHelpers.getEventColor(event);
+
+		String timeStr = formatTime(entry.voteTime);
+		String uuidShort = shortId(entry.playerUuid);
+		String voteShort = shortId(entry.voteId);
+
+		ItemBuilder item = new ItemBuilder(mat)
+				.setName(eventColor + AdminVoteLogHelpers.safe(entry.event) + " &7(" + voteShort + ")");
+
+		// Only add lore lines when the value is actually set / meaningful
+		// (prevents blank/0/default noise)
+		if (notEmpty(entry.playerName) || notEmpty(entry.playerUuid)) {
+			item.addLoreLine("&7Player: &f" + safe(entry.playerName) + " &7(" + uuidShort + ")");
+		}
+
+		if (entry.voteTime > 0) {
+			item.addLoreLine("&7Time: &f" + timeStr);
+		}
+
+		if (notEmpty(entry.service)) {
+			item.addLoreLine("&7Service: &f" + safe(entry.service));
+		}
+
+		if (notEmpty(entry.context)) {
+			item.addLoreLine("&7Context: &f" + safe(entry.context));
+		}
+
+		if (notEmpty(entry.status)) {
+			item.addLoreLine("&7Status: &f" + safe(entry.status));
+		}
+
+		if (entry.proxyCachedTotal != 0) {
+			item.addLoreLine("&7Cached Total: &f" + entry.proxyCachedTotal);
+		}
+
+		if (notEmpty(entry.voteId)) {
+			item.addLoreLine("&7VoteId: &f" + safe(entry.voteId));
+		}
+
+		return new BInventoryButton(item) {
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				// read-only
+			}
+		};
+	}
+
+	private String formatTime(long millis) {
+		try {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			return sdf.format(new Date(millis));
+		} catch (Exception e) {
+			return String.valueOf(millis);
+		}
+	}
+
+	private boolean notEmpty(String s) {
+		return s != null && !s.trim().isEmpty();
+	}
+
+	private String shortId(String s) {
+		if (s == null || s.isEmpty()) {
+			return "unknown";
+		}
+		return s.length() > 8 ? s.substring(0, 8) : s;
+	}
+
+	private String safe(String s) {
+		return s == null ? "" : s;
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+}

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

@@ -59,7 +59,7 @@ public class AdminVoteVoteShop extends GUIHandler {
 
 					@Override
 					public void onInput(Player player, String value) {
-						plugin.getGui().createShop(value);
+						plugin.getShopFile().createShop(value);
 						plugin.reload();
 					}
 				});

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

@@ -53,7 +53,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 		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)) {
+				plugin.getShopFile().getShopIdentifierIdentifierName(identifier)) {
 
 			@Override
 			public void setValue(Player player, String name) {
@@ -61,7 +61,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 			}
 		}));
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.OAK_DOOR, 1),
-				new EditGUIValueString("Permission", plugin.getGui().getChestVoteShopPermission(identifier)) {
+				new EditGUIValueString("Permission", plugin.getShopFile().getVoteShopPermission(identifier)) {
 
 					@Override
 					public void setValue(Player player, String name) {
@@ -69,7 +69,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 					}
 				}));
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.EMERALD, 1),
-				new EditGUIValueNumber("Cost", plugin.getGui().getChestShopIdentifierCost(identifier)) {
+				new EditGUIValueNumber("Cost", plugin.getShopFile().getShopIdentifierCost(identifier)) {
 
 					@Override
 					public void setValue(Player player, Number num) {
@@ -77,7 +77,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 					}
 				}));
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.BARRIER, 1),
-				new EditGUIValueNumber("Limit", plugin.getGui().getChestShopIdentifierLimit(identifier)) {
+				new EditGUIValueNumber("Limit", plugin.getShopFile().getShopIdentifierLimit(identifier)) {
 
 					@Override
 					public void setValue(Player player, Number num) {
@@ -86,7 +86,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 				}));
 
 		// display item
-		ConfigurationSection displayItemData = plugin.getGui().getChestShopIdentifierSection(identifier);
+		ConfigurationSection displayItemData = plugin.getShopFile().getShopIdentifierSection(identifier);
 		inv.addButton(new EditGUIButton(new ItemBuilder(displayItemData.getString("Material")).setAmount(1),
 				new EditGUIValueString("Material", displayItemData.getString("Material")) {
 
@@ -141,7 +141,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						plugin.getRewardHandler().getDirectlyDefined("CHEST.Shop." + identifier + ".Rewards"));
+						plugin.getRewardHandler().getDirectlyDefined("Shop." + identifier + ".Rewards"));
 			}
 		});
 
@@ -156,8 +156,8 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 	}
 
 	private void setPathData(String path, Object value) {
-		plugin.getGui().getData().set("CHEST.Shop." + identifier + "." + path, value);
-		plugin.getGui().saveData();
+		plugin.getShopFile().getData().set("Shop." + identifier + "." + path, value);
+		plugin.getShopFile().saveData();
 		plugin.reload();
 	}
 

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

@@ -42,9 +42,9 @@ public class AdminVoteVoteShopItemRemove extends GUIHandler {
 		BInventory inv = new BInventory("Edit VoteShop Remove Item");
 		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteShop");
 
-		for (final String identifier : plugin.getGui().getChestShopIdentifiers()) {
+		for (final String identifier : plugin.getShopFile().getShopIdentifiers()) {
 			inv.addButton(
-					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier))
+					new BInventoryButton(new ItemBuilder(plugin.getShopFile().getShopIdentifierSection(identifier))
 							.addLoreLine("&c&lClick to remove")) {
 
 						@Override
@@ -54,7 +54,7 @@ public class AdminVoteVoteShopItemRemove extends GUIHandler {
 
 								@Override
 								public void onConfirm(Player p) {
-									plugin.getGui().removeShop(identifier);
+									plugin.getShopFile().removeShop(identifier);
 									p.sendMessage("Removed " + identifier);
 									plugin.reload();
 								}
@@ -65,7 +65,6 @@ public class AdminVoteVoteShopItemRemove extends GUIHandler {
 								}
 							}.open();
 
-
 						}
 					}.addData("ident", identifier));
 		}

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

@@ -41,9 +41,9 @@ public class AdminVoteVoteShopItems extends GUIHandler {
 		BInventory inv = new BInventory("Edit VoteShop Items");
 		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteShop");
 
-		for (String identifier : plugin.getGui().getChestShopIdentifiers()) {
+		for (String identifier : plugin.getShopFile().getShopIdentifiers()) {
 			inv.addButton(
-					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier))) {
+					new BInventoryButton(new ItemBuilder(plugin.getShopFile().getShopIdentifierSection(identifier))) {
 
 						@Override
 						public void onClick(ClickEvent clickEvent) {

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

@@ -12,8 +12,9 @@ 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.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
@@ -30,20 +31,20 @@ public class VoteBest extends GUIHandler {
 
 	@Override
 	public ArrayList<String> getChat(CommandSender sender) {
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();
 		msg.add(plugin.getConfigFile().getFormatCommandsVoteBestTitle());
 		msg.addAll(plugin.getConfigFile().getFormatCommandsVoteBestLines());
 
-		HashMap<String, String> placeholders = new HashMap<String, String>();
+		HashMap<String, String> placeholders = new HashMap<>();
 		placeholders.put("HighestDailyTotal", "" + user.getHighestDailyTotal());
 		placeholders.put("HighestWeeklyTotal", "" + user.getHighestWeeklyTotal());
 		placeholders.put("HighestMonthlyTotal", "" + user.getHighestMonthlyTotal());
 
 		placeholders.put("player", user.getPlayerName());
 
-		msg = ArrayUtils.getInstance().replacePlaceHolder(msg, placeholders);
+		msg = PlaceholderUtils.replacePlaceHolder(msg, placeholders);
 
-		return ArrayUtils.getInstance().colorize(msg);
+		return ArrayUtils.colorize(msg);
 	}
 
 	@Override

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

@@ -12,10 +12,10 @@ import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
@@ -39,19 +39,19 @@ public class VoteGUI extends GUIHandler {
 		ItemBuilder builder = new ItemBuilder(plugin.getGui().getChestVoteGUISlotSection(slot));
 
 		String[] lore = new String[1];
-		lore = ArrayUtils.getInstance().convert(plugin.getGui().getChestVoteGUISlotLore(slot));
+		lore = ArrayUtils.convert(plugin.getGui().getChestVoteGUISlotLore(slot));
 
 		String str = plugin.getConfigFile().getVoteTopDefault();
 		if (lore.length == 0) {
-			if (StringParser.getInstance().startsWithIgnoreCase(slot, "url")) {
+			if (MessageAPI.startsWithIgnoreCase(slot, "url")) {
 				lore = new String[] { "&aClick me" };
-			} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "next")) {
-				lore = ArrayUtils.getInstance().convert(new VoteNext(plugin, player, user).getChat(player));
-			} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "last")) {
-				lore = ArrayUtils.getInstance().convert(new VoteLast(plugin, player, user).getChat(player));
-			} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "total")) {
-				lore = ArrayUtils.getInstance().convert(new VoteTotal(plugin, player, user).getChat(player));
-			} else if (StringParser.getInstance().startsWithIgnoreCase(slot, "top")) {
+			} else if (MessageAPI.startsWithIgnoreCase(slot, "next")) {
+				lore = ArrayUtils.convert(new VoteNext(plugin, player, user).getChat(player));
+			} else if (MessageAPI.startsWithIgnoreCase(slot, "last")) {
+				lore = ArrayUtils.convert(new VoteLast(plugin, player, user).getChat(player));
+			} else if (MessageAPI.startsWithIgnoreCase(slot, "total")) {
+				lore = ArrayUtils.convert(new VoteTotal(plugin, player, user).getChat(player));
+			} else if (MessageAPI.startsWithIgnoreCase(slot, "top")) {
 
 				if (str.equalsIgnoreCase("monthly")) {
 					lore = plugin.getTopVoterHandler().topVoterMonthly(1);
@@ -64,18 +64,18 @@ public class VoteGUI extends GUIHandler {
 				}
 			} else if (slot.equalsIgnoreCase("today")) {
 				String[] today = new VoteToday(plugin, player, user, 1).voteTodayGUI();
-				ArrayList<String> list = new ArrayList<String>();
+				ArrayList<String> list = new ArrayList<>();
 				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);
+				lore = ArrayUtils.convert(list);
 			} else if (slot.equalsIgnoreCase("help")) {
 				lore = new String[] { "Click to view help" };
 			}
 		}
-		builder.setLore(ArrayUtils.getInstance().convert(lore));
+		builder.setLore(ArrayUtils.convert(lore));
 		return builder;
 	}
 
@@ -151,7 +151,8 @@ public class VoteGUI extends GUIHandler {
 					String cmd = plugin.getGui().getChestVoteGUISlotCommand(slot);
 					if (cmd.equalsIgnoreCase("none")) {
 						return;
-					} else if (!cmd.equals("")) {
+					}
+					if (!cmd.equals("")) {
 						event.runSync(new Runnable() {
 
 							@Override
@@ -162,13 +163,19 @@ public class VoteGUI extends GUIHandler {
 					} else {
 						plugin.getCommandLoader().processSlotClick(player, user, slot);
 					}
+					String prefix = "";
+					if (event.getButton().getBuilder().isConditional()) {
+						prefix = "Item.";
+					}
 
-					if (plugin.getRewardHandler().hasRewards(plugin.getGui().getData(), plugin.getGui()
-							.getChestVoteGUISlotRewardsPath(slot, event.getButton().getLastRewardsPath(player)))) {
-						plugin.getRewardHandler().giveReward(plugin.getVotingPluginUserManager().getVotingPluginUser(player),
+					if (plugin.getRewardHandler().hasRewards(plugin.getGui().getData(),
+							plugin.getGui().getChestVoteGUISlotRewardsPath(slot,
+									prefix + event.getButton().getLastRewardsPath(player)))) {
+						plugin.getRewardHandler().giveReward(
+								plugin.getVotingPluginUserManager().getVotingPluginUser(player),
 								plugin.getGui().getData(),
 								plugin.getGui().getChestVoteGUISlotRewardsPath(slot,
-										event.getButton().getLastRewardsPath(player)),
+										prefix + event.getButton().getLastRewardsPath(player)),
 								new RewardOptions().addPlaceholder("identifier", slot));
 					}
 				}

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

@@ -10,8 +10,8 @@ import org.bukkit.entity.Player;
 import com.bencodez.advancedcore.api.command.CommandHandler;
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.nms.NMSManager;
+import com.bencodez.simpleapi.messages.MessageAPI;
+import com.bencodez.simpleapi.nms.NMSManager;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 import net.md_5.bungee.api.ChatColor;
@@ -34,8 +34,8 @@ public class VoteHelp extends GUIHandler {
 	}
 
 	public ArrayList<TextComponent> helpText(CommandSender sender) {
-		ArrayList<TextComponent> msg = new ArrayList<TextComponent>();
-		HashMap<String, TextComponent> unsorted = new HashMap<String, TextComponent>();
+		ArrayList<TextComponent> msg = new ArrayList<>();
+		HashMap<String, TextComponent> unsorted = new HashMap<>();
 
 		boolean requirePerms = plugin.getConfigFile().isFormatCommandsVoteHelpRequirePermission();
 
@@ -54,7 +54,7 @@ public class VoteHelp extends GUIHandler {
 						plugin.getConfigFile().getFormatCommandsVoteHelpLine(), hoverColor));
 			}
 		}
-		ArrayList<String> unsortedList = new ArrayList<String>();
+		ArrayList<String> unsortedList = new ArrayList<>();
 		unsortedList.addAll(unsorted.keySet());
 		Collections.sort(unsortedList, String.CASE_INSENSITIVE_ORDER);
 		for (String cmd : unsortedList) {
@@ -65,8 +65,8 @@ public class VoteHelp extends GUIHandler {
 	}
 
 	public ArrayList<TextComponent> helpTextLegacy(CommandSender sender) {
-		ArrayList<TextComponent> msg = new ArrayList<TextComponent>();
-		HashMap<String, TextComponent> unsorted = new HashMap<String, TextComponent>();
+		ArrayList<TextComponent> msg = new ArrayList<>();
+		HashMap<String, TextComponent> unsorted = new HashMap<>();
 
 		boolean requirePerms = plugin.getConfigFile().isFormatCommandsVoteHelpRequirePermission();
 
@@ -76,7 +76,7 @@ public class VoteHelp extends GUIHandler {
 						cmdHandle.getHelpLine("/vote", plugin.getConfigFile().getFormatCommandsVoteHelpLine()));
 			}
 		}
-		ArrayList<String> unsortedList = new ArrayList<String>();
+		ArrayList<String> unsortedList = new ArrayList<>();
 		unsortedList.addAll(unsorted.keySet());
 		Collections.sort(unsortedList, String.CASE_INSENSITIVE_ORDER);
 		for (String cmd : unsortedList) {
@@ -108,8 +108,8 @@ public class VoteHelp extends GUIHandler {
 
 	public ArrayList<TextComponent> voteHelpText(CommandSender sender) {
 		int pagesize = plugin.getConfigFile().getFormatPageSize();
-		ArrayList<TextComponent> msg = new ArrayList<TextComponent>();
-		ArrayList<TextComponent> text = new ArrayList<TextComponent>();
+		ArrayList<TextComponent> msg = new ArrayList<>();
+		ArrayList<TextComponent> text = new ArrayList<>();
 		if (NMSManager.getInstance().isVersion("1.12")) {
 			text = helpTextLegacy(sender);
 		} else {
@@ -121,7 +121,7 @@ public class VoteHelp extends GUIHandler {
 			maxPage++;
 		}
 
-		msg.add(StringParser.getInstance()
+		msg.add(MessageAPI
 				.stringToComp(plugin.getConfigFile().getFormatCommandsVoteHelpTitle() + " " + page + "/" + maxPage));
 
 		for (int i = pagesize * (page - 1); (i < text.size()) && (i < ((page) * pagesize)); i++) {

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

@@ -12,12 +12,13 @@ import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
 import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.user.VotingPluginUser;
+import com.bencodez.votingplugin.votesites.VoteSite;
 
 public class VoteLast extends GUIHandler {
 
@@ -32,20 +33,20 @@ public class VoteLast extends GUIHandler {
 
 	@Override
 	public ArrayList<String> getChat(CommandSender sender) {
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();
 
 		String playerName = user.getPlayerName();
 
-		msg.add(StringParser.getInstance().replaceIgnoreCase(plugin.getConfigFile().getFormatCommandsVoteLastTitle(),
-				"%player%", playerName));
+		msg.add(MessageAPI.replaceIgnoreCase(plugin.getConfigFile().getFormatCommandsVoteLastTitle(), "%player%",
+				playerName));
 
-		for (VoteSite voteSite : plugin.getVoteSites()) {
+		for (VoteSite voteSite : plugin.getVoteSiteManager().getVoteSitesEnabled()) {
 			if (!voteSite.isHidden()) {
 				msg.add(user.voteCommandLastLine(voteSite));
 			}
 		}
 
-		return ArrayUtils.getInstance().colorize(msg);
+		return ArrayUtils.colorize(msg);
 	}
 
 	@Override
@@ -62,7 +63,7 @@ public class VoteLast extends GUIHandler {
 	public void onChest(Player player) {
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteLastName());
 		inv.addPlaceholder("player", user.getPlayerName());
-		for (VoteSite site : plugin.getVoteSites()) {
+		for (VoteSite site : plugin.getVoteSiteManager().getVoteSitesEnabled()) {
 			if (!site.isHidden()) {
 				inv.addButton(inv.getNextSlot(),
 						new UpdatingBInventoryButton(plugin, site.getItem().setName(site.getDisplayName())
@@ -73,15 +74,16 @@ public class VoteLast extends GUIHandler {
 								if (plugin.getGui().isChestVoteLastClickableLinks()) {
 									Player player = event.getPlayer();
 									if (player != null) {
-										VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
+										VotingPluginUser user = plugin.getVotingPluginUserManager()
+												.getVotingPluginUser(player);
 										user.sendMessage(
-												StringParser.getInstance()
+												PlaceholderUtils
 														.replacePlaceHolder(
-																StringParser.getInstance().replacePlaceHolder(
-																		StringParser.getInstance()
-																				.replacePlaceHolder(plugin.getGui()
+																PlaceholderUtils.replacePlaceHolder(
+																		PlaceholderUtils.replacePlaceHolder(
+																				plugin.getGui()
 																						.getChestVoteURLURLText(),
-																						"voteurl", site.getVoteURL()),
+																				"voteurl", site.getVoteURL()),
 																		"sitename", site.getDisplayName()),
 																"player", player.getName()));
 

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

@@ -11,15 +11,16 @@ 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.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.user.VotingPluginUser;
+import com.bencodez.votingplugin.votesites.VoteSite;
 
 import xyz.upperlevel.spigot.book.BookUtil;
 
@@ -36,23 +37,21 @@ public class VoteNext extends GUIHandler {
 
 	@Override
 	public ArrayList<String> getChat(CommandSender sender) {
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();
 
 		String playerName = user.getPlayerName();
 
-		msg.add(StringParser.getInstance().colorize(StringParser.getInstance()
+		msg.add(MessageAPI.colorize(MessageAPI
 				.replaceIgnoreCase(plugin.getConfigFile().getFormatCommandsVoteNextTitle(), "%player%", playerName)));
 
-		for (VoteSite voteSite : plugin.getVoteSites()) {
+		for (VoteSite voteSite : plugin.getVoteSiteManager().getVoteSitesEnabled()) {
 			if (!voteSite.isHidden()) {
 				String msgLine = plugin.getConfigFile().getFormatCommandsVoteNextLayout();
 
-				msgLine = StringParser.getInstance().replaceIgnoreCase(msgLine, "%info%",
-						user.voteCommandNextInfo(voteSite));
+				msgLine = MessageAPI.replaceIgnoreCase(msgLine, "%info%", user.voteCommandNextInfo(voteSite));
 
-				msgLine = StringParser.getInstance().replaceIgnoreCase(msgLine, "%SiteName%",
-						voteSite.getDisplayName());
-				msg.add(StringParser.getInstance().colorize(msgLine));
+				msgLine = MessageAPI.replaceIgnoreCase(msgLine, "%SiteName%", voteSite.getDisplayName());
+				msg.add(MessageAPI.colorize(msgLine));
 			}
 		}
 		return msg;
@@ -63,9 +62,9 @@ public class VoteNext extends GUIHandler {
 		BookWrapper book = new BookWrapper(plugin.getGui().getBookVoteURLBookGUITitle());
 
 		// add colors/config options
-		for (VoteSite site : plugin.getVoteSites()) {
+		for (VoteSite site : plugin.getVoteSiteManager().getVoteSitesEnabled()) {
 			if (!site.isHidden()) {
-				Layout nextLayout = new Layout(new ArrayList<String>(Arrays.asList("[Json]")));
+				Layout nextLayout = new Layout(new ArrayList<>(Arrays.asList("[Json]")));
 				nextLayout.replaceTextComponent("[Json]",
 						BookUtil.TextBuilder.of(book.colorize(site.getDisplayName()))
 								.onClick(BookUtil.ClickAction.openUrl(site.getVoteURLJsonStrip()))
@@ -87,17 +86,20 @@ public class VoteNext extends GUIHandler {
 	public void onChest(Player player) {
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteNextName());
 		inv.addPlaceholder("player", user.getPlayerName());
-		for (VoteSite site : plugin.getVoteSites()) {
+		for (VoteSite site : plugin.getVoteSiteManager().getVoteSitesEnabled()) {
 			if (!site.isHidden()) {
 				String siteNameDisplay = plugin.getGui().getChestVoteNextCustomSiteNamesDisplays(site.getKey());
 				if (siteNameDisplay.isEmpty()) {
 					siteNameDisplay = site.getDisplayName();
 				}
 				inv.addButton(inv.getNextSlot(),
-						new UpdatingBInventoryButton(plugin, site.getItem().setName(siteNameDisplay)
-								.setLore(StringParser.getInstance().replacePlaceHolder(
-										plugin.getGui().getChestVoteNextLine(), "time", user.voteCommandNextInfo(site)))
-								.setAmountNone(1), 1000, 1000) {
+						new UpdatingBInventoryButton(plugin,
+								site.getItem().setName(siteNameDisplay)
+										.setLore(PlaceholderUtils.replacePlaceHolder(
+												plugin.getGui().getChestVoteNextLine(), "time",
+												user.voteCommandNextInfo(site)))
+										.setAmountNone(1),
+								1000, 1000) {
 
 							@Override
 							public void onClick(ClickEvent clickEvent) {

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

@@ -3,6 +3,7 @@ package com.bencodez.votingplugin.commands.gui.player;
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -12,10 +13,12 @@ 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.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.events.VoteShopPurchaseEvent;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class VoteShop extends GUIHandler {
@@ -45,8 +48,8 @@ public class VoteShop extends GUIHandler {
 
 	@Override
 	public void onChest(Player player) {
-		if (!plugin.getGui().isChestVoteShopEnabled()) {
-			player.sendMessage(StringParser.getInstance().colorize(plugin.getGui().getChestVoteShopDisabled()));
+		if (!plugin.getShopFile().isVoteShopEnabled()) {
+			player.sendMessage(MessageAPI.colorize(plugin.getShopFile().getVoteShopDisabled()));
 			return;
 		}
 
@@ -57,26 +60,33 @@ public class VoteShop extends GUIHandler {
 		/*
 		 * if (!plugin.getConfigFile().isExtraVoteShopCheck()) { user.cacheAsync(); }
 		 */
-		BInventory inv = new BInventory(plugin.getGui().getChestVoteShopName());
+		BInventory inv = new BInventory(plugin.getShopFile().getVoteShopName());
 		inv.addPlaceholder("points", "" + user.getPoints());
 		inv.addPlaceholder("sitesavailable", "" + user.getSitesNotVotedOn());
 		inv.dontClose();
 
-		for (final String identifier : plugin.getGui().getChestShopIdentifiers()) {
+		for (final String identifier : plugin.getShopFile().getShopIdentifiers()) {
 
-			String perm = plugin.getGui().getChestVoteShopPermission(identifier);
+			String perm = plugin.getShopFile().getVoteShopPermission(identifier);
 			boolean hasPerm = false;
 			if (perm.isEmpty()) {
 				hasPerm = true;
 			} else {
+				String p = "";
 				if (perm.startsWith("!")) {
-					hasPerm = !player.hasPermission(perm.substring(1));
+					p = PlaceholderUtils.replacePlaceHolders(player, perm.substring(1));
+					hasPerm = !player.hasPermission(p);
 				} else {
-					hasPerm = player.hasPermission(perm);
+					p = PlaceholderUtils.replacePlaceHolders(player, perm);
+					hasPerm = player.hasPermission(p);
+				}
+				if (!hasPerm) {
+					plugin.extraDebug("VoteShop: " + player.getName() + "/" + player.getUniqueId()
+							+ " does not have permission `" + p + "` for " + identifier);
 				}
 			}
 
-			int limit = plugin.getGui().getChestShopIdentifierLimit(identifier);
+			int limit = plugin.getShopFile().getShopIdentifierLimit(identifier);
 
 			boolean limitPass = true;
 			if (limit > 0) {
@@ -85,10 +95,10 @@ public class VoteShop extends GUIHandler {
 				}
 			}
 
-			if (!plugin.getGui().getChestVoteShopNotBuyable(identifier)) {
-				if ((hasPerm || !plugin.getGui().getChestVoteShopHideOnNoPermission(identifier))
-						&& (limitPass || !plugin.getGui().isChestVoteShopHideLimitedReached())) {
-					ItemBuilder builder = new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier));
+			if (!plugin.getShopFile().getVoteShopNotBuyable(identifier)) {
+				if ((hasPerm || !plugin.getShopFile().getVoteShopHideOnNoPermission(identifier))
+						&& (limitPass || !plugin.getShopFile().isVoteShopHideLimitedReached())) {
+					ItemBuilder builder = new ItemBuilder(plugin.getShopFile().getShopIdentifierSection(identifier));
 
 					inv.addButton(new BInventoryButton(builder) {
 
@@ -103,7 +113,7 @@ public class VoteShop extends GUIHandler {
 
 							String identifier = (String) getData("identifier");
 							int limit = (int) getData("Limit");
-							int points = plugin.getGui().getChestShopIdentifierCost(identifier);
+							int points = plugin.getShopFile().getShopIdentifierCost(identifier);
 							if (identifier != null) {
 								// if (plugin.getGui().getChestVoteShopCloseGUI(identifier)) {
 								// event.closeInventory();
@@ -118,32 +128,35 @@ public class VoteShop extends GUIHandler {
 								}
 
 								if (limitPass) {
-									if (!plugin.getGui().isChestVoteShopRequireConfirmation(identifier)) {
-										HashMap<String, String> placeholders = new HashMap<String, String>();
+									if (!plugin.getShopFile().isVoteShopRequireConfirmation(identifier)) {
+										HashMap<String, String> placeholders = new HashMap<>();
 										placeholders.put("identifier",
-												plugin.getGui().getChestShopIdentifierIdentifierName(identifier));
+												plugin.getShopFile().getShopIdentifierIdentifierName(identifier));
 										placeholders.put("points", "" + points);
 										placeholders.put("limit", "" + limit);
 										if (user.removePoints(points, true)) {
 											plugin.getLogger().info("VoteShop: " + user.getPlayerName() + "/"
 													+ user.getUUID() + " bought " + identifier + " for " + points);
-											if (plugin.getConfigFile().isTrackShopPurchases()) {
-												plugin.getServerData().addVoteShopPurchase(identifier);
-											}
 
-											plugin.getRewardHandler().giveReward(user, plugin.getGui().getData(),
-													plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
+											plugin.getRewardHandler().giveReward(user, plugin.getShopFile().getData(),
+													plugin.getShopFile().getShopIdentifierRewardsPath(identifier),
 													new RewardOptions().setPlaceholders(placeholders));
 
-											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
-													plugin.getGui().getCHESTVoteShopPurchase(identifier),
+											user.sendMessage(PlaceholderUtils.replacePlaceHolder(
+													plugin.getShopFile().getVoteShopPurchase(identifier),
 													placeholders));
+
+											VoteShopPurchaseEvent purcahseEvent = new VoteShopPurchaseEvent(
+													player.getUniqueId(), player.getName(), user, identifier, points);
+
+											Bukkit.getPluginManager().callEvent(purcahseEvent);
+
 											if (limit > 0) {
 												user.setVoteShopIdentifierLimit(identifier,
 														user.getVoteShopIdentifierLimit(identifier) + 1);
 											}
 										} else {
-											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
+											user.sendMessage(PlaceholderUtils.replacePlaceHolder(
 													plugin.getConfigFile().getFormatShopFailedMsg(), placeholders));
 										}
 									} else {
@@ -158,10 +171,10 @@ public class VoteShop extends GUIHandler {
 
 									}
 								} else {
-									user.sendMessage(plugin.getGui().getChestVoteShopLimitReached());
+									user.sendMessage(plugin.getShopFile().getVoteShopLimitReached());
 								}
 								plugin.getCommandLoader().processSlotClick(player, user, identifier);
-								if (plugin.getGui().isChestVoteShopReopenGUIOnPurchase()) {
+								if (plugin.getShopFile().isVoteShopReopenGUIOnPurchase()) {
 									plugin.getCommandLoader().processSlotClick(player, user, "shop");
 								}
 							}
@@ -171,7 +184,7 @@ public class VoteShop extends GUIHandler {
 				}
 			} else {
 				if (hasPerm) {
-					ItemBuilder builder = new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier));
+					ItemBuilder builder = new ItemBuilder(plugin.getShopFile().getShopIdentifierSection(identifier));
 					inv.addButton(new BInventoryButton(builder) {
 
 						@Override
@@ -184,20 +197,20 @@ public class VoteShop extends GUIHandler {
 			}
 		}
 
-		for (final String str : plugin.getGui().getChestGUIVoteShopExtraItems()) {
-			inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIVoteShopExtraItems(str))) {
+		for (final String str : plugin.getShopFile().getVoteShopExtraItems()) {
+			inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getShopFile().getGUIVoteShopExtraItems(str))) {
 
 				@Override
 				public void onClick(ClickEvent clickEvent) {
 					plugin.getCommandLoader().processSlotClick(player, user, str);
-					new RewardBuilder(plugin.getGui().getData(),
-							"CHEST.VoteShopExtraItems." + str + "." + clickEvent.getButton().getLastRewardsPath(player))
+					new RewardBuilder(plugin.getShopFile().getData(),
+							"ExtraItems." + str + "." + clickEvent.getButton().getLastRewardsPath(player))
 							.setGiveOffline(false).send(clickEvent.getPlayer());
 				}
 			});
 		}
 
-		if (plugin.getGui().isChestVoteShopBackButton()) {
+		if (plugin.getShopFile().isVoteShopBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 

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

@@ -3,6 +3,7 @@ package com.bencodez.votingplugin.commands.gui.player;
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -12,10 +13,11 @@ 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.misc.PlayerUtils;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
+import com.bencodez.simpleapi.player.PlayerUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.events.VoteShopPurchaseEvent;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class VoteShopConfirm extends GUIHandler {
@@ -46,41 +48,43 @@ public class VoteShopConfirm extends GUIHandler {
 
 	@Override
 	public void onChest(Player player) {
-		PlayerUtils.getInstance().setPlayerMeta(player, "ident", identifier);
-		BInventory inv = new BInventory(plugin.getGui().getChestShopConfirmPurchaseTitle());
+		PlayerUtils.setPlayerMeta(plugin, player, "ident", identifier);
+		BInventory inv = new BInventory(plugin.getShopFile().getShopConfirmPurchaseTitle());
 		inv.dontClose();
-		inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopConfirmPurchaseYesItem())) {
+		inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getShopFile().getShopConfirmPurchaseYesItem())) {
 
 			@Override
 			public void onClick(ClickEvent event) {
 				user.cache();
-				int points = plugin.getGui().getChestShopIdentifierCost(identifier);
-				int limit = plugin.getGui().getChestShopIdentifierLimit(identifier);
-				HashMap<String, String> placeholders = new HashMap<String, String>();
+				int points = plugin.getShopFile().getShopIdentifierCost(identifier);
+				int limit = plugin.getShopFile().getShopIdentifierLimit(identifier);
+				HashMap<String, String> placeholders = new HashMap<>();
 				placeholders.put("identifier", identifier);
 				placeholders.put("points", "" + points);
 				placeholders.put("limit", "" + limit);
 				if (user.removePoints(points, true)) {
 					plugin.getLogger().info("VoteShop: " + user.getPlayerName() + "/" + user.getUUID() + " bought "
 							+ identifier + " for " + points);
-					if (plugin.getConfigFile().isTrackShopPurchases()) {
-						plugin.getServerData().addVoteShopPurchase(identifier);
-					}
 
-					plugin.getRewardHandler().giveReward(user, plugin.getGui().getData(),
-							plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
+					plugin.getRewardHandler().giveReward(user, plugin.getShopFile().getData(),
+							plugin.getShopFile().getShopIdentifierRewardsPath(identifier),
 							new RewardOptions().setPlaceholders(placeholders));
 
-					user.sendMessage(StringParser.getInstance()
-							.replacePlaceHolder(plugin.getGui().getCHESTVoteShopPurchase(identifier), placeholders));
+					user.sendMessage(PlaceholderUtils
+							.replacePlaceHolder(plugin.getShopFile().getVoteShopPurchase(identifier), placeholders));
+
+					VoteShopPurchaseEvent purcahseEvent = new VoteShopPurchaseEvent(player.getUniqueId(),
+							player.getName(), user, identifier, points);
+
+					Bukkit.getPluginManager().callEvent(purcahseEvent);
 					if (limit > 0) {
 						user.setVoteShopIdentifierLimit(identifier, user.getVoteShopIdentifierLimit(identifier) + 1);
 					}
 				} else {
-					user.sendMessage(StringParser.getInstance()
+					user.sendMessage(PlaceholderUtils
 							.replacePlaceHolder(plugin.getConfigFile().getFormatShopFailedMsg(), placeholders));
 				}
-				if (plugin.getGui().getChestVoteShopCloseGUI(identifier)) {
+				if (plugin.getShopFile().getVoteShopCloseGUI(identifier)) {
 					event.getButton().getInv().closeInv(player, null);
 				} else {
 					new VoteShop(plugin, event.getPlayer(), user).open();
@@ -88,11 +92,11 @@ public class VoteShopConfirm extends GUIHandler {
 
 			}
 		});
-		inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopConfirmPurchaseNoItem())) {
+		inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getShopFile().getShopConfirmPurchaseNoItem())) {
 
 			@Override
 			public void onClick(ClickEvent event) {
-				if (plugin.getGui().getChestVoteShopCloseGUI(identifier)) {
+				if (plugin.getShopFile().getVoteShopCloseGUI(identifier)) {
 					event.getButton().getInv().closeInv(player, null);
 				} else {
 					new VoteShop(plugin, event.getPlayer(), user).open();

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

@@ -12,8 +12,9 @@ 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.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
@@ -31,11 +32,11 @@ public class VoteStreak extends GUIHandler {
 
 	@Override
 	public ArrayList<String> getChat(CommandSender sender) {
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();
 		msg.add(plugin.getConfigFile().getFormatCommandsVoteStreakTitle());
 		msg.addAll(plugin.getConfigFile().getFormatCommandsVoteStreakLines());
 
-		HashMap<String, String> placeholders = new HashMap<String, String>();
+		HashMap<String, String> placeholders = new HashMap<>();
 		placeholders.put("DailyStreak", "" + user.getDayVoteStreak());
 		placeholders.put("WeeklyStreak", "" + user.getWeekVoteStreak());
 		placeholders.put("MonthlyStreak", "" + user.getMonthVoteStreak());
@@ -46,9 +47,9 @@ public class VoteStreak extends GUIHandler {
 
 		placeholders.put("player", user.getPlayerName());
 
-		msg = ArrayUtils.getInstance().replacePlaceHolder(msg, placeholders);
+		msg = PlaceholderUtils.replacePlaceHolder(msg, placeholders);
 
-		return ArrayUtils.getInstance().colorize(msg);
+		return ArrayUtils.colorize(msg);
 	}
 
 	@Override

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

@@ -16,14 +16,14 @@ 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.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
-import com.bencodez.advancedcore.nms.NMSManager;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.nms.NMSManager;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
 import com.bencodez.votingplugin.user.VotingPluginUser;
+import com.bencodez.votingplugin.votesites.VoteSite;
 
 public class VoteToday extends GUIHandler {
 
@@ -44,7 +44,7 @@ public class VoteToday extends GUIHandler {
 		if (page < 1) {
 			page = 1;
 		}
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();
 		String[] voteToday = voteToday();
 
 		int maxPage = voteToday.length / pagesize;
@@ -52,7 +52,7 @@ public class VoteToday extends GUIHandler {
 			maxPage++;
 		}
 
-		HashMap<String, String> placeholders = new HashMap<String, String>();
+		HashMap<String, String> placeholders = new HashMap<>();
 		placeholders.put("page", "" + page);
 		placeholders.put("maxpage", "" + maxPage);
 
@@ -66,7 +66,7 @@ public class VoteToday extends GUIHandler {
 			msg.add(voteToday[i]);
 		}
 
-		return ArrayUtils.getInstance().colorize(ArrayUtils.getInstance().replacePlaceHolder(msg, placeholders));
+		return ArrayUtils.colorize(PlaceholderUtils.replacePlaceHolder(msg, placeholders));
 	}
 
 	@Override
@@ -91,18 +91,18 @@ public class VoteToday extends GUIHandler {
 				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(plugin.getConfigFile().getFormatTimeFormat());
 				String timeString = plugin.getVoteToday().get(user).get(voteSite).format(formatter);
 				String msg = plugin.getGui().getChestVoteTodayLine();
-				HashMap<String, String> placeholders = new HashMap<String, String>();
+				HashMap<String, String> placeholders = new HashMap<>();
 				placeholders.put("VoteSite", voteSite.getDisplayName());
 				placeholders.put("Time", timeString);
-				msg = StringParser.getInstance().replacePlaceHolder(msg, placeholders);
+				msg = PlaceholderUtils.replacePlaceHolder(msg, placeholders);
 				ItemBuilder item = null;
 				if (plugin.getGui().isChestVoteTodayUseSkull() && !NMSManager.getInstance().isVersion("1.12")) {
 					item = new ItemBuilder(user.getPlayerHead());
 				} else {
 					item = new ItemBuilder(plugin.getGui().getChestVoteTodayPlayerItem());
 				}
-				item.setName(StringParser.getInstance().replacePlaceHolder(plugin.getGui().getChestVoteTodayIconTitle(),
-						"player", user.getPlayerName()));
+				item.setName(PlaceholderUtils.replacePlaceHolder(plugin.getGui().getChestVoteTodayIconTitle(), "player",
+						user.getPlayerName()));
 				item.setLore(msg);
 				final UUID uuid = user.getUuid();
 				inv.addButton(inv.getNextSlot(), new BInventoryButton(item) {
@@ -116,7 +116,7 @@ public class VoteToday extends GUIHandler {
 				});
 			}
 		}
-		
+
 		String guiPath = "VoteToday";
 		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
 			inv.addButton(
@@ -130,6 +130,7 @@ public class VoteToday extends GUIHandler {
 									.setGiveOffline(false).send(clickEvent.getPlayer());
 
 						}
+
 					});
 		}
 
@@ -145,28 +146,29 @@ public class VoteToday extends GUIHandler {
 	}
 
 	public String[] voteToday() {
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();
 		for (TopVoterPlayer user : plugin.getVoteToday().keySet()) {
 
 			for (VoteSite voteSite : plugin.getVoteToday().get(user).keySet()) {
 				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(plugin.getConfigFile().getFormatTimeFormat());
 				String timeString = plugin.getVoteToday().get(user).get(voteSite).format(formatter);
-				HashMap<String, String> placeholders = new HashMap<String, String>();
+				HashMap<String, String> placeholders = new HashMap<>();
 				placeholders.put("player", user.getPlayerName());
 				placeholders.put("votesite", voteSite.getKey());
+                                placeholders.put("sitename", voteSite.getDisplayName());
 				placeholders.put("time", timeString);
-				msg.add(StringParser.getInstance()
-						.replacePlaceHolder(plugin.getConfigFile().getFormatCommandsVoteTodayLine(), placeholders));
+				msg.add(PlaceholderUtils.replacePlaceHolder(plugin.getConfigFile().getFormatCommandsVoteTodayLine(),
+						placeholders));
 				// msg.add("&6" + user.getPlayerName() + " : " + voteSite.getKey() + " : " +
 				// timeString);
 			}
 		}
-		msg = ArrayUtils.getInstance().colorize(msg);
-		return ArrayUtils.getInstance().convert(msg);
+		msg = ArrayUtils.colorize(msg);
+		return ArrayUtils.convert(msg);
 	}
 
 	public String[] voteTodayGUI() {
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();
 		for (TopVoterPlayer user : plugin.getVoteToday().keySet()) {
 
 			LocalDateTime mostRecent = null;
@@ -180,16 +182,17 @@ public class VoteToday extends GUIHandler {
 			if (mostRecent != null) {
 				DateTimeFormatter formatter = DateTimeFormatter.ofPattern(plugin.getConfigFile().getFormatTimeFormat());
 				String timeString = mostRecent.format(formatter);
-				HashMap<String, String> placeholders = new HashMap<String, String>();
+				HashMap<String, String> placeholders = new HashMap<>();
 				placeholders.put("player", user.getPlayerName());
 				placeholders.put("votesite", mostRecentSite.getKey());
+                                placeholders.put("sitename", mostRecentSite.getDisplayName());
 				placeholders.put("time", timeString);
-				msg.add(StringParser.getInstance()
-						.replacePlaceHolder(plugin.getConfigFile().getFormatCommandsVoteTodayLine(), placeholders));
+				msg.add(PlaceholderUtils.replacePlaceHolder(plugin.getConfigFile().getFormatCommandsVoteTodayLine(),
+						placeholders));
 			}
 		}
-		msg = ArrayUtils.getInstance().colorize(msg);
-		return ArrayUtils.getInstance().convert(msg);
+		msg = ArrayUtils.colorize(msg);
+		return ArrayUtils.convert(msg);
 	}
 
 }

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

@@ -20,8 +20,8 @@ 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.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
@@ -46,17 +46,17 @@ public class VoteTopVoter extends GUIHandler {
 	public ArrayList<String> getChat(CommandSender sender) {
 		switch (top) {
 		case AllTime:
-			return ArrayUtils.getInstance().convert(plugin.getTopVoterHandler().topVoterAllTime(page));
+			return ArrayUtils.convert(plugin.getTopVoterHandler().topVoterAllTime(page));
 		case Daily:
-			return ArrayUtils.getInstance().convert(plugin.getTopVoterHandler().topVoterDaily(page));
+			return ArrayUtils.convert(plugin.getTopVoterHandler().topVoterDaily(page));
 		case Monthly:
-			return ArrayUtils.getInstance().convert(plugin.getTopVoterHandler().topVoterMonthly(page));
+			return ArrayUtils.convert(plugin.getTopVoterHandler().topVoterMonthly(page));
 		case Weekly:
-			return ArrayUtils.getInstance().convert(plugin.getTopVoterHandler().topVoterWeekly(page));
+			return ArrayUtils.convert(plugin.getTopVoterHandler().topVoterWeekly(page));
 		default:
 			break;
 		}
-		return new ArrayList<String>();
+		return new ArrayList<>();
 	}
 
 	@Override
@@ -85,7 +85,7 @@ public class VoteTopVoter extends GUIHandler {
 
 			ConfigurationSection customization = plugin.getGui().getChestVoteTopCustomization();
 			boolean customzationEnabled = false;
-			Queue<Integer> playerSlots = new ConcurrentLinkedQueue<Integer>();
+			Queue<Integer> playerSlots = new ConcurrentLinkedQueue<>();
 			if (customization != null) {
 				customzationEnabled = customization.getBoolean("Enabled");
 				List<Integer> customizationPlayerSlots = customization.getIntegerList("PlayerSlots");
@@ -109,7 +109,7 @@ public class VoteTopVoter extends GUIHandler {
 					playerItem = new ItemBuilder(Material.valueOf(plugin.getGui().getChestVoteTopPlayerItemMaterial()));
 				}
 
-				playerItem.setLore(new ArrayList<String>());
+				playerItem.setLore(new ArrayList<>());
 
 				BInventoryButton button = new BInventoryButton(playerItem
 						.setName(plugin.getGui().getChestVoteTopItemName())

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

@@ -65,7 +65,7 @@ public class VoteTopVoterLastMonth extends GUIHandler {
 				playerItem = new ItemBuilder(Material.valueOf(plugin.getGui().getChestVoteTopPlayerItemMaterial()));
 			}
 
-			playerItem.setLore(new ArrayList<String>());
+			playerItem.setLore(new ArrayList<>());
 
 			inv.addButton(new BInventoryButton(playerItem.setName(plugin.getGui().getChestVoteTopItemName())
 					.addLoreLine(plugin.getGui().getChestVoteTopItemLore()).addPlaceholder("position", "" + pos)

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/player/VoteTopVoterPreviousMonths.java

@@ -0,0 +1,147 @@
+package com.bencodez.votingplugin.commands.gui.player;
+
+import java.time.YearMonth;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+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.topvoter.TopVoterPlayer;
+import com.bencodez.votingplugin.user.VotingPluginUser;
+
+import net.md_5.bungee.api.ChatColor;
+
+public class VoteTopVoterPreviousMonths extends GUIHandler {
+
+	private VotingPluginMain plugin;
+	private VotingPluginUser user;
+	private int index = -1;
+
+	public VoteTopVoterPreviousMonths(VotingPluginMain plugin, CommandSender player, VotingPluginUser user, int index) {
+		super(plugin, player);
+		this.plugin = plugin;
+		this.user = user;
+		this.index = index;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender arg0) {
+		return null;
+	}
+
+	public void next(int index) {
+
+	}
+
+	@Override
+	public void onBook(Player player) {
+		// TODO
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+	}
+
+	@Override
+	public void onChest(Player player) {
+
+		Set<YearMonth> months = plugin.getPreviousMonthsTopVoters().keySet();
+
+		List<YearMonth> yearMonthList = months.stream().sorted(Collections.reverseOrder()).collect(Collectors.toList());
+		YearMonth yearMonth = null;
+
+		if (index < 0) {
+			if (!yearMonthList.isEmpty()) {
+				yearMonth = yearMonthList.get(0);
+			}
+			player.sendMessage(ChatColor.RED + "Can't open previous months, no data");
+			return;
+		}
+		if (yearMonthList.size() <= index) {
+			player.sendMessage(ChatColor.RED + "Can't open previous months, no data for requested index");
+			return;
+		}
+		yearMonth = yearMonthList.get(index);
+
+		Set<Entry<TopVoterPlayer, Integer>> users = null;
+		if (!plugin.getPreviousMonthsTopVoters().containsKey(yearMonth)) {
+			player.sendMessage(ChatColor.RED + "Can't open previous months, no data");
+			return;
+		}
+		users = plugin.getPreviousMonthsTopVoters().get(yearMonth).entrySet();
+
+		BInventory inv = new BInventory(plugin.getGui().getChestVoteTopName());
+		inv.addPlaceholder("topvoter", yearMonth.toString());
+		if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
+			inv.dontClose();
+		}
+
+		int pos = 1;
+		for (Entry<TopVoterPlayer, Integer> entry : users) {
+			ItemBuilder playerItem;
+
+			if (plugin.getGui().isChestVoteTopUseSkull()) {
+				playerItem = new ItemBuilder(entry.getKey().getPlayerHead());
+			} else {
+				playerItem = new ItemBuilder(Material.valueOf(plugin.getGui().getChestVoteTopPlayerItemMaterial()));
+			}
+
+			playerItem.setLore(new ArrayList<>());
+
+			inv.addButton(new BInventoryButton(playerItem.setName(plugin.getGui().getChestVoteTopItemName())
+					.addLoreLine(plugin.getGui().getChestVoteTopItemLore()).addPlaceholder("position", "" + pos)
+					.addPlaceholder("player", entry.getKey().getPlayerName())
+					.addPlaceholder("votes", "" + entry.getValue())) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					TopVoterPlayer user = (TopVoterPlayer) getData("User");
+					new VoteGUI(plugin, player, user.getUser())
+							.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
+				}
+			}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey()));
+			pos++;
+		}
+
+		inv.getPageButtons().add(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestVoteTopSwitchItem())
+				.addPlaceholder("Top", yearMonth.toString())) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
+					new VoteTopVoterPreviousMonths(plugin, player, user, index + 1).open(GUIMethod.CHEST);
+				} else {
+					new VoteTopVoterPreviousMonths(plugin, player, user, index - 1).open(GUIMethod.CHEST);
+				}
+			}
+		});
+
+		if (plugin.getGui().isChestVoteTopBackButton()) {
+			inv.getPageButtons().add(plugin.getCommandLoader().getBackButton(user).setSlot(1));
+		}
+
+		inv.setPages(true);
+		inv.setMaxInvSize(plugin.getGui().getChestVoteTopSize());
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}

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

@@ -8,13 +8,13 @@ import org.bukkit.entity.Player;
 import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
 import com.bencodez.advancedcore.api.inventory.BInventory;
-import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.user.VotingPluginUser;
@@ -32,7 +32,7 @@ public class VoteTotal extends GUIHandler {
 
 	@Override
 	public ArrayList<String> getChat(CommandSender arg0) {
-		ArrayList<String> msg = new ArrayList<String>();
+		ArrayList<String> msg = new ArrayList<>();
 
 		int daily = user.getTotal(TopVoter.Daily);
 		int weekly = user.getTotal(TopVoter.Weekly);
@@ -40,15 +40,15 @@ public class VoteTotal extends GUIHandler {
 		int all = user.getTotal(TopVoter.AllTime);
 
 		for (String s : plugin.getConfigFile().getFormatCommandsVoteTotal()) {
-			String str = StringParser.getInstance().replaceIgnoreCase(s, "%DailyTotal%", "" + daily);
-			str = StringParser.getInstance().replaceIgnoreCase(str, "%WeeklyTotal%", "" + weekly);
-			str = StringParser.getInstance().replaceIgnoreCase(str, "%MonthlyTotal%", "" + month);
-			str = StringParser.getInstance().replaceIgnoreCase(str, "%AllTimeTotal%", "" + all);
-			str = StringParser.getInstance().replaceIgnoreCase(str, "%player%", user.getPlayerName());
+			String str = MessageAPI.replaceIgnoreCase(s, "%DailyTotal%", "" + daily);
+			str = MessageAPI.replaceIgnoreCase(str, "%WeeklyTotal%", "" + weekly);
+			str = MessageAPI.replaceIgnoreCase(str, "%MonthlyTotal%", "" + month);
+			str = MessageAPI.replaceIgnoreCase(str, "%AllTimeTotal%", "" + all);
+			str = MessageAPI.replaceIgnoreCase(str, "%player%", user.getPlayerName());
 			msg.add(str);
 		}
 
-		return ArrayUtils.getInstance().colorize(msg);
+		return ArrayUtils.colorize(msg);
 	}
 
 	@Override

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

@@ -7,6 +7,7 @@ import java.util.List;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
 
 import com.bencodez.advancedcore.api.bookgui.BookWrapper;
 import com.bencodez.advancedcore.api.bookgui.Layout;
@@ -18,13 +19,13 @@ import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.messages.MessageBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.user.VotingPluginUser;
+import com.bencodez.votingplugin.votesites.VoteSite;
 
 import xyz.upperlevel.spigot.book.BookUtil;
 
@@ -42,16 +43,15 @@ public class VoteURL extends GUIHandler {
 		if (user == null && player instanceof Player) {
 			this.user = plugin.getVotingPluginUserManager().getVotingPluginUser((Player) player);
 		}
-		if (player != null && user != null && player.getName().equals(user.getPlayerName())) {
-			if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders() && user.hasPrimaryAccount()) {
-				user = plugin.getVotingPluginUserManager().getVotingPluginUser(user.getPrimaryAccount());
-			}
-		}
 	}
 
 	@Override
-	public ArrayList<String> getChat(CommandSender arg0) {
-		ArrayList<String> sites = new ArrayList<String>();
+	public ArrayList<String> getChat(CommandSender sender) {
+		return getChat(sender, false);
+	}
+
+	public ArrayList<String> getChat(CommandSender sender, boolean bypassCanVote) {
+		ArrayList<String> sites = new ArrayList<>();
 
 		List<String> title = plugin.getConfigFile().getFormatCommandsVoteText();
 		if (title != null) {
@@ -59,32 +59,41 @@ public class VoteURL extends GUIHandler {
 		}
 		if (plugin.getConfigFile().isFormatCommandsVoteAutoInputSites()) {
 			int counter = 0;
-			for (VoteSite voteSite : plugin.getVoteSites()) {
+			for (VoteSite voteSite : plugin.getVoteSiteManager().getVoteSitesEnabled()) {
 				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));
+					if (voteSite.getPermissionToView().isEmpty()
+							|| sender.hasPermission(voteSite.getPermissionToView())) {
+						if (!plugin.getConfigFile().isFormatCommandsVoteOnlyShowSitesToVote()
+								|| user.canVoteSite(voteSite) || bypassCanVote) {
+							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) {
-			HashMap<String, String> phs = new HashMap<String, String>();
+			HashMap<String, String> phs = new HashMap<>();
 			phs.put("DailyTotal", "" + user.getTotal(TopVoter.Daily));
 			phs.put("WeekTotal", "" + user.getTotal(TopVoter.Weekly));
 			phs.put("MonthTotal", "" + user.getTotal(TopVoter.Monthly));
 			phs.put("Total", "" + user.getTotal(TopVoter.AllTime));
 
-			sites = ArrayUtils.getInstance().replacePlaceHolder(sites, phs);
+			sites = PlaceholderUtils.replacePlaceHolder(sites, phs);
 		}
 
-		return ArrayUtils.getInstance().colorize(sites);
+		return ArrayUtils.colorize(sites);
 	}
 
 	private ItemBuilder getItemAll() {
@@ -117,13 +126,16 @@ public class VoteURL extends GUIHandler {
 
 		if (user.canVoteSite(voteSite)) {
 			builder = new ItemBuilder(plugin.getGui().getChestVoteURLCanVoteItemSection());
-			builder.setName(
-					plugin.getGui().getChestVoteURLGUISiteNameCanVote().replace("%Name%", voteSite.getDisplayName()));
+			builder.setName(plugin.getGui().getChestVoteURLGUISiteNameCanVote());
 		} else {
-			builder.setName(plugin.getGui().getChestVoteURLGUISiteName().replace("%Name%", voteSite.getDisplayName()));
-			builder.addLoreLine(
-					plugin.getGui().getChestVoteURLNextVote().replace("%Info%", user.voteCommandNextInfo(voteSite)));
+			builder.setName(plugin.getGui().getChestVoteURLGUISiteName());
+			builder.addLoreLine(plugin.getGui().getChestVoteURLNextVote());
 		}
+		builder.addPlaceholder("ServiceSite", voteSite.getServiceSite());
+		builder.addPlaceholder("Name", voteSite.getDisplayName());
+		builder.addPlaceholder("VoteDelay", "" + voteSite.getVoteDelay());
+		builder.addPlaceholder("VoteHour", "" + voteSite.getVoteDelayDailyHour());
+		builder.addPlaceholder("Info", user.voteCommandNextInfo(voteSite));
 
 		return builder;
 	}
@@ -137,21 +149,26 @@ public class VoteURL extends GUIHandler {
 			book.addLayout(layout);
 		}
 		int i = 1;
-		for (VoteSite site : plugin.getVoteSites()) {
-			Layout layout = new Layout(plugin.getGui().getBookVoteURLBookGUILayout()).addPlaceholder("sitename",
-					site.getDisplayName());
-			String text = plugin.getGui().getBookVoteURLBookGUIAlreadyVotedText();
-			ChatColor color = ChatColor.valueOf(plugin.getGui().getBookVoteURLBookGUIAlreadyVotedColor());
-			if (user.canVoteSite(site)) {
-				color = ChatColor.valueOf(plugin.getGui().getBookVoteURLBookGUICanVoteColor());
-				text = plugin.getGui().getBookVoteURLBookGUICanVoteText();
+		for (VoteSite site : plugin.getVoteSiteManager().getVoteSitesEnabled()) {
+			if (!site.isHidden()) {
+				if (site.getPermissionToView().isEmpty() || player.hasPermission(site.getPermissionToView())) {
+					Layout layout = new Layout(plugin.getGui().getBookVoteURLBookGUILayout())
+							.addPlaceholder("sitename", site.getDisplayName()).addPlaceholder("num", "" + i);
+					String text = plugin.getGui().getBookVoteURLBookGUIAlreadyVotedText();
+					ChatColor color = ChatColor.valueOf(plugin.getGui().getBookVoteURLBookGUIAlreadyVotedColor());
+					if (user.canVoteSite(site)) {
+						color = ChatColor.valueOf(plugin.getGui().getBookVoteURLBookGUICanVoteColor());
+						text = plugin.getGui().getBookVoteURLBookGUICanVoteText();
+					}
+					String url = PlaceholderUtils.replacePlaceHolder(PlaceholderUtils.replacePlaceHolder(
+							site.getVoteURLJsonStrip(), "player", user.getPlayerName()), "num", "" + i);
+					layout.replaceTextComponent("[UrlText]",
+							BookUtil.TextBuilder.of(text).color(color).onClick(BookUtil.ClickAction.openUrl(url))
+									.onHover(BookUtil.HoverAction.showText(url)).build());
+					book.addLayout(layout);
+					i++;
+				}
 			}
-			String url = StringParser.getInstance().replacePlaceHolder(StringParser.getInstance()
-					.replacePlaceHolder(site.getVoteURLJsonStrip(), "player", user.getPlayerName()), "num", "" + i);
-			layout.replaceTextComponent("[UrlText]", BookUtil.TextBuilder.of(text).color(color)
-					.onClick(BookUtil.ClickAction.openUrl(url)).onHover(BookUtil.HoverAction.showText(url)).build());
-			book.addLayout(layout);
-			i++;
 		}
 
 		book.open(player);
@@ -164,60 +181,11 @@ public class VoteURL extends GUIHandler {
 
 	@Override
 	public void onChest(Player player) {
-		// normal GUI
+
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteURLName());
-		if (plugin.getGui().isChestVoteURLViewAllUrlsButtonEnabled()) {
-			ItemBuilder builderAll = getItemAll();
 
-			inv.addButton(new UpdatingBInventoryButton(plugin, builderAll, 5000, 5000) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(event.getPlayer());
-					json = true;
-					user.sendMessage(getChat(player));
-				}
-
-				@Override
-				public ItemBuilder onUpdate(Player player) {
-					return getItemAll();
-				}
-			});
-		}
-
-		int startSlot = plugin.getGui().getChestVoteURLAllUrlsButtonStartSlot();
-		for (final VoteSite voteSite : plugin.getVoteSites()) {
-			if (!voteSite.isHidden()) {
-				ItemBuilder builder = getItemVoteSite(voteSite);
-				if (startSlot >= 0) {
-					builder.setSlot(startSlot);
-					startSlot++;
-				}
-
-				inv.addButton(new UpdatingBInventoryButton(plugin, builder, 5000, 5000) {
-
-					@Override
-					public void onClick(ClickEvent event) {
-						Player player = event.getPlayer();
-						if (player != null) {
-							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
-							user.sendMessage(StringParser.getInstance().replacePlaceHolder(StringParser.getInstance()
-									.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
-											plugin.getGui().getChestVoteURLURLText(), "voteurl", voteSite.getVoteURL()),
-											"sitename", voteSite.getDisplayName()),
-									"player", player.getName()));
-
-						}
-
-					}
-
-					@Override
-					public ItemBuilder onUpdate(Player player) {
-						return getItemVoteSite(voteSite);
-					}
-
-				});
-			}
+		if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
+			inv.dontClose();
 		}
 
 		for (final String str : plugin.getGui().getChestVoteURLExtraItems()) {
@@ -233,6 +201,81 @@ public class VoteURL extends GUIHandler {
 			});
 		}
 
+		if (plugin.getGui().isChestVoteURLViewAllUrlsButtonEnabled()) {
+			ItemBuilder builderAll = getItemAll();
+
+			inv.addButton(new UpdatingBInventoryButton(plugin, builderAll, 5000, 5000) {
+
+				@Override
+				public void onClick(ClickEvent event) {
+					event.closeInventory();
+					VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(event.getPlayer());
+					json = true;
+					if (event.getClick().equals(ClickType.SHIFT_LEFT)
+							|| event.getClick().equals(ClickType.SHIFT_RIGHT)) {
+						user.sendMessage(getChat(player, true));
+					} else {
+						user.sendMessage(getChat(player, false));
+					}
+				}
+
+				@Override
+				public ItemBuilder onUpdate(Player player) {
+					return getItemAll();
+				}
+			});
+		}
+
+		int startSlot = plugin.getGui().getChestVoteURLAllUrlsButtonStartSlot();
+		for (final VoteSite voteSite : plugin.getVoteSiteManager().getVoteSitesEnabled()) {
+			if (!voteSite.isHidden()) {
+				if (voteSite.getPermissionToView().isEmpty() || player.hasPermission(voteSite.getPermissionToView())) {
+					ItemBuilder builder = getItemVoteSite(voteSite);
+					if (startSlot >= 0) {
+						if (inv.isSlotTaken(startSlot)) {
+							boolean found = false;
+							while (!found) {
+								startSlot++;
+								if (!inv.isSlotTaken(startSlot)) {
+									found = true;
+								}
+							}
+						}
+						builder.setSlot(startSlot);
+						startSlot++;
+					}
+
+					inv.addButton(new UpdatingBInventoryButton(plugin, builder, 5000, 5000) {
+
+						@Override
+						public void onClick(ClickEvent event) {
+							event.closeInventory();
+							Player player = event.getPlayer();
+							if (player != null) {
+								VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
+								HashMap<String, String> placeholders = new HashMap<>();
+								placeholders.put("voteurl", voteSite.getVoteURL());
+								placeholders.put("sitename", voteSite.getDisplayName());
+								placeholders.put("player", player.getName());
+								placeholders.put("servicesite", voteSite.getServiceSite());
+								placeholders.put("VoteDelay", "" + voteSite.getVoteDelay());
+								placeholders.put("VoteHour", "" + voteSite.getVoteDelayDailyHour());
+								user.sendMessage(plugin.getGui().getChestVoteURLURLText(), placeholders);
+
+							}
+
+						}
+
+						@Override
+						public ItemBuilder onUpdate(Player player) {
+							return getItemVoteSite(voteSite);
+						}
+
+					});
+				}
+			}
+		}
+
 		if (plugin.getGui().isChestVoteURLBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}

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

@@ -14,8 +14,8 @@ import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.user.VotingPluginUser;
+import com.bencodez.votingplugin.votesites.VoteSite;
 
 public class VoteURLVoteSite extends GUIHandler {
 
@@ -47,11 +47,11 @@ public class VoteURLVoteSite extends GUIHandler {
 
 	@Override
 	public void onChest(Player player) {
-		if (!plugin.isVoteSite(voteSite)) {
+		if (!plugin.getVoteSiteManager().isVoteSite(voteSite)) {
 			player.sendMessage("Not a valid votesite");
 			return;
 		}
-		VoteSite site = plugin.getVoteSite(voteSite, true);
+		VoteSite site = plugin.getVoteSiteManager().getVoteSite(voteSite, true);
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteURLSiteName());
 		inv.addPlaceholder("site", site.getDisplayName());
 		inv.setMeta(player, "VoteSite", site);

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/tabcompleter/AdminVoteTabCompleter.java

@@ -10,8 +10,8 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 
-import com.bencodez.advancedcore.api.command.TabCompleteHandler;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.command.AdvancedCoreTabCompleteHandler;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 /**
@@ -32,15 +32,15 @@ public class AdminVoteTabCompleter implements TabCompleter {
 	@Override
 	public List<String> onTabComplete(CommandSender sender, Command cmd, String alias, String[] args) {
 
-		List<String> tab = new ArrayList<String>();
+		List<String> tab = new ArrayList<>();
 
-		Set<String> cmds = new HashSet<String>();
+		Set<String> cmds = new HashSet<>();
 
-		cmds.addAll(TabCompleteHandler.getInstance().getTabCompleteOptions(plugin.getAdminVoteCommand(), sender, args,
-				args.length - 1));
+		cmds.addAll(AdvancedCoreTabCompleteHandler.getInstance().getTabCompleteOptions(plugin.getAdminVoteCommand(),
+				sender, args, args.length - 1));
 
 		for (String str : cmds) {
-			if (StringParser.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
+			if (MessageAPI.startsWithIgnoreCase(str, args[args.length - 1])) {
 				tab.add(str);
 			}
 		}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/tabcompleter/AliasCommandFilterListener.java

@@ -0,0 +1,141 @@
+package com.bencodez.votingplugin.commands.tabcompleter;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerCommandSendEvent;
+
+import com.bencodez.votingplugin.VotingPluginMain;
+
+/**
+ * Filters VotingPlugin command aliases from tab completion when aliases are
+ * disabled.
+ * <p>
+ * This listener ONLY hides aliases that are explicitly listed in VotingPlugin's
+ * plugin.yml under the "aliases:" section for the "vote" and "adminvote"
+ * commands.
+ * <p>
+ * It will NOT hide unrelated commands such as "/votechallenge" unless that
+ * exact command name is an alias defined in VotingPlugin's plugin.yml.
+ */
+public class AliasCommandFilterListener implements Listener {
+
+	private final VotingPluginMain plugin;
+
+	/**
+	 * Cached lowercase alias names (without '/') that should be hidden when alias
+	 * loading is disabled.
+	 */
+	private final Set<String> aliasesToHide;
+
+	/**
+	 * Creates a new listener and caches aliases from VotingPlugin's plugin.yml.
+	 *
+	 * @param plugin VotingPlugin main instance
+	 */
+	public AliasCommandFilterListener(VotingPluginMain plugin) {
+		this.plugin = plugin;
+		this.aliasesToHide = buildAliasesToHide(plugin);
+	}
+
+	/**
+	 * Removes VotingPlugin aliases from the player's available command list when
+	 * alias loading is disabled.
+	 *
+	 * @param event Bukkit command send event
+	 */
+	@EventHandler
+	public void onPlayerCommandSend(PlayerCommandSendEvent event) {
+		// Only hide when aliases feature is disabled
+		if (plugin.getConfigFile().isLoadCommandAliases()) {
+			return;
+		}
+
+		// Remove ONLY exact alias command names (not "vote*" prefixes)
+		event.getCommands().removeIf(this::shouldHideCommand);
+	}
+
+	/**
+	 * Determines whether a specific command should be hidden.
+	 *
+	 * @param cmd Command name (without '/'), possibly namespaced (e.g.
+	 *            "otherplugin:vote")
+	 * @return true if the command should be hidden
+	 */
+	private boolean shouldHideCommand(String cmd) {
+		String name = cmd.toLowerCase(Locale.ROOT);
+
+		// Never touch namespaced commands (otherplugin:vote)
+		if (name.contains(":")) {
+			return false;
+		}
+
+		// Always keep the primary commands visible
+		if (name.equals("vote") || name.equals("adminvote")) {
+			return false;
+		}
+
+		// Hide only exact aliases defined in VotingPlugin plugin.yml
+		return aliasesToHide.contains(name);
+	}
+
+	/**
+	 * Builds the set of aliases to hide from VotingPlugin's plugin.yml.
+	 * <p>
+	 * Bukkit exposes the plugin.yml "commands" section via
+	 * {@code plugin.getDescription().getCommands()}. Each command entry is a map
+	 * that may contain an "aliases" key.
+	 *
+	 * @param plugin VotingPlugin main instance
+	 * @return a lowercase set of alias command names
+	 */
+	private Set<String> buildAliasesToHide(VotingPluginMain plugin) {
+		Set<String> aliases = new HashSet<>();
+
+		Map<String, Map<String, Object>> commands = plugin.getDescription().getCommands();
+		if (commands == null || commands.isEmpty()) {
+			return Collections.emptySet();
+		}
+
+		// Only consider aliases for these main commands
+		addAliasesFor(commands, "vote", aliases);
+		addAliasesFor(commands, "adminvote", aliases);
+
+		return Collections.unmodifiableSet(aliases);
+	}
+
+	/**
+	 * Adds aliases for a given command from the plugin.yml commands map into the
+	 * provided set.
+	 *
+	 * @param commandsMap full commands map from PluginDescriptionFile
+	 * @param commandName the primary command to read aliases for (e.g. "vote")
+	 * @param out         output set to add lowercase alias names into
+	 */
+	@SuppressWarnings("unchecked")
+	private static void addAliasesFor(Map<String, Map<String, Object>> commandsMap, String commandName,
+			Set<String> out) {
+		Map<String, Object> cmdInfo = commandsMap.get(commandName);
+		if (cmdInfo == null) {
+			return;
+		}
+
+		Object aliasesObj = cmdInfo.get("aliases");
+		if (aliasesObj instanceof String) {
+			// plugin.yml also allows a single alias as a string
+			out.add(((String) aliasesObj).toLowerCase(Locale.ROOT));
+		} else if (aliasesObj instanceof Collection) {
+			for (Object o : (Collection<Object>) aliasesObj) {
+				if (o != null) {
+					out.add(o.toString().toLowerCase(Locale.ROOT));
+				}
+			}
+		}
+	}
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/tabcompleter/AliasesTabCompleter.java

@@ -12,9 +12,9 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 
 import com.bencodez.advancedcore.api.command.CommandHandler;
-import com.bencodez.advancedcore.api.command.TabCompleteHandler;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.command.TabCompleteHandler;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 /**
@@ -39,19 +39,19 @@ public class AliasesTabCompleter implements TabCompleter {
 	 */
 	@Override
 	public List<String> onTabComplete(CommandSender sender, Command cmd, String alias, String[] argsIn) {
-		ArrayList<String> msgArray = new ArrayList<String>();
+		ArrayList<String> msgArray = new ArrayList<>();
 		msgArray.add("");
 		for (String arg : argsIn) {
 			msgArray.add(arg);
 		}
 
-		String[] args = ArrayUtils.getInstance().convert(msgArray);
+		String[] args = ArrayUtils.convert(msgArray);
 
-		ArrayList<String> tab = new ArrayList<String>();
+		ArrayList<String> tab = new ArrayList<>();
 
-		Set<String> cmds = new HashSet<String>();
+		Set<String> cmds = new HashSet<>();
 
-		ArrayList<CommandHandler> cmdHandlers = new ArrayList<CommandHandler>();
+		ArrayList<CommandHandler> cmdHandlers = new ArrayList<>();
 
 		if (adminCommand) {
 			cmdHandlers.addAll(plugin.getAdminVoteCommand());
@@ -88,7 +88,7 @@ public class AliasesTabCompleter implements TabCompleter {
 		}
 
 		for (String str : cmds) {
-			if (StringParser.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
+			if (MessageAPI.startsWithIgnoreCase(str, args[args.length - 1])) {
 				tab.add(str);
 			}
 		}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/tabcompleter/VoteTabCompleter.java

@@ -10,8 +10,8 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 
-import com.bencodez.advancedcore.api.command.TabCompleteHandler;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.command.AdvancedCoreTabCompleteHandler;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 // TODO: Auto-generated Javadoc
@@ -33,15 +33,15 @@ public class VoteTabCompleter implements TabCompleter {
 	@Override
 	public List<String> onTabComplete(CommandSender sender, Command cmd, String alias, String[] args) {
 
-		ArrayList<String> tab = new ArrayList<String>();
+		ArrayList<String> tab = new ArrayList<>();
 
-		Set<String> cmds = new HashSet<String>();
+		Set<String> cmds = new HashSet<>();
 
-		cmds.addAll(TabCompleteHandler.getInstance().getTabCompleteOptions(plugin.getVoteCommand(), sender, args,
-				args.length - 1));
+		cmds.addAll(AdvancedCoreTabCompleteHandler.getInstance().getTabCompleteOptions(plugin.getVoteCommand(), sender,
+				args, args.length - 1));
 
 		for (String str : cmds) {
-			if (StringParser.getInstance().startsWithIgnoreCase(str, args[args.length - 1])) {
+			if (MessageAPI.startsWithIgnoreCase(str, args[args.length - 1])) {
 				tab.add(str);
 			}
 		}

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

@@ -3,26 +3,18 @@ package com.bencodez.votingplugin.config;
 import java.io.File;
 import java.util.ArrayList;
 
-import com.bencodez.advancedcore.api.yml.YMLFile;
-import com.bencodez.advancedcore.api.yml.annotation.AnnotationHandler;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataBoolean;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataInt;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataListString;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataString;
+import com.bencodez.simpleapi.file.YMLFile;
+import com.bencodez.simpleapi.file.annotation.AnnotationHandler;
+import com.bencodez.simpleapi.file.annotation.ConfigDataBoolean;
+import com.bencodez.simpleapi.file.annotation.ConfigDataInt;
+import com.bencodez.simpleapi.file.annotation.ConfigDataListString;
+import com.bencodez.simpleapi.file.annotation.ConfigDataString;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 import lombok.Getter;
 
 public class BungeeSettings extends YMLFile {
 
-	@ConfigDataBoolean(path = "BungeeBroadcast")
-	@Getter
-	private boolean bungeeBroadcast = false;
-
-	@ConfigDataBoolean(path = "BungeeBroadcastAlways")
-	@Getter
-	private boolean bungeeBroadcastAlways = false;
-
 	@ConfigDataBoolean(path = "BungeeDebug")
 	@Getter
 	private boolean bungeeDebug = false;
@@ -33,19 +25,55 @@ public class BungeeSettings extends YMLFile {
 
 	@ConfigDataString(path = "Redis.Host")
 	@Getter
-	private String RedisHost = "";
+	private String redisHost = "";
 
 	@ConfigDataString(path = "Redis.Username")
 	@Getter
-	private String RedisUsername = "";
+	private String redisUsername = "";
+
+	@ConfigDataInt(path = "Redis.Db-Index")
+	@Getter
+	private int redisdbindex = 0;
+
+	@ConfigDataString(path = "PluginMessageChannel")
+	@Getter
+	private String pluginMessagingChannel = "vp:vp";
+
+	@ConfigDataBoolean(path = "PluginMessageEncryption")
+	@Getter
+	private boolean pluginMessageEncryption = false;
+
+	@ConfigDataString(path = "Redis.Prefix")
+	@Getter
+	private String redisPrefix = "";
 
 	@ConfigDataString(path = "Redis.Password")
 	@Getter
-	private String RedisPassword = "";
+	private String redisPassword = "";
 
 	@ConfigDataInt(path = "Redis.Port")
 	@Getter
-	private int RedisPort = 6379;
+	private int redisPort = 6379;
+
+	@ConfigDataString(path = "MQTT.ClientID")
+	@Getter
+	private String mqttClientID = "";
+
+	@ConfigDataString(path = "MQTT.BrokerURL")
+	@Getter
+	private String mqttBrokerURL = "tcp://localhost:1883";
+
+	@ConfigDataString(path = "MQTT.Username")
+	@Getter
+	private String mqttUsername = "";
+
+	@ConfigDataString(path = "MQTT.Password")
+	@Getter
+	private String mqttPassword = "";
+
+	@ConfigDataString(path = "MQTT.Prefix")
+	@Getter
+	private String mqttPrefix = "";
 
 	@ConfigDataString(path = "BungeeServer.Host")
 	@Getter
@@ -59,10 +87,6 @@ public class BungeeSettings extends YMLFile {
 	@Getter
 	private boolean perServerPoints = false;
 
-	@ConfigDataBoolean(path = "PerServerMilestones")
-	@Getter
-	private boolean perServerMilestones = false;
-
 	@ConfigDataBoolean(path = "GiveExtraAllSitesRewards")
 	@Getter
 	private boolean giveExtraAllSitesRewards = false;
@@ -99,10 +123,6 @@ public class BungeeSettings extends YMLFile {
 	@Getter
 	private boolean votifierBypass = false;
 
-	@ConfigDataBoolean(path = "DisableBroadcast")
-	@Getter
-	private boolean disableBroadcast = false;
-
 	@ConfigDataBoolean(path = "GlobalData.UseMainMySQL")
 	@Getter
 	private boolean globlalDataUseMainMySQL = true;
@@ -113,10 +133,11 @@ public class BungeeSettings extends YMLFile {
 
 	@ConfigDataListString(path = "BungeeVotePartyGlobalCommands")
 	@Getter
-	private ArrayList<String> bungeeVotePartyGlobalCommands = new ArrayList<String>();
+	private ArrayList<String> bungeeVotePartyGlobalCommands = new ArrayList<>();
 
 	public BungeeSettings(VotingPluginMain plugin) {
 		super(plugin, new File(plugin.getDataFolder(), "BungeeSettings.yml"));
+		setIgnoreCase(plugin.getConfigFile().isCaseInsensitiveYMLFiles());
 	}
 
 	public String getServerNameStorage() {

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

@@ -7,14 +7,15 @@ 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;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataInt;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataKeys;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataListString;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataString;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.file.YMLFile;
+import com.bencodez.simpleapi.file.annotation.AnnotationHandler;
+import com.bencodez.simpleapi.file.annotation.ConfigDataBoolean;
+import com.bencodez.simpleapi.file.annotation.ConfigDataInt;
+import com.bencodez.simpleapi.file.annotation.ConfigDataKeys;
+import com.bencodez.simpleapi.file.annotation.ConfigDataListString;
+import com.bencodez.simpleapi.file.annotation.ConfigDataLong;
+import com.bencodez.simpleapi.file.annotation.ConfigDataString;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.placeholders.PlaceholderCacheLevel;
 import com.bencodez.votingplugin.topvoter.TopVoter;
@@ -39,14 +40,30 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean addTotalsOffline = true;
 
+	@ConfigDataBoolean(path = "LoadInteralExpansion")
+	@Getter
+	private boolean loadInteralExpansion = true;
+
 	@ConfigDataBoolean(path = "PerSiteCoolDownEvents")
 	@Getter
 	private boolean perSiteCoolDownEvents = false;
 
+	@ConfigDataInt(path = "LimitVotePoints")
+	@Getter
+	private int limitVotePoints = -1;
+
+	@ConfigDataBoolean(path = "CaseInsensitiveYMLFiles")
+	@Getter
+	public boolean caseInsensitiveYMLFiles = false;
+
 	@ConfigDataBoolean(path = "QueueVotesDuringTimeChange")
 	@Getter
 	private boolean queueVotesDuringTimeChange = false;
 
+	@ConfigDataBoolean(path = "AdvancedServiceSiteHandling")
+	@Getter
+	private boolean advancedServiceSiteHandling = false;
+
 	@ConfigDataBoolean(path = "AllowUnjoined")
 	@Getter
 	private boolean allowUnjoined = false;
@@ -55,6 +72,185 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean preloadSkulls = false;
 
+	@ConfigDataBoolean(path = "DiscordSRV.Enabled")
+	@Getter
+	private boolean discordSRVEnabled = false;
+
+	@ConfigDataBoolean(path = "DiscordSRV.TopVoter.AllTime.Enabled")
+	@Getter
+	private boolean discordSRVTopVoterAllTimeEnabled = false;
+
+	@ConfigDataBoolean(path = "DiscordSRV.TopVoter.AllTime.NewMessageOnUpdate")
+	@Getter
+	private boolean discordSRVTopVoterAllTimeNewMessageOnUpdate = false;
+
+	@ConfigDataBoolean(path = "DiscordSRV.TopVoter.Monthly.NewMessageOnUpdate")
+	@Getter
+	private boolean discordSRVTopVoterMonthlyNewMessageOnUpdate = false;
+
+	@ConfigDataBoolean(path = "DiscordSRV.TopVoter.Weekly.NewMessageOnUpdate")
+	@Getter
+	private boolean discordSRVTopVoterWeeklyNewMessageOnUpdate = false;
+
+	@ConfigDataBoolean(path = "DiscordSRV.TopVoter.Daily.NewMessageOnUpdate")
+	@Getter
+	private boolean discordSRVTopVoterDailyNewMessageOnUpdate = false;
+
+	@ConfigDataLong(path = "DiscordSRV.TopVoter.AllTime.Channel")
+	@Getter
+	private long discordSRVTopVoterAllTimeChannel = 0;
+
+	@ConfigDataString(path = "DiscordSRV.TopVoter.AllTime.Title")
+	@Getter
+	private String discordSRVTopVoterAllTimeTitle = "All Time Top Voters";
+
+	@ConfigDataString(path = "DiscordSRV.TopVoter.AllTime.RankDisplay")
+	@Getter
+	private String discordSRVTopVoterAllTimeRankDisplay = "%rank%: %player% - %votes% Votes";
+
+	@ConfigDataBoolean(path = "DiscordSRV.TopVoter.Monthly.Enabled")
+	@Getter
+	private boolean discordSRVTopVoterMonthlyEnabled = false;
+
+	@ConfigDataLong(path = "DiscordSRV.TopVoter.Monthly.Channel")
+	@Getter
+	private long discordSRVTopVoterMonthlyChannel = 0;
+
+	@ConfigDataString(path = "DiscordSRV.TopVoter.Monthly.Title")
+	@Getter
+	private String discordSRVTopVoterMonthlyTitle = "Top Voters of the Month";
+
+	@ConfigDataString(path = "DiscordSRV.TopVoter.Monthly.RankDisplay")
+	@Getter
+	private String discordSRVTopVoterMonthlyRankDisplay = "%rank%: %player% - %votes% Votes";
+
+	@ConfigDataBoolean(path = "DiscordSRV.TopVoter.Weekly.Enabled")
+	@Getter
+	private boolean discordSRVTopVoterWeeklyEnabled = false;
+
+	@ConfigDataLong(path = "DiscordSRV.TopVoter.Weekly.Channel")
+	@Getter
+	private long discordSRVTopVoterWeeklyChannel = 0;
+
+	@ConfigDataString(path = "DiscordSRV.TopVoter.Weekly.Title")
+	@Getter
+	private String discordSRVTopVoterWeeklyTitle = "Top Voters of the Week";
+
+	@ConfigDataString(path = "DiscordSRV.TopVoter.Weekly.RankDisplay")
+	@Getter
+	private String discordSRVTopVoterWeeklyRankDisplay = "%rank%: %player% - %votes% Votes";
+
+	@ConfigDataBoolean(path = "DiscordSRV.TopVoter.Daily.Enabled")
+	@Getter
+	private boolean discordSRVTopVoterDailyEnabled = false;
+
+	@ConfigDataLong(path = "DiscordSRV.TopVoter.Daily.Channel")
+	@Getter
+	private long discordSRVTopVoterDailyChannel = 0;
+
+	@ConfigDataString(path = "DiscordSRV.TopVoter.Daily.Title")
+	@Getter
+	private String discordSRVTopVoterDailyTitle = "Top Voters of the Day";
+
+	@ConfigDataString(path = "DiscordSRV.TopVoter.Daily.RankDisplay")
+	@Getter
+	private String discordSRVTopVoterDailyRankDisplay = "%rank%: %player% - %votes% Votes";
+
+	// VoteLogging configuration section - minimal options mirror Config.yml
+	@ConfigDataBoolean(path = "VoteLogging.Enabled")
+	@Getter
+	private boolean voteLoggingEnabled = false;
+
+	@ConfigDataInt(path = "VoteLogging.PurgeDays")
+	@Getter
+	private int voteLoggingPurgeDays = 30;
+
+	@ConfigDataBoolean(path = "VoteLogging.UseMainMySQL")
+	@Getter
+	private boolean voteLoggingUseMainMySQL = true;
+
+	public ConfigurationSection getVoteLoggingSection() {
+		if (!getData().isConfigurationSection("VoteLogging")) {
+			getData().createSection("VoteLogging");
+		}
+		return getData().getConfigurationSection("VoteLogging");
+	}
+
+	public boolean isDiscordSRVTopVoterEnabled(TopVoter topVoter) {
+		switch (topVoter) {
+		case AllTime:
+			return isDiscordSRVTopVoterAllTimeEnabled();
+		case Monthly:
+			return isDiscordSRVTopVoterMonthlyEnabled();
+		case Weekly:
+			return isDiscordSRVTopVoterWeeklyEnabled();
+		case Daily:
+			return isDiscordSRVTopVoterDailyEnabled();
+		default:
+			return false;
+		}
+	}
+
+	public boolean isDiscordSRVTopVoterNewMessageOnUpdate(TopVoter topVoter) {
+		switch (topVoter) {
+		case AllTime:
+			return isDiscordSRVTopVoterAllTimeNewMessageOnUpdate();
+		case Monthly:
+			return isDiscordSRVTopVoterMonthlyNewMessageOnUpdate();
+		case Weekly:
+			return isDiscordSRVTopVoterWeeklyNewMessageOnUpdate();
+		case Daily:
+			return isDiscordSRVTopVoterDailyNewMessageOnUpdate();
+		default:
+			return false;
+		}
+	}
+
+	public long getDiscordSRVTopVoterChannel(TopVoter topVoter) {
+		switch (topVoter) {
+		case AllTime:
+			return getDiscordSRVTopVoterAllTimeChannel();
+		case Monthly:
+			return getDiscordSRVTopVoterMonthlyChannel();
+		case Weekly:
+			return getDiscordSRVTopVoterWeeklyChannel();
+		case Daily:
+			return getDiscordSRVTopVoterDailyChannel();
+		default:
+			return 0;
+		}
+	}
+
+	public String getDiscordSRVTopVoterTitle(TopVoter topVoter) {
+		switch (topVoter) {
+		case AllTime:
+			return getDiscordSRVTopVoterAllTimeTitle();
+		case Monthly:
+			return getDiscordSRVTopVoterMonthlyTitle();
+		case Weekly:
+			return getDiscordSRVTopVoterWeeklyTitle();
+		case Daily:
+			return getDiscordSRVTopVoterDailyTitle();
+		default:
+			return "";
+		}
+	}
+
+	public String getDiscordSRVTopVoterRankDisplay(TopVoter topVoter) {
+		switch (topVoter) {
+		case AllTime:
+			return getDiscordSRVTopVoterAllTimeRankDisplay();
+		case Monthly:
+			return getDiscordSRVTopVoterMonthlyRankDisplay();
+		case Weekly:
+			return getDiscordSRVTopVoterWeeklyRankDisplay();
+		case Daily:
+			return getDiscordSRVTopVoterDailyRankDisplay();
+		default:
+			return "";
+		}
+	}
+
 	@ConfigDataBoolean(path = "AllowUnJoinedCheckServer")
 	@Getter
 	private boolean allowUnJoinedCheckServer = true;
@@ -75,10 +271,6 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean extraVoteShopCheck = true;
 
-	@ConfigDataBoolean(path = "TrackShopPurchases")
-	@Getter
-	private boolean trackShopPurchases = false;
-
 	@ConfigDataBoolean(path = "AlwaysUpdate")
 	@Getter
 	private boolean alwaysUpdate = false;
@@ -87,17 +279,13 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean autoCreateVoteSites = true;
 
-	@ConfigDataBoolean(path = "Format.BroadcastVote")
-	@Getter
-	private boolean broadcastVotesEnabled = true;
-
 	@ConfigDataBoolean(path = "CountFakeVotes")
 	@Getter
 	private boolean countFakeVotes = true;
 
-	@ConfigDataInt(path = "DelayBetweenUpdates")
+	@ConfigDataString(path = "DelayBetweenUpdates")
 	@Getter
-	private int delayBetweenUpdates = 3;
+	private String delayBetweenUpdates = "3m";
 
 	@ConfigDataBoolean(path = "DisableAdvancedTab")
 	@Getter
@@ -109,15 +297,15 @@ public class Config extends YMLFile {
 
 	@ConfigDataListString(path = "DisabledCommands")
 	@Getter
-	private ArrayList<String> disabledCommands = new ArrayList<String>();
+	private ArrayList<String> disabledCommands = new ArrayList<>();
 
 	@ConfigDataListString(path = "DisabledDefaultPermissions")
 	@Getter
-	private ArrayList<String> disabledDefaultPermissions = new ArrayList<String>();
+	private ArrayList<String> disabledDefaultPermissions = new ArrayList<>();
 
 	@ConfigDataListString(path = "CachedPlaceholders")
 	@Getter
-	private ArrayList<String> cachedPlaceholders = new ArrayList<String>();
+	private ArrayList<String> cachedPlaceholders = new ArrayList<>();
 
 	@ConfigDataBoolean(path = "DisableInteractEvent")
 	@Getter
@@ -127,6 +315,14 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean disableNoServiceSiteMessage = false;
 
+	@ConfigDataString(path = "Format.Commands.AdminVote.Points.PlayerRemoved")
+	@Getter
+	private String formatCommandsAdminVotePointsPlayerRemoved = "&c%amount% voting points have been removed from you";
+
+	@ConfigDataString(path = "Format.Commands.AdminVote.Points.PlayerGiven")
+	@Getter
+	private String formatCommandsAdminVotePointsPlayerGiven = "&cYou have been given %amount% voting points";
+
 	@ConfigDataBoolean(path = "DisableUpdateChecking")
 	@Getter
 	private boolean disableUpdateChecking = false;
@@ -143,26 +339,6 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean extraBackgroundUpdate = false;
 
-	@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;
-
-	@ConfigDataBoolean(path = "Format.OnlyOneOfflineBroadcast")
-	@Getter
-	private boolean formatOnlyOneOfflineBroadcast = false;
-
-	@ConfigDataString(path = "Format.OfflineBroadcast")
-	@Getter
-	private String formatOfflineBroadcast = "&6[&4Broadcast&6] &2Thanks &c%player% &2for voting on %numberofvotes% times!";
-
 	@ConfigDataBoolean(path = "Format.Commands.Vote.ForceLinks")
 	@Getter
 	private boolean formatCommandsVoteForceLinks = true;
@@ -213,7 +389,7 @@ public class Config extends YMLFile {
 
 	@ConfigDataListString(path = "Format.Commands.Vote.Today.Title")
 	@Getter
-	private ArrayList<String> formatCommandsVoteTodayTitle = ArrayUtils.getInstance()
+	private ArrayList<String> formatCommandsVoteTodayTitle = ArrayUtils
 			.convert(new String[] { "&cToday's Votes %page%/%maxpage%", "&cPlayerName : VoteSite : Time" });
 
 	@ConfigDataString(path = "Format.Commands.Vote.ToggleBroadcasts.Disabled")
@@ -275,10 +451,6 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean loadCommandAliases = true;
 
-	@ConfigDataBoolean(path = "LogVotesToFile")
-	@Getter
-	private boolean logVotesToFile = false;
-
 	@ConfigDataInt(path = "MaxiumNumberOfTopVotersToLoad")
 	@Getter
 	private int MaxiumNumberOfTopVotersToLoad = 1000;
@@ -311,10 +483,6 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean useJavascriptPlaceholders = false;
 
-	@ConfigDataBoolean(path = "UsePrimaryAccountForPlaceholders")
-	@Getter
-	private boolean usePrimaryAccountForPlaceholders = false;
-
 	@ConfigDataBoolean(path = "UseVoteGUIMainCommand")
 	@Getter
 	private boolean useVoteGUIMainCommand = false;
@@ -325,61 +493,27 @@ public class Config extends YMLFile {
 
 	@ConfigDataListString(path = "VotingBroadcastBlacklist")
 	@Getter
-	private ArrayList<String> votingBroadcastBlacklist = new ArrayList<String>();
-
-	public Config(VotingPluginMain plugin) {
-		super(plugin, new File(plugin.getDataFolder(), "Config.yml"));
-	}
-
-	/**
-	 * Gets the black list.
-	 *
-	 * @return the black list
-	 */
-	@SuppressWarnings("unchecked")
-	public ArrayList<String> getBlackList() {
-		return (ArrayList<String>) getData().getList("BlackList", new ArrayList<String>());
-	}
+	private ArrayList<String> votingBroadcastBlacklist = new ArrayList<>();
 
 	@ConfigDataKeys(path = "CustomCommands")
 	@Getter
-	private Set<String> customCommands = new HashSet<String>();
+	private Set<String> customCommands = new HashSet<>();
 
 	@ConfigDataKeys(path = "CustomPlaceholderReturns")
 	@Getter
-	private Set<String> customPlaceholderReturns = new HashSet<String>();
-
-	public Set<String> getCustomPlaceholderReturns(String placeholder) {
-		Set<String> str = getData().getConfigurationSection("CustomPlaceholderReturns." + placeholder).getKeys(false);
-		if (str == null) {
-			str = new HashSet<String>();
-		}
-		return str;
-	}
-
-	public String getCustomPlaceholderReturns(String placeholder, String returnString) {
-		return getData().getString("CustomPlaceholderReturns." + placeholder + "." + returnString, "");
-	}
-
-	public ConfigurationSection getCustomCommands(String ident) {
-		return getData().getConfigurationSection("CustomCommands." + ident);
-	}
-
-	@ConfigDataString(path = "Format.BroadcastMsg")
-	@Getter
-	private String formatBroadCastMsg = "&6[&4Broadcast&6] &2Thanks &c%player% &2for voting on %SiteName%";
-
-	@ConfigDataBoolean(path = "Format.BroadcastWhenOnline")
-	@Getter
-	private boolean formatBroadcastWhenOnline = false;
+	private Set<String> customPlaceholderReturns = new HashSet<>();
 
 	@ConfigDataBoolean(path = "Format.Commands.Vote.AutoInputSites")
 	@Getter
 	private boolean formatCommandsVoteAutoInputSites = true;
 
+	@ConfigDataBoolean(path = "Format.Commands.Vote.OnlyShowSitesToVote")
+	@Getter
+	private boolean formatCommandsVoteOnlyShowSitesToVote = false;
+
 	@ConfigDataListString(path = "Format.Commands.Vote.Best.Lines")
 	@Getter
-	private ArrayList<String> formatCommandsVoteBestLines = new ArrayList<String>();
+	private ArrayList<String> formatCommandsVoteBestLines = new ArrayList<>();
 
 	@ConfigDataString(path = "Format.Commands.Vote.Best.Title")
 	@Getter
@@ -425,10 +559,6 @@ public class Config extends YMLFile {
 	@Getter
 	private String placeholderCacheLevelString = "AUTO";
 
-	public PlaceholderCacheLevel getPlaceholderCacheLevel() {
-		return PlaceholderCacheLevel.getCache(getPlaceholderCacheLevelString());
-	}
-
 	@ConfigDataString(path = "Format.Commands.Vote.Next.Layout")
 	@Getter
 	private String formatCommandsVoteNextLayout = "&3%SiteName%: &6%info%";
@@ -437,69 +567,10 @@ public class Config extends YMLFile {
 	@Getter
 	private String formatCommandsVoteNextTitle = "&3&l%player% Next Votes:";
 
-	/**
-	 * Gets the commands vote party.
-	 *
-	 * @return the commands vote party
-	 */
-	@SuppressWarnings("unchecked")
-	public ArrayList<String> getFormatCommandsVoteParty() {
-		ArrayList<String> msg = new ArrayList<String>();
-		msg.add("&cCurrently at &6%Votes%&c, &6%NeededVotes% &cmore votes to go to reach &6%VotesRequired%");
-		return (ArrayList<String>) getData().getList("Format.Commands.Vote.Party", msg);
-
-	}
-
-	@SuppressWarnings("unchecked")
-	public ArrayList<String> getFormatCommandsVoteStreakLines() {
-		return (ArrayList<String>) getData().getList("Format.Commands.Vote.Streak.Lines", new ArrayList<String>());
-	}
-
 	@ConfigDataString(path = "Format.Commands.Vote.Streak.Title")
 	@Getter
 	private String formatCommandsVoteStreakTitle = "&3&l%player% Vote Streak";
 
-	/**
-	 * Gets the commands vote text.
-	 *
-	 * @return the commands vote text
-	 */
-	@SuppressWarnings("unchecked")
-	public ArrayList<String> getFormatCommandsVoteText() {
-		ArrayList<String> str = new ArrayList<String>();
-		str.add("&4&lVote for our server!");
-		return (ArrayList<String>) getData().getList("Format.Commands.Vote.Text", str);
-	}
-
-	@SuppressWarnings("unchecked")
-	public ArrayList<String> getFormatCommandsVoteTotal() {
-		ArrayList<String> list = (ArrayList<String>) getData().getList("Format.Commands.Vote.Total",
-				new ArrayList<String>());
-		if (list.isEmpty()) {
-			list.add("&3&l%player% Total Votes:");
-			list.add("&3&lDaily Total: &6&l%DailyTotal%");
-			list.add("&3&lWeekly Total: &6&l%WeeklyTotal%");
-			list.add("&3&lMonthly Total: &6&l%MonthlyTotal%");
-			list.add("&3&lAllTime Total: &6&l%AllTimeTotal%");
-		}
-		return list;
-	}
-
-	@SuppressWarnings("unchecked")
-	public ArrayList<String> getFormatCommandsVoteTotalAll() {
-
-		ArrayList<String> list = (ArrayList<String>) getData().getList("Format.Commands.Vote.TotalAll",
-				new ArrayList<String>());
-		if (list.isEmpty()) {
-			list.add("&3&lServer Total Votes:");
-			list.add("&3&lDaily Total: &6&l%DailyTotal%");
-			list.add("&3&lWeekly Total: &6&l%WeeklyTotal%");
-			list.add("&3&lMonthly Total: &6&l%MonthlyTotal%");
-			list.add("&3&lAllTime Total: &6&l%AllTimeTotal%");
-		}
-		return list;
-	}
-
 	@ConfigDataString(path = "Format.Commands.Vote.Sites")
 	@Getter
 	private String formatCommandsVoteURLS = "&4%num%: &c&l%SiteName% - &c%url%";
@@ -551,9 +622,11 @@ public class Config extends YMLFile {
 	@ConfigDataString(path = "Format.Signs.TopVoterSign.Line2")
 	@Getter
 	private String formatSignTopVoterSignLine2 = "#%position%";
+
 	@ConfigDataString(path = "Format.Signs.TopVoterSign.Line3")
 	@Getter
 	private String formatSignTopVoterSignLine3 = "%player%";
+
 	@ConfigDataString(path = "Format.Signs.TopVoterSign.Line4")
 	@Getter
 	private String formatSignTopVoterSignLine4 = "%votes% Votes";
@@ -593,40 +666,13 @@ public class Config extends YMLFile {
 	@ConfigDataString(path = "Format.InvalidCommand.Vote")
 	@Getter
 	private String formatInvalidCommandVote = "&4No valid arguments, see /vote help!";
-
 	@ConfigDataString(path = "Format.InvalidCommand.AdminVote")
 	@Getter
 	private String formatInvalidCommandAdminVote = "&4No valid arguments, see /adminvote help!";
-
-	/**
-	 * Gets the vote help.
-	 *
-	 * @return the vote help
-	 */
-	@SuppressWarnings("unchecked")
-	public ArrayList<String> getFormatVoteHelp() {
-		return (ArrayList<String>) getData().getList("Format.Commands.Vote.Help.Lines", new ArrayList<String>());
-	}
-
 	@ConfigDataBoolean(path = "GiveDefaultPermission")
 	@Getter
 	private boolean giveDefaultPermission = true;
 
-	public boolean getLoadTopVoter(TopVoter top) {
-		switch (top) {
-		case AllTime:
-			return isLoadTopVoterAllTime();
-		case Daily:
-			return isLoadTopVoterDaily();
-		case Monthly:
-			return isLoadTopVoterMonthly();
-		case Weekly:
-			return isLoadTopVoterWeekly();
-		default:
-			return false;
-		}
-	}
-
 	@ConfigDataBoolean(path = "LoadTopVoter.AllTime")
 	@Getter
 	private boolean loadTopVoterAllTime = true;
@@ -647,13 +693,17 @@ public class Config extends YMLFile {
 	@Getter
 	private int pointsOnVote = 1;
 
-	@ConfigDataInt(path = "PurgeMin")
+	@ConfigDataBoolean(path = "PurgeNoDataOnStartup")
 	@Getter
-	private int purgeMin = 90;
+	private boolean purgeNoDataOnStartup = false;
 
-	@ConfigDataBoolean(path = "PurgeOldData")
+	@ConfigDataBoolean(path = "StoreMonthTotalsWithDate")
 	@Getter
-	private boolean purgeOldData = false;
+	private boolean storeMonthTotalsWithDate = false;
+
+	@ConfigDataBoolean(path = "UseMonthDateTotalsAsPrimaryTotal")
+	@Getter
+	private boolean useMonthDateTotalsAsPrimaryTotal = false;
 
 	@ConfigDataString(path = "RequestAPI.DefaultMethod")
 	@Getter
@@ -661,7 +711,7 @@ public class Config extends YMLFile {
 
 	@ConfigDataListString(path = "RequestAPI.DisabledMethods")
 	@Getter
-	private ArrayList<String> requestAPIDisabledMethods = new ArrayList<String>();
+	private ArrayList<String> requestAPIDisabledMethods = new ArrayList<>();
 
 	@ConfigDataBoolean(path = "StoreTopVoters.Daily")
 	@Getter
@@ -679,35 +729,132 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean topVoterIgnorePermission = false;
 
-	@ConfigDataBoolean(path = "VoteReminding.Enabled")
-	@Getter
-	private boolean voteRemindingEnabled = true;
-
-	@ConfigDataInt(path = "VoteReminding.RemindDelay")
-	@Getter
-	private int voteRemindingRemindDelay = 30;
-
-	@ConfigDataBoolean(path = "VoteReminding.RemindOnLogin")
-	@Getter
-	private boolean voteRemindingRemindOnLogin = false;
-
-	@ConfigDataBoolean(path = "VoteReminding.RemindOnlyOnce")
-	@Getter
-	private boolean voteRemindingRemindOnlyOnce = false;
-
-	/**
-	 * Gets the rewards.
-	 *
-	 * @return the rewards
-	 */
-	public String getVoteRemindingRewardsPath() {
-		return "VoteReminding.Rewards";
-	}
-
 	@ConfigDataString(path = "VoteTopDefault")
 	@Getter
 	private String voteTopDefault = "Monthly";
 
+	@ConfigDataBoolean(path = "AlwaysProcessAsyncPlaceholders")
+	@Getter
+	private boolean alwaysProcessAsyncPlaceholders = false;
+
+	public Config(VotingPluginMain plugin) {
+		super(plugin, new File(plugin.getDataFolder(), "Config.yml"));
+		setIgnoreCase(true);
+	}
+
+	/**
+	 * Gets the black list.
+	 *
+	 * @return the black list
+	 */
+	@SuppressWarnings("unchecked")
+	public ArrayList<String> getBlackList() {
+		return (ArrayList<String>) getData().getList("BlackList", new ArrayList<>());
+	}
+
+	public ConfigurationSection getCustomCommands(String ident) {
+		return getData().getConfigurationSection("CustomCommands." + ident);
+	}
+
+	public Set<String> getCustomPlaceholderReturns(String placeholder) {
+		Set<String> str = getData().getConfigurationSection("CustomPlaceholderReturns." + placeholder).getKeys(false);
+		if (str == null) {
+			str = new HashSet<>();
+		}
+		return str;
+	}
+
+	public String getCustomPlaceholderReturns(String placeholder, String returnString) {
+		return getData().getString("CustomPlaceholderReturns." + placeholder + "." + returnString, "");
+	}
+
+	/**
+	 * Gets the commands vote party.
+	 *
+	 * @return the commands vote party
+	 */
+	@SuppressWarnings("unchecked")
+	public ArrayList<String> getFormatCommandsVoteParty() {
+		ArrayList<String> msg = new ArrayList<>();
+		msg.add("&cCurrently at &6%Votes%&c, &6%NeededVotes% &cmore votes to go to reach &6%VotesRequired%");
+		return (ArrayList<String>) getData().getList("Format.Commands.Vote.Party", msg);
+
+	}
+
+	@SuppressWarnings("unchecked")
+	public ArrayList<String> getFormatCommandsVoteStreakLines() {
+		return (ArrayList<String>) getData().getList("Format.Commands.Vote.Streak.Lines", new ArrayList<>());
+	}
+
+	/**
+	 * Gets the commands vote text.
+	 *
+	 * @return the commands vote text
+	 */
+	@SuppressWarnings("unchecked")
+	public ArrayList<String> getFormatCommandsVoteText() {
+		ArrayList<String> str = new ArrayList<>();
+		str.add("&4&lVote for our server!");
+		return (ArrayList<String>) getData().getList("Format.Commands.Vote.Text", str);
+	}
+
+	@SuppressWarnings("unchecked")
+	public ArrayList<String> getFormatCommandsVoteTotal() {
+		ArrayList<String> list = (ArrayList<String>) getData().getList("Format.Commands.Vote.Total", new ArrayList<>());
+		if (list.isEmpty()) {
+			list.add("&3&l%player% Total Votes:");
+			list.add("&3&lDaily Total: &6&l%DailyTotal%");
+			list.add("&3&lWeekly Total: &6&l%WeeklyTotal%");
+			list.add("&3&lMonthly Total: &6&l%MonthlyTotal%");
+			list.add("&3&lAllTime Total: &6&l%AllTimeTotal%");
+		}
+		return list;
+	}
+
+	@SuppressWarnings("unchecked")
+	public ArrayList<String> getFormatCommandsVoteTotalAll() {
+
+		ArrayList<String> list = (ArrayList<String>) getData().getList("Format.Commands.Vote.TotalAll",
+				new ArrayList<>());
+		if (list.isEmpty()) {
+			list.add("&3&lServer Total Votes:");
+			list.add("&3&lDaily Total: &6&l%DailyTotal%");
+			list.add("&3&lWeekly Total: &6&l%WeeklyTotal%");
+			list.add("&3&lMonthly Total: &6&l%MonthlyTotal%");
+			list.add("&3&lAllTime Total: &6&l%AllTimeTotal%");
+		}
+		return list;
+	}
+
+	/**
+	 * Gets the vote help.
+	 *
+	 * @return the vote help
+	 */
+	@SuppressWarnings("unchecked")
+	public ArrayList<String> getFormatVoteHelp() {
+		return (ArrayList<String>) getData().getList("Format.Commands.Vote.Help.Lines", new ArrayList<>());
+	}
+
+	public boolean getLoadTopVoter(TopVoter top) {
+		switch (top) {
+		case AllTime:
+			return isLoadTopVoterAllTime();
+		case Daily:
+			return isLoadTopVoterDaily();
+		case Monthly:
+			return isLoadTopVoterMonthly();
+		case Weekly:
+			return isLoadTopVoterWeekly();
+		default:
+			return false;
+		}
+	}
+
+	public PlaceholderCacheLevel getPlaceholderCacheLevel() {
+		return PlaceholderCacheLevel.getCache(getPlaceholderCacheLevelString());
+	}
+
 	@Override
 	public void loadValues() {
 		new AnnotationHandler().load(getData(), this);

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

@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.concurrent.TimeUnit;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -13,12 +14,13 @@ import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
 import com.bencodez.advancedcore.api.rewards.DirectlyDefinedReward;
-import com.bencodez.advancedcore.api.yml.YMLFile;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.file.YMLFile;
+import com.bencodez.simpleapi.messages.MessageAPI;
+import com.bencodez.simpleapi.time.ParsedDuration;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.objects.VoteSite;
+import com.bencodez.votingplugin.votesites.VoteSite;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -30,6 +32,7 @@ public class ConfigVoteSites extends YMLFile {
 
 	public ConfigVoteSites(VotingPluginMain plugin) {
 		super(plugin, new File(plugin.getDataFolder(), "VoteSites.yml"));
+		setIgnoreCase(plugin.getConfigFile().isCaseInsensitiveYMLFiles());
 		this.plugin = plugin;
 	}
 
@@ -41,14 +44,14 @@ public class ConfigVoteSites extends YMLFile {
 	public void generateVoteSite(String siteName) {
 		if (plugin.getConfigFile().isAutoCreateVoteSites()) {
 			String org = siteName;
-			siteName = siteName.replace(".", "_");
+			siteName = siteName.replace(".", "_").replace(" ", "_");
 			plugin.getLogger().warning("VoteSite " + siteName + " does not exist with the servicesite '" + org
 					+ "', creating one, set AutoCreateVoteSites to false to prevent this");
 			setEnabled(siteName, true);
 			setServiceSite(siteName, org);
 			setVoteURL(siteName, "VoteURL");
-			setVoteDelay(siteName, 24);
-			set(siteName, "DisplayItem.Material", "GRASS");
+			setVoteDelay(siteName, "24h");
+			set(siteName, "DisplayItem.Material", "STONE");
 			set(siteName, "DisplayItem.Amount", 1);
 			set(siteName, "Rewards.Messages.Player", "&aThanks for voting on %ServiceSite%!");
 
@@ -103,8 +106,8 @@ public class ConfigVoteSites extends YMLFile {
 
 			for (Player p : Bukkit.getOnlinePlayers()) {
 				if (p.hasPermission("VotingPlugin.Admin.GenerateServiceSite") || p.isOp()) {
-					p.sendMessage(StringParser.getInstance().colorize("&cGenerating votesite for service site "
-							+ siteName + ", please check console for details"));
+					p.sendMessage(MessageAPI.colorize("&cGenerating votesite for service site " + siteName
+							+ ", please check console for details"));
 				}
 			}
 		}
@@ -138,6 +141,10 @@ public class ConfigVoteSites extends YMLFile {
 		return getData(site).getConfigurationSection("Item");
 	}
 
+	public String getPermissionToView(String siteName) {
+		return getData(siteName).getString("PermissionToView", "");
+	}
+
 	/**
 	 * Gets the priority.
 	 *
@@ -168,24 +175,27 @@ public class ConfigVoteSites extends YMLFile {
 		return getData(siteName).getString("ServiceSite");
 	}
 
+	public ParsedDuration getVoteDelay(String site) {
+		ConfigurationSection sec = getData(site);
+
+		// NEW FORMAT (string)
+		if (sec.isString("VoteDelay")) {
+			return ParsedDuration.parse(sec.getString("VoteDelay"), TimeUnit.HOURS);
+		}
+
+		// LEGACY FORMAT (numbers)
+		double hours = sec.getDouble("VoteDelay", 0);
+		double minutes = sec.getDouble("VoteDelayMin", 0);
+
+		long millis = (long) (hours * 60 * 60 * 1000) + (long) (minutes * 60 * 1000);
+
+		return ParsedDuration.ofMillis(millis);
+	}
+
 	public int getVoteDelayDailyHour(String siteName) {
 		return getData(siteName).getInt("VoteDelayDailyHour", 0);
 	}
 
-	/**
-	 * Gets the vote delay.
-	 *
-	 * @param siteName the site name
-	 * @return the vote delay
-	 */
-	public double getVoteDelay(String siteName) {
-		return getData(siteName).getDouble("VoteDelay", 24);
-	}
-
-	public double getVoteDelayMin(String siteName) {
-		return getData(siteName).getDouble("VoteDelayMin", 0);
-	}
-
 	/**
 	 * Gets the vote site enabled.
 	 *
@@ -239,7 +249,7 @@ public class ConfigVoteSites extends YMLFile {
 	 * @return the vote sites load
 	 */
 	public ArrayList<VoteSite> getVoteSitesLoad() {
-		ArrayList<VoteSite> voteSites = new ArrayList<VoteSite>();
+		ArrayList<VoteSite> voteSites = new ArrayList<>();
 		ArrayList<String> voteSiteNames = getVoteSitesNames(true);
 		if (voteSiteNames != null) {
 			for (String site : voteSiteNames) {
@@ -276,9 +286,9 @@ public class ConfigVoteSites extends YMLFile {
 	}
 
 	public ArrayList<String> getVoteSitesNames(boolean checkEnabled) {
-		ArrayList<String> siteNames = new ArrayList<String>();
+		ArrayList<String> siteNames = new ArrayList<>();
 		if (getData().isConfigurationSection("VoteSites")) {
-			siteNames = ArrayUtils.getInstance().convert(getData().getConfigurationSection("VoteSites").getKeys(false));
+			siteNames = ArrayUtils.convert(getData().getConfigurationSection("VoteSites").getKeys(false));
 		}
 
 		for (int i = siteNames.size() - 1; i >= 0; i--) {
@@ -305,7 +315,7 @@ public class ConfigVoteSites extends YMLFile {
 	 * @return the vote URL
 	 */
 	public String getVoteURL(String siteName) {
-		return getData(siteName).getString("VoteURL");
+		return getData(siteName).getString("VoteURL", "");
 	}
 
 	public boolean getWaitUntilVoteDelay(String siteName) {
@@ -443,14 +453,10 @@ public class ConfigVoteSites extends YMLFile {
 	 * @param siteName  the site name
 	 * @param voteDelay the vote delay
 	 */
-	public void setVoteDelay(String siteName, double voteDelay) {
+	public void setVoteDelay(String siteName, String voteDelay) {
 		set(siteName, "VoteDelay", voteDelay);
 	}
 
-	public void setVoteDelayDaily(String siteName, boolean value) {
-		set(siteName, "VoteDelayDaily", value);
-	}
-
 	/**
 	 * Sets the vote URL.
 	 *
@@ -479,4 +485,12 @@ public class ConfigVoteSites extends YMLFile {
 		return pass;
 	}
 
+	public void setVoteDelayDailyHour(String siteName, int intValue) {
+		set(siteName, "VoteDelayDailyHour", intValue);
+	}
+
+	public void setVoteDelayDaily(String siteName, boolean value) {
+		set(siteName, "VoteDelayDaily", value);
+	}
+
 }

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

@@ -7,15 +7,15 @@ 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;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataConfigurationSection;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataInt;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataKeys;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataListString;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataString;
+import com.bencodez.simpleapi.array.ArrayUtils;
+import com.bencodez.simpleapi.file.YMLFile;
+import com.bencodez.simpleapi.file.annotation.AnnotationHandler;
+import com.bencodez.simpleapi.file.annotation.ConfigDataBoolean;
+import com.bencodez.simpleapi.file.annotation.ConfigDataConfigurationSection;
+import com.bencodez.simpleapi.file.annotation.ConfigDataInt;
+import com.bencodez.simpleapi.file.annotation.ConfigDataKeys;
+import com.bencodez.simpleapi.file.annotation.ConfigDataListString;
+import com.bencodez.simpleapi.file.annotation.ConfigDataString;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 
@@ -45,45 +45,17 @@ public class GUI extends YMLFile {
 
 	@ConfigDataListString(path = "BOOK.VoteURLBookGUI.Layout")
 	@Getter
-	private ArrayList<String> bookVoteURLBookGUILayout = ArrayUtils.getInstance()
+	private ArrayList<String> bookVoteURLBookGUILayout = ArrayUtils
 			.convert(new String[] { "&c%Sitename%", "[UrlText]" });
 
 	@ConfigDataListString(path = "BOOK.VoteURLBookGUI.TopLayout")
 	@Getter
-	private ArrayList<String> bookVoteURLBookGUITopLayout = new ArrayList<String>();
+	private ArrayList<String> bookVoteURLBookGUITopLayout = new ArrayList<>();
 
 	@ConfigDataString(path = "BOOK.VoteURLBookGUI.Title")
 	@Getter
 	private String bookVoteURLBookGUITitle = "&cVoteURL";
 
-	@Getter
-	@ConfigDataConfigurationSection(path = "CHEST.ShopConfirmPurchase.NoItem")
-	private ConfigurationSection chestShopConfirmPurchaseNoItem;
-
-	@Getter
-	@ConfigDataString(path = "CHEST.ShopConfirmPurchase.Title")
-	private String chestShopConfirmPurchaseTitle = "Confirm Purchase?";
-
-	@Getter
-	@ConfigDataConfigurationSection(path = "CHEST.ShopConfirmPurchase.YesItem")
-	private ConfigurationSection chestShopConfirmPurchaseYesItem;
-
-	@Getter
-	@ConfigDataString(path = "CHEST.VoteShopDisabled")
-	private String chestVoteShopDisabled = "&cVote shop disabled";
-
-	@ConfigDataBoolean(path = "CHEST.VoteShopHideLimitedReached")
-	@Getter
-	private boolean chestVoteShopHideLimitedReached = true;
-
-	@ConfigDataString(path = "CHEST.VoteShopLimitReached")
-	@Getter
-	private String chestVoteShopLimitReached = "&aYou reached your limit";
-
-	@ConfigDataBoolean(path = "CHEST.VoteShopRequireConfirmation")
-	@Getter
-	private boolean chestVoteShopRequireConfirmation = false;
-
 	@ConfigDataBoolean(path = "CHEST.VoteBest.BackButton")
 	@Getter
 	private boolean chestVoteBestBackButton = true;
@@ -162,59 +134,10 @@ public class GUI extends YMLFile {
 
 	private VotingPluginMain plugin;
 
-	public GUI(VotingPluginMain plugin) {
-		super(plugin, new File(plugin.getDataFolder(), "GUI.yml"));
-		this.plugin = plugin;
-	}
-
-	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();
-	}
-
 	@ConfigDataConfigurationSection(path = "CHEST.BackButton")
 	@Getter
 	private ConfigurationSection CHESTBackButton;
 
-	public int getChestShopIdentifierCost(String identifier) {
-		return getData().getInt("CHEST.Shop." + identifier + ".Cost");
-	}
-
-	public String getChestShopIdentifierIdentifierName(String identifier) {
-		return getData().getString("CHEST.Shop." + identifier + ".Identifier_Name", identifier);
-	}
-
-	public int getChestShopIdentifierLimit(String identifier) {
-		return getData().getInt("CHEST.Shop." + identifier + ".Limit", -1);
-	}
-
-	public String getChestShopIdentifierRewardsPath(String identifier) {
-		return "CHEST.Shop." + identifier + ".Rewards";
-	}
-
-	public Set<String> getChestShopIdentifiers() {
-		ConfigurationSection shop = getData().getConfigurationSection("CHEST.Shop");
-		if (shop != null) {
-			return shop.getKeys(false);
-		}
-		return new HashSet<String>();
-	}
-
-	public ConfigurationSection getChestShopIdentifierSection(String identifier) {
-		return getData().getConfigurationSection("CHEST.Shop." + identifier);
-	}
-
 	@ConfigDataConfigurationSection(path = "CHEST.VoteBest.DayBest.Item")
 	@Getter
 	private ConfigurationSection chestVoteBestDayBestItem;
@@ -235,54 +158,14 @@ public class GUI extends YMLFile {
 	@Getter
 	private String chestVoteGUIName = "&cVoteGUI: &c&l%player%";
 
-	/**
-	 * Gets the vote GUI slot command.
-	 *
-	 * @param slot the slot
-	 * @return the vote GUI slot command
-	 */
-
-	public String getChestVoteGUISlotCommand(String slot) {
-		return getData().getString("CHEST.VoteGUI." + slot + ".Command", "");
-	}
-
-	/**
-	 * Gets the vote GUI slot lore.
-	 *
-	 * @param slot the slot
-	 * @return the vote GUI slot lore
-	 */
-	@SuppressWarnings("unchecked")
-	public ArrayList<String> getChestVoteGUISlotLore(String slot) {
-		return (ArrayList<String>) getData().getList("CHEST.VoteGUI." + slot + ".Item.Lore", new ArrayList<String>());
-	}
-
-	public String getChestVoteGUISlotRewardsPath(String slot, String lastPath) {
-		return "CHEST.VoteGUI." + slot + "." + lastPath;
-	}
-
 	@ConfigDataKeys(path = "CHEST.VoteGUI")
 	@Getter
-	private Set<String> chestVoteGUISlots = new HashSet<String>();
-
-	public ConfigurationSection getChestVoteGUISlotSection(String slot) {
-		return getData().getConfigurationSection("CHEST.VoteGUI." + slot + ".Item");
-	}
+	private Set<String> chestVoteGUISlots = new HashSet<>();
 
 	@ConfigDataConfigurationSection(path = "CHEST.VoteTop.Customization")
 	@Getter
 	private ConfigurationSection chestVoteTopCustomization;
 
-	/**
-	 * Gets the vote GUI slot slot.
-	 *
-	 * @param slot the slot
-	 * @return the vote GUI slot slot
-	 */
-	public int getChestVoteGUISlotSlot(String slot) {
-		return getData().getInt("CHEST.VoteGUI." + slot + ".Slot", -1);
-	}
-
 	@ConfigDataBoolean(path = "CHEST.VoteLast.BackButton")
 	@Getter
 	private boolean chestVoteLastBackButton = false;
@@ -307,63 +190,10 @@ public class GUI extends YMLFile {
 	@Getter
 	private String chestVoteNextLine = "%time%";
 
-	public String getChestVoteNextCustomSiteNamesDisplays(String site) {
-		return getData().getString("CHEST.VoteNext.CustomSiteNamesDisplays." + site, "");
-	}
-
 	@ConfigDataString(path = "CHEST.VoteRewardName")
 	@Getter
 	private String chestVoteRewardName = "VoteReward";
 
-	@ConfigDataBoolean(path = "CHEST.VoteShopBackButton")
-	@Getter
-	private boolean chestVoteShopBackButton = true;
-
-	@ConfigDataBoolean(path = "CHEST.VoteShopReopenGUIOnPurchase")
-	@Getter
-	private boolean chestVoteShopReopenGUIOnPurchase = true;
-
-	public boolean getChestVoteShopCloseGUI(String shop) {
-		return getData().getBoolean("CHEST.Shop." + shop + ".CloseGUI", true);
-	}
-	
-	public boolean getChestVoteShopHideOnNoPermission(String shop) {
-		return getData().getBoolean("CHEST.Shop." + shop + ".HideOnNoPermission", true);
-	}
-
-	@ConfigDataBoolean(path = "CHEST.VoteShopEnabled")
-	@Getter
-	private boolean chestVoteShopEnabled = true;
-
-	@ConfigDataString(path = "CHEST.VoteShopName")
-	@Getter
-	private String chestVoteShopName = "VoteShop";
-
-	public boolean getChestVoteShopNotBuyable(String shop) {
-		return getData().getBoolean("CHEST.Shop." + shop + ".NotBuyable", false);
-	}
-
-	public String getChestVoteShopPermission(String ident) {
-		return getData().getString("CHEST.Shop." + ident + ".Permission", "");
-	}
-
-	public String getCHESTVoteShopPurchase(String identifier) {
-		return getData().getString("CHEST.Shop." + identifier + ".PurchaseMessage",
-				plugin.getConfigFile().getFormatShopPurchaseMsg());
-	}
-
-	public boolean getChestVoteShopResetDaily(String shop) {
-		return getData().getBoolean("CHEST.Shop." + shop + ".Reset.Daily", false);
-	}
-
-	public boolean getChestVoteShopResetMonthly(String shop) {
-		return getData().getBoolean("CHEST.Shop." + shop + ".Reset.Monthly", false);
-	}
-
-	public boolean getChestVoteShopResetWeekly(String shop) {
-		return getData().getBoolean("CHEST.Shop." + shop + ".Reset.Weekly", false);
-	}
-
 	@ConfigDataBoolean(path = "CHEST.VoteStreak.BackButton")
 	@Getter
 	private boolean chestVoteStreakBackButton = false;
@@ -438,7 +268,7 @@ public class GUI extends YMLFile {
 
 	@ConfigDataListString(path = "CHEST.VoteTop.SwitchItem.TopVoters")
 	@Getter
-	private ArrayList<String> chestVoteTopSwitchItemTopVoters = new ArrayList<String>();
+	private ArrayList<String> chestVoteTopSwitchItemTopVoters = new ArrayList<>();
 
 	@ConfigDataConfigurationSection(path = "CHEST.VoteTotal.AllTimeTotal.Item")
 	@Getter
@@ -452,22 +282,6 @@ public class GUI extends YMLFile {
 	@Getter
 	private ConfigurationSection chestVoteTotalDayTotalItem;
 
-	public ConfigurationSection getChestVoteTotalItem(TopVoter top) {
-		switch (top) {
-		case AllTime:
-			return getChestVoteTotalAllTimeTotalItem();
-		case Daily:
-			return getChestVoteTotalDayTotalItem();
-		case Monthly:
-			return getChestVoteTotalMonthTotalItem();
-		case Weekly:
-			return getChestVoteTotalWeekTotalItem();
-		default:
-			return getChestVoteTotalAllTimeTotalItem();
-
-		}
-	}
-
 	@ConfigDataConfigurationSection(path = "CHEST.VoteTotal.MonthTotal.Item")
 	@Getter
 	private ConfigurationSection chestVoteTotalMonthTotalItem;
@@ -510,30 +324,7 @@ public class GUI extends YMLFile {
 
 	@ConfigDataKeys(path = "CHEST.VoteURL.ExtraItems")
 	@Getter
-	private Set<String> chestVoteURLExtraItems = new HashSet<String>();
-
-	public ConfigurationSection getChestVoteURLExtraItemsItem(String item) {
-		return getData().getConfigurationSection("CHEST.VoteURL.ExtraItems." + item);
-	}
-
-	public Set<String> getChestGUIExtraItems(String gui) {
-		if (getData().isConfigurationSection("CHEST." + gui + ".ExtraItems")) {
-			return getData().getConfigurationSection("CHEST." + gui + ".ExtraItems").getKeys(false);
-		}
-		return new HashSet<String>();
-	}
-
-	public ConfigurationSection getChestGUIVoteShopExtraItems(String item) {
-		return getData().getConfigurationSection("CHEST.VoteShopExtraItems." + item);
-	}
-
-	@ConfigDataKeys(path = "CHEST.VoteShopExtraItems")
-	@Getter
-	private Set<String> chestGUIVoteShopExtraItems = new HashSet<String>();
-
-	public ConfigurationSection getChestGUIExtraItemsItem(String gui, String item) {
-		return getData().getConfigurationSection("CHEST." + gui + ".ExtraItems." + item);
-	}
+	private Set<String> chestVoteURLExtraItems = new HashSet<>();
 
 	@ConfigDataString(path = "CHEST.VoteURL.SiteName")
 	@Getter
@@ -567,9 +358,85 @@ public class GUI extends YMLFile {
 	@Getter
 	private boolean chestVoteURLViewAllUrlsButtonEnabled = false;
 
-	public boolean isChestVoteShopRequireConfirmation(String identifier) {
-		return getData().getBoolean("CHEST.Shop." + identifier + ".RequireConfirmation",
-				isChestVoteShopRequireConfirmation());
+	public GUI(VotingPluginMain plugin) {
+		super(plugin, new File(plugin.getDataFolder(), "GUI.yml"));
+		setIgnoreCase(plugin.getConfigFile().isCaseInsensitiveYMLFiles());
+		this.plugin = plugin;
+	}
+
+	public Set<String> getChestGUIExtraItems(String gui) {
+		if (getData().isConfigurationSection("CHEST." + gui + ".ExtraItems")) {
+			return getData().getConfigurationSection("CHEST." + gui + ".ExtraItems").getKeys(false);
+		}
+		return new HashSet<>();
+	}
+
+	public ConfigurationSection getChestGUIExtraItemsItem(String gui, String item) {
+		return getData().getConfigurationSection("CHEST." + gui + ".ExtraItems." + item);
+	}
+
+	/**
+	 * Gets the vote GUI slot command.
+	 *
+	 * @param slot the slot
+	 * @return the vote GUI slot command
+	 */
+
+	public String getChestVoteGUISlotCommand(String slot) {
+		return getData().getString("CHEST.VoteGUI." + slot + ".Command", "");
+	}
+
+	/**
+	 * Gets the vote GUI slot lore.
+	 *
+	 * @param slot the slot
+	 * @return the vote GUI slot lore
+	 */
+	@SuppressWarnings("unchecked")
+	public ArrayList<String> getChestVoteGUISlotLore(String slot) {
+		return (ArrayList<String>) getData().getList("CHEST.VoteGUI." + slot + ".Item.Lore", new ArrayList<>());
+	}
+
+	public String getChestVoteGUISlotRewardsPath(String slot, String lastPath) {
+		return "CHEST.VoteGUI." + slot + "." + lastPath;
+	}
+
+	public ConfigurationSection getChestVoteGUISlotSection(String slot) {
+		return getData().getConfigurationSection("CHEST.VoteGUI." + slot + ".Item");
+	}
+
+	/**
+	 * Gets the vote GUI slot slot.
+	 *
+	 * @param slot the slot
+	 * @return the vote GUI slot slot
+	 */
+	public int getChestVoteGUISlotSlot(String slot) {
+		return getData().getInt("CHEST.VoteGUI." + slot + ".Slot", -1);
+	}
+
+	public String getChestVoteNextCustomSiteNamesDisplays(String site) {
+		return getData().getString("CHEST.VoteNext.CustomSiteNamesDisplays." + site, "");
+	}
+
+	public ConfigurationSection getChestVoteTotalItem(TopVoter top) {
+		switch (top) {
+		case AllTime:
+			return getChestVoteTotalAllTimeTotalItem();
+		case Daily:
+			return getChestVoteTotalDayTotalItem();
+		case Monthly:
+			return getChestVoteTotalMonthTotalItem();
+		case Weekly:
+			return getChestVoteTotalWeekTotalItem();
+		default:
+			return getChestVoteTotalAllTimeTotalItem();
+
+		}
+	}
+
+	public ConfigurationSection getChestVoteURLExtraItemsItem(String item) {
+		return getData().getConfigurationSection("CHEST.VoteURL.ExtraItems." + item);
 	}
 
 	@Override
@@ -581,9 +448,4 @@ public class GUI extends YMLFile {
 	public void onFileCreation() {
 		plugin.saveResource("GUI.yml", true);
 	}
-
-	public void removeShop(String value) {
-		getData().set("CHEST.Shop." + value, null);
-		saveData();
-	}
 }

VotingPlugin/src/main/java/com/bencodez/votingplugin/config/ShopFile.java

@@ -0,0 +1,199 @@
+package com.bencodez.votingplugin.config;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.bukkit.configuration.ConfigurationSection;
+
+import com.bencodez.simpleapi.file.YMLFile;
+import com.bencodez.simpleapi.file.annotation.AnnotationHandler;
+import com.bencodez.simpleapi.file.annotation.ConfigDataBoolean;
+import com.bencodez.simpleapi.file.annotation.ConfigDataConfigurationSection;
+import com.bencodez.simpleapi.file.annotation.ConfigDataKeys;
+import com.bencodez.simpleapi.file.annotation.ConfigDataString;
+import com.bencodez.votingplugin.VotingPluginMain;
+
+import lombok.Getter;
+
+public class ShopFile extends YMLFile {
+
+	@Getter
+	@ConfigDataConfigurationSection(path = "ShopConfirmPurchase.NoItem")
+	private ConfigurationSection shopConfirmPurchaseNoItem;
+
+	@Getter
+	@ConfigDataString(path = "ShopConfirmPurchase.Title")
+	private String shopConfirmPurchaseTitle = "Confirm Purchase?";
+
+	@Getter
+	@ConfigDataConfigurationSection(path = "ShopConfirmPurchase.YesItem")
+	private ConfigurationSection shopConfirmPurchaseYesItem;
+
+	@Getter
+	@ConfigDataString(path = "VoteShop.Disabled")
+	private String voteShopDisabled = "&cVote shop disabled";
+
+	@ConfigDataBoolean(path = "VoteShop.HideLimitedReached")
+	@Getter
+	private boolean voteShopHideLimitedReached = true;
+
+	@ConfigDataString(path = "VoteShop.LimitReached")
+	@Getter
+	private String voteShopLimitReached = "&aYou reached your limit";
+
+	@ConfigDataBoolean(path = "VoteShop.RequireConfirmation")
+	@Getter
+	private boolean voteShopRequireConfirmation = false;
+
+	private VotingPluginMain plugin;
+
+	@ConfigDataBoolean(path = "VoteShop.BackButton")
+	@Getter
+	private boolean voteShopBackButton = true;
+
+	@ConfigDataBoolean(path = "VoteShop.ReopenGUIOnPurchase")
+	@Getter
+	private boolean voteShopReopenGUIOnPurchase = true;
+
+	@ConfigDataBoolean(path = "VoteShop.Enabled")
+	@Getter
+	private boolean voteShopEnabled = true;
+
+	@ConfigDataString(path = "VoteShop.Name")
+	@Getter
+	private String voteShopName = "VoteShop";
+
+	@ConfigDataKeys(path = "ExtraItems")
+	@Getter
+	private Set<String> voteShopExtraItems = new HashSet<>();
+
+	public ShopFile(VotingPluginMain plugin) {
+		super(plugin, new File(plugin.getDataFolder(), "Shop.yml"));
+		setIgnoreCase(plugin.getConfigFile().isCaseInsensitiveYMLFiles());
+		this.plugin = plugin;
+	}
+
+	public void convertFromGUIFile() {
+		// booleans
+		setValue("VoteShop.Enabled", plugin.getGui().getData().getBoolean("CHEST.VoteShopEnabled"));
+		setValue("VoteShop.BackButton", plugin.getGui().getData().getBoolean("CHEST.VoteShopBackButton"));
+		setValue("VoteShop.HideLimitReached", plugin.getGui().getData().getBoolean("CHEST.VoteShopHideLimitedReached"));
+		setValue("VoteShop.RequireConfirmation",
+				plugin.getGui().getData().getBoolean("CHEST.VoteShopRequireConfirmation"));
+		setValue("VoteShop.ReopenGUIOnPurchase",
+				plugin.getGui().getData().getBoolean("CHEST.VoteShopReopenGUIOnPurchase"));
+
+		// strings
+		setValue("VoteShop.Name", plugin.getGui().getData().getString("CHEST.VoteShopName"));
+		setValue("VoteShop.LimitReached", plugin.getGui().getData().getString("CHEST.VoteShopLimitReached"));
+		setValue("VoteShop.Disabled", plugin.getGui().getData().getString("CHEST.VoteShopDisabled"));
+
+		// sections
+		setValue("Shop", plugin.getGui().getData().getConfigurationSection("CHEST.Shop"));
+		setValue("ExtraItems", plugin.getGui().getData().getConfigurationSection("CHEST.VoteShopExtraItems"));
+		setValue("ShopConfirmPurchase", plugin.getGui().getData().getConfigurationSection("CHEST.ShopConfirmPurchase"));
+		saveData();
+
+	}
+
+	public void createShop(String value) {
+		ConfigurationSection shopData = getData().createSection("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 ConfigurationSection getGUIVoteShopExtraItems(String item) {
+		return getData().getConfigurationSection("ExtraItems." + item);
+	}
+
+	public int getShopIdentifierCost(String identifier) {
+		return getData().getInt("Shop." + identifier + ".Cost");
+	}
+
+	public String getShopIdentifierIdentifierName(String identifier) {
+		return getData().getString("Shop." + identifier + ".Identifier_Name", identifier);
+	}
+
+	public int getShopIdentifierLimit(String identifier) {
+		return getData().getInt("Shop." + identifier + ".Limit", -1);
+	}
+
+	public String getShopIdentifierRewardsPath(String identifier) {
+		return "Shop." + identifier + ".Rewards";
+	}
+
+	public Set<String> getShopIdentifiers() {
+		ConfigurationSection shop = getData().getConfigurationSection("Shop");
+		if (shop != null) {
+			return shop.getKeys(false);
+		}
+		return new HashSet<>();
+	}
+
+	public ConfigurationSection getShopIdentifierSection(String identifier) {
+		return getData().getConfigurationSection("Shop." + identifier);
+	}
+
+	public boolean getVoteShopCloseGUI(String shop) {
+		return getData().getBoolean("Shop." + shop + ".CloseGUI", true);
+	}
+
+	public boolean getVoteShopHideOnNoPermission(String shop) {
+		return getData().getBoolean("Shop." + shop + ".HideOnNoPermission", true);
+	}
+
+	public boolean getVoteShopNotBuyable(String shop) {
+		return getData().getBoolean("Shop." + shop + ".NotBuyable", false);
+	}
+
+	public String getVoteShopPermission(String ident) {
+		return getData().getString("Shop." + ident + ".Permission", "");
+	}
+
+	public String getVoteShopPurchase(String identifier) {
+		return getData().getString("Shop." + identifier + ".PurchaseMessage",
+				plugin.getConfigFile().getFormatShopPurchaseMsg());
+	}
+
+	public boolean getVoteShopResetDaily(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Daily", false);
+	}
+
+	public boolean getVoteShopResetMonthly(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Monthly", false);
+	}
+
+	public boolean getVoteShopResetWeekly(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Weekly", false);
+	}
+
+	public boolean isVoteShopRequireConfirmation(String identifier) {
+		return getData().getBoolean("Shop." + identifier + ".RequireConfirmation", isVoteShopRequireConfirmation());
+	}
+
+	@Override
+	public void loadValues() {
+		new AnnotationHandler().load(getData(), this);
+	}
+
+	@Override
+	public void onFileCreation() {
+		plugin.saveResource("Shop.yml", true);
+	}
+
+	public void removeShop(String value) {
+		getData().set("Shop." + value, null);
+		saveData();
+	}
+}