Update version number to 6.18.3

Bump org.junit.jupiter:junit-jupiter-engine from 5.11.4 to 5.12.0 in /VotingPlugin

.github/FUNDING.yml

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

.github/dependabot.yml

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

.github/stale.yml

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

.github/workflows/publish-javadoc.yml

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

.github/workflows/stale.yml

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

README.md

@@ -2,14 +2,6 @@
 Plugin on SpigotMC
 https://www.spigotmc.org/resources/votingplugin.15358/
 
-![img](http://badge.henrya.org/spigot/downloads?id=15358&color=green)
-
-![img2](http://badge.henrya.org/spigot/version?id=15358&color=red)
-
-## License
-### Creative Commons Arttribution 3.0 Unported
-https://github.com/BenCodez/VotingPlugin/blob/master/VotingPlugin/Resources/LICENSE.txt
-
 ### Maven:
 
     <repository>
@@ -23,19 +15,6 @@ https://github.com/BenCodez/VotingPlugin/blob/master/VotingPlugin/Resources/LICE
 	    <version>LATEST</version>
 	    <scope>provided</scope>
     </dependency>
-
-    BACKUP/OLD WAY
-    <repository>
-        <id>jitpack.io</id>
-        <url>https://jitpack.io</url>
-    </repository>
-    
-    <dependency>
-	    <groupId>com.github.BenCodez</groupId>
-	    <artifactId>VotingPlugin</artifactId>
-	    <version>LATEST</version>
-	    <scope>provided</scope>
-	</dependency>
   
   Versions:  
   LATEST - latest stable release  

VotingPlugin/.gitignore

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

VotingPlugin/Resources/bungeeconfig.yml

@@ -1,166 +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
-
-# Online mode for UUIDS
-# Offline mode setups are not fully tested and are not supported currently
-OnlineMode: true
-
-
-# ----------------------------------------------------------------
-# 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
-
-# What type of bungee setup
-# Requires restart and set on all servers
-# https://github.com/BenCodez/VotingPlugin/wiki/Bungeecoord-Setups
-# Available:
-# SOCKETS 
-# PLUGINMESSAGING 
-# MYSQL
-BungeeMethod: PLUGINMESSAGING
-
-# 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 false on bungee, spigot servers will handle that
-# Recommened to leave true, setting to false setups are currently unsupported
-BungeeManageTotals: true
-
-# Tell servers to broadcast
-# Set DisableBroadcast to true on spigot servers (BungeeSettings.yml) as well
-Broadcast: true
-
-# Geyser settings
-# This may or may not work
-# Does not work on velocity currently
-GeyserSupport: false
-GeyserPrefix: '.'
-
-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!'
-  
-
-# ----------------------------
-# PLUGINMESSAGING Settings
-# ----------------------------
-
-# Applies to PLUGINMESSAGING only
-# Votes will be forwarded when specific player is online
-WaitForUserOnline: false
-
-# ----------------------------
-# SOCKET Settings
-# ONLY for SOCKET method
-# ----------------------------
-# Options available here:
-# https://github.com/BenCodez/VotingPlugin/wiki/Bungee-Setup-SOCKETS
-
-
-# ----------------------------
-# Redis setup
-# Experimental
-# Primary server for redis needs votifier
-# Set socket host on each proxy and redissockets on primary redis only
-# All servers on pluginmessaging
-# ----------------------------
-
-# Support for redis
-# experimental
-RedisSupport: false
-
-# Enable on primary server with votifier
-PrimaryServer: false
-
-RedisSocketHost:
-  Host: 0.0.0.0
-  Port: 1234
-
-RedisServers:
-  secondproxy:
-    Host: 0.0.0.0
-    Port: 1235

VotingPlugin/pom.xml

@@ -1,21 +1,24 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
 	<artifactId>votingplugin</artifactId>
-	<version>6.11</version>
+	<version>6.18.3</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
 		<github.global.server>github</github.global.server>
 		<project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
 		<build.number>NOTSET</build.number>
+		<maven.compiler.source>8</maven.compiler.source>
+		<maven.compiler.target>8</maven.compiler.target>
+		<maven.compiler.release>8</maven.compiler.release>
 	</properties>
 	<build>
 		<resources>
 			<resource>
-				<directory>Resources</directory>
+				<directory>src/main/resources</directory>
 				<filtering>true</filtering>
 				<includes>
 					<include>plugin.yml</include>
@@ -24,11 +27,12 @@
 				</includes>
 			</resource>
 			<resource>
-				<directory>Resources</directory>
+				<directory>src/main/resources</directory>
 				<filtering>false</filtering>
 			</resource>
 		</resources>
-		<sourceDirectory>src</sourceDirectory>
+		<sourceDirectory>src/main/java</sourceDirectory>
+		<testSourceDirectory>src/test/java</testSourceDirectory>
 		<pluginManagement>
 			<plugins>
 				<plugin>
@@ -58,16 +62,6 @@
 			</plugins>
 		</pluginManagement>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.3.1</version>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-					<finalName>${project.name}</finalName>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.projectlombok</groupId>
 				<artifactId>lombok-maven-plugin</artifactId>
@@ -82,7 +76,7 @@
 						<configuration>
 							<addOutputDirectory>false</addOutputDirectory>
 							<outputDirectory>${project.basedir}/target/delombok</outputDirectory>
-							<sourceDirectory>${project.basedir}/src</sourceDirectory>
+							<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
 						</configuration>
 					</execution>
 				</executions>
@@ -90,7 +84,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.4.3</version>
+				<version>3.6.0</version>
 				<configuration>
 					<shadedArtifactAttached>false</shadedArtifactAttached>
 					<minimizeJar>true</minimizeJar>
@@ -103,9 +97,20 @@
 						</filter>
 					</filters>
 					<relocations>
+						<relocation>
+							<pattern>com.tcoded.folialib</pattern>
+							<shadedPattern>
+								${project.groupId}.votingplugin.simpleapi.folialib</shadedPattern>
+						</relocation>
+						<relocation>
+							<pattern>com.bencodez.simpleapi</pattern>
+							<shadedPattern>
+								${project.groupId}.votingplugin.simpleapi</shadedPattern>
+						</relocation>
 						<relocation>
 							<pattern>com.bencodez.advancedcore</pattern>
-							<shadedPattern>${project.groupId}.votingplugin.advancedcore</shadedPattern>
+							<shadedPattern>
+								${project.groupId}.votingplugin.advancedcore</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>net.pl3x.bukkit.chatapi</pattern>
@@ -113,24 +118,30 @@
 						</relocation>
 						<relocation>
 							<pattern>me.mrten.mysqlapi</pattern>
-							<shadedPattern>${project.groupId}.votingplugin.mysqlapi</shadedPattern>
+							<shadedPattern>
+								${project.groupId}.votingplugin.mysqlapi</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>com.zaxxer.HikariCP</pattern>
-							<shadedPattern>${project.groupId}.votingplugin.HikariCP</shadedPattern>
+							<shadedPattern>
+								${project.groupId}.votingplugin.HikariCP</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>com.zaxxer.hikari</pattern>
-							<shadedPattern>${project.groupId}.votingplugin.hikari</shadedPattern>
+							<shadedPattern>
+								${project.groupId}.votingplugin.hikari</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>org.bstats</pattern>
-							<shadedPattern>${project.groupId}.votingplugin.bstats</shadedPattern>
+							<shadedPattern>
+								${project.groupId}.votingplugin.bstats</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>xyz.upperlevel.spigot</pattern>
-							<shadedPattern>${project.groupId}.votingplugin.advancedcore.xyz.upperlevel.spigot</shadedPattern>
+							<shadedPattern>
+								${project.groupId}.votingplugin.advancedcore.xyz.upperlevel.spigot</shadedPattern>
 						</relocation>
+
 					</relocations>
 				</configuration>
 				<executions>
@@ -141,7 +152,8 @@
 						</goals>
 						<configuration>
 							<artifactSet>
-								<!-- Lets exclude google code, because the server already has this 
+								<!-- Lets exclude google code, because the
+								server already has this 
 									code in it (guava, etc) -->
 								<excludes>
 									<exclude>com.google.*:*</exclude>
@@ -162,31 +174,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.1.0</version>
-				<executions>
-					<execution>
-						<id>copy-resources</id>
-						<phase>install</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${user.home}/Documents/Test Server/plugins</outputDirectory>
-							<resources>
-								<resource>
-									<directory>${basedir}/target</directory>
-									<includes>
-										<include>VotingPlugin.jar</include>
-									</includes>
-								</resource>
-							</resources>
-							<overwrite>true</overwrite>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 	<repositories>
@@ -194,7 +181,6 @@
 			<id>spigot-repo</id>
 			<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
 		</repository>
-
 		<repository>
 			<id>maven-central</id>
 			<url>https://oss.sonatype.org/content/groups/public</url>
@@ -212,33 +198,32 @@
 			<url>https://nexus.bencodez.com/repository/maven-public/</url>
 		</repository>
 		<repository>
-			<id>jitpack.io</id>
-			<url>https://jitpack.io</url>
+			<id>papermc</id>
+			<url>https://repo.papermc.io/repository/maven-public/</url>
+		</repository>
+		<repository>
+			<id>placeholderapi</id>
+			<url>
+				https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
 		</repository>
 	</repositories>
 	<dependencies>
-		<dependency>
-			<groupId>com.github.limework</groupId>
-			<artifactId>redisbungee</artifactId>
-			<version>0.6.5</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.19.3-R0.1-SNAPSHOT</version>
+			<version>1.21.4-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.2</version>
+			<version>1.18.36</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.md-5</groupId>
 			<artifactId>bungeecord-api</artifactId>
-			<version>1.17-R0.1-SNAPSHOT</version>
+			<version>1.20-R0.3-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -256,88 +241,72 @@
 		<dependency>
 			<groupId>com.velocitypowered</groupId>
 			<artifactId>velocity-api</artifactId>
-			<version>1.1.5</version>
+			<version>3.1.2-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.bstats</groupId>
 			<artifactId>bstats-velocity</artifactId>
-			<version>2.2.1</version>
+			<version>3.1.0</version>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>me.clip</groupId>
+			<artifactId>placeholderapi</artifactId>
+			<version>2.11.6</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.bencodez</groupId>
+			<artifactId>advancedcore</artifactId>
+			<version>3.7.14</version>
+			<scope>compile</scope>
+		</dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.12.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>5.15.2</version>
+            <scope>test</scope>
+        </dependency>
 	</dependencies>
 	<profiles>
 		<profile>
-			<id>prod</id>
+			<id>default</id>
 			<properties>
-				<build.profile.id>prod</build.profile.id>
+				<build.profile.id>default</build.profile.id>
 			</properties>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
-			<repositories>
-				<repository>
-					<id>jitpack.io</id>
-					<url>https://jitpack.io</url>
-				</repository>
-			</repositories>
-			<dependencies>
-				<dependency>
-					<groupId>com.github.bencodez</groupId>
-					<artifactId>advancedcore</artifactId>
-					<version>master-SNAPSHOT</version>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-jar-plugin</artifactId>
+						<version>3.4.2</version>
+						<configuration>
+							<archive>
+								<manifestEntries>
+									<paperweight-mappings-namespace>mojang</paperweight-mappings-namespace>
+								</manifestEntries>
+							</archive>
+							<finalName>${project.name}</finalName>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
 		</profile>
 		<profile>
-			<id>prod2</id>
+			<id>deploy-snapshot</id>
 			<properties>
-				<build.profile.id>prod2</build.profile.id>
+				<build.profile.id>dev-snapshot</build.profile.id>
 			</properties>
-			<distributionManagement>
-				<repository>
-					<id>internal.repo</id>
-					<name>Temporary Staging Repository</name>
-					<url>file://${project.build.directory}/mvn-repo</url>
-				</repository>
-			</distributionManagement>
-			<dependencies>
-				<dependency>
-					<groupId>com.bencodez</groupId>
-					<artifactId>advancedcore</artifactId>
-					<version>LATEST</version>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>dev</id>
-			<properties>
-				<build.profile.id>dev</build.profile.id>
-			</properties>
-			<dependencies>
-				<dependency>
-					<groupId>com.bencodez</groupId>
-					<artifactId>advancedcore</artifactId>
-					<version>LATEST</version>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>deploy</id>
-			<properties>
-				<build.profile.id>deploy</build.profile.id>
-			</properties>
-			<dependencies>
-				<dependency>
-					<groupId>com.bencodez</groupId>
-					<artifactId>advancedcore</artifactId>
-					<version>LATEST</version>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
 			<distributionManagement>
 				<snapshotRepository>
 					<id>nexus</id>
@@ -350,10 +319,44 @@
 			</distributionManagement>
 			<build>
 				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-jar-plugin</artifactId>
+						<version>3.4.2</version>
+						<configuration>
+							<archive>
+								<manifestEntries>
+									<paperweight-mappings-namespace>mojang</paperweight-mappings-namespace>
+								</manifestEntries>
+							</archive>
+							<finalName>
+								${project.name}</finalName>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>com.coderplus.maven.plugins</groupId>
+						<artifactId>copy-rename-maven-plugin</artifactId>
+						<version>1.0.1</version>
+						<executions>
+							<execution>
+								<id>copy-file</id>
+								<phase>install</phase>
+								<goals>
+									<goal>copy</goal>
+								</goals>
+								<configuration>
+									<sourceFile>
+										${project.basedir}/target/${project.name}.jar</sourceFile>
+									<destinationFile>
+										${project.basedir}/target/${project.name}-${build.number}.jar</destinationFile>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>2.10.4</version>
+						<version>3.11.2</version>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>
@@ -362,7 +365,8 @@
 								</goals>
 								<phase>deploy</phase>
 								<configuration>
-									<sourcepath>${project.basedir}/target/delombok</sourcepath>
+									<sourcepath>
+										${project.basedir}/target/delombok</sourcepath>
 								</configuration>
 							</execution>
 						</executions>
@@ -370,7 +374,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>3.0.0-M1</version>
+						<version>3.1.3</version>
 						<configuration>
 							<skip>true</skip>
 						</configuration>
@@ -378,7 +382,7 @@
 					<plugin>
 						<groupId>org.sonatype.plugins</groupId>
 						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.5.1</version>
+						<version>1.7.0</version>
 						<executions>
 							<execution>
 								<id>default-deploy</id>
@@ -394,29 +398,72 @@
 							<skipStaging>true</skipStaging>
 						</configuration>
 					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>javadoc</id>
+			<properties>
+				<build.profile.id>javadoc</build.profile.id>
+			</properties>
+			<distributionManagement>
+				<repository>
+					<id>internal.repo</id>
+					<name>Temporary Staging Repository</name>
+					<url>file://${project.build.directory}/mvn-repo</url>
+				</repository>
+			</distributionManagement>
+			<build>
+				<plugins>
 					<plugin>
-						<groupId>com.github.github</groupId>
-						<artifactId>site-maven-plugin</artifactId>
-						<version>0.12</version>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-jar-plugin</artifactId>
+						<version>3.4.2</version>
+						<configuration>
+							<archive>
+								<manifestEntries>
+									<paperweight-mappings-namespace>mojang</paperweight-mappings-namespace>
+								</manifestEntries>
+							</archive>
+							<finalName>${project.name}</finalName>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>3.11.2</version>
 						<executions>
 							<execution>
-								<id>javadoc</id>
+								<id>attach-javadocs</id>
 								<goals>
-									<goal>site</goal>
+									<goal>jar</goal>
 								</goals>
 								<phase>deploy</phase>
 								<configuration>
-									<message>Maven javadoc for ${project.version}</message>
-									<noJekyll>true</noJekyll>
-									<outputDirectory>${project.build.directory}/apidocs
-									</outputDirectory>
-									<branch>refs/heads/gh-pages</branch>
-									<includes>
-										<include>**/*</include>
-									</includes>
-									<repositoryName>VotingPlugin</repositoryName>
-									<repositoryOwner>BenCodez</repositoryOwner>
-									<server>github</server>
+									<sourcepath>
+										${project.basedir}/target/delombok</sourcepath>
+									<outputDirectory>
+										${project.basedir}/target/apidocs</outputDirectory>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>com.coderplus.maven.plugins</groupId>
+						<artifactId>copy-rename-maven-plugin</artifactId>
+						<version>1.0.1</version>
+						<executions>
+							<execution>
+								<id>copy-file</id>
+								<phase>deploy</phase>
+								<goals>
+									<goal>copy</goal>
+								</goals>
+								<configuration>
+									<sourceFile>
+										${project.basedir}/target/${project.name}.jar</sourceFile>
+									<destinationFile>
+										${project.basedir}/target/${project.name}-${project.version}.jar</destinationFile>
 								</configuration>
 							</execution>
 						</executions>
@@ -424,5 +471,152 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>dev</id>
+			<properties>
+				<build.profile.id>dev</build.profile.id>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-jar-plugin</artifactId>
+						<version>3.4.2</version>
+						<configuration>
+							<archive>
+								<manifestEntries>
+									<paperweight-mappings-namespace>mojang</paperweight-mappings-namespace>
+								</manifestEntries>
+							</archive>
+							<finalName>${project.name}</finalName>
+						</configuration>
+					</plugin>
+					<plugin>
+						<artifactId>maven-resources-plugin</artifactId>
+						<version>3.3.1</version>
+						<executions>
+							<execution>
+								<id>copy-resources</id>
+								<phase>install</phase>
+								<goals>
+									<goal>copy-resources</goal>
+								</goals>
+								<configuration>
+									<outputDirectory>
+										${user.home}/Documents/Test_Server/plugins</outputDirectory>
+									<resources>
+										<resource>
+											<directory>${basedir}/target</directory>
+											<includes>
+												<include>VotingPlugin.jar</include>
+											</includes>
+										</resource>
+									</resources>
+									<overwrite>true</overwrite>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>deploy</id>
+			<properties>
+				<build.profile.id>deploy</build.profile.id>
+			</properties>
+			<distributionManagement>
+				<snapshotRepository>
+					<id>nexus</id>
+					<url>https://nexus.bencodez.com/repository/maven-snapshots/</url>
+				</snapshotRepository>
+				<repository>
+					<id>nexus</id>
+					<url>https://nexus.bencodez.com/repository/maven-releases/</url>
+				</repository>
+			</distributionManagement>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-jar-plugin</artifactId>
+						<version>3.4.2</version>
+						<configuration>
+							<archive>
+								<manifestEntries>
+									<paperweight-mappings-namespace>mojang</paperweight-mappings-namespace>
+								</manifestEntries>
+							</archive>
+							<finalName>${project.name}</finalName>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>com.coderplus.maven.plugins</groupId>
+						<artifactId>copy-rename-maven-plugin</artifactId>
+						<version>1.0.1</version>
+						<executions>
+							<execution>
+								<id>copy-file</id>
+								<phase>deploy</phase>
+								<goals>
+									<goal>copy</goal>
+								</goals>
+								<configuration>
+									<sourceFile>
+										${project.basedir}/target/${project.name}.jar</sourceFile>
+									<destinationFile>
+										${project.basedir}/target/${project.name}-${project.version}.jar</destinationFile>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>3.11.2</version>
+						<executions>
+							<execution>
+								<id>attach-javadocs</id>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+								<phase>deploy</phase>
+								<configuration>
+									<sourcepath>
+										${project.basedir}/target/delombok</sourcepath>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-deploy-plugin</artifactId>
+						<version>3.1.3</version>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.sonatype.plugins</groupId>
+						<artifactId>nexus-staging-maven-plugin</artifactId>
+						<version>1.7.0</version>
+						<executions>
+							<execution>
+								<id>default-deploy</id>
+								<phase>deploy</phase>
+								<goals>
+									<goal>deploy</goal>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<serverId>nexus</serverId>
+							<nexusUrl>https://nexus.bencodez.com/nexus/</nexusUrl>
+							<skipStaging>true</skipStaging>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 </project>

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.user.UserManager;
-import com.bencodez.votingplugin.user.VotingPluginUser;
-
-@Deprecated
-public class User {
-	private VotingPluginUser user;
-
-	public User(Player p) {
-		user = UserManager.getInstance().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/bungee/Config.java

@@ -1,183 +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 boolean getAllowUnJoined() {
-		return getData().getBoolean("AllowUnJoined", false);
-	}
-
-	public List<String> getBlockedServers() {
-		return getData().getStringList("BlockedServers");
-	}
-
-	public boolean getBroadcast() {
-		return getData().getBoolean("Broadcast", false);
-	}
-
-	public boolean getGeyserSupport() {
-		return getData().getBoolean("GeyserSupport", false);
-	}
-
-	public String getGeyserPrefix() {
-		return getData().getString("GeyserPrefix", ".");
-	}
-
-	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 boolean getRedisSupport() {
-		return getData().getBoolean("RedisSupport", false);
-	}
-
-	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 int getRedisSocketHostPort() {
-		return getData().getInt("RedisSocketHost.Port", 1297);
-	}
-
-	public String getRedisSocketHostHost() {
-		return getData().getString("RedisSocketHost.Host", "");
-	}
-
-	public boolean getDebug() {
-		return getData().getBoolean("Debug", 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 Configuration getRedisServersConfiguration(String s) {
-		return getData().getSection("RedisServers." + s);
-	}
-
-	public Collection<String> getRedisServers() {
-		return getData().getSection("RedisServers").getKeys();
-	}
-
-	public Collection<String> getSpigotServers() {
-		return getData().getSection("SpigotServers").getKeys();
-	}
-
-	public boolean getWaitForUserOnline() {
-		return getData().getBoolean("WaitForUserOnline", false);
-	}
-
-	public boolean getPrimaryServer() {
-		return getData().getBoolean("PrimaryServer", 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 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,94 +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.YamlConfiguration;
-
-public class NonVotedPlayersCache {
-	private VotingPluginBungee bungee;
-	@Getter
-	private Configuration data;
-
-	public NonVotedPlayersCache(VotingPluginBungee bungee) {
-		this.bungee = bungee;
-	}
-
-	public void addPlayer(ProxiedPlayer proxiedPlayer) {
-		if (!bungee.getMysql().containsKeyQuery(proxiedPlayer.getUniqueId().toString())) {
-			addPlayer(proxiedPlayer.getUniqueId().toString(), proxiedPlayer.getName());
-		}
-	}
-
-	private void addPlayer(String uuid, String playerName) {
-		getData().set("NonVotedPlayers." + playerName + ".UUID", uuid);
-		getData().set("NonVotedPlayers." + playerName + ".LastTime", System.currentTimeMillis());
-	}
-
-	public void check() {
-		for (String player : getData().getSection("NonVotedPlayers").getKeys()) {
-			long time = getData().getLong("NonVotedPlayers." + player + ".LastTime", 0);
-			if ((System.currentTimeMillis() - time) > 1000 * 60 * 60 * 24 * 5) {
-				remove(player);
-			} else {
-				String uuid = getData().getString("NonVotedPlayers." + player + ".UUID", "");
-				if (!uuid.isEmpty()) {
-					if (bungee.getMysql().containsKeyQuery(uuid)) {
-						remove(player);
-					}
-				} else {
-					remove(player);
-				}
-			}
-		}
-		save();
-	}
-
-	public void load() {
-		if (!bungee.getDataFolder().exists()) {
-			bungee.getDataFolder().mkdir();
-		}
-
-		File file = new File(bungee.getDataFolder(), "nonvotedplayerscache.yml");
-
-		if (!file.exists()) {
-			try {
-				file.createNewFile();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		try {
-			data = ConfigurationProvider.getProvider(YamlConfiguration.class)
-					.load(new File(bungee.getDataFolder(), "nonvotedplayerscache.yml"));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public 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(YamlConfiguration.class).save(data,
-					new File(bungee.getDataFolder(), "nonvotedplayerscache.yml"));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-}

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

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

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

@@ -1,143 +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.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 file = new File(bungee.getDataFolder(), "votecache.yml");
-
-		if (!file.exists()) {
-			try {
-				file.createNewFile();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		try {
-			data = ConfigurationProvider.getProvider(YamlConfiguration.class)
-					.load(new File(bungee.getDataFolder(), "votecache.yml"));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void save() {
-		try {
-			ConfigurationProvider.getProvider(YamlConfiguration.class).save(data,
-					new File(bungee.getDataFolder(), "votecache.yml"));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-}

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

@@ -1,70 +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);
-					} else {
-						sender.sendMessage(
-								new TextComponent("&aNot using socket/pluginmessage method, command unavailable"));
-					}
-				}
-				if (args[0].equalsIgnoreCase("help")) {
-					TextComponent[] msg = new TextComponent[4];
-					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");
-					sender.sendMessage(msg);
-				}
-			}
-		} else {
-			sender.sendMessage(new TextComponent("&cYou do not have permission to do this!"));
-		}
-	}
-}

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

@@ -1,123 +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 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 String getBungeeHost() {
-		return getString(getNode("BungeeServer", "Host"), "");
-	}
-
-	public boolean getBungeeManageTotals() {
-		return getBoolean(getNode("BungeeManageTotals"), true);
-	}
-
-	public String getBungeeMethod() {
-		return getString(getNode("BungeeMethod"), "PLUGINMESSAGING");
-	}
-
-	public int getBungeePort() {
-		return getInt(getNode("BungeeServer", "Port"), 1297);
-	}
-
-	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);
-	}
-}

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

@@ -1,81 +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);
-					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();
-				} else {
-					source.sendMessage(Component.text("Not using socket/pluginmessage method, command unavailable")
-							.color(NamedTextColor.AQUA));
-				}
-			}
-			if (args[0].equalsIgnoreCase("help")) {
-				String[] msg = new String[4];
-				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";
-				for (String m : msg) {
-					source.sendMessage(Component.text(m).color(NamedTextColor.AQUA));
-				}
-
-			}
-		}
-	}
-
-	@Override
-	public boolean hasPermission(final Invocation invocation) {
-		return invocation.source().hasPermission("votingpluginbungee.admin");
-	}
-}

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

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

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

@@ -1,177 +0,0 @@
-package com.bencodez.votingplugin.commands.gui.player;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.bencodez.advancedcore.api.gui.GUIHandler;
-import com.bencodez.advancedcore.api.gui.GUIMethod;
-import com.bencodez.advancedcore.api.inventory.BInventory;
-import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
-import com.bencodez.advancedcore.api.inventory.BInventoryButton;
-import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.rewards.RewardOptions;
-import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.user.UserManager;
-import com.bencodez.votingplugin.user.VotingPluginUser;
-
-public class VoteShop extends GUIHandler {
-
-	private VotingPluginMain plugin;
-	private VotingPluginUser user;
-
-	public VoteShop(VotingPluginMain plugin, CommandSender player, VotingPluginUser user) {
-		super(plugin, player);
-		this.plugin = plugin;
-		this.user = user;
-	}
-
-	@Override
-	public ArrayList<String> getChat(CommandSender arg0) {
-		return null;
-	}
-
-	@Override
-	public void onBook(Player player) {
-	}
-
-	@Override
-	public void onChat(CommandSender sender) {
-
-	}
-
-	@Override
-	public void onChest(Player player) {
-		if (!plugin.getGui().getChestVoteShopEnabled()) {
-			player.sendMessage(StringParser.getInstance().colorize(plugin.getGui().getChestVoteShopDisabled()));
-			return;
-		}
-
-		if (this.user == null) {
-			user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
-		}
-		BInventory inv = new BInventory(plugin.getGui().getChestVoteShopName());
-		inv.addPlaceholder("points", "" + user.getPoints());
-		inv.dontClose();
-
-		for (final String identifier : plugin.getGui().getChestShopIdentifiers()) {
-
-			String perm = plugin.getGui().getChestVoteShopPermission(identifier);
-			boolean hasPerm = false;
-			if (perm.isEmpty()) {
-				hasPerm = true;
-			} else {
-				if (perm.startsWith("!")) {
-					hasPerm = !player.hasPermission(perm.substring(1));
-				} else {
-					hasPerm = player.hasPermission(perm);
-				}
-			}
-
-			int limit = plugin.getGui().getChestShopIdentifierLimit(identifier);
-
-			boolean limitPass = true;
-			if (limit > 0) {
-				if (user.getVoteShopIdentifierLimit(identifier) >= limit) {
-					limitPass = false;
-				}
-			}
-
-			if (!plugin.getGui().getChestVoteShopNotBuyable(identifier)) {
-				if (hasPerm && (limitPass || !plugin.getGui().isChestVoteShopHideLimitedReached())) {
-					ItemBuilder builder = new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier));
-
-					inv.addButton(new BInventoryButton(builder) {
-
-						@Override
-						public void onClick(ClickEvent event) {
-							Player player = event.getWhoClicked();
-
-							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
-							user.clearCache();
-
-							String identifier = (String) getData("identifier");
-							int limit = (int) getData("Limit");
-							int points = plugin.getGui().getChestShopIdentifierCost(identifier);
-							if (identifier != null) {
-								if (plugin.getGui().getChestVoteShopCloseGUI(identifier)) {
-									event.closeInventory();
-								}
-
-								// limit fail-safe, should never be needed, except in rare cases
-								boolean limitPass = true;
-								if (limit > 0) {
-									if (user.getVoteShopIdentifierLimit(identifier) >= limit) {
-										limitPass = false;
-									}
-								}
-
-								if (limitPass) {
-									if (!plugin.getGui().isChestVoteShopRequireConfirmation(identifier)) {
-										HashMap<String, String> placeholders = new HashMap<String, String>();
-										placeholders.put("identifier",
-												plugin.getGui().getChestShopIdentifierIdentifierName(identifier));
-										placeholders.put("points", "" + points);
-										placeholders.put("limit", "" + limit);
-										if (user.removePoints(points)) {
-											plugin.getLogger().info("VoteShop: " + user.getPlayerName() + "/"
-													+ user.getUUID() + " bought " + identifier + " for " + points);
-
-											plugin.getRewardHandler().giveReward(user, plugin.getGui().getData(),
-													plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
-													new RewardOptions().setPlaceholders(placeholders));
-
-											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
-													plugin.getGui().getCHESTVoteShopPurchase(identifier),
-													placeholders));
-											if (limit > 0) {
-												user.setVoteShopIdentifierLimit(identifier,
-														user.getVoteShopIdentifierLimit(identifier) + 1);
-											}
-										} else {
-											user.sendMessage(StringParser.getInstance().replacePlaceHolder(
-													plugin.getConfigFile().getFormatShopFailedMsg(), placeholders));
-										}
-									} else {
-										new VoteShopConfirm(plugin, player, user, identifier).open(GUIMethod.CHEST);
-
-									}
-								} else {
-									user.sendMessage(plugin.getGui().getChestVoteShopLimitReached());
-								}
-							}
-						}
-
-					}.addData("identifier", identifier).addData("Limit", limit));
-				}
-			} else {
-				if (hasPerm) {
-					ItemBuilder builder = new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier));
-					inv.addButton(new BInventoryButton(builder) {
-
-						@Override
-						public void onClick(ClickEvent event) {
-
-						}
-
-					}.dontClose().addData("identifier", identifier).addData("Limit", limit));
-				}
-			}
-		}
-
-		if (plugin.getGui().getChestVoteShopBackButton()) {
-			inv.addButton(plugin.getCommandLoader().getBackButton(user));
-		}
-
-		inv.openInventory(player);
-	}
-
-	@Override
-	public void open() {
-		open(GUIMethod.CHEST);
-	}
-
-}

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

@@ -1,149 +0,0 @@
-package com.bencodez.votingplugin.commands.gui.player;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.Map.Entry;
-import java.util.Set;
-
-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.advancedcore.api.misc.ArrayUtils;
-import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.topvoter.TopVoter;
-import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
-import com.bencodez.votingplugin.user.VotingPluginUser;
-
-public class VoteTopVoter extends GUIHandler {
-
-	private int page;
-	private VotingPluginMain plugin;
-	private TopVoter top;
-	private VotingPluginUser user;
-
-	public VoteTopVoter(VotingPluginMain plugin, CommandSender player, VotingPluginUser user, TopVoter top, int page) {
-		super(plugin, player);
-		this.plugin = plugin;
-		this.user = user;
-		this.top = top;
-		this.page = page;
-	}
-
-	@Override
-	public ArrayList<String> getChat(CommandSender sender) {
-		switch (top) {
-		case AllTime:
-			return ArrayUtils.getInstance().convert(plugin.getTopVoterHandler().topVoterAllTime(page));
-		case Daily:
-			return ArrayUtils.getInstance().convert(plugin.getTopVoterHandler().topVoterDaily(page));
-		case Monthly:
-			return ArrayUtils.getInstance().convert(plugin.getTopVoterHandler().topVoterMonthly(page));
-		case Weekly:
-			return ArrayUtils.getInstance().convert(plugin.getTopVoterHandler().topVoterWeekly(page));
-		default:
-			break;
-		}
-		return new ArrayList<String>();
-	}
-
-	@Override
-	public void onBook(Player player) {
-		// TODO
-	}
-
-	@Override
-	public void onChat(CommandSender sender) {
-		sendMessage(getChat(sender));
-	}
-
-	@Override
-	public void onChest(Player player) {
-		try {
-			if (top == null) {
-				top = TopVoter.getDefault();
-			}
-			Set<Entry<TopVoterPlayer, Integer>> users = null;
-
-			String topVoter = top.getName();
-			@SuppressWarnings("unchecked")
-			LinkedHashMap<TopVoterPlayer, Integer> topVotes = (LinkedHashMap<TopVoterPlayer, Integer>) plugin
-					.getTopVoter(top).clone();
-			users = topVotes.entrySet();
-
-			BInventory inv = new BInventory(plugin.getGui().getChestVoteTopName());
-			inv.addPlaceholder("topvoter", topVoter);
-			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<String>());
-
-				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) {
-						if (plugin.getGui().getChestVoteTopOpenMainGUIOnClick()) {
-							TopVoterPlayer user = (TopVoterPlayer) getData("User");
-							new VoteGUI(plugin, player, user.getUser())
-									.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
-						} else {
-							getInv().forceClose(clickEvent.getPlayer());
-						}
-					}
-				}.addData("player", entry.getKey().getPlayerName()).addData("User", entry.getKey()));
-				pos++;
-			}
-
-			final TopVoter cur = top;
-			inv.getPageButtons().add(new BInventoryButton(
-					new ItemBuilder(plugin.getGui().getChestVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
-
-				@Override
-				public void onClick(ClickEvent clickEvent) {
-					if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
-						new VoteTopVoter(plugin, player, user, cur.next(), 0).open(GUIMethod.CHEST);
-					} else {
-						new VoteTopVoter(plugin, player, user, cur.prev(), 0).open(GUIMethod.CHEST);
-					}
-				}
-			});
-
-			if (plugin.getGui().getChestVoteTopBackButton()) {
-				inv.getPageButtons().add(plugin.getCommandLoader().getBackButton(user).setSlot(1));
-			}
-
-			inv.setPages(true);
-			inv.setMaxInvSize(plugin.getGui().getChestVoteTopSize());
-			inv.openInventory(player);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	@Override
-	public void open() {
-		open(GUIMethod.valueOf(plugin.getGui().getGuiMethodTopVoter().toUpperCase()));
-	}
-
-}

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

@@ -1,244 +0,0 @@
-package com.bencodez.votingplugin.commands.gui.player;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.bencodez.advancedcore.api.bookgui.BookWrapper;
-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.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.MessageBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
-import com.bencodez.advancedcore.api.rewards.RewardBuilder;
-import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.objects.VoteSite;
-import com.bencodez.votingplugin.topvoter.TopVoter;
-import com.bencodez.votingplugin.user.UserManager;
-import com.bencodez.votingplugin.user.VotingPluginUser;
-
-import xyz.upperlevel.spigot.book.BookUtil;
-
-public class VoteURL extends GUIHandler {
-
-	private boolean json;
-	private VotingPluginMain plugin;
-	private VotingPluginUser user;
-
-	public VoteURL(VotingPluginMain plugin, CommandSender player, VotingPluginUser user, boolean json) {
-		super(plugin, player);
-		this.plugin = plugin;
-		this.user = user;
-		this.json = json;
-		if (user == null && player instanceof Player) {
-			this.user = UserManager.getInstance().getVotingPluginUser((Player) player);
-		}
-		if (player != null && user != null && player.getName().equals(user.getPlayerName())) {
-			if (plugin.getConfigFile().isUsePrimaryAccountForPlaceholders() && user.hasPrimaryAccount()) {
-				user = UserManager.getInstance().getVotingPluginUser(user.getPrimaryAccount());
-			}
-		}
-	}
-
-	@Override
-	public ArrayList<String> getChat(CommandSender arg0) {
-		ArrayList<String> sites = new ArrayList<String>();
-
-		List<String> title = plugin.getConfigFile().getFormatCommandsVoteText();
-		if (title != null) {
-			sites.addAll(title);
-		}
-		if (plugin.getConfigFile().getFormatCommandsVoteAutoInputSites()) {
-			int counter = 0;
-			for (VoteSite voteSite : plugin.getVoteSites()) {
-				if (!voteSite.isHidden()) {
-					counter++;
-					String voteURL = voteSite.getVoteURL(json);
-					MessageBuilder message = new MessageBuilder(plugin.getConfigFile().getFormatCommandsVoteURLS());
-					message.replacePlaceholder("num", Integer.toString(counter)).replacePlaceholder("url", voteURL)
-							.replacePlaceholder("SiteName", voteSite.getDisplayName());
-					if (user != null && user.getPlayerName() != null) {
-						message.replacePlaceholder("player", "" + user.getPlayerName()).replacePlaceholder("Next",
-								"" + user.voteCommandNextInfo(voteSite));
-					}
-					sites.add(message.colorize().getText());
-				}
-			}
-		}
-		if (user != null) {
-			HashMap<String, String> phs = new HashMap<String, String>();
-			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);
-		}
-
-		return ArrayUtils.getInstance().colorize(sites);
-	}
-
-	private ItemBuilder getItemAll() {
-		ItemBuilder builderAll = new ItemBuilder(plugin.getGui().getChestVoteURLAlreadyVotedAllUrlsButtonItemSection());
-		if (plugin.getGui().isChestVoteURLAllUrlsButtonrequireAllSitesVoted()) {
-			if (user.canVoteAny()) {
-				builderAll = new ItemBuilder(plugin.getGui().getChestVoteURLCanVoteAllUrlsButtonItemSection());
-			}
-		} else {
-			if (user.canVoteAll()) {
-				builderAll = new ItemBuilder(plugin.getGui().getChestVoteURLCanVoteAllUrlsButtonItemSection());
-			}
-		}
-
-		if (!builderAll.hasCustomDisplayName()) {
-			builderAll.setName("&4All Voting Sites");
-		}
-		if (!builderAll.hasCustomLore()) {
-			builderAll.setLore("&cClick Me");
-		}
-		int slot = plugin.getGui().getChestVoteURLAllUrlsButtonSlot();
-		if (slot >= 0) {
-			builderAll.setSlot(slot);
-		}
-		return builderAll;
-	}
-
-	private ItemBuilder getItemVoteSite(VoteSite voteSite) {
-		ItemBuilder builder = new ItemBuilder(plugin.getGui().getChestVoteURLAlreadyVotedItemSection());
-
-		if (user.canVoteSite(voteSite)) {
-			builder = new ItemBuilder(plugin.getGui().getChestVoteURLCanVoteItemSection());
-			builder.setName(
-					plugin.getGui().getChestVoteURLGUISiteNameCanVote().replace("%Name%", voteSite.getDisplayName()));
-		} else {
-			builder.setName(plugin.getGui().getChestVoteURLGUISiteName().replace("%Name%", voteSite.getDisplayName()));
-			builder.addLoreLine(
-					plugin.getGui().getChestVoteURLNextVote().replace("%Info%", user.voteCommandNextInfo(voteSite)));
-		}
-
-		return builder;
-	}
-
-	@Override
-	public void onBook(Player player) {
-		BookWrapper book = new BookWrapper(plugin.getGui().getBookVoteURLBookGUITitle());
-
-		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();
-			}
-			String url = StringParser.getInstance().replacePlaceHolder(site.getVoteURLJsonStrip(), "player",
-					user.getPlayerName());
-			layout.replaceTextComponent("[UrlText]", BookUtil.TextBuilder.of(text).color(color)
-					.onClick(BookUtil.ClickAction.openUrl(url)).onHover(BookUtil.HoverAction.showText(url)).build());
-			book.addLayout(layout);
-
-		}
-
-		book.open(player);
-	}
-
-	@Override
-	public void onChat(CommandSender sender) {
-		sendMessage(getChat(sender));
-	}
-
-	@Override
-	public void onChest(Player player) {
-		// normal GUI
-		BInventory inv = new BInventory(plugin.getGui().getChestVoteURLName());
-		if (plugin.getGui().getChestVoteURLViewAllUrlsButtonEnabled()) {
-			ItemBuilder builderAll = getItemAll();
-
-			inv.addButton(new UpdatingBInventoryButton(builderAll, 5000, 5000) {
-
-				@Override
-				public void onClick(ClickEvent event) {
-					VotingPluginUser user = UserManager.getInstance().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(builder, 5000, 5000) {
-
-					@Override
-					public void onClick(ClickEvent event) {
-						Player player = event.getPlayer();
-						if (player != null) {
-							VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
-							user.sendMessage(StringParser.getInstance().replacePlaceHolder(StringParser.getInstance()
-									.replacePlaceHolder(StringParser.getInstance().replacePlaceHolder(
-											plugin.getGui().getChestVoteURLURLText(), "voteurl", voteSite.getVoteURL()),
-											"sitename", voteSite.getDisplayName()),
-									"player", player.getName()));
-
-						}
-
-					}
-
-					@Override
-					public ItemBuilder onUpdate(Player player) {
-						return getItemVoteSite(voteSite);
-					}
-
-				});
-			}
-		}
-
-		for (final String str : plugin.getGui().getChestVoteURLExtraItems()) {
-			inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestVoteURLExtraItemsItem(str))) {
-
-				@Override
-				public void onClick(ClickEvent clickEvent) {
-					new RewardBuilder(plugin.getGui().getData(), "CHEST.VoteURL.ExtraItems." + str + ".Rewards")
-							.setGiveOffline(false).send(clickEvent.getPlayer());
-
-				}
-			});
-		}
-
-		if (plugin.getGui().getChestVoteURLBackButton()) {
-			inv.addButton(plugin.getCommandLoader().getBackButton(user));
-		}
-
-		inv.openInventory(player);
-
-	}
-
-	@Override
-	public void open() {
-		open(GUIMethod.valueOf(plugin.getGui().getGuiMethodURL().toUpperCase()));
-	}
-
-}

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

@@ -1,840 +0,0 @@
-package com.bencodez.votingplugin.config;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-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.ConfigDataListString;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataString;
-import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.topvoter.TopVoter;
-
-import lombok.Getter;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class Config.
- */
-public class Config extends YMLFile {
-
-	@ConfigDataBoolean(path = "AddCustomCommands")
-	@Getter
-	private boolean addCustomCommands = false;
-
-	@ConfigDataBoolean(path = "AddTotals")
-	@Getter
-	private boolean addTotals = true;
-
-	@ConfigDataBoolean(path = "PerSiteCoolDownEvents")
-	@Getter
-	private boolean perSiteCoolDownEvents = false;
-
-	@ConfigDataBoolean(path = "AllowUnjoined")
-	@Getter
-	private boolean allowUnjoined = false;
-
-	@ConfigDataBoolean(path = "PreloadSkulls")
-	@Getter
-	private boolean preloadSkulls = false;
-
-	@ConfigDataBoolean(path = "AutoCachePlaceholders")
-	@Getter
-	private boolean autoCachePlaceholders = true;
-
-	@ConfigDataBoolean(path = "AllowUnJoinedCheckServer")
-	@Getter
-	private boolean allowUnJoinedCheckServer = true;
-
-	@ConfigDataInt(path = "PlayerDataLoadLimit")
-	@Getter
-	private int playerDataLoadLimit = -1;
-
-	@ConfigDataBoolean(path = "AllowVotePointTransfers")
-	@Getter
-	private boolean allowVotePointTransfers = false;
-
-	@ConfigDataBoolean(path = "AlternateUUIDLookup")
-	@Getter
-	private boolean alternateUUIDLookup = false;
-
-	@ConfigDataBoolean(path = "AlwaysCloseInventory")
-	@Getter
-	private boolean alwaysCloseInventory = false;
-
-	@ConfigDataBoolean(path = "AlwaysUpdate")
-	@Getter
-	private boolean alwaysUpdate = false;
-
-	@ConfigDataBoolean(path = "AlwaysWaitForCachePlaceholders")
-	@Getter
-	private boolean alwaysWaitForCachePlaceholders = false;
-
-	@ConfigDataBoolean(path = "AlwaysProcessPlaceholders")
-	@Getter
-	private boolean alwaysProcessPlaceholders = false;
-
-	@ConfigDataBoolean(path = "AutoCreateVoteSites")
-	@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")
-	@Getter
-	private int delayBetweenUpdates = 3;
-
-	@ConfigDataBoolean(path = "DisableAdvancedTab")
-	@Getter
-	private boolean disableAdvancedTab = false;
-
-	@ConfigDataBoolean(path = "DisableCoolDownCheck")
-	@Getter
-	private boolean disableCoolDownCheck = false;
-
-	@ConfigDataListString(path = "DisabledCommands")
-	@Getter
-	private ArrayList<String> disabledCommands = new ArrayList<String>();
-
-	@ConfigDataListString(path = "DisabledDefaultPermissions")
-	@Getter
-	private ArrayList<String> disabledDefaultPermissions = new ArrayList<String>();
-
-	@ConfigDataListString(path = "CachedPlaceholders")
-	@Getter
-	private ArrayList<String> cachedPlaceholders = new ArrayList<String>();
-
-	@ConfigDataBoolean(path = "DisableInteractEvent")
-	@Getter
-	private boolean disableInteractEvent = false;
-
-	@ConfigDataBoolean(path = "DisableNoServiceSiteMessage")
-	@Getter
-	private boolean disableNoServiceSiteMessage = false;
-
-	@ConfigDataBoolean(path = "DisableUpdateChecking")
-	@Getter
-	private boolean disableUpdateChecking = false;
-
-	@ConfigDataBoolean(path = "ExtraAllSitesCheck")
-	@Getter
-	private boolean extraAllSitesCheck = false;
-
-	@ConfigDataBoolean(path = "CloseInventoryOnVote")
-	@Getter
-	private boolean closeInventoryOnVote = true;
-
-	@ConfigDataBoolean(path = "ExtraBackgroundUpdate")
-	@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;
-
-	@ConfigDataString(path = "Format.Commands.Vote.Last.LastVoted")
-	@Getter
-	private String formatCommandsVoteLastLastVoted = "%times% ago";
-
-	@ConfigDataString(path = "Format.Commands.Vote.Last.Line", defaultValue = "&3%SiteName%: &6%timeSince% ago")
-	@Getter
-	private String formatCommandsVoteLastLine;
-
-	@ConfigDataString(path = "Format.Commands.Vote.Last.NeverVoted", defaultValue = "Never voted")
-	@Getter
-	private String formatCommandsVoteLastNeverVoted;
-
-	@ConfigDataString(path = "Format.Commands.Vote.Last.TimeFormat", defaultValue = "%amount% %TimeType%")
-	@Getter
-	private String formatCommandsVoteLastTimeFormat;
-
-	@ConfigDataString(path = "Format.Commands.Vote.Today.Line")
-	@Getter
-	private String formatCommandsVoteTodayLine = "&6%player% : %VoteSite% : %Time%";
-
-	@ConfigDataListString(path = "Format.Commands.Vote.Today.Title")
-	@Getter
-	private ArrayList<String> formatCommandsVoteTodayTitle = ArrayUtils.getInstance()
-			.convert(new String[] { "&cToday's Votes %page%/%maxpage%", "&cPlayerName : VoteSite : Time" });
-
-	@ConfigDataString(path = "Format.Commands.Vote.ToggleBroadcasts.Disabled")
-	@Getter
-	private String formatCommandsVoteToggleBroadcastDisabled = "&cYou will no longer see vote broadcasts";
-
-	@ConfigDataString(path = "Format.Commands.Vote.ToggleBroadcasts.Enabled")
-	@Getter
-	private String formatCommandsVoteToggleBroadcastEnabled = "&cYou will now see vote broadcasts";
-
-	@ConfigDataString(path = "Format.Commands.Vote.ToggleReminders.Disabled")
-	@Getter
-	private String formatCommandsVoteToggleRemindersDisabled = "&cVote reminders disabled";
-
-	@ConfigDataString(path = "Format.Commands.Vote.ToggleReminders.Enabled")
-	@Getter
-	private String formatCommandsVoteToggleRemindersEnabled = "&cVote reminders enabled";
-
-	@Getter
-	private int formatPageSize = 10;
-
-	@ConfigDataString(path = "Format.TimeFormats.Day", defaultValue = "Day")
-	@Getter
-	private String formatTimeFormatsDay;
-
-	@ConfigDataString(path = "Format.TimeFormats.Days", defaultValue = "Days")
-	@Getter
-	private String formatTimeFormatsDays;
-
-	@ConfigDataString(path = "Format.TimeFormats.Hour", defaultValue = "Hour")
-	@Getter
-	private String formatTimeFormatsHour;
-
-	@ConfigDataString(path = "Format.TimeFormats.Hours", defaultValue = "Hours")
-	@Getter
-	private String formatTimeFormatsHours;
-
-	@ConfigDataString(path = "Format.TimeFormats.Minute", defaultValue = "Minute")
-	@Getter
-	private String formatTimeFormatsMinute;
-
-	@ConfigDataString(path = "Format.TimeFormats.Minutes", defaultValue = "Minutes")
-	@Getter
-	private String formatTimeFormatsMinutes;
-
-	@ConfigDataString(path = "Format.TimeFormats.Second", defaultValue = "Second")
-	@Getter
-	private String formatTimeFormatsSecond;
-
-	@ConfigDataString(path = "Format.TimeFormats.Seconds", defaultValue = "Seconds")
-	@Getter
-	private String formatTimeFormatsSeconds;
-
-	@ConfigDataBoolean(path = "LimitMonthlyVotes")
-	@Getter
-	private boolean limitMonthlyVotes = false;
-
-	@ConfigDataBoolean(path = "LoadCommandAliases")
-	@Getter
-	private boolean loadCommandAliases = true;
-
-	@ConfigDataBoolean(path = "LogVotesToFile")
-	@Getter
-	private boolean logVotesToFile = false;
-
-	@ConfigDataInt(path = "MaxiumNumberOfTopVotersToLoad")
-	@Getter
-	private int MaxiumNumberOfTopVotersToLoad = 1000;
-
-	@ConfigDataBoolean(path = "OverrideVersionDisable")
-	@Getter
-	private boolean overrideVersionDisable = false;
-
-	@ConfigDataBoolean(path = "PreventRepeatMilestones")
-	@Getter
-	private boolean preventRepeatMilestones = false;
-
-	@ConfigDataBoolean(path = "UpdateWithPlayersOnlineOnly")
-	@Getter
-	private boolean updateWithPlayersOnlineOnly = false;
-
-	@ConfigDataBoolean(path = "UseHighestTotals")
-	@Getter
-	private boolean useHighestTotals = true;
-
-	@ConfigDataBoolean(path = "UseJavascriptPlaceholders")
-	@Getter
-	private boolean useJavascriptPlaceholders = false;
-
-	@ConfigDataBoolean(path = "UsePrimaryAccountForPlaceholders")
-	@Getter
-	private boolean usePrimaryAccountForPlaceholders = false;
-
-	@ConfigDataBoolean(path = "UseVoteGUIMainCommand")
-	@Getter
-	private boolean useVoteGUIMainCommand = false;
-
-	@ConfigDataBoolean(path = "UseVoteStreaks")
-	@Getter
-	private boolean useVoteStreaks = true;
-
-	@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>());
-	}
-
-	public Set<String> getCustomCommands() {
-		Set<String> str = getData().getConfigurationSection("CustomCommands").getKeys(false);
-		if (str == null) {
-			str = new HashSet<String>();
-		}
-		return str;
-	}
-
-	public ConfigurationSection getCustomCommands(String ident) {
-		return getData().getConfigurationSection("CustomCommands." + ident);
-	}
-
-	/**
-	 * Gets the broad cast msg.
-	 *
-	 * @return the broad cast msg
-	 */
-	public String getFormatBroadCastMsg() {
-		return getData().getString("Format.BroadcastMsg",
-				"&6[&4Broadcast&6] &2Thanks &c%player% &2for voting on %SiteName%");
-
-	}
-
-	/**
-	 * Gets the broadcast when online.
-	 *
-	 * @return the broadcast when online
-	 */
-	public boolean getFormatBroadcastWhenOnline() {
-		return getData().getBoolean("Format.BroadcastWhenOnline");
-	}
-
-	/**
-	 * Gets the commands vote auto input sites.
-	 *
-	 * @return the commands vote auto input sites
-	 */
-	public boolean getFormatCommandsVoteAutoInputSites() {
-		return getData().getBoolean("Format.Commands.Vote.AutoInputSites");
-	}
-
-	@SuppressWarnings("unchecked")
-	public ArrayList<String> getFormatCommandsVoteBestLines() {
-		return (ArrayList<String>) getData().getList("Format.Commands.Vote.Best.Lines", new ArrayList<String>());
-	}
-
-	public String getFormatCommandsVoteBestTitle() {
-		return getData().getString("Format.Commands.Vote.Best.Title", "&3&l%player% Best Votes");
-	}
-
-	public String getFormatCommandsVoteHelpHoverColor() {
-		return getData().getString("Format.Commands.Vote.Help.HoverColor", "AQUA");
-	}
-
-	/**
-	 * Gets the commands vote help line.
-	 *
-	 * @return the commands vote help line
-	 */
-	public String getFormatCommandsVoteHelpLine() {
-		return getData().getString("Format.Commands.Vote.Help.Line", "&6%Command% - &6%HelpMessage%");
-	}
-
-	/**
-	 * Gets the commands vote help require permission.
-	 *
-	 * @return the commands vote help require permission
-	 */
-	public boolean getFormatCommandsVoteHelpRequirePermission() {
-		return getData().getBoolean("Format.Commands.Vote.Help.RequirePermission");
-	}
-
-	/**
-	 * Gets the commands vote help title.
-	 *
-	 * @return the commands vote help title
-	 */
-	public String getFormatCommandsVoteHelpTitle() {
-		return getData().getString("Format.Commands.Vote.Help.Title", "&6Voting Player Help");
-
-	}
-
-	/**
-	 * Gets the commands vote last title.
-	 *
-	 * @return the commands vote last title
-	 */
-	public String getFormatCommandsVoteLastTitle() {
-		return getData().getString("Format.Commands.Vote.Last.Title", "&3&l%player% Last Vote Times:");
-
-	}
-
-	/**
-	 * Gets the commands vote next info can vote.
-	 *
-	 * @return the commands vote next info can vote
-	 */
-	public String getFormatCommandsVoteNextInfoCanVote() {
-		return getData().getString("Format.Commands.Vote.Next.Info.CanVote", "Go Vote!");
-	}
-
-	/**
-	 * Gets the commands vote next info error.
-	 *
-	 * @return the commands vote next info error
-	 */
-	public String getFormatCommandsVoteNextInfoError() {
-		return getData().getString("Format.Commands.Vote.Next.Info.Error", "");
-	}
-
-	/**
-	 * Gets the commands vote next info time.
-	 *
-	 * @return the commands vote next info time
-	 */
-	public String getFormatCommandsVoteNextInfoTime() {
-		return getData().getString("Format.Commands.Vote.Next.Info.TimeUntilVote",
-				"&cCould not caculate time until next vote!");
-	}
-
-	public String getFormatCommandsVoteNextInfoVoteDelayDaily() {
-		return getData().getString("Format.Commands.Vote.Next.Info.VoteDelayDaily",
-				"%hours% Hours and %minutes% Minutes");
-	}
-
-	/**
-	 * Gets the commands vote next layout.
-	 *
-	 * @return the commands vote next layout
-	 */
-	public String getFormatCommandsVoteNextLayout() {
-		return getData().getString("Format.Commands.Vote.Next.Layout", "&3%SiteName%: &6%info%");
-	}
-
-	/**
-	 * Gets the commands vote next title.
-	 *
-	 * @return the commands vote next title
-	 */
-	public String getFormatCommandsVoteNextTitle() {
-		return getData().getString("Format.Commands.Vote.Next.Title", "&3&l%player% Next Votes:");
-
-	}
-
-	/**
-	 * 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>());
-	}
-
-	public String getFormatCommandsVoteStreakTitle() {
-		return getData().getString("Format.Commands.Vote.Streak.Title", "&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;
-	}
-
-	/**
-	 * Gets the commands vote URLS.
-	 *
-	 * @return the commands vote URLS
-	 */
-	public String getFormatCommandsVoteURLS() {
-		return getData().getString("Format.Commands.Vote.Sites", "&4%num%: &c&l%SiteName% - &c%url%");
-	}
-
-	/**
-	 * Gets the command vote points.
-	 *
-	 * @return the command vote points
-	 */
-	public String getFormatCommandVotePoints() {
-		return getData().getString("Format.Commands.Vote.Points", "&a%Player% currently has &a&l%Points%&a Points!");
-
-	}
-
-	/**
-	 * Gets the command vote top line.
-	 *
-	 * @return the command vote top line
-	 */
-	public String getFormatCommandVoteTopLine() {
-		return getData().getString("Format.Commands.Vote.Top.Line", "&c%num%: &6%player%, %votes%");
-	}
-
-	/**
-	 * Gets the command vote top title.
-	 *
-	 * @return the command vote top title
-	 */
-	public String getFormatCommandVoteTopTitle() {
-		return getData().getString("Format.Commands.Vote.Top.Title", "&3Top %Top% Voters %page%/%maxpages%");
-
-	}
-
-	public String getFormatNextPage() {
-		return getData().getString("Format.NextPage", "&aNext Page");
-	}
-
-	/**
-	 * Gets the format no perms.
-	 *
-	 * @return the format no perms
-	 */
-	public String getFormatNoPerms() {
-		return getData().getString("Format.NoPerms", "&cYou do not have enough permission!");
-	}
-
-	public String getFormatNotNumber() {
-		return getData().getString("Format.NotNumber", "&cError on &6%arg%&c, number expected!");
-	}
-
-	public String getFormatPrevPage() {
-		return getData().getString("Format.PrevPage", "&aPrevious Page");
-	}
-
-	public String getFormatShopFailedMsg() {
-		String msg = getData().getString("Format.ShopFailed", "&cYou do not have %Points% points to purhcase this!");
-
-		return msg;
-
-	}
-
-	public String getFormatShopPurchaseMsg() {
-		return getData().getString("Format.ShopPurchase", "&aYou bought the %Identifier% for %Points% Points!");
-
-	}
-
-	/**
-	 * Gets the sign top voter sign line 1.
-	 *
-	 * @return the sign top voter sign line 1
-	 */
-	public String getFormatSignTopVoterSignLine1() {
-		return getData().getString("Format.Signs.TopVoterSign.Line1", "TopVoter: %SiteName%");
-
-	}
-
-	/**
-	 * Gets the sign top voter sign line 2.
-	 *
-	 * @return the sign top voter sign line 2
-	 */
-	public String getFormatSignTopVoterSignLine2() {
-		return getData().getString("Format.Signs.TopVoterSign.Line2", "#%position%");
-	}
-
-	/**
-	 * Gets the sign top voter sign line 3.
-	 *
-	 * @return the sign top voter sign line 3
-	 */
-	public String getFormatSignTopVoterSignLine3() {
-		return getData().getString("Format.Signs.TopVoterSign.Line3", "%player%");
-
-	}
-
-	/**
-	 * Gets the sign top voter sign line 4.
-	 *
-	 * @return the sign top voter sign line 4
-	 */
-	public String getFormatSignTopVoterSignLine4() {
-		return getData().getString("Format.Signs.TopVoterSign.Line4", "%votes% Votes");
-
-	}
-
-	/**
-	 * Gets the sign top voter sign right click message.
-	 *
-	 * @return the sign top voter sign right click message
-	 */
-	public String getFormatSignTopVoterSignRightClickMessage() {
-		return getData().getString("Format.Signs.RightClickMessage",
-				"&c&l%player% &cis &c&l%position% &cwith &c&l%votes% &cin &c&l%SiteName%");
-
-	}
-
-	/**
-	 * Gets the time format.
-	 *
-	 * @return the time format
-	 */
-	public String getFormatTimeFormat() {
-		return getData().getString("Format.TimeFormat", "EEE, d MMM yyyy HH:mm");
-
-	}
-
-	public String getFormatTopVoterAllTime() {
-		return getData().getString("Format.TopVoter.AllTime", "AllTime");
-	}
-
-	public String getFormatTopVoterDaily() {
-		return getData().getString("Format.TopVoter.Daily", "Daily");
-	}
-
-	public String getFormatTopVoterMonthly() {
-		return getData().getString("Format.TopVoter.Monthly", "Monthly");
-	}
-
-	/**
-	 * Gets the top voter reward msg.
-	 *
-	 * @return the top voter reward msg
-	 */
-	public String getFormatTopVoterRewardMsg() {
-		return getData().getString("Format.TopVoterAwardMsg",
-				"&aYou came in %place% in top voters of the month! Here is an award!");
-
-	}
-
-	public String getFormatTopVoterWeekly() {
-		return getData().getString("Format.TopVoter.Weekly", "Weekly");
-	}
-
-	public String getFormatUserNotExist() {
-		return getData().getString("Format.UserNotExist", "&cUser does not exist: %player%");
-	}
-
-	/**
-	 * 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>());
-	}
-
-	public boolean getGiveDefaultPermission() {
-		return getData().getBoolean("GiveDefaultPermission", true);
-	}
-
-	public boolean getLoadTopVoter(TopVoter top) {
-		switch (top) {
-		case AllTime:
-			return getLoadTopVoterAllTime();
-		case Daily:
-			return getLoadTopVoterDaily();
-		case Monthly:
-			return getLoadTopVoterMonthly();
-		case Weekly:
-			return getLoadTopVoterWeekly();
-		default:
-			return false;
-		}
-	}
-
-	public boolean getLoadTopVoterAllTime() {
-		return getData().getBoolean("LoadTopVoter.AllTime", true);
-	}
-
-	public boolean getLoadTopVoterDaily() {
-		return getData().getBoolean("LoadTopVoter.Daily", false);
-	}
-
-	public boolean getLoadTopVoterMonthly() {
-		return getData().getBoolean("LoadTopVoter.Monthly", true);
-	}
-
-	public boolean getLoadTopVoterWeekly() {
-		return getData().getBoolean("LoadTopVoter.Weekly", false);
-	}
-
-	public int getPointsOnVote() {
-		return getData().getInt("PointsOnVote", 1);
-	}
-
-	public int getPurgeMin() {
-		return getData().getInt("PurgeMin", 90);
-	}
-
-	public boolean getPurgeOldData() {
-		return getData().getBoolean("PurgeOldData");
-	}
-
-	/**
-	 * Gets the request API default method.
-	 *
-	 * @return the request API default method
-	 */
-	public String getRequestAPIDefaultMethod() {
-		return getData().getString("RequestAPI.DefaultMethod", "Anvil");
-	}
-
-	/**
-	 * Gets the request API disabled methods.
-	 *
-	 * @return the request API disabled methods
-	 */
-	@SuppressWarnings("unchecked")
-	public ArrayList<String> getRequestAPIDisabledMethods() {
-		return (ArrayList<String>) getData().getList("RequestAPI.DisabledMethods", new ArrayList<String>());
-	}
-
-	/**
-	 * Gets the store top voters daily.
-	 *
-	 * @return the store top voters daily
-	 */
-	public boolean getStoreTopVotersDaily() {
-		return getData().getBoolean("StoreTopVoters.Daily");
-	}
-
-	/**
-	 * Gets the store top voters weekly.
-	 *
-	 * @return the store top voters weekly
-	 */
-	public boolean getStoreTopVotersWeekly() {
-		return getData().getBoolean("StoreTopVoters.Weekly");
-	}
-
-	public boolean getTopVoterAwardsTies() {
-		return getData().getBoolean("TopVoterAwardsTies", true);
-	}
-
-	public boolean getTopVoterIgnorePermission() {
-		return getData().getBoolean("TopVoterIgnorePermission");
-	}
-
-	/**
-	 * Gets the enabled.
-	 *
-	 * @return the enabled
-	 */
-	public boolean getVoteRemindingEnabled() {
-		return getData().getBoolean("VoteReminding.Enabled");
-	}
-
-	/**
-	 * Gets the remind delay.
-	 *
-	 * @return the remind delay
-	 */
-	public int getVoteRemindingRemindDelay() {
-		return getData().getInt("VoteReminding.RemindDelay", 30);
-	}
-
-	/**
-	 * Gets the remind on login.
-	 *
-	 * @return the remind on login
-	 */
-	public boolean getVoteRemindingRemindOnLogin() {
-		return getData().getBoolean("VoteReminding.RemindOnLogin");
-	}
-
-	/**
-	 * Gets the remind only once.
-	 *
-	 * @return the remind only once
-	 */
-	public boolean getVoteRemindingRemindOnlyOnce() {
-		return getData().getBoolean("VoteReminding.RemindOnlyOnce");
-	}
-
-	/**
-	 * Gets the rewards.
-	 *
-	 * @return the rewards
-	 */
-	public String getVoteRemindingRewardsPath() {
-		return "VoteReminding.Rewards";
-	}
-
-	public String getVoteTopDefault() {
-		return getData().getString("VoteTopDefault", "Monthly");
-	}
-
-	@Override
-	public void loadValues() {
-		new AnnotationHandler().load(getData(), this);
-	}
-
-	@Override
-	public void onFileCreation() {
-		getPlugin().saveResource("Config.yml", true);
-	}
-
-}

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

@@ -1,574 +0,0 @@
-package com.bencodez.votingplugin.config;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-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.ConfigDataListString;
-import com.bencodez.advancedcore.api.yml.annotation.ConfigDataString;
-import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.topvoter.TopVoter;
-
-import lombok.Getter;
-
-public class GUI extends YMLFile {
-
-	@ConfigDataString(path = "BOOK.VoteURLBookGUI.AlreadyVotedColor")
-	@Getter
-	private String bookVoteURLBookGUIAlreadyVotedColor = "RED";
-
-	@ConfigDataString(path = "BOOK.VoteURLBookGUI.AlreadyVotedText")
-	@Getter
-	private String bookVoteURLBookGUIAlreadyVotedText = "Click me";
-
-	@ConfigDataString(path = "BOOK.VoteURLBookGUI.CanVoteColor")
-	@Getter
-	private String bookVoteURLBookGUICanVoteColor = "GREEN";
-
-	@ConfigDataString(path = "BOOK.VoteURLBookGUI.CanVoteText")
-	@Getter
-	private String bookVoteURLBookGUICanVoteText = "Click me";
-
-	@ConfigDataListString(path = "BOOK.VoteURLBookGUI.Layout")
-	@Getter
-	private ArrayList<String> bookVoteURLBookGUILayout = ArrayUtils.getInstance()
-			.convert(new String[] { "&c%Sitename%", "[UrlText]" });
-
-	@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;
-
-	@ConfigDataString(path = "CHEST.VoteToday.IconTitle")
-	@Getter
-	private String chestVoteTodayIconTitle = "%player%";
-
-	@ConfigDataString(path = "CHEST.VoteToday.Line")
-	@Getter
-	private String chestVoteTodayLine = "&6%VoteSite% : %Time%";
-
-	@ConfigDataConfigurationSection(path = "CHEST.VoteToday.PlayerItem")
-	@Getter
-	private ConfigurationSection chestVoteTodayPlayerItem;
-
-	@ConfigDataBoolean(path = "CHEST.VoteToday.UseSkull", defaultValue = true)
-	@Getter
-	private boolean chestVoteTodayUseSkull = true;
-
-	@ConfigDataString(path = "CHEST.VoteTop.PlayerItem.Material")
-	@Getter
-	private String chestVoteTopPlayerItemMaterial = "PAPER";
-
-	@ConfigDataBoolean(path = "CHEST.VoteTop.UseSkull")
-	@Getter
-	private boolean chestVoteTopUseSkull = true;
-
-	@ConfigDataBoolean(path = "CHEST.VoteURL.AllUrlsButton.RequireAllSitesVoted")
-	@Getter
-	private boolean chestVoteURLAllUrlsButtonrequireAllSitesVoted = true;
-
-	@ConfigDataString(path = "GUIMethod.Best")
-	@Getter
-	private String guiMethodBest = "CHEST";
-
-	@ConfigDataString(path = "GUIMethod.GUI")
-	@Getter
-	private String guiMethodGUI = "CHEST";
-
-	@ConfigDataString(path = "GUIMethod.Last")
-	@Getter
-	private String guiMethodLast = "CHEST";
-
-	@ConfigDataString(path = "GUIMethod.Next")
-	@Getter
-	private String guiMethodNext = "CHEST";
-
-	@ConfigDataString(path = "GUIMethod.Streak")
-	@Getter
-	private String guiMethodStreak = "CHEST";
-
-	@ConfigDataString(path = "GUIMethod.Today")
-	@Getter
-	private String guiMethodToday = "CHEST";
-
-	@ConfigDataString(path = "GUIMethod.TopVoter")
-	@Getter
-	private String guiMethodTopVoter = "CHEST";
-
-	@ConfigDataString(path = "GUIMethod.Total")
-	@Getter
-	private String guiMethodTotal = "CHEST";
-
-	@ConfigDataString(path = "GUIMethod.URL")
-	@Getter
-	private String guiMethodURL = "CHEST";
-
-	@ConfigDataBoolean(path = "LastMonthGUI")
-	@Getter
-	private boolean lastMonthGUI = false;
-
-	@ConfigDataBoolean(path = "CHEST.VoteLast.ClickableLinks")
-	@Getter
-	private boolean chestVoteLastClickableLinks = true;
-
-	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();
-	}
-
-	public ConfigurationSection getCHESTBackButton() {
-		return getData().getConfigurationSection("CHEST.BackButton");
-	}
-
-	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);
-	}
-
-	public ConfigurationSection getChestVoteBestDayBestItem() {
-		return getData().getConfigurationSection("CHEST.VoteBest.DayBest.Item");
-	}
-
-	public ConfigurationSection getChestVoteBestMonthBestItem() {
-		return getData().getConfigurationSection("CHEST.VoteBest.MonthBest.Item");
-	}
-
-	public String getChestVoteBestName() {
-		return getData().getString("CHEST.VoteBest.Name", "VoteBest: %player%");
-	}
-
-	public ConfigurationSection getChestVoteBestWeekBestItem() {
-		return getData().getConfigurationSection("CHEST.VoteBest.WeekBest.Item");
-	}
-
-	public String getChestVoteGUIName() {
-		return getData().getString("CHEST.VoteGUIName", "&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) {
-		return "CHEST.VoteGUI." + slot + ".Rewards";
-	}
-
-	/**
-	 * Gets the vote GUI slots.
-	 *
-	 * @return the vote GUI slots
-	 */
-	public Set<String> getChestVoteGUISlots() {
-		try {
-			return getData().getConfigurationSection("CHEST.VoteGUI").getKeys(false);
-		} catch (Exception ex) {
-			return new HashSet<String>();
-		}
-	}
-
-	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 boolean getChestVoteLastBackButton() {
-		return getData().getBoolean("CHEST.VoteLast.BackButton");
-	}
-
-	public String getChestVoteLastLine() {
-		return getData().getString("CHEST.VoteLast.Line", "&6%timeSince%");
-	}
-
-	public String getChestVoteLastName() {
-		return getData().getString("CHEST.VoteLast.Name", "VoteLast: %player%");
-	}
-
-	public boolean getChestVoteNextBackButton() {
-		return getData().getBoolean("CHEST.VoteNext.BackButton");
-	}
-
-	public String getChestVoteNextName() {
-		return getData().getString("CHEST.VoteNext.Name", "VoteNext: %player%");
-	}
-
-	public String getChestVoteRewardName() {
-		return getData().getString("CHEST.VoteRewardName", "VoteReward");
-	}
-
-	public boolean getChestVoteShopBackButton() {
-		return getData().getBoolean("CHEST.VoteShopBackButton", true);
-	}
-
-	public boolean getChestVoteShopCloseGUI(String shop) {
-		return getData().getBoolean("CHEST.Shop." + shop + ".CloseGUI", true);
-	}
-
-	public boolean getChestVoteShopEnabled() {
-		return getData().getBoolean("CHEST.VoteShopEnabled", true);
-	}
-
-	public String getChestVoteShopName() {
-		return getData().getString("CHEST.VoteShopName", "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);
-	}
-
-	public boolean getChestVoteStreakBackButton() {
-		return getData().getBoolean("CHEST.VoteStreak.BackButton");
-	}
-
-	public ConfigurationSection getChestVoteStreakCurrentDayStreakItem() {
-		return getData().getConfigurationSection("CHEST.VoteStreak.CurrentDayStreak.Item");
-	}
-
-	public ConfigurationSection getChestVoteStreakCurrentMonthStreakItem() {
-		return getData().getConfigurationSection("CHEST.VoteStreak.CurrentMonthStreak.Item");
-	}
-
-	public ConfigurationSection getChestVoteStreakCurrentWeekStreakItem() {
-		return getData().getConfigurationSection("CHEST.VoteStreak.CurrentWeekStreak.Item");
-	}
-
-	public ConfigurationSection getChestVoteStreakHighestDayStreakItem() {
-		return getData().getConfigurationSection("CHEST.VoteStreak.HighestDayStreak.Item");
-	}
-
-	public ConfigurationSection getChestVoteStreakHighestMonthStreakItem() {
-		return getData().getConfigurationSection("CHEST.VoteStreak.HighestMonthStreak.Item");
-	}
-
-	public ConfigurationSection getChestVoteStreakHighestWeekStreakItem() {
-		return getData().getConfigurationSection("CHEST.VoteStreak.HighestWeekStreak.Item");
-	}
-
-	public String getChestVoteStreakName() {
-		return getData().getString("CHEST.VoteStreak.Name", "VoteStreak");
-	}
-
-	public boolean getChestVoteTodayBackButton() {
-		return getData().getBoolean("CHEST.VoteToday.BackButton");
-	}
-
-	public String getChestVoteTodayName() {
-		return getData().getString("CHEST.VoteToday.Name", "VoteToday");
-	}
-
-	public boolean getChestVoteTopBackButton() {
-		return getData().getBoolean("CHEST.VoteTop.BackButton");
-	}
-
-	public String getChestVoteTopItemLore() {
-		return getData().getString("CHEST.VoteTop.Item.Lore", "&3&lVotes: &3%votes%");
-	}
-
-	public String getChestVoteTopItemName() {
-		return getData().getString("CHEST.VoteTop.Item.Name", "&3&l%position%: &3%player%");
-	}
-
-	public String getChestVoteTopName() {
-		return getData().getString("CHEST.VoteTop.Name", "VoteTop %topvoter%");
-	}
-
-	public boolean getChestVoteTopOpenMainGUIOnClick() {
-		return getData().getBoolean("CHEST.VoteTop.OpenMainGUIOnClick", true);
-	}
-
-	public int getChestVoteTopSize() {
-		return getData().getInt("CHEST.VoteTop.Size", 27);
-	}
-
-	public ConfigurationSection getChestVoteTopSwitchItem() {
-		return getData().getConfigurationSection("CHEST.VoteTop.SwitchItem");
-	}
-
-	public ConfigurationSection getChestVoteTotalAllTimeTotalItem() {
-		return getData().getConfigurationSection("CHEST.VoteTotal.AllTimeTotal.Item");
-	}
-
-	public boolean getChestVoteTotalBackButton() {
-		return getData().getBoolean("CHEST.VoteTotal.BackButton");
-	}
-
-	public ConfigurationSection getChestVoteTotalDayTotalItem() {
-		return getData().getConfigurationSection("CHEST.VoteTotal.DayTotal.Item");
-	}
-
-	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 getChestVoteTotalMonthTotalItem() {
-		return getData().getConfigurationSection("CHEST.VoteTotal.MonthTotal.Item");
-	}
-
-	public String getChestVoteTotalName() {
-		return getData().getString("CHEST.VoteTotal.Name", "VoteTotal: %player%");
-	}
-
-	public ConfigurationSection getChestVoteTotalWeekTotalItem() {
-		return getData().getConfigurationSection("CHEST.VoteTotal.WeekTotal.Item");
-	}
-
-	public int getChestVoteURLAllUrlsButtonSlot() {
-		return getData().getInt("CHEST.VoteURL.AllUrlsButton.Slot", -1);
-	}
-
-	public int getChestVoteURLAllUrlsButtonStartSlot() {
-		return getData().getInt("CHEST.VoteURL.StartSlot", -1);
-	}
-
-	public ConfigurationSection getChestVoteURLAlreadyVotedAllUrlsButtonItemSection() {
-		if (getData().isConfigurationSection("CHEST.VoteURL.AllUrlsButton.AlreadyVotedItem")) {
-			return getData().getConfigurationSection("CHEST.VoteURL.AllUrlsButton.AlreadyVotedItem");
-		} else {
-			return getData().getConfigurationSection("CHEST.VoteURL.AlreadyVotedItem");
-		}
-	}
-
-	public ConfigurationSection getChestVoteURLAlreadyVotedItemSection() {
-		return getData().getConfigurationSection("CHEST.VoteURL.AlreadyVotedItem");
-	}
-
-	public boolean getChestVoteURLBackButton() {
-		return getData().getBoolean("CHEST.VoteURL.BackButton");
-	}
-
-	public ConfigurationSection getChestVoteURLCanVoteAllUrlsButtonItemSection() {
-		if (getData().isConfigurationSection("CHEST.VoteURL.AllUrlsButton.CanVoteItem")) {
-			return getData().getConfigurationSection("CHEST.VoteURL.AllUrlsButton.CanVoteItem");
-		} else {
-			return getData().getConfigurationSection("CHEST.VoteURL.CanVoteItem");
-		}
-	}
-
-	public ConfigurationSection getChestVoteURLCanVoteItemSection() {
-		return getData().getConfigurationSection("CHEST.VoteURL.CanVoteItem");
-	}
-
-	public Set<String> getChestVoteURLExtraItems() {
-		if (getData().isConfigurationSection("CHEST.VoteURL.ExtraItems")) {
-			return getData().getConfigurationSection("CHEST.VoteURL.ExtraItems").getKeys(false);
-		}
-		return new HashSet<String>();
-	}
-
-	public ConfigurationSection getChestVoteURLExtraItemsItem(String item) {
-		return getData().getConfigurationSection("CHEST.VoteURL.ExtraItems." + item);
-	}
-
-	/**
-	 * Gets the vote URL site name.
-	 *
-	 * @return the vote URL site name
-	 */
-	public String getChestVoteURLGUISiteName() {
-		return getData().getString("CHEST.VoteURL.SiteName", "&c%Name%");
-	}
-
-	public String getChestVoteURLGUISiteNameCanVote() {
-		return getData().getString("CHEST.VoteURL.SiteNameCanVote", "&a%Name%");
-	}
-
-	public String getChestVoteURLName() {
-		return getData().getString("CHEST.VoteURL.Name", "&cVoteURL");
-	}
-
-	/**
-	 * Gets the vote URL next vote.
-	 *
-	 * @return the vote URL next vote
-	 */
-	public String getChestVoteURLNextVote() {
-		return getData().getString("CHEST.VoteURL.NextVote", "&cCan Vote In: %Info%");
-
-	}
-
-	/**
-	 * Gets the vote URL see URL.
-	 *
-	 * @return the vote URL see URL
-	 */
-	public String getChestVoteURLSeeURL() {
-		return getData().getString("CHEST.VoteURL.SeeURL", "&cClick to see URL");
-	}
-
-	public String getChestVoteURLSiteName() {
-		return getData().getString("CHEST.VoteURLSite.Name", "VoteSite %site%");
-	}
-
-	public String getChestVoteURLURLText() {
-		return getData().getString("CHEST.VoteURL.URLText", "%VoteUrl%");
-	}
-
-	/**
-	 * Gets the vote URL view all urls button enabled.
-	 *
-	 * @return the vote URL view all urls button enabled
-	 */
-	public boolean getChestVoteURLViewAllUrlsButtonEnabled() {
-		return getData().getBoolean("CHEST.VoteURL.ViewAllUrlsButtonEnabled");
-	}
-
-	public boolean isChestVoteShopRequireConfirmation(String identifier) {
-		return getData().getBoolean("CHEST.Shop." + identifier + ".RequireConfirmation",
-				isChestVoteShopRequireConfirmation());
-	}
-
-	@Override
-	public void loadValues() {
-		new AnnotationHandler().load(getData(), this);
-	}
-
-	@Override
-	public void onFileCreation() {
-		plugin.saveResource("GUI.yml", true);
-	}
-
-	public void removeShop(String value) {
-		getData().set("CHEST.Shop." + value, null);
-		saveData();
-	}
-}

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

@@ -1,184 +0,0 @@
-package com.bencodez.votingplugin.cooldown;
-
-import java.util.HashMap;
-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.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;
-
-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);
-	}
-
-	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 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<VoteSite, Boolean> coolDownChecks = user.getCoolDownCheckSiteList();
-			boolean changed = false;
-			for (VoteSite site : plugin.getVoteSites()) {
-				if (user.canVoteSite(site)) {
-					if (!coolDownChecks.containsKey(site) || !coolDownChecks.get(site).booleanValue()) {
-						coolDownChecks.put(site, Boolean.TRUE);
-						changed = true;
-						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 (time > 0) {
-			if (perSiteTasks.containsKey(uuid)) {
-				perSiteTasks.get(uuid).cancel(false);
-				perSiteTasks.remove(uuid);
-			}
-			plugin.devDebug("PerSiteCoolDownEvent schedule time: " + time);
-			ScheduledFuture<?> scheduledFuture = timer.schedule(new Runnable() {
-
-				@Override
-				public void run() {
-					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 (time > 0) {
-			user.setCoolDownCheck(true);
-			if (allSiteTasks.containsKey(uuid)) {
-				allSiteTasks.get(uuid).cancel(false);
-				allSiteTasks.remove(uuid);
-			}
-			ScheduledFuture<?> scheduledFuture = timer.schedule(new Runnable() {
-
-				@Override
-				public void run() {
-					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() {
-
-			}
-		});
-	}
-
-	@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());
-	}
-
-}

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

@@ -1,244 +0,0 @@
-package com.bencodez.votingplugin.listeners;
-
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-import org.bukkit.Bukkit;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
-import com.bencodez.advancedcore.api.misc.PlayerUtils;
-import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.bungee.BungeeMethod;
-import com.bencodez.votingplugin.events.PlayerPostVoteEvent;
-import com.bencodez.votingplugin.events.PlayerVoteEvent;
-import com.bencodez.votingplugin.objects.VoteSite;
-import com.bencodez.votingplugin.user.UserManager;
-import com.bencodez.votingplugin.user.VotingPluginUser;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class VotiferEvent.
- */
-public class PlayerVoteListener implements Listener {
-
-	private static Object object = new Object();
-
-	private VotingPluginMain plugin;
-
-	/**
-	 * Instantiates a new votifer event.
-	 *
-	 * @param plugin the plugin
-	 */
-	public PlayerVoteListener(VotingPluginMain plugin) {
-		this.plugin = plugin;
-	}
-
-	/**
-	 * On votifer event.
-	 *
-	 * @param event the event
-	 */
-	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-	public void onplayerVote(PlayerVoteEvent event) {
-		if (!plugin.isEnabled()) {
-			return;
-		}
-		String playerName = event.getPlayer();
-		if (!PlayerUtils.getInstance().isValidUser(playerName, plugin.getConfigFile().isAllowUnJoinedCheckServer())) {
-			if (!plugin.getConfigFile().isAllowUnjoined()) {
-				plugin.getLogger().warning("Player " + playerName
-						+ " has not joined before, disregarding vote, set AllowUnjoined to true to prevent this");
-				if (event.isBungee() && plugin.getBungeeSettings().isRemoveInvalidUsers()) {
-					UserManager.getInstance().getVotingPluginUser(playerName).remove();
-				}
-				return;
-			}
-		}
-
-		if (playerName.isEmpty()) {
-			plugin.getLogger().warning("Empty player name for vote");
-			return;
-		}
-
-		if (event.isBungee()) {
-			plugin.debug("BungeePlayerVote forcebungee: " + event.isForceBungee() + ", bungeetotals: "
-					+ event.getBungeeTextTotals());
-
-			if (plugin.getBungeeSettings().isTriggerVotifierEvent()) {
-				new BungeeVotifierEvent().send(plugin, event);
-			}
-		}
-
-		VoteSite voteSite = event.getVoteSite();
-
-		if (voteSite == null) {
-			voteSite = plugin.getVoteSite(plugin.getVoteSiteName(true, event.getServiceSite()), true);
-		}
-
-		// check valid service sites
-		if (voteSite == null) {
-			if (!plugin.getConfigFile().isDisableNoServiceSiteMessage()) {
-				plugin.getLogger().warning("No voting site with the service site: '" + event.getServiceSite() + "'");
-
-				ArrayList<String> services = new ArrayList<String>();
-				for (VoteSite site : plugin.getVoteSites()) {
-					services.add(site.getServiceSite());
-				}
-				plugin.getLogger()
-						.warning("Current known service sites: " + ArrayUtils.getInstance().makeStringList(services));
-			}
-			return;
-		}
-
-		if (!voteSite.isEnabled()) {
-			plugin.debug("Votesite: " + voteSite.getKey() + " is not enabled");
-			return;
-		}
-
-		VotingPluginUser user = null;
-		if (event.getVotingPluginUser() != null) {
-			user = event.getVotingPluginUser();
-		} else {
-			user = UserManager.getInstance().getVotingPluginUser(playerName);
-		}
-
-		if (voteSite.isWaitUntilVoteDelay() && !user.canVoteSite(voteSite)) {
-			plugin.getLogger().info(user.getPlayerName() + " must wait until votedelay is over, ignoring vote");
-			return;
-		}
-
-		synchronized (object) {
-			if (!plugin.isEnabled()) {
-				return;
-			}
-			// reupdate cache
-			user.clearCache();
-			user.cache();
-
-			user.updateName(true);
-
-			// vote party
-			plugin.getVoteParty().vote(user, event.isRealVote(), event.isForceBungee());
-
-			if (event.isBroadcast() && !plugin.getBungeeSettings().isDisableBroadcast()) {
-				// broadcast vote if enabled in config
-				if (plugin.getConfigFile().isBroadcastVotesEnabled()
-						&& (plugin.getBungeeSettings().isBungeeBroadcast() || !event.isBungee())) {
-					if (!plugin.getConfigFile().getFormatBroadcastWhenOnline() || user.isOnline()) {
-						voteSite.broadcastVote(user);
-					}
-				}
-			}
-
-			if (plugin.getBroadcastHandler() != null) {
-				plugin.getBroadcastHandler().onVote(playerName);
-			}
-
-			// update last vote time
-			if (event.getTime() != 0) {
-				user.setTime(voteSite, event.getTime());
-			} else {
-				user.setTime(voteSite);
-			}
-
-			// try logging to file
-			if (plugin.getConfigFile().isLogVotesToFile()) {
-				try {
-					plugin.logVote(LocalDateTime.now().atZone(ZoneId.systemDefault()).toLocalDateTime(), playerName,
-							voteSite.getKey());
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-
-			// check first vote rewards
-			plugin.getSpecialRewards().checkFirstVote(user, event.isForceBungee());
-			plugin.getSpecialRewards().checkFirstVoteToday(user, event.isForceBungee());
-
-			if (user.isReminded() && plugin.getConfigFile().getVoteRemindingRemindOnlyOnce()) {
-				user.setReminded(false);
-			}
-
-			// check if player has voted on all sites in one day
-			if (((user.isOnline() || voteSite.isGiveOffline()) && plugin.getOptions().isProcessRewards())
-					|| event.isBungee()) {
-				boolean online = true;
-				if (event.isBungee()) {
-					online = event.isWasOnline();
-				}
-				user.playerVote(voteSite, online, false, event.isForceBungee());
-				if (event.getVoteNumber() == 1) {
-					user.sendVoteEffects(online);
-				}
-				if (plugin.getConfigFile().isCloseInventoryOnVote()) {
-					user.closeInv();
-				}
-			} else {
-				user.addOfflineVote(voteSite.getKey());
-				plugin.debug(
-						"Offline vote set for " + playerName + " (" + user.getUUID() + ") on " + voteSite.getKey());
-			}
-
-			// add to total votes
-			if ((plugin.getConfigFile().isCountFakeVotes() || event.isRealVote()) && event.isAddTotals()) {
-				if (plugin.getConfigFile().isAddTotals()) {
-					user.addTotal();
-					user.addTotalDaily();
-					user.addTotalWeekly();
-				}
-				user.addPoints();
-			}
-			user.checkDayVoteStreak(event.isForceBungee());
-
-			// other rewards
-			plugin.getSpecialRewards().checkAllSites(user, event.isForceBungee());
-			plugin.getSpecialRewards().checkAlmostAllSites(user, event.isForceBungee());
-			plugin.getSpecialRewards().checkCumualativeVotes(user, event.getBungeeTextTotals(), event.isForceBungee());
-			plugin.getSpecialRewards().checkMilestone(user, event.getBungeeTextTotals(), event.isForceBungee());
-			plugin.getCoolDownCheck().vote(user, voteSite);
-
-			final String uuid = user.getUUID();
-			if (plugin.getBungeeSettings().isUseBungeecoord()) {
-				if (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.MYSQL)) {
-
-					Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
-
-						@Override
-						public void run() {
-							if (Bukkit.getOnlinePlayers().size() > 0) {
-								plugin.getPluginMessaging().sendPluginMessage("VoteUpdate", uuid);
-							}
-						}
-					}, 40);
-				}
-			}
-
-			PlayerPostVoteEvent postVoteEvent = new PlayerPostVoteEvent(voteSite, user, event.isRealVote(),
-					event.isForceBungee());
-			plugin.getServer().getPluginManager().callEvent(postVoteEvent);
-
-			plugin.getTimer().schedule(new Runnable() {
-
-				@Override
-				public void run() {
-					VotingPluginUser user = plugin.getVotingPluginUserManager()
-							.getVotingPluginUser(UUID.fromString(uuid));
-					if (!user.isOnline()) {
-						user.clearCache();
-					}
-				}
-			}, 5, TimeUnit.SECONDS);
-
-		}
-
-		plugin.setUpdate(true);
-	}
-
-}

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

@@ -1,124 +0,0 @@
-package com.bencodez.votingplugin.listeners;
-
-import java.util.ArrayList;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
-import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.bungee.BungeeMethod;
-import com.bencodez.votingplugin.events.PlayerVoteEvent;
-import com.vexsoftware.votifier.model.Vote;
-import com.vexsoftware.votifier.model.VotifierEvent;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class VotiferEvent.
- */
-public class VotiferEvent implements Listener {
-
-	/** The plugin. */
-	private VotingPluginMain plugin;
-
-	/**
-	 * Instantiates a new votifer event.
-	 *
-	 * @param plugin the plugin
-	 */
-	public VotiferEvent(VotingPluginMain plugin) {
-		this.plugin = plugin;
-	}
-
-	/**
-	 * On votifer event.
-	 *
-	 * @param event the event
-	 */
-	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
-	public void onVotiferEvent(VotifierEvent event) {
-
-		Vote vote = event.getVote();
-		String str = vote.getServiceName();
-		if (str.isEmpty()) {
-			str = "Empty";
-		}
-		final String voteSite = str;
-		final String IP = vote.getAddress();
-		final String voteUsername = vote.getUsername().trim();
-		if (IP.equals("VotingPlugin")) {
-			// ignore own plugin calls of event
-			return;
-		}
-
-		if (voteUsername.length() == 0) {
-			plugin.getLogger().warning("No name from vote on " + voteSite);
-			return;
-		}
-
-		plugin.getLogger()
-				.info("Received a vote from service site '" + voteSite + "' by player '" + voteUsername + "'!");
-
-		plugin.debug("PlayerUsername: " + voteUsername);
-		plugin.debug("VoteSite: " + voteSite);
-		plugin.debug("IP: " + IP);
-
-		plugin.getVoteTimer().execute(new Runnable() {
-
-			@Override
-			public void run() {
-				plugin.getServerData().addServiceSite(voteSite);
-				if (plugin.getBungeeSettings().isUseBungeecoord() && !plugin.getBungeeSettings().isVotifierBypass()
-						&& (plugin.getBungeeHandler().getMethod().equals(BungeeMethod.PLUGINMESSAGING)
-								|| plugin.getBungeeHandler().getMethod().equals(BungeeMethod.SOCKETS))) {
-					plugin.getLogger().severe(
-							"Ignoring vote from votifier since pluginmessaging or socket bungee method is enabled, this means you aren't setup correctly for those methods, please check: https://github.com/BenCodez/VotingPlugin/wiki/Bungeecord-Setups");
-					return;
-				}
-				String voteSiteNameStr = plugin.getVoteSiteName(false, voteSite);
-
-				ArrayList<String> sites = plugin.getConfigVoteSites().getVoteSitesNames(false);
-				boolean createSite = false;
-				if (sites != null) {
-					if (!ArrayUtils.getInstance().containsIgnoreCase(sites, voteSiteNameStr)) {
-						createSite = true;
-					}
-				} else {
-					createSite = true;
-				}
-
-				if (plugin.getConfigFile().isAutoCreateVoteSites() && createSite) {
-					plugin.getLogger().warning("VoteSite with service site '" + voteSiteNameStr
-							+ "' does not exist, attempting to generate...");
-					plugin.getConfigVoteSites().generateVoteSite(voteSiteNameStr);
-
-					plugin.getLogger().info("Current known service sites: "
-							+ ArrayUtils.getInstance().makeStringList(plugin.getServerData().getServiceSites()));
-				}
-
-				if (plugin.getTimeChecker().isProcessing()) {
-					// time change in progress
-					plugin.debug("Adding vote to time queue " + voteUsername + "/" + voteSite);
-					plugin.getTimeQueueHandler().addVote(voteUsername, voteSite);
-
-					return;
-				}
-
-				String voteSiteName = plugin.getVoteSiteName(true, voteSite);
-
-				PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName, true), voteUsername,
-						voteSite, true);
-				plugin.getServer().getPluginManager().callEvent(voteEvent);
-
-				if (voteEvent.isCancelled()) {
-					plugin.debug("Vote cancelled");
-					return;
-				}
-
-			}
-		});
-
-	}
-
-}

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

@@ -1,74 +0,0 @@
-package com.bencodez.votingplugin.test;
-
-import java.util.ArrayList;
-
-import com.bencodez.advancedcore.api.rewards.Reward;
-import com.bencodez.advancedcore.api.rewards.RewardOptions;
-import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.events.PlayerVoteEvent;
-import com.bencodez.votingplugin.user.UserManager;
-import com.bencodez.votingplugin.user.VotingPluginUser;
-
-public class VoteTester {
-
-	private static VoteTester instance = new VoteTester();
-
-	public static VoteTester getInstance() {
-		return instance;
-	}
-
-	private VotingPluginMain plugin = VotingPluginMain.plugin;
-
-	public void testRewards(int amount, String name, String rewardName) {
-		long time1 = System.currentTimeMillis();
-		ArrayList<Long> timesPerReward = new ArrayList<Long>();
-		VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(name);
-		Reward reward = plugin.getRewardHandler().getReward(rewardName);
-		int rewardsGiven = 0;
-		for (int i = 0; i < amount; i++) {
-			long start1 = System.currentTimeMillis();
-			if (reward.canGiveReward(user, new RewardOptions())) {
-				rewardsGiven++;
-				plugin.getRewardHandler().giveReward(user, reward, new RewardOptions().setIgnoreRequirements(true));
-			}
-			long start2 = System.currentTimeMillis();
-			timesPerReward.add(start2 - start1);
-		}
-		long time2 = System.currentTimeMillis();
-		long time = time2 - time1;
-		long timeTotal = 0;
-		for (Long t : timesPerReward) {
-			timeTotal += t.longValue();
-		}
-		long timePerRewardAvg = timeTotal / timesPerReward.size();
-		VotingPluginMain.plugin.getLogger().info("Time to process rewards (" + amount + "): " + time
-				+ " ms, average per reward " + timePerRewardAvg + " ms. " + VotingPluginMain.plugin.getStorageType()
-				+ ", " + UserManager.getInstance().getAllUUIDs().size() + " users. " + rewardsGiven + " rewards given");
-	}
-
-	public void testVotes(int amount, String name, String site) {
-		long time1 = System.currentTimeMillis();
-		ArrayList<Long> timesPerVote = new ArrayList<Long>();
-		for (int i = 0; i < amount; i++) {
-			long start1 = System.currentTimeMillis();
-			PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(site, false), name,
-					plugin.getVoteSiteServiceSite(site), false);
-			plugin.getServer().getPluginManager().callEvent(voteEvent);
-			long start2 = System.currentTimeMillis();
-			timesPerVote.add(start2 - start1);
-		}
-		long time2 = System.currentTimeMillis();
-		long time = time2 - time1;
-		long timeTotal = 0;
-		for (Long t : timesPerVote) {
-			timeTotal += t.longValue();
-		}
-		long timePerVoteAvg = timeTotal / timesPerVote.size();
-		VotingPluginMain.plugin.getLogger()
-				.info("Time to process votes (" + amount + "): " + time + " ms, average per vote " + timePerVoteAvg
-						+ " ms. " + VotingPluginMain.plugin.getStorageType() + ", "
-						+ UserManager.getInstance().getAllUUIDs().size() + " users. "
-						+ VotingPluginMain.plugin.getVoteSites().size() + " votesites");
-	}
-
-}

VotingPlugin/src/com/bencodez/votingplugin/user/UserManager.java

@@ -1,117 +0,0 @@
-package com.bencodez.votingplugin.user;
-
-import java.util.ArrayList;
-import java.util.UUID;
-
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
-
-import com.bencodez.advancedcore.api.user.usercache.UserDataManager;
-import com.bencodez.advancedcore.api.user.usercache.keys.UserDataKeyInt;
-import com.bencodez.advancedcore.api.user.usercache.keys.UserDataKeyString;
-import com.bencodez.votingplugin.VotingPluginMain;
-
-public class UserManager {
-	/** The instance. */
-	static UserManager instance = new UserManager();
-	/** The plugin. */
-	static VotingPluginMain plugin = VotingPluginMain.plugin;
-
-	/**
-	 * Gets the single instance of UserManager.
-	 *
-	 * @return single instance of UserManager
-	 */
-	public static UserManager getInstance() {
-		return instance;
-	}
-
-	public UserManager() {
-	}
-
-	public void addCachingKeys() {
-		UserDataManager manager = plugin.getUserManager().getDataManager();
-		manager.addKey(new UserDataKeyString("TopVoterIgnore").setColumnType("VARCHAR(5)"));
-		manager.addKey(new UserDataKeyInt("VotePartyVotes"));
-		manager.addKey(new UserDataKeyString("LastVotes"));
-		manager.addKey(new UserDataKeyString("CoolDownCheck").setColumnType("VARCHAR(5)"));
-		manager.addKey(new UserDataKeyString("OfflineVotes").setColumnType("MEDIUMTEXT"));
-		manager.addKey(new UserDataKeyInt("MilestoneCount"));
-		manager.addKey(new UserDataKeyInt("MonthTotal"));
-		manager.addKey(new UserDataKeyInt("AllTimeTotal"));
-		manager.addKey(new UserDataKeyInt("DailyTotal"));
-		manager.addKey(new UserDataKeyInt("WeeklyTotal"));
-		manager.addKey(new UserDataKeyInt("Points"));
-		manager.addKey(new UserDataKeyInt("DayVoteStreak"));
-		manager.addKey(new UserDataKeyInt("BestDayVoteStreak"));
-		manager.addKey(new UserDataKeyString("DayVoteStreakLastUpdate").setColumnType("MEDIUMTEXT"));
-		manager.addKey(new UserDataKeyString("GottenMileStones").setColumnType("LONGTEXT"));
-		manager.addKey(new UserDataKeyString("Reminded").setColumnType("VARCHAR(5)"));
-		manager.addKey(new UserDataKeyString("DisableBroadcast").setColumnType("VARCHAR(5)"));
-		manager.addKey(new UserDataKeyInt("WeekVoteStreak"));
-		manager.addKey(new UserDataKeyInt("BestWeekVoteStreak"));
-		manager.addKey(new UserDataKeyInt("MonthVoteStreak"));
-		manager.addKey(new UserDataKeyInt("HighestDailyTotal"));
-		manager.addKey(new UserDataKeyInt("HighestMonthlyTotal"));
-		manager.addKey(new UserDataKeyInt("HighestWeeklyTotal"));
-		manager.addKey(new UserDataKeyInt("LastMonthTotal"));
-		manager.addKey(new UserDataKeyInt("BestMonthVoteStreak"));
-		if (plugin.getOptions().isPerServerRewards()) {
-			manager.addKey(new UserDataKeyString("OfflineRewards" + plugin.getOptions().getServer())
-					.setColumnType("MEDIUMTEXT"));
-		}
-		if (plugin.getConfigFile().isExtraAllSitesCheck()) {
-			manager.addKey(new UserDataKeyInt(getGottenAllSitesDayPath()));
-		}
-	}
-
-	public String getGottenAllSitesDayPath() {
-		if (plugin.getBungeeSettings().isUseBungeecoord()) {
-			return "AllSitesLast_" + plugin.getBungeeSettings().getServerNameStorage();
-		}
-		return "AllSitesLast";
-	}
-
-	public String getGottenAlmostAllSitesDayPath() {
-		if (plugin.getBungeeSettings().isUseBungeecoord()) {
-			return "AlmostAllSitesLast_" + plugin.getBungeeSettings().getServerNameStorage();
-		}
-		return "AlmostAllSitesLast";
-	}
-
-	public ArrayList<String> getAllUUIDs() {
-		return plugin.getUserManager().getAllUUIDs();
-	}
-
-	public VotingPluginUser getVotingPluginUser(com.bencodez.advancedcore.api.user.AdvancedCoreUser user) {
-		return new VotingPluginUser(plugin, user);
-	}
-
-	@SuppressWarnings("deprecation")
-	public VotingPluginUser getVotingPluginUser(UUID uuid, String playerName) {
-		return new VotingPluginUser(plugin, uuid, playerName);
-	}
-
-	public VotingPluginUser getVotingPluginUser(OfflinePlayer player) {
-		return getVotingPluginUser(player.getUniqueId(), player.getName());
-	}
-
-	public VotingPluginUser getVotingPluginUser(Player player) {
-		return getVotingPluginUser(player.getName());
-	}
-
-	@SuppressWarnings("deprecation")
-	public VotingPluginUser getVotingPluginUser(String playerName) {
-		return new VotingPluginUser(plugin, plugin.getUserManager().getProperName(playerName));
-	}
-
-	@SuppressWarnings("deprecation")
-	public VotingPluginUser getVotingPluginUser(UUID uuid) {
-		return new VotingPluginUser(plugin, uuid);
-	}
-
-	@SuppressWarnings("deprecation")
-	public VotingPluginUser getVotingPluginUser(UUID uuid, boolean loadName) {
-		return new VotingPluginUser(plugin, uuid, loadName);
-	}
-}

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

@@ -33,7 +33,7 @@ public class VotingPluginHooks {
 	}
 
 	public UserManager getUserManager() {
-		return UserManager.getInstance();
+		return getMainClass().getVotingPluginUserManager();
 	}
 
 }

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

@@ -7,6 +7,7 @@ import java.net.URL;
 import java.security.CodeSource;
 import java.time.Instant;
 import java.time.LocalDateTime;
+import java.time.YearMonth;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -41,20 +42,25 @@ import com.bencodez.advancedcore.api.inventory.editgui.EditGUIButton;
 import com.bencodez.advancedcore.api.inventory.editgui.valuetypes.EditGUIValueNumber;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
 import com.bencodez.advancedcore.api.javascript.JavascriptPlaceholderRequest;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.rewards.DirectlyDefinedReward;
 import com.bencodez.advancedcore.api.rewards.Reward;
 import com.bencodez.advancedcore.api.rewards.RewardEditData;
+import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.advancedcore.api.rewards.RewardPlaceholderHandle;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInject;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInjectConfigurationSection;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInjectInt;
 import com.bencodez.advancedcore.api.rewards.injected.RewardInjectValidator;
-import com.bencodez.advancedcore.api.skull.SkullHandler;
-import com.bencodez.advancedcore.api.updater.Updater;
+import com.bencodez.advancedcore.api.rewards.injectedrequirement.RequirementInjectConfigurationSection;
+import com.bencodez.advancedcore.api.user.AdvancedCoreUser;
+import com.bencodez.advancedcore.api.user.userstorage.Column;
 import com.bencodez.advancedcore.logger.Logger;
-import com.bencodez.advancedcore.nms.NMSManager;
+import com.bencodez.simpleapi.file.YMLConfig;
+import com.bencodez.simpleapi.nms.NMSManager;
+import com.bencodez.simpleapi.skull.SkullCache;
+import com.bencodez.simpleapi.updater.Updater;
 import com.bencodez.votingplugin.broadcast.BroadcastHandler;
 import com.bencodez.votingplugin.commands.CommandLoader;
 import com.bencodez.votingplugin.commands.executers.CommandAdminVote;
@@ -66,6 +72,7 @@ import com.bencodez.votingplugin.config.BungeeSettings;
 import com.bencodez.votingplugin.config.Config;
 import com.bencodez.votingplugin.config.ConfigVoteSites;
 import com.bencodez.votingplugin.config.GUI;
+import com.bencodez.votingplugin.config.ShopFile;
 import com.bencodez.votingplugin.config.SpecialRewardsConfig;
 import com.bencodez.votingplugin.cooldown.CoolDownCheck;
 import com.bencodez.votingplugin.data.ServerData;
@@ -79,8 +86,11 @@ import com.bencodez.votingplugin.listeners.VotingPluginUpdateEvent;
 import com.bencodez.votingplugin.objects.VoteSite;
 import com.bencodez.votingplugin.placeholders.MVdWPlaceholders;
 import com.bencodez.votingplugin.placeholders.PlaceHolders;
+import com.bencodez.votingplugin.placeholders.VotingPluginExpansion;
+import com.bencodez.votingplugin.servicesites.ServiceSiteHandler;
 import com.bencodez.votingplugin.signs.Signs;
 import com.bencodez.votingplugin.specialrewards.SpecialRewards;
+import com.bencodez.votingplugin.test.VoteTester;
 import com.bencodez.votingplugin.timequeue.TimeQueueHandler;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 import com.bencodez.votingplugin.topvoter.TopVoterHandler;
@@ -107,7 +117,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	private ArrayList<CommandHandler> adminVoteCommand;
 
 	@Getter
-	private LinkedHashMap<java.util.UUID, ArrayList<String>> advancedTab = new LinkedHashMap<java.util.UUID, ArrayList<String>>();
+	private LinkedHashMap<java.util.UUID, ArrayList<String>> advancedTab = new LinkedHashMap<>();
 
 	@Getter
 	private BroadcastHandler broadcastHandler;
@@ -136,15 +146,25 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	@Getter
 	private GUI gui;
 
+	@Getter
+	private ShopFile shopFile;
+
 	@Getter
 	private LinkedHashMap<TopVoterPlayer, Integer> lastMonthTopVoter;
 
+	@Getter
+	@Setter
+	private LinkedHashMap<YearMonth, LinkedHashMap<TopVoterPlayer, Integer>> previousMonthsTopVoters;
+
 	@Getter
 	private MVdWPlaceholders mvdwPlaceholders;
 
 	@Getter
 	private PlaceHolders placeholders;
 
+	@Getter
+	private VoteTester voteTester;
+
 	@Getter
 	private String profile = "";
 
@@ -211,24 +231,55 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	private boolean ymlError = false;
 
 	@Getter
-	private ScheduledExecutorService voteTimer = Executors.newScheduledThreadPool(1);
+	private ScheduledExecutorService voteTimer;
 
 	@Getter
 	private UserManager votingPluginUserManager;
 
-	private void addDirectlyDefinedRewards(DirectlyDefinedReward directlyDefinedReward) {
+	@Getter
+	private TimeQueueHandler timeQueueHandler;
+
+	@Getter
+	private ServiceSiteHandler serviceSiteHandler;
+
+	@Getter
+	private long lastBackgroundTaskTimeTaken = -1;
+
+	private boolean firstTimeLoaded = false;
+
+	public void addDirectlyDefinedRewards(DirectlyDefinedReward directlyDefinedReward) {
 		getRewardHandler().addDirectlyDefined(directlyDefinedReward);
 	}
 
 	public void basicBungeeUpdate() {
 		for (Player player : Bukkit.getOnlinePlayers()) {
-			VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(player);
-			user.clearCache();
+			VotingPluginUser user = getVotingPluginUserManager().getVotingPluginUser(player);
+			user.cache();
 			user.offVote();
 			user.checkOfflineRewards();
 		}
 	}
 
+	public void checkFirstTimeLoaded() {
+		if (!firstTimeLoaded) {
+
+			if (getGui().isChestVoteTopUseSkull()) {
+				int maxToLoad = 200;
+				for (TopVoter top : topVoter.keySet()) {
+					int num = 1;
+					Set<TopVoterPlayer> players = topVoter.get(top).keySet();
+					for (TopVoterPlayer p : players) {
+						if (num <= maxToLoad) {
+							getSkullCacheHandler().addToCache(p.getUuid(), p.getPlayerName());
+						}
+						num++;
+					}
+				}
+			}
+		}
+		firstTimeLoaded = true;
+	}
+
 	/**
 	 * Check votifier.
 	 */
@@ -255,18 +306,18 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		}
 
 		if (ymlError) {
-			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+			plugin.getBukkitScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
 
 				@Override
 				public void run() {
 					plugin.getLogger().severe("Failed to load a file, check startup log");
 				}
-			}, 10);
+			}, 1);
 		}
 	}
 
 	public ArrayList<TopVoterPlayer> convertSet(Set<TopVoterPlayer> set) {
-		return new ArrayList<TopVoterPlayer>(set);
+		return new ArrayList<>(set);
 	}
 
 	@Override
@@ -277,7 +328,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	public LinkedHashMap<TopVoterPlayer, Integer> getTopVoter(TopVoter top) {
 		LinkedHashMap<TopVoterPlayer, Integer> top1 = topVoter.get(top);
 		if (top1 == null) {
-			top1 = new LinkedHashMap<TopVoterPlayer, Integer>();
+			top1 = new LinkedHashMap<>();
 		}
 		return top1;
 	}
@@ -289,7 +340,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	 * @return the user
 	 */
 	public VotingPluginUser getUser(UUID uuid) {
-		return UserManager.getInstance().getVotingPluginUser(uuid);
+		return getVotingPluginUserManager().getVotingPluginUser(uuid);
 	}
 
 	private YamlConfiguration getVersionFile() {
@@ -337,26 +388,29 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	public String getVoteSiteName(boolean checkEnabled, String... urls) {
 		ArrayList<String> sites = getConfigVoteSites().getVoteSitesNames(checkEnabled);
+
 		for (String url : urls) {
 			if (url == null) {
 				return null;
 			}
-			if (sites != null) {
-				for (String siteName : sites) {
-					String URL = getConfigVoteSites().getServiceSite(siteName);
-					if (URL != null) {
-						if (URL.equalsIgnoreCase(url)) {
+			if (!url.isEmpty()) {
+				if (sites != null) {
+					for (String siteName : sites) {
+						String URL = getConfigVoteSites().getServiceSite(siteName);
+						if (URL != null) {
+							if (URL.equalsIgnoreCase(url)) {
+								return siteName;
+							}
+						}
+						if (siteName.equalsIgnoreCase(url)) {
 							return siteName;
 						}
-					}
-					if (siteName.equalsIgnoreCase(url)) {
-						return siteName;
-					}
 
+					}
 				}
 			}
-			return url;
 		}
+
 		for (String url : urls) {
 			return url;
 		}
@@ -364,6 +418,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	}
 
+	public ArrayList<VoteSite> getVoteSitesEnabled() {
+		ArrayList<VoteSite> sites = new ArrayList<>();
+		for (VoteSite site : getVoteSites()) {
+			if (site.isEnabled()) {
+				sites.add(site);
+			}
+		}
+		return sites;
+	}
+
 	public String getVoteSiteServiceSite(String name) {
 		ArrayList<String> sites = getConfigVoteSites().getVoteSitesNames(true);
 		if (name == null) {
@@ -373,10 +437,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			for (String siteName : sites) {
 				String URL = getConfigVoteSites().getServiceSite(siteName);
 				if (URL != null) {
-					if (URL.equalsIgnoreCase(name)) {
-						return URL;
-					}
-					if (name.equalsIgnoreCase(siteName)) {
+					if (URL.equalsIgnoreCase(name) || name.equalsIgnoreCase(siteName)) {
 						return URL;
 					}
 				}
@@ -405,6 +466,15 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		return false;
 	}
 
+	private void loadBungeeHandler() {
+		bungeeHandler = new BungeeHandler(this);
+		bungeeHandler.load();
+
+		if (getOptions().getServer().equalsIgnoreCase("PleaseSet")) {
+			getLogger().warning("Bungeecoord is true and server name is not set, bungeecoord features may not work");
+		}
+	}
+
 	public void loadDirectlyDefined() {
 		getRewardHandler().getDirectlyDefinedRewards().clear();
 		// AllSites reward
@@ -875,27 +945,27 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					});
 		}
 
-		for (String identifier : plugin.getGui().getChestShopIdentifiers()) {
-			addDirectlyDefinedRewards(new DirectlyDefinedReward("CHEST.Shop." + identifier + ".Rewards") {
+		for (String identifier : plugin.getShopFile().getShopIdentifiers()) {
+			addDirectlyDefinedRewards(new DirectlyDefinedReward("Shop." + identifier + ".Rewards") {
 
 				@Override
 				public void createSection(String key) {
-					getGui().createSection(key);
+					getShopFile().createSection(key);
 				}
 
 				@Override
 				public ConfigurationSection getFileData() {
-					return getGui().getData();
+					return getShopFile().getData();
 				}
 
 				@Override
 				public void save() {
-					getGui().saveData();
+					getShopFile().saveData();
 				}
 
 				@Override
 				public void setData(String path, Object value) {
-					getGui().setValue(path, value);
+					getShopFile().setValue(path, value);
 				}
 			});
 		}
@@ -922,10 +992,13 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 				getBungeeSettings().setValue(path, value);
 			}
 		});
+
+		getRewardHandler().checkDirectlyDefined();
+
 	}
 
 	private void loadTimer() {
-		Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+		plugin.getBukkitScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
 
 			@Override
 			public void run() {
@@ -950,7 +1023,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 				}, 1000, 1000 * 30, TimeUnit.MILLISECONDS);
 
 			}
-		}, 40L);
+		}, 2);
 
 	}
 
@@ -979,6 +1052,10 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	}
 
+	private void loadVoteTimer() {
+		voteTimer = Executors.newSingleThreadScheduledExecutor();
+	}
+
 	/**
 	 * Log vote.
 	 *
@@ -1001,28 +1078,44 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		new VotingPluginMetrics().load(plugin);
 	}
 
-	@Getter
-	private TimeQueueHandler timeQueueHandler;
-
 	@Override
 	public void onPostLoad() {
+		// auto conversion for Shop.yml
+		if (plugin.getShopFile().isJustCreated()) {
+			if (!plugin.getGui().isJustCreated() && !getServerData().isVoteShopConverted()) {
+				plugin.getLogger().warning("Converting VoteShop configuration to Shop.yml from GUI.yml");
+				plugin.getShopFile().convertFromGUIFile();
+			}
+			getServerData().setShopConverted(true);
+		} else if (!getServerData().isVoteShopConverted()) {
+			getServerData().setShopConverted(true);
+		}
+
 		loadVersionFile();
 		getOptions().setServer(bungeeSettings.getServer());
+
+		// only purges if enabled in config
+		getVotingPluginUserManager().purgeOldPlayersNoData();
+
+		voteTester = new VoteTester(plugin);
+
+		loadVoteTimer();
+
 		if (bungeeSettings.isUseBungeecoord()) {
-			bungeeHandler = new BungeeHandler(this);
-			bungeeHandler.load();
-
-			if (getOptions().getServer().equalsIgnoreCase("PleaseSet")) {
-				getLogger()
-						.warning("Bungeecoord is true and server name is not set, bungeecoord features may not work");
-			}
-
+			loadBungeeHandler();
 		}
 
 		if (!bungeeSettings.isUseBungeecoord() || !bungeeSettings.isGloblalDataEnabled()) {
 			this.timeQueueHandler = new TimeQueueHandler(this);
 		}
 
+		if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
+			if (getConfigFile().isLoadInteralExpansion()) {
+				new VotingPluginExpansion(this).register();
+				getLogger().info("Loading PlaceholderAPI expansion");
+			}
+		}
+
 		registerCommands();
 		checkVotifier();
 		registerEvents();
@@ -1031,13 +1124,14 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		checkUpdate.startUp();
 		voteReminding = new VoteReminding(this);
 		voteReminding.loadRemindChecking();
+		voteReminding.loadReminds();
 		specialRewards = new SpecialRewards(this);
 		signs = new Signs(this);
 
 		coolDownCheck.checkEnabled();
 		coolDownCheck.load();
 
-		Bukkit.getScheduler().runTask(plugin, new Runnable() {
+		plugin.getBukkitScheduler().runTask(plugin, new Runnable() {
 
 			@Override
 			public void run() {
@@ -1046,20 +1140,23 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		});
 
 		topVoterHandler = new TopVoterHandler(this);
-		lastMonthTopVoter = new LinkedHashMap<TopVoterPlayer, Integer>();
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+		lastMonthTopVoter = new LinkedHashMap<>();
+		previousMonthsTopVoters = new LinkedHashMap<>();
+		plugin.getBukkitScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 			@Override
 			public void run() {
 				topVoterHandler.loadLastMonth();
 				debug("Loaded last month top voters");
+
+				topVoterHandler.loadPreviousMonthTopVoters();
 			}
 		});
-		topVoter = new LinkedHashMap<TopVoter, LinkedHashMap<TopVoterPlayer, Integer>>();
+		topVoter = new LinkedHashMap<>();
 		for (TopVoter top : TopVoter.values()) {
-			topVoter.put(top, new LinkedHashMap<TopVoterPlayer, Integer>());
+			topVoter.put(top, new LinkedHashMap<>());
 		}
-		voteToday = new LinkedHashMap<TopVoterPlayer, HashMap<VoteSite, LocalDateTime>>();
+		voteToday = new LinkedHashMap<>();
 		voteLog = new Logger(plugin, new File(plugin.getDataFolder() + File.separator + "Log", "votelog.txt"));
 
 		new AdminGUI(this).loadHook();
@@ -1070,7 +1167,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		topVoterHandler.register();
 
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+		plugin.getBukkitScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 			@Override
 			public void run() {
@@ -1087,11 +1184,13 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			}
 		});
 		getJavascriptEngine().put("VotingPluginHooks", VotingPluginHooks.getInstance());
+		getJavascriptEngine().put("VotingPlugin", this);
 
 		loadTimer();
 
 		// placeholderapi loading
 		placeholders = new PlaceHolders(this);
+		getServerData().updatePlaceholders();
 		placeholders.load();
 
 		if (Bukkit.getPluginManager().isPluginEnabled("MVdWPlaceholderAPI")) {
@@ -1105,7 +1204,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			@Override
 			public String onRewardRequest(Reward reward, com.bencodez.advancedcore.api.user.AdvancedCoreUser user,
 					int num, HashMap<String, String> placeholders) {
-				VotingPluginUser vpUser = UserManager.getInstance().getVotingPluginUser(user);
+				VotingPluginUser vpUser = getVotingPluginUserManager().getVotingPluginUser(user);
 				String str = "" + vpUser.addPoints(num);
 				debug("Setting points to " + str);
 				return str;
@@ -1135,10 +1234,9 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					ConfigurationSection section, HashMap<String, String> placeholders) {
 				if (section.getBoolean("Enabled")) {
 					user.sendBossBar(
-							StringParser.getInstance().replacePlaceHolder(section.getString("Message", ""),
-									placeholders),
+							PlaceholderUtils.replacePlaceHolder(section.getString("Message", ""), placeholders),
 							section.getString("Color", "BLUE"), section.getString("Style", "SOLID"),
-							(double) UserManager.getInstance().getVotingPluginUser(user).getSitesVotedOn()
+							(double) getVotingPluginUserManager().getVotingPluginUser(user).getSitesVotedOn()
 									/ plugin.getVoteSites().size(),
 							section.getInt("Delay", 30));
 				}
@@ -1146,12 +1244,75 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			}
 		});
 
+		getRewardHandler().addInjectedRequirements(new RequirementInjectConfigurationSection("VoteTotal") {
+
+			@Override
+			public boolean onRequirementsRequested(Reward reward, AdvancedCoreUser acUser, ConfigurationSection section,
+					RewardOptions rewardOptions) {
+				boolean atleast = section.getBoolean("AtleastMode", false);
+				VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(acUser);
+
+				for (TopVoter top : TopVoter.values()) {
+					int required = section.getInt(top.toString(), -1);
+					if (required >= 0) {
+						int total = user.getTotal(top);
+						if (atleast) {
+							if (total < required) {
+								debug("Failed requirement " + top.toString() + " " + total + "/" + required);
+								return false;
+							}
+						} else {
+							if (total != required) {
+								debug("Failed requirement " + top.toString() + " " + total + "!=" + required);
+								return false;
+							}
+						}
+					}
+				}
+
+				int milestoneCountRequired = section.getInt("MilestoneCount", -1);
+				if (milestoneCountRequired >= 0) {
+					int milestoneCount = user.getMilestoneCount();
+					if (atleast) {
+						if (milestoneCount < milestoneCountRequired) {
+							debug("Failed requirement milestonecount " + milestoneCount + "/" + milestoneCountRequired);
+							return false;
+						}
+					} else {
+						if (milestoneCount != milestoneCountRequired) {
+							debug("Failed requirement milestonecount " + milestoneCount + "!="
+									+ milestoneCountRequired);
+							return false;
+						}
+					}
+				}
+
+				int pointsRequired = section.getInt("Points", -1);
+				if (pointsRequired >= 0) {
+					int points = user.getPoints();
+					if (atleast) {
+						if (points < pointsRequired) {
+							debug("Failed requirement points " + points + "/" + pointsRequired);
+							return false;
+						}
+					} else {
+						if (points != pointsRequired) {
+							debug("Failed requirement points " + points + "!=" + pointsRequired);
+							return false;
+						}
+					}
+				}
+
+				return true;
+			}
+		});
+
 		for (final TopVoter top : TopVoter.values()) {
 			getRewardHandler().addPlaceholder(new RewardPlaceholderHandle("Total_" + top.toString()) {
 
 				@Override
 				public String getValue(Reward reward, com.bencodez.advancedcore.api.user.AdvancedCoreUser user) {
-					VotingPluginUser vUser = UserManager.getInstance().getVotingPluginUser(user);
+					VotingPluginUser vUser = getVotingPluginUserManager().getVotingPluginUser(user);
 					return "" + vUser.getTotal(top);
 				}
 			});
@@ -1163,7 +1324,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		}
 
 		plugin.getLogger().info("Enabled VotingPlugin " + plugin.getDescription().getVersion());
-		if (getProfile().contains("dev")) {
+		if (plugin.getDescription().getVersion().contains("SNAPSHOT")) {
 			plugin.getLogger().info(
 					"Using dev build, this is not a stable build, use at your own risk. Build number: " + buildNumber);
 		}
@@ -1194,14 +1355,22 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		}
 
 		if (!issues) {
-			Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+			plugin.getBukkitScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
 
 				@Override
 				public void run() {
 					plugin.getLogger().warning(
 							"Detected an issue with voting sites, check the server startup log for more details: https://github.com/BenCodez/VotingPlugin/wiki/Votifier-Troubleshooting");
 				}
-			}, 30l);
+			}, 5);
+
+			plugin.getBukkitScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+
+				@Override
+				public void run() {
+					serviceSiteHandler = new ServiceSiteHandler(plugin);
+				}
+			}, 10);
 		}
 
 	}
@@ -1223,16 +1392,15 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			if (!configFile.isOverrideVersionDisable()) {
 				Bukkit.getPluginManager().disablePlugin(this);
 				return;
-			} else {
-				plugin.getLogger().warning("Overriding version disable, beware of using this! This may cause issues!");
 			}
+			plugin.getLogger().warning("Overriding version disable, beware of using this! This may cause issues!");
 		}
 
 		setupFiles();
 
 		loadVoteSites();
 
-		votingPluginUserManager = UserManager.getInstance();
+		votingPluginUserManager = new UserManager(this);
 		votingPluginUserManager.addCachingKeys();
 
 		setJenkinsSite("bencodez.com");
@@ -1254,6 +1422,13 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 				debug(e);
 			}
 		}
+		voteTimer.shutdown();
+		try {
+			voteTimer.awaitTermination(1, TimeUnit.SECONDS);
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+		voteTimer.shutdownNow();
 		if (timeQueueHandler != null) {
 			timeQueueHandler.save();
 		}
@@ -1286,7 +1461,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		Permission perm = Bukkit.getPluginManager().getPermission("VotingPlugin.Player");
 		if (perm != null) {
-			if (configFile.getGiveDefaultPermission()) {
+			if (configFile.isGiveDefaultPermission()) {
 				perm.setDefault(PermissionDefault.TRUE);
 				getLogger().info("Giving VotingPlugin.Player permission by default, can be disabled in the config");
 			} else {
@@ -1344,8 +1519,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	}
 
 	private void reloadPlugin(boolean userStorage) {
-		setUpdate(true);
-
 		configFile.reloadData();
 		configFile.loadValues();
 
@@ -1354,11 +1527,20 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		specialRewardsConfig.reloadData();
 
 		gui.reloadData();
+		shopFile.reloadData();
 
 		bungeeSettings.reloadData();
+		updateAdvancedCoreHook();
+
+		reloadAdvancedCore(userStorage);
 
 		if (bungeeSettings.isUseBungeecoord()) {
-			getBungeeHandler().loadGlobalMysql();
+			if (getBungeeHandler() == null) {
+				loadBungeeHandler();
+			}
+			if (userStorage) {
+				getBungeeHandler().loadGlobalMysql();
+			}
 		}
 		checkYMLError();
 
@@ -1366,25 +1548,31 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			broadcastHandler.schedule(getConfigFile().getFormatAlternateBroadcastDelay());
 		}
 
-		updateAdvancedCoreHook();
 		plugin.loadVoteSites();
-		loadDirectlyDefined();
-		reloadAdvancedCore(userStorage);
+
 		getOptions().setServer(bungeeSettings.getServer());
 		if (userStorage) {
 			placeholders.load();
+			placeholders.reload();
+			getCoolDownCheck().getTimer().schedule(new Runnable() {
+
+				@Override
+				public void run() {
+					for (VoteSite site : plugin.getVoteSites()) {
+						if (site.isVoteDelayDaily()) {
+							getCoolDownCheck().checkAllVoteSite(site);
+						}
+					}
+				}
+			}, 5, TimeUnit.SECONDS);
+
 		}
 
 		voteReminding.loadRemindChecking();
 		coolDownCheck.checkEnabled();
+		loadDirectlyDefined();
 
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				update();
-			}
-		});
+		setUpdate(true);
 	}
 
 	private void setupFiles() {
@@ -1400,10 +1588,13 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		bungeeSettings = new BungeeSettings(this);
 		bungeeSettings.setup();
 
+		serverData = new ServerData(this);
+
 		gui = new GUI(this);
 		gui.setup();
 
-		serverData = new ServerData(this);
+		shopFile = new ShopFile(this);
+		shopFile.setup();
 
 		checkYMLError();
 
@@ -1420,42 +1611,51 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					synchronized (plugin) {
 						if (plugin != null && plugin.isEnabled()) {
 							getUserManager().getDataManager().clearCacheBasic();
+							SkullCache.flushWeek();
 
 							plugin.debug("Starting background task, current cached users: "
 									+ plugin.getUserManager().getDataManager().getUserDataCache().keySet().size());
 
-							int dataLoadLimit = getConfigFile().getPlayerDataLoadLimit();
 							try {
 								boolean extraBackgroundUpdate = configFile.isExtraBackgroundUpdate();
 								long startTime = System.currentTimeMillis();
 
-								LinkedHashMap<TopVoterPlayer, HashMap<VoteSite, LocalDateTime>> voteToday = new LinkedHashMap<TopVoterPlayer, HashMap<VoteSite, LocalDateTime>>();
-								LinkedHashMap<TopVoter, LinkedHashMap<TopVoterPlayer, Integer>> tempTopVoter = new LinkedHashMap<TopVoter, LinkedHashMap<TopVoterPlayer, Integer>>();
+								LinkedHashMap<TopVoterPlayer, HashMap<VoteSite, LocalDateTime>> voteToday = new LinkedHashMap<>();
+								LinkedHashMap<TopVoter, LinkedHashMap<TopVoterPlayer, Integer>> tempTopVoter = new LinkedHashMap<>();
 
-								ArrayList<TopVoter> topVotersToCheck = new ArrayList<TopVoter>();
+								ArrayList<TopVoter> topVotersToCheck = new ArrayList<>();
 								for (TopVoter top : TopVoter.values()) {
 									if (plugin == null) {
 										return;
 									}
 									if (plugin.getConfigFile().getLoadTopVoter(top)) {
 										topVotersToCheck.add(top);
-										tempTopVoter.put(top, new LinkedHashMap<TopVoterPlayer, Integer>());
+										tempTopVoter.put(top, new LinkedHashMap<>());
 									}
 								}
 								boolean topVoterIgnorePermissionUse = plugin.getConfigFile()
-										.getTopVoterIgnorePermission();
+										.isTopVoterIgnorePermission();
 								ArrayList<String> blackList = plugin.getConfigFile().getBlackList();
 
-								ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
+								// ArrayList<String> uuids = getVotingPluginUserManager().getAllUUIDs();
 								int currentDay = LocalDateTime.now().getDayOfMonth();
-								int currentDataLoad = 0;
-								for (String uuid : uuids) {
+								HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+								long time1 = ((System.currentTimeMillis() - startTime) / 1000);
+								plugin.debug("Finished getting player data in " + time1 + " seconds, " + cols.size()
+										+ " users, " + plugin.getStorageType().toString());
+								time1 = System.currentTimeMillis();
+								for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
+
+									String uuid = playerData.getKey().toString();
+									if ((plugin == null) || !plugin.isEnabled()) {
+										return;
+									}
 									if (uuid != null && !uuid.isEmpty()) {
-										VotingPluginUser user = UserManager.getInstance()
+										VotingPluginUser user = getVotingPluginUserManager()
 												.getVotingPluginUser(UUID.fromString(uuid), false);
 										user.dontCache();
-										user.tempCache();
-										user.getUserData().updateCacheWithTemp();
+										user.updateTempCacheWithColumns(playerData.getValue());
+										cols.put(playerData.getKey(), null);
 										if (!user.isBanned() && !blackList.contains(user.getPlayerName())) {
 
 											if (!topVoterIgnorePermissionUse || !user.isTopVoterIgnore()) {
@@ -1467,7 +1667,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 												}
 											}
 
-											HashMap<VoteSite, LocalDateTime> times = new HashMap<VoteSite, LocalDateTime>();
+											HashMap<VoteSite, LocalDateTime> times = new HashMap<>();
 											for (Entry<VoteSite, Long> entry : user.getLastVotes().entrySet()) {
 												if (entry.getKey().isEnabled() && !entry.getKey().isHidden()) {
 													long time = entry.getValue();
@@ -1486,29 +1686,23 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 												voteToday.put(user.getTopVoterPlayer(), times);
 											}
 										}
-										if (!extraBackgroundUpdate) {
+										if (extraBackgroundUpdate) {
 											if (user.isOnline()) {
 												user.offVote();
 											}
 										}
-										plugin.getPlaceholders().onUpdate(user);
-										user.clearTempCache();
-										user = null;
-										if (dataLoadLimit > 0) {
-											currentDataLoad++;
-											if (currentDataLoad >= dataLoadLimit) {
-												currentDataLoad -= dataLoadLimit;
-												Thread.sleep(1000);
+										if (plugin != null) {
+											if (!plugin.getPlaceholders().getCacheLevel().onlineOnly()
+													|| user.isOnline()) {
+												plugin.getPlaceholders().onUpdate(user, false);
 											}
 										}
+										user.clearTempCache();
+										user = null;
 									}
 								}
-								update = false;
-								long time1 = ((System.currentTimeMillis() - startTime) / 1000);
-								plugin.debug("Finished loading player data in " + time1 + " seconds, " + uuids.size()
-										+ " users, " + plugin.getStorageType().toString() + ", data load limit: "
-										+ dataLoadLimit);
-								time1 = System.currentTimeMillis();
+								cols.clear();
+								cols = null;
 
 								topVoterHandler.updateTopVoters(tempTopVoter);
 								placeholders.onUpdate();
@@ -1516,15 +1710,22 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 								serverData.updateValues();
 								getSigns().updateSigns();
 
+								checkFirstTimeLoaded();
+
+								plugin.getUserManager().getDataManager().clearNonNeededCachedUsers();
+								plugin.extraDebug("Current cached users: "
+										+ plugin.getUserManager().getDataManager().getUserDataCache().keySet().size());
+
+								update = false;
+
 								tempTopVoter = null;
 
 								time1 = ((System.currentTimeMillis() - time1) / 1000);
 								long totalTime = ((System.currentTimeMillis() - startTime) / 1000);
+								lastBackgroundTaskTimeTaken = totalTime;
 								plugin.debug("Background task finished. Final processing took " + time1
 										+ " seconds. Total time: " + totalTime + " seconds");
-								plugin.extraDebug("Current cached users: "
-										+ plugin.getUserManager().getDataManager().getUserDataCache().keySet().size());
-								checkFirstTimeLoaded();
+
 							} catch (Exception ex) {
 								if (plugin != null) {
 									plugin.getLogger().info("Looks like something went wrong");
@@ -1540,31 +1741,26 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		}
 	}
 
-	private boolean firstTimeLoaded = false;
-
-	public void checkFirstTimeLoaded() {
-		if (!firstTimeLoaded) {
-			if (getGui().isChestVoteTopUseSkull()) {
-				int maxToLoad = 200;
-				for (TopVoter top : topVoter.keySet()) {
-					int num = 1;
-					Set<TopVoterPlayer> players = topVoter.get(top).keySet();
-					for (TopVoterPlayer p : players) {
-						if (num <= maxToLoad) {
-							SkullHandler.getInstance().loadSkull(p.getPlayerName());
-						}
-						num++;
-					}
-				}
-			}
-		}
-		firstTimeLoaded = true;
-	}
-
 	public void updateAdvancedCoreHook() {
 		getJavascriptEngine().put("VotingPlugin", this);
 		allowDownloadingFromSpigot(15358);
-		setConfigData(configFile.getData());
+		setConfigData(new YMLConfig(this, configFile.getData()) {
+
+			@Override
+			public void createSection(String key) {
+				configFile.createSection(key);
+			}
+
+			@Override
+			public void saveData() {
+				configFile.saveData();
+			}
+
+			@Override
+			public void setValue(String path, Object value) {
+				configFile.setValue(path, value);
+			}
+		});
 		if (bungeeSettings.isUseBungeecoord()) {
 			getOptions().setPerServerRewards(getBungeeSettings().isPerServerRewards());
 		}

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

@@ -2,8 +2,7 @@ package com.bencodez.votingplugin;
 
 import java.util.concurrent.Callable;
 
-import com.bencodez.advancedcore.api.metrics.BStatsMetrics;
-import com.bencodez.votingplugin.user.UserManager;
+import com.bencodez.simpleapi.metrics.BStatsMetrics;
 
 public class VotingPluginMetrics {
 
@@ -17,9 +16,8 @@ public class VotingPluginMetrics {
 				if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 						plugin.getSpecialRewardsConfig().getFirstVoteRewardsPath())) {
 					return "True";
-				} else {
-					return "False";
 				}
+				return "False";
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_everysite", new Callable<String>() {
@@ -29,9 +27,8 @@ 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>() {
@@ -41,9 +38,8 @@ public class VotingPluginMetrics {
 				if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 						plugin.getSpecialRewardsConfig().getAllSitesRewardPath())) {
 					return "True";
-				} else {
-					return "False";
 				}
+				return "False";
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_cumulative", new Callable<String>() {
@@ -52,25 +48,30 @@ public class VotingPluginMetrics {
 			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";
 				}
+				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().getVotePartyEnabled()) {
+				if (!plugin.getSpecialRewardsConfig().isVotePartyEnabled()) {
 					return "False";
-				} else {
-					return "True";
 				}
+				return "True";
+			}
+		}));
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("placeholder_cache_level", new Callable<String>() {
+
+			@Override
+			public String call() throws Exception {
+				return plugin.getPlaceholders().getCacheLevel().toString();
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_milestone", new Callable<String>() {
@@ -79,14 +80,13 @@ public class VotingPluginMetrics {
 			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";
 				}
+				for (String milestone : plugin.getSpecialRewardsConfig().getMilestoneVotes()) {
+					if (plugin.getSpecialRewardsConfig().getMilestoneRewardEnabled(Integer.parseInt(milestone))) {
+						return "True";
+					}
+				}
+				return "False";
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_anysitereward", new Callable<String>() {
@@ -96,9 +96,8 @@ public class VotingPluginMetrics {
 				if (plugin.getRewardHandler().hasRewards(plugin.getSpecialRewardsConfig().getData(),
 						plugin.getSpecialRewardsConfig().getAnySiteRewardsPath())) {
 					return "True";
-				} else {
-					return "False";
 				}
+				return "False";
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("extrarewards_votestreakday", new Callable<String>() {
@@ -155,7 +154,7 @@ public class VotingPluginMetrics {
 
 			@Override
 			public String call() throws Exception {
-				return "" + plugin.getVoteSites().size();
+				return "" + plugin.getVoteSitesEnabled().size();
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("numberofrewards", new Callable<String>() {
@@ -177,12 +176,14 @@ public class VotingPluginMetrics {
 
 			@Override
 			public String call() throws Exception {
-				int total = UserManager.getInstance().getAllUUIDs().size();
+				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";
@@ -219,28 +220,28 @@ public class VotingPluginMetrics {
 
 			@Override
 			public String call() throws Exception {
-				return "" + plugin.getConfigFile().getVoteRemindingEnabled();
+				return "" + plugin.getConfigFile().isVoteRemindingEnabled();
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("LoadTopVoter_Monthly", new Callable<String>() {
 
 			@Override
 			public String call() throws Exception {
-				return "" + plugin.getConfigFile().getLoadTopVoterMonthly();
+				return "" + plugin.getConfigFile().isLoadTopVoterMonthly();
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("LoadTopVoter_Weekly", new Callable<String>() {
 
 			@Override
 			public String call() throws Exception {
-				return "" + plugin.getConfigFile().getLoadTopVoterWeekly();
+				return "" + plugin.getConfigFile().isLoadTopVoterWeekly();
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("LoadTopVoter_Daily", new Callable<String>() {
 
 			@Override
 			public String call() throws Exception {
-				return "" + plugin.getConfigFile().getLoadTopVoterDaily();
+				return "" + plugin.getConfigFile().isLoadTopVoterDaily();
 			}
 		}));
 		metrics.addCustomChart(new BStatsMetrics.SimplePie("bungeemethod", new Callable<String>() {
@@ -249,9 +250,8 @@ public class VotingPluginMetrics {
 			public String call() throws Exception {
 				if (plugin.getBungeeSettings().isUseBungeecoord()) {
 					return "" + plugin.getBungeeHandler().getMethod().toString();
-				} else {
-					return "Disabled";
 				}
+				return "Disabled";
 			}
 		}));
 		if (plugin.getBungeeSettings().isUseBungeecoord()) {
@@ -318,11 +318,11 @@ public class VotingPluginMetrics {
 			}
 		}));
 
-		metrics.addCustomChart(new BStatsMetrics.SimplePie("geyserprefixsupport", new Callable<String>() {
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("bedrockplayerprefix", new Callable<String>() {
 
 			@Override
 			public String call() throws Exception {
-				return "" + plugin.getOptions().isGeyserPrefixSupport();
+				return "" + plugin.getOptions().getBedrockPlayerPrefix();
 			}
 		}));
 
@@ -351,6 +351,14 @@ public class VotingPluginMetrics {
 			}
 		}));
 
+		metrics.addCustomChart(new BStatsMetrics.SimplePie("background_task_time_taken", new Callable<String>() {
+
+			@Override
+			public String call() throws Exception {
+				return "" + plugin.getLastBackgroundTaskTimeTaken();
+			}
+		}));
+
 		if (!plugin.getBuildNumber().equals("NOTSET")) {
 			metrics.addCustomChart(new BStatsMetrics.SimplePie("dev_build_number", new Callable<String>() {
 

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

@@ -10,15 +10,15 @@ 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.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
+import com.bencodez.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.user.UserManager;
 
 public class BroadcastHandler {
 	private VotingPluginMain plugin;
 	private ScheduledExecutorService timer;
-	ConcurrentLinkedQueue<String> votedPlayers = new ConcurrentLinkedQueue<String>();
+	ConcurrentLinkedQueue<String> votedPlayers = new ConcurrentLinkedQueue<>();
 
 	public BroadcastHandler(VotingPluginMain plugin, int delay) {
 		this.plugin = plugin;
@@ -31,8 +31,7 @@ public class BroadcastHandler {
 			for (int i = 0; i < size; i++) {
 				votedPlayers.poll();
 			}
-			String bc = StringParser.getInstance()
-					.colorize(plugin.getConfigFile().getFormatAlternateBroadcastBroadcast());
+			String bc = MessageAPI.colorize(plugin.getConfigFile().getFormatAlternateBroadcastBroadcast());
 			String playersText = "";
 			while (!votedPlayers.isEmpty()) {
 				playersText += votedPlayers.remove();
@@ -40,13 +39,13 @@ public class BroadcastHandler {
 					playersText += ", ";
 				}
 			}
-			HashMap<String, String> placeholders = new HashMap<String, String>();
+			HashMap<String, String> placeholders = new HashMap<>();
 			placeholders.put("numberofplayers", "" + size);
 			placeholders.put("players", playersText);
-			bc = StringParser.getInstance().replacePlaceHolder(bc, placeholders);
-			ArrayList<Player> players = new ArrayList<Player>();
+			bc = PlaceholderUtils.replacePlaceHolder(bc, placeholders);
+			ArrayList<Player> players = new ArrayList<>();
 			for (Player p : Bukkit.getOnlinePlayers()) {
-				if (!UserManager.getInstance().getVotingPluginUser(p).getDisableBroadcast()) {
+				if (!plugin.getVotingPluginUserManager().getVotingPluginUser(p).getDisableBroadcast()) {
 					players.add(p);
 				}
 			}

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

@@ -3,31 +3,43 @@ 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
+	// alltimetotal//monthtotal//weeklytotal//dailytotal//points//milestonecount//votepartycurrent//votepartyrequired//datemonthtotal
 
 	@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 dateMonthTotal = 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) {
+			int milestoneCount, int votePartyCurrent, int votePartyRequired, int dateMonthTotal) {
 		this.allTimeTotal = allTimeTotal;
 		this.monthTotal = monthTotal;
 		this.weeklyTotal = weeklyTotal;
@@ -36,6 +48,7 @@ public class BungeeMessageData {
 		this.milestoneCount = milestoneCount;
 		this.votePartyCurrent = votePartyCurrent;
 		this.votePartyRequired = votePartyRequired;
+		this.dateMonthTotal = dateMonthTotal;
 	}
 
 	public BungeeMessageData(String str) {
@@ -52,6 +65,9 @@ public class BungeeMessageData {
 			votePartyCurrent = Integer.parseInt(data[6]);
 			votePartyRequired = Integer.parseInt(data[7]);
 		}
+		if (data.length >= 9) {
+			dateMonthTotal = Integer.parseInt(data[8]);
+		}
 	}
 
 	@Override

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

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

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

@@ -0,0 +1,297 @@
+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.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.bencodez.votingplugin.bungee.proxy.VotingPluginProxyConfig;
+
+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 implements VotingPluginProxyConfig {
+	private VotingPluginBungee bungee;
+	@Getter
+	private Configuration data;
+
+	public Config(VotingPluginBungee bungee) {
+		this.bungee = bungee;
+	}
+
+	public Map<String, Object> configToMap(Configuration config) {
+		Map<String, Object> map = new HashMap<>();
+		if (config != null) {
+			config.getKeys().forEach(key -> map.put(key, config.get(key)));
+		}
+		return map;
+	}
+
+	public boolean getAllowUnJoined() {
+		return getData().getBoolean("AllowUnJoined", false);
+	}
+
+	public String getBedrockPlayerPrefix() {
+		return getData().getString("BedrockPlayerPrefix", ".");
+	}
+
+	public List<String> getBlockedServers() {
+		return getData().getStringList("BlockedServers");
+	}
+
+	public boolean getBroadcast() {
+		return getData().getBoolean("Broadcast", false);
+	}
+
+	public String getBungeeHost() {
+		return getData().getString("BungeeServer.Host", "");
+	}
+
+	public 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 String getFallBack() {
+		return getData().getString("FallBackServer", "");
+	}
+
+	public boolean getGlobalDataEnabled() {
+		return getData().getBoolean("GlobalData.Enabled", false);
+	}
+
+	public boolean getGlobalDataUseMainMySQL() {
+		return getData().getBoolean("GlobalData.UseMainMySQL", true);
+	}
+
+	public int getLimitVotePoints() {
+		return getData().getInt("LimitVotePoints", -1);
+	}
+
+	public int getMaxAmountOfVotesPerDay() {
+		return getData().getInt("MaxAmountOfVotesPerDay", -1);
+	}
+
+	public String getMultiProxyMethod() {
+		return getData().getString("MultiProxyMethod", "SOCKET");
+	}
+
+	public boolean getMultiProxyOneGlobalReward() {
+		return getData().getBoolean("MultiProxyOneGlobalReward", false);
+	}
+
+	public String getMultiProxyRedisHost() {
+		return getData().getString("MultiProxyRedis.Host", "");
+	}
+
+	public String getMultiProxyRedisPassword() {
+		return getData().getString("MultiProxyRedis.Password", "");
+	}
+
+	public int getMultiProxyRedisPort() {
+		return getData().getInt("MultiProxyRedis.Port", 6379);
+	}
+
+	public boolean getMultiProxyRedisUseExistingConnection() {
+		return getData().getBoolean("MultiProxyRedis.UseExistingConnection", false);
+	}
+
+	public String getMultiProxyRedisUsername() {
+		return getData().getString("MultiProxyRedis.Username", "");
+	}
+
+	public Collection<String> getMultiProxyServers() {
+		return getData().getSection("MultiProxyServers").getKeys();
+	}
+
+	public Map<String, Object> getMultiProxyServersConfiguration(String s) {
+		return configToMap(getData().getSection("MultiProxyServers." + s));
+	}
+
+	public String getMultiProxySocketHostHost() {
+		return getData().getString("MultiProxySocketHost.Host", "");
+	}
+
+	public int getMultiProxySocketHostPort() {
+		return getData().getInt("MultiProxySocketHost.Port", 1297);
+	}
+
+	public boolean getMultiProxySupport() {
+		return getData().getBoolean("MultiProxySupport", false);
+	}
+
+	public boolean getOnlineMode() {
+		return getData().getBoolean("OnlineMode", true);
+	}
+
+	public int getPointsOnVote() {
+		return getData().getInt("PointsOnVote", 1);
+	}
+
+	public boolean getPrimaryServer() {
+		return getData().getBoolean("PrimaryServer", false);
+	}
+
+	public String getProxyServerName() {
+		return getData().getString("ProxyServerName", "SOCKET");
+	}
+
+	public List<String> getProxyServers() {
+		return getData().getStringList("ProxyServers");
+	}
+
+	public String getRedisHost() {
+		return getData().getString("Redis.Host", "");
+	}
+
+	public String getRedisPassword() {
+		return getData().getString("Redis.Password", "");
+	}
+
+	public int getRedisPort() {
+		return getData().getInt("Redis.Port", 6379);
+	}
+
+	public String getRedisPrefix() {
+		return getData().getString("Redis.Prefix", "");
+	}
+
+	public String getRedisUsername() {
+		return getData().getString("Redis.Username", "");
+	}
+
+	public boolean getSendVotesToAllServers() {
+		return getData().getBoolean("SendVotesToAllServers");
+	}
+
+	public Map<String, Object> getSpigotServerConfiguration(String s) {
+		return configToMap(getData().getSection("SpigotServers." + s));
+	}
+
+	public Collection<String> getSpigotServers() {
+		return getData().getSection("SpigotServers").getKeys();
+	}
+
+	public boolean getStoreMonthTotalsWithDate() {
+		return getData().getBoolean("StoreMonthTotalsWithDate", false);
+	}
+
+	public boolean getTimeChangeFailSafeBypass() {
+		return getData().getBoolean("TimeChangeFailSafeBypass", false);
+	}
+
+	public int getTimeHourOffSet() {
+		return getData().getInt("TimeHourOffSet");
+	}
+
+	public String getTimeZone() {
+		return getData().getString("TimeZone", "");
+	}
+
+	public boolean getUseMonthDateTotalsAsPrimaryTotal() {
+		return getData().getBoolean("UseMonthDateTotalsAsPrimaryTotal", false);
+	}
+
+	public boolean getUUIDLookup() {
+		return getData().getBoolean("UUIDLookup", true);
+	}
+
+	public int getVoteCacheTime() {
+		return getData().getInt("VoteCacheTime", -1);
+	}
+
+	public String getVotePartyBroadcast() {
+		return getData().getString("VoteParty.Broadcast", "");
+	}
+
+	public List<String> getVotePartyBungeeCommands() {
+		return getData().getStringList("VoteParty.BungeeCommands");
+	}
+
+	public boolean getVotePartyEnabled() {
+		return getData().getBoolean("VoteParty.Enabled", false);
+	}
+
+	public int getVotePartyIncreaseVotesRequired() {
+		return getData().getInt("VoteParty.IncreaseVotesRequired", 0);
+	}
+
+	public boolean getVotePartySendToAllServers() {
+		return getData().getBoolean("VoteParty.SendToAllServers", true);
+	}
+
+	public List<String> getVotePartyServersToSend() {
+		return getData().getStringList("VoteParty.ServersToSend");
+	}
+
+	public int getVotePartyVotesRequired() {
+		return getData().getInt("VoteParty.VotesRequired", 100);
+	}
+
+	public boolean getWaitForUserOnline() {
+		return getData().getBoolean("WaitForUserOnline", false);
+	}
+
+	public List<String> getWhiteListedServers() {
+		return getData().getStringList("WhiteListedServers");
+	}
+
+	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();
+		}
+	}
+
+	@Override
+	public String getPluginMessageChannel() {
+		return getData().getString("PluginMessageChannel", "vp:vp");
+	}
+
+	@Override
+	public boolean getPluginMessageEncryption() {
+		return getData().getBoolean("PluginMessageEncryption", false);
+	}
+
+}

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

@@ -0,0 +1,73 @@
+package com.bencodez.votingplugin.bungee;
+
+import java.io.File;
+
+import com.bencodez.simpleapi.file.BungeeJsonFile;
+import com.velocitypowered.api.proxy.Player;
+
+import lombok.Getter;
+import net.md_5.bungee.config.Configuration;
+
+public class NonVotedPlayersCache extends BungeeJsonFile {
+	private VotingPluginBungee plugin;
+	@Getter
+	private Configuration data;
+
+	public NonVotedPlayersCache(VotingPluginBungee plugin) {
+		super(new File(plugin.getDataFolder(), "nonvotedplayerscache.json"));
+		this.plugin = plugin;
+	}
+
+	public void addPlayer(Player player) {
+		if (!plugin.getVotingPluginProxy().getProxyMySQL().containsKeyQuery(player.getUniqueId().toString())) {
+			addPlayer(player.getUniqueId().toString(), player.getUsername());
+		}
+	}
+
+	public void addPlayer(String uuid, String playerName) {
+		setString("NonVotedPlayers." + playerName + ".UUID", uuid);
+		setLong("NonVotedPlayers." + playerName + ".LastTime", System.currentTimeMillis());
+		save();
+	}
+
+	public void addPlayerCheck(String uuid, String playerName) {
+		if (!plugin.getVotingPluginProxy().getProxyMySQL().containsKeyQuery(uuid)) {
+			addPlayer(uuid, playerName);
+		}
+	}
+
+	public void check() {
+		for (String player : getKeys("NonVotedPlayers")) {
+			long time = getLong("NonVotedPlayers." + player + ".LastTime", 0);
+			if ((System.currentTimeMillis() - time) > 1000 * 60 * 60 * 24 * 5) {
+				removePlayer(player);
+			} else {
+				String uuid = getString("NonVotedPlayers." + player + ".UUID", "");
+				if (!uuid.isEmpty()) {
+					if (plugin.getVotingPluginProxy().getProxyMySQL().containsKeyQuery(uuid)) {
+						removePlayer(player);
+					}
+				} else {
+					removePlayer(player);
+				}
+			}
+		}
+		save();
+	}
+
+	public String playerExists(String playerName) {
+		String uuid = getString("NonVotedPlayers." + playerName + ".UUID", "");
+		if (!uuid.isEmpty()) {
+			return uuid;
+		}
+		return "";
+	}
+
+	private void removePlayer(String player) {
+		plugin.debug("Removing nonvotedplayer: " + player);
+		remove("NonVotedPlayers." + player);
+
+		save();
+	}
+
+}

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

@@ -0,0 +1,126 @@
+package com.bencodez.votingplugin.bungee;
+
+import java.io.File;
+import java.util.Collection;
+
+import com.bencodez.simpleapi.file.BungeeJsonFile;
+import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
+import com.google.gson.JsonElement;
+
+public class VoteCache extends BungeeJsonFile {
+	private VotingPluginBungee bungee;
+
+	public VoteCache(VotingPluginBungee bungee) {
+		super(new File(bungee.getDataFolder(), "votecache.json"));
+		this.bungee = bungee;
+		initialize();
+	}
+
+	private void initialize() {
+		if (!bungee.getDataFolder().exists()) {
+			bungee.getDataFolder().mkdir();
+		}
+		// Reload the JSON file to ensure latest data
+		reload();
+	}
+
+	public void addTimedVote(int num, VoteTimeQueue voteTimedQueue) {
+		String path = "TimedVoteCache." + num;
+		setString(path + ".Name", voteTimedQueue.getName());
+		setString(path + ".Service", voteTimedQueue.getService());
+		setLong(path + ".Time", voteTimedQueue.getTime());
+	}
+
+	public void addVote(String server, int num, OfflineBungeeVote voteData) {
+		String path = "VoteCache." + server + "." + num;
+		setString(path + ".Name", voteData.getPlayerName());
+		setString(path + ".Service", voteData.getService());
+		setString(path + ".UUID", voteData.getUuid());
+		setLong(path + ".Time", voteData.getTime());
+		setBoolean(path + ".Real", voteData.isRealVote());
+		setString(path + ".Text", voteData.getText());
+	}
+
+	public void addVoteOnline(String player, int num, OfflineBungeeVote voteData) {
+		String path = "OnlineCache." + player + "." + num;
+		setString(path + ".Name", voteData.getPlayerName());
+		setString(path + ".Service", voteData.getService());
+		setString(path + ".UUID", voteData.getUuid());
+		setLong(path + ".Time", voteData.getTime());
+		setBoolean(path + ".Real", voteData.isRealVote());
+		setString(path + ".Text", voteData.getText());
+	}
+
+	public void clearData() {
+		setString("VoteCache", null);
+		setString("OnlineCache", null);
+		setString("TimedVoteCache", null);
+		save();
+	}
+
+	public Collection<String> getOnlineVotes(String name) {
+		return getKeys("OnlineCache." + name);
+	}
+
+	public JsonElement getOnlineVotes(String name, String num) {
+		return getNode("OnlineCache." + name + "." + num);
+	}
+
+	public Collection<String> getPlayers() {
+		return getKeys("OnlineCache");
+	}
+
+	public Collection<String> getServers() {
+		return getKeys("VoteCache");
+	}
+
+	public Collection<String> getServerVotes(String server) {
+		return getKeys("VoteCache." + server);
+	}
+
+	public JsonElement getServerVotes(String server, String num) {
+		return getNode("VoteCache." + server + "." + num);
+	}
+
+	public Collection<String> getTimedVoteCache() {
+		return getKeys("TimedVoteCache");
+	}
+
+	public JsonElement getTimedVoteCache(String key) {
+		return getNode("TimedVoteCache." + key);
+	}
+
+	public int getVotePartyCache(String server) {
+		return getInt("VoteParty.Cache." + server, 0);
+	}
+
+	public int getVotePartyCurrentVotes() {
+		return getInt("VoteParty.CurrentVotes", 0);
+	}
+
+	public int getVotePartyInreaseVotesRequired() {
+		return getInt("VoteParty.IncreaseVotes", 0);
+	}
+
+	public void setVotePartyCache(String server, int amount) {
+		setInt("VoteParty.Cache." + server, amount);
+	}
+
+	public void setVotePartyCurrentVotes(int amount) {
+		setInt("VoteParty.CurrentVotes", amount);
+	}
+
+	public void setVotePartyInreaseVotesRequired(int amount) {
+		setInt("VoteParty.IncreaseVotes", amount);
+	}
+
+	@Override
+	public void save() {
+		super.save();
+	}
+
+	@Override
+	public void reload() {
+		super.reload();
+	}
+}

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

@@ -28,7 +28,7 @@ public class VoteEventBungee implements net.md_5.bungee.api.plugin.Listener {
 					vote.setServiceName(serviceSite);
 				}
 
-				plugin.vote(vote.getUsername(), serviceSite, true, true, 0, null, null);
+				plugin.getVotingPluginProxy().vote(vote.getUsername(), serviceSite, true, true, 0, null, null);
 			}
 		});
 

VotingPlugin/src/main/java/com/bencodez/votingplugin/bungee/VotingPluginBungee.java

@@ -0,0 +1,859 @@
+package com.bencodez.votingplugin.bungee;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.security.CodeSource;
+import java.sql.SQLException;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import com.bencodez.advancedcore.api.time.TimeType;
+import com.bencodez.advancedcore.api.user.userstorage.DataType;
+import com.bencodez.advancedcore.api.user.userstorage.mysql.api.config.MysqlConfigBungee;
+import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalDataHandlerProxy;
+import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalMySQL;
+import com.bencodez.advancedcore.bungeeapi.mysql.BungeeMySQL;
+import com.bencodez.votingplugin.bungee.proxy.VotingPluginProxy;
+import com.bencodez.votingplugin.bungee.proxy.VotingPluginProxyConfig;
+import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
+import com.bencodez.votingplugin.topvoter.TopVoter;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
+import lombok.Getter;
+import net.md_5.bungee.api.ChatColor;
+import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.connection.Server;
+import net.md_5.bungee.api.event.PluginMessageEvent;
+import net.md_5.bungee.api.plugin.Listener;
+import net.md_5.bungee.api.plugin.Plugin;
+import net.md_5.bungee.config.Configuration;
+import net.md_5.bungee.config.ConfigurationProvider;
+import net.md_5.bungee.event.EventHandler;
+
+public class VotingPluginBungee extends Plugin implements Listener {
+
+	@Getter
+	private Config config;
+
+	private NonVotedPlayersCache nonVotedPlayersCache;
+
+	private VoteCache voteCacheFile;
+
+	private String buildNumber = "NOTSET";
+
+	private VoteEventBungee voteEventBungee;
+
+	@Getter
+	private VotingPluginProxy votingPluginProxy;
+
+	public void debug(String msg) {
+		if (config.getDebug()) {
+			getLogger().info("Debug: " + msg);
+		}
+	}
+
+	public void debug2(String msg) {
+		debug(msg);
+	}
+
+	public Set<String> getAvailableAllServers() {
+		Set<String> servers = new HashSet<>();
+		if (config.getWhiteListedServers().isEmpty()) {
+			for (String s : getProxy().getServers().keySet()) {
+				if (!config.getBlockedServers().contains(s)) {
+					servers.add(s);
+				}
+			}
+		} else {
+			servers.addAll(config.getWhiteListedServers());
+		}
+
+		return servers;
+	}
+
+	public String getProperPlayerName(String uuid, String currentName) {
+		ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(uuid));
+		if (p != null && p.isConnected()) {
+			return p.getName();
+		}
+		return currentName;
+	}
+
+	private Configuration getVersionFile() {
+		try {
+			CodeSource src = this.getClass().getProtectionDomain().getCodeSource();
+			if (src != null) {
+				URL jar = src.getLocation();
+				ZipInputStream zip = null;
+				zip = new ZipInputStream(jar.openStream());
+				while (true) {
+					ZipEntry e = zip.getNextEntry();
+					if (e != null) {
+						String name = e.getName();
+						if (name.equals("votingpluginversion.yml")) {
+							Reader defConfigStream = new InputStreamReader(zip);
+							if (defConfigStream != null) {
+								Configuration conf = ConfigurationProvider
+										.getProvider(net.md_5.bungee.config.YamlConfiguration.class)
+										.load(defConfigStream);
+
+								defConfigStream.close();
+								return conf;
+							}
+						}
+					}
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public boolean isOnline(ProxiedPlayer p) {
+		if (p != null) {
+			return p.isConnected();
+		}
+
+		return false;
+	}
+
+	private void loadMysql() {
+		votingPluginProxy.setProxyMySQL(new BungeeMySQL(this, "VotingPlugin_Users", config.getData()) {
+
+			@Override
+			public void debug(SQLException e) {
+				if (config.getDebug()) {
+					e.printStackTrace();
+				}
+			}
+		});
+
+		ArrayList<String> servers = new ArrayList<>();
+		for (String s : getAvailableAllServers()) {
+			servers.add(s);
+		}
+
+		if (config.getGlobalDataEnabled()) {
+			if (config.getGlobalDataUseMainMySQL()) {
+				votingPluginProxy.setGlobalDataHandler(new GlobalDataHandlerProxy(
+						new GlobalMySQL("VotingPlugin_GlobalData", getVotingPluginProxy().getProxyMySQL().getMysql()) {
+
+							@Override
+							public void debug(Exception e) {
+								if (config.getDebug()) {
+									e.printStackTrace();
+								}
+							}
+
+							@Override
+							public void debug(String text) {
+								debug2(text);
+							}
+
+							@Override
+							public void info(String text) {
+								getLogger().info(text);
+
+							}
+
+							@Override
+							public void severe(String text) {
+								getLogger().severe(text);
+							}
+
+							@Override
+							public void warning(String text) {
+								getLogger().warning(text);
+							}
+						}, servers) {
+
+					@Override
+					public void onTimeChangedFailed(String server, TimeType type) {
+						getVotingPluginProxy().getGlobalDataHandler().setBoolean(server, type.toString(), false);
+						getVotingPluginProxy().getGlobalDataHandler().setBoolean(server, "FinishedProcessing", true);
+						getVotingPluginProxy().getGlobalDataHandler().setBoolean(server, "Processing", false);
+					}
+
+					@Override
+					public void onTimeChangedFinished(TimeType type) {
+						if (type.equals(TimeType.MONTH)) {
+							getVotingPluginProxy().getProxyMySQL().copyColumnData(TopVoter.Monthly.getColumnName(),
+									"LastMonthTotal");
+						}
+						getVotingPluginProxy().getProxyMySQL().wipeColumnData(TopVoter.of(type).getColumnName(),
+								DataType.INTEGER);
+
+						if (!config.getGlobalDataEnabled()) {
+							return;
+						}
+						for (String s : getAvailableAllServers()) {
+							getVotingPluginProxy().getGlobalDataHandler().setBoolean(s, "ForceUpdate", true);
+							if (getVotingPluginProxy().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
+								getVotingPluginProxy().sendPluginMessageServer(s, "BungeeTimeChange", "");
+							} else if (getVotingPluginProxy().getMethod().equals(BungeeMethod.SOCKETS)) {
+								getVotingPluginProxy().sendServerMessage(s, "BungeeTimeChange");
+							}
+						}
+
+						getVotingPluginProxy().processQueue();
+
+					}
+				});
+			} else {
+				votingPluginProxy
+						.setGlobalDataHandler(new GlobalDataHandlerProxy(new GlobalMySQL("VotingPlugin_GlobalData",
+								new MysqlConfigBungee(config.getData().getSection("GlobalData"))) {
+
+							@Override
+							public void debug(Exception e) {
+								if (config.getDebug()) {
+									e.printStackTrace();
+								}
+							}
+
+							@Override
+							public void debug(String text) {
+								debug2(text);
+							}
+
+							@Override
+							public void info(String text) {
+								getLogger().info(text);
+
+							}
+
+							@Override
+							public void severe(String text) {
+								getLogger().severe(text);
+							}
+
+							@Override
+							public void warning(String text) {
+								getLogger().warning(text);
+							}
+						}, servers) {
+
+							@Override
+							public void onTimeChangedFailed(String server, TimeType type) {
+								getVotingPluginProxy().getGlobalDataHandler().setBoolean(server, type.toString(),
+										false);
+								getVotingPluginProxy().getGlobalDataHandler().setBoolean(server, "FinishedProcessing",
+										true);
+								getVotingPluginProxy().getGlobalDataHandler().setBoolean(server, "Processing", false);
+							}
+
+							@Override
+							public void onTimeChangedFinished(TimeType type) {
+								if (type.equals(TimeType.MONTH)) {
+									getVotingPluginProxy().getProxyMySQL()
+											.copyColumnData(TopVoter.Monthly.getColumnName(), "LastMonthTotal");
+								}
+								getVotingPluginProxy().getProxyMySQL().wipeColumnData(TopVoter.of(type).getColumnName(),
+										DataType.INTEGER);
+
+								if (!config.getGlobalDataEnabled()) {
+									return;
+								}
+								for (String s : getAvailableAllServers()) {
+									getVotingPluginProxy().getGlobalDataHandler().setBoolean(s, "ForceUpdate", true);
+									if (getVotingPluginProxy().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
+										getVotingPluginProxy().sendPluginMessageServer(s, "BungeeTimeChange", "");
+									} else if (getVotingPluginProxy().getMethod().equals(BungeeMethod.SOCKETS)) {
+										getVotingPluginProxy().sendServerMessage(s, "BungeeTimeChange");
+									}
+								}
+
+								getVotingPluginProxy().processQueue();
+
+							}
+						});
+			}
+			getVotingPluginProxy().getGlobalDataHandler().getGlobalMysql().alterColumnType("IgnoreTime", "VARCHAR(5)");
+			getVotingPluginProxy().getGlobalDataHandler().getGlobalMysql().alterColumnType("MONTH", "VARCHAR(5)");
+			getVotingPluginProxy().getGlobalDataHandler().getGlobalMysql().alterColumnType("WEEK", "VARCHAR(5)");
+			getVotingPluginProxy().getGlobalDataHandler().getGlobalMysql().alterColumnType("DAY", "VARCHAR(5)");
+			getVotingPluginProxy().getGlobalDataHandler().getGlobalMysql().alterColumnType("FinishedProcessing",
+					"VARCHAR(5)");
+			getVotingPluginProxy().getGlobalDataHandler().getGlobalMysql().alterColumnType("Processing", "VARCHAR(5)");
+			getVotingPluginProxy().getGlobalDataHandler().getGlobalMysql().alterColumnType("ForceUpdate", "VARCHAR(5)");
+			getVotingPluginProxy().getGlobalDataHandler().getGlobalMysql().alterColumnType("LastUpdated", "MEDIUMTEXT");
+		}
+
+		// column types
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("TopVoterIgnore", "VARCHAR(5)");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("CheckWorld", "VARCHAR(5)");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("Reminded", "VARCHAR(5)");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("DisableBroadcast", "VARCHAR(5)");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("LastOnline", "VARCHAR(20)");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("PlayerName", "VARCHAR(30)");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("DailyTotal", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("WeeklyTotal", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("DayVoteStreak", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("BestDayVoteStreak", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("WeekVoteStreak", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("BestWeekVoteStreak", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("VotePartyVotes", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("MonthVoteStreak", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("Points", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("HighestDailyTotal", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("AllTimeTotal", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("HighestMonthlyTotal", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("MilestoneCount", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("MonthTotal", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("LastWeeklyTotal", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("LastDailyTotal", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("OfflineRewards", "MEDIUMTEXT");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("DayVoteStreakLastUpdate", "MEDIUMTEXT");
+		if (config.getStoreMonthTotalsWithDate()) {
+			getVotingPluginProxy().getProxyMySQL().alterColumnType(
+					getVotingPluginProxy().getMonthTotalsWithDatePath(LocalDateTime.now()), "INT DEFAULT '0'");
+			getVotingPluginProxy().getProxyMySQL().alterColumnType(
+					getVotingPluginProxy().getMonthTotalsWithDatePath(LocalDateTime.now().plusMonths(1)),
+					"INT DEFAULT '0'");
+			getVotingPluginProxy().getProxyMySQL().alterColumnType(
+					getVotingPluginProxy().getMonthTotalsWithDatePath(LocalDateTime.now().plusMonths(2)),
+					"INT DEFAULT '0'");
+		}
+	}
+
+	public void loadVersionFile() {
+		Configuration conf = getVersionFile();
+		if (conf != null) {
+			buildNumber = conf.get("buildnumber", "NOTSET");
+		}
+	}
+
+	public void login(ProxiedPlayer p) {
+		if (p != null && p.getServer() != null && p.getServer().getInfo() != null) {
+			final ProxiedPlayer proxiedPlayer = p;
+			getProxy().getScheduler().schedule(this, new Runnable() {
+
+				@Override
+				public void run() {
+					getVotingPluginProxy().login(proxiedPlayer.getName(), proxiedPlayer.getUniqueId().toString(),
+							proxiedPlayer.getServer().getInfo().getName());
+				}
+			}, 1, TimeUnit.SECONDS);
+		}
+
+	}
+
+	@Override
+	public void onDisable() {
+		if (getVotingPluginProxy().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
+			getLogger().info("VotingPlugin saving vote cache: " + getVotingPluginProxy().getCachedVotes().size() + "/"
+					+ getVotingPluginProxy().getCachedOnlineVotes().size());
+			for (Entry<String, ArrayList<OfflineBungeeVote>> entry : getVotingPluginProxy().getCachedVotes()
+					.entrySet()) {
+				String server = entry.getKey();
+				int num = 0;
+				for (OfflineBungeeVote voteData : entry.getValue()) {
+					voteCacheFile.addVote(server, num, voteData);
+					num++;
+				}
+			}
+			for (Entry<String, ArrayList<OfflineBungeeVote>> entry : getVotingPluginProxy().getCachedOnlineVotes()
+					.entrySet()) {
+				String name = entry.getKey();
+				int num = 0;
+				for (OfflineBungeeVote voteData : entry.getValue()) {
+					voteCacheFile.addVoteOnline(name, num, voteData);
+					num++;
+				}
+			}
+		}
+		if (!getVotingPluginProxy().getTimeChangeQueue().isEmpty()) {
+			int num = 0;
+			for (VoteTimeQueue vote : getVotingPluginProxy().getTimeChangeQueue()) {
+				voteCacheFile.addTimedVote(num, vote);
+				num++;
+			}
+		}
+
+		getVotingPluginProxy().onDisable();
+
+		voteCacheFile.save();
+		nonVotedPlayersCache.save();
+
+		getLogger().info("VotingPlugin disabled");
+
+	}
+
+	@Override
+	public void onEnable() {
+
+		getProxy().getPluginManager().registerListener(this, this);
+
+		config = new Config(this);
+		config.load();
+
+		getProxy().getPluginManager().registerCommand(this, new VotingPluginBungeeCommand(this));
+
+		votingPluginProxy = new VotingPluginProxy() {
+
+			@Override
+			public void addNonVotedPlayer(String uuid, String playerName) {
+				nonVotedPlayersCache.addPlayer(uuid, playerName);
+			}
+
+			@Override
+			public void broadcast(String message) {
+				getProxy().broadcast(new TextComponent(ChatColor.translateAlternateColorCodes('&', message)));
+			}
+
+			@Override
+			public void debug(String str) {
+				debug2(str);
+			}
+
+			@Override
+			public Set<String> getAllAvailableServers() {
+				return getAvailableAllServers();
+			}
+
+			@Override
+			public VotingPluginProxyConfig getConfig() {
+				return config;
+			}
+
+			@Override
+			public String getCurrentPlayerServer(String player) {
+				return getProxy().getPlayer(player).getServer().getInfo().getName();
+			}
+
+			@Override
+			public File getDataFolderPlugin() {
+				return getDataFolder();
+			}
+
+			@Override
+			public String getProperName(String uuid, String playerName) {
+				return getProperPlayerName(uuid, playerName);
+			}
+
+			@Override
+			public String getUUID(String playerName) {
+
+				if (!config.getOnlineMode()) {
+					return UUID.nameUUIDFromBytes(("OfflinePlayer:" + playerName).getBytes(StandardCharsets.UTF_8))
+							.toString();
+				}
+				ProxiedPlayer p = getProxy().getPlayer(playerName);
+				if (p != null && p.isConnected()) {
+					return p.getUniqueId().toString();
+				}
+
+				for (Entry<UUID, String> entry : getVotingPluginProxy().getUuidPlayerNameCache().entrySet()) {
+					if (entry.getValue().equalsIgnoreCase(playerName)) {
+						return entry.getKey().toString();
+					}
+				}
+
+				if (getVotingPluginProxy().getProxyMySQL() != null) {
+					String str = getVotingPluginProxy().getProxyMySQL().getUUID(playerName);
+					if (str != null) {
+						return str;
+					}
+				}
+				if (nonVotedPlayersCache != null) {
+					return nonVotedPlayersCache.playerExists(playerName);
+				}
+
+				return "";
+
+			}
+
+			@Override
+			public String getPluginVersion() {
+				return getDescription().getVersion();
+			}
+
+			@Override
+			public int getVoteCacheCurrentVotePartyVotes() {
+				return voteCacheFile.getVotePartyCurrentVotes();
+			}
+
+			@Override
+			public long getVoteCacheLastUpdated() {
+				return voteCacheFile.getLong("Time.LastUpdated", 0L);
+			}
+
+			@Override
+			public int getVoteCachePrevDay() {
+				return voteCacheFile.getInt("Time.Day", 0);
+			}
+
+			@Override
+			public String getVoteCachePrevMonth() {
+				return voteCacheFile.getString("Time.Month", "");
+			}
+
+			@Override
+			public int getVoteCachePrevWeek() {
+				return voteCacheFile.getInt("Time.Week", 0);
+			}
+
+			@Override
+			public int getVoteCacheVotePartyIncreaseVotesRequired() {
+				return voteCacheFile.getVotePartyInreaseVotesRequired();
+			}
+
+			@Override
+			public boolean isPlayerOnline(String playerName) {
+				ProxiedPlayer player = getProxy().getPlayer(playerName);
+				return player != null && player.isConnected();
+			}
+
+			@Override
+			public boolean isServerValid(String server) {
+				return getProxy().getServerInfo(server) != null;
+			}
+
+			@Override
+			public boolean isSomeoneOnlineServer(String server) {
+				return !getProxy().getServerInfo(server).getPlayers().isEmpty();
+			}
+
+			@Override
+			public boolean isVoteCacheIgnoreTime() {
+				return voteCacheFile.getBoolean("Time.IgnoreTime", false);
+			}
+
+			@Override
+			public void log(String message) {
+				getLogger().info(message);
+			}
+
+			@Override
+			public void logSevere(String message) {
+				getLogger().severe(message);
+			}
+
+			@Override
+			public void runAsync(Runnable run) {
+				runAsyncNow(run);
+			}
+
+			@Override
+			public void runConsoleCommand(String command) {
+				getProxy().getPluginManager().dispatchCommand(getProxy().getConsole(), command);
+			}
+
+			@Override
+			public void saveVoteCacheFile() {
+				voteCacheFile.save();
+			}
+
+			@Override
+			public void sendPluginMessageData(String server, String channel, byte[] data, boolean queue) {
+				getProxy().getServerInfo(server).sendData(channel, data, queue);
+			}
+
+			@Override
+			public void setVoteCacheLastUpdated() {
+				voteCacheFile.setLong("Time.LastUpdated", System.currentTimeMillis());
+				voteCacheFile.save();
+			}
+
+			@Override
+			public void setVoteCachePrevDay(int day) {
+				voteCacheFile.setInt("Time.Day", day);
+				voteCacheFile.save();
+			}
+
+			@Override
+			public void setVoteCachePrevMonth(String text) {
+				voteCacheFile.setString("Time.Month", text);
+				voteCacheFile.save();
+			}
+
+			@Override
+			public void setVoteCachePrevWeek(int week) {
+				voteCacheFile.setInt("Time.Week", week);
+				voteCacheFile.save();
+			}
+
+			@Override
+			public void setVoteCacheVoteCacheIgnoreTime(boolean ignore) {
+				voteCacheFile.setBoolean("Time.IgnoreTime", ignore);
+				voteCacheFile.save();
+			}
+
+			@Override
+			public void setVoteCacheVotePartyCurrentVotes(int votes) {
+				voteCacheFile.setVotePartyCurrentVotes(votes);
+			}
+
+			@Override
+			public void setVoteCacheVotePartyIncreaseVotesRequired(int votes) {
+				voteCacheFile.setVotePartyInreaseVotesRequired(votes);
+
+			}
+
+			@Override
+			public void warn(String message) {
+				getLogger().warning(message);
+			}
+
+			@Override
+			public void reloadCore(boolean mysql) {
+				reloadPlugin(mysql);
+			}
+
+		};
+		try {
+			Class.forName("com.vexsoftware.votifier.bungee.events.VotifierEvent");
+		} catch (ClassNotFoundException e) {
+			getVotingPluginProxy().setVotifierEnabled(false);
+		}
+		if (getVotingPluginProxy().isVotifierEnabled()) {
+			try {
+				voteEventBungee = new VoteEventBungee(this);
+				getProxy().getPluginManager().registerListener(this, voteEventBungee);
+			} catch (Exception e) {
+				getVotingPluginProxy().setVotifierEnabled(false);
+			}
+		}
+
+		boolean mysqlLoaded = true;
+		try {
+			if (!config.getData().getString("Host", "").isEmpty()) {
+				loadMysql();
+			} else {
+				mysqlLoaded = false;
+				getLogger().severe("MySQL settings not set in bungeeconfig.yml");
+			}
+		} catch (Exception e) {
+			mysqlLoaded = false;
+			e.printStackTrace();
+		}
+
+		this.getProxy().registerChannel(getConfig().getPluginMessageChannel());
+
+		if (mysqlLoaded) {
+
+			voteCacheFile = new VoteCache(this);
+			// voteCacheFile.load();
+
+			nonVotedPlayersCache = new NonVotedPlayersCache(this);
+			// nonVotedPlayersCache.load();
+
+			getVotingPluginProxy().load();
+
+			try {
+				for (String key : voteCacheFile.getTimedVoteCache()) {
+					JsonElement dataElement = voteCacheFile.getTimedVoteCache(key);
+
+					if (dataElement != null && dataElement.isJsonObject()) {
+						JsonObject data = dataElement.getAsJsonObject();
+						String name = data.has("Name") ? data.get("Name").getAsString() : "";
+						String service = data.has("Service") ? data.get("Service").getAsString() : "";
+						long time = data.has("Time") ? data.get("Time").getAsLong() : 0L;
+
+						getVotingPluginProxy().getTimeChangeQueue().add(new VoteTimeQueue(name, service, time));
+					}
+				}
+
+				getVotingPluginProxy().processQueue();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+
+			try {
+				for (String server : voteCacheFile.getServers()) {
+					ArrayList<OfflineBungeeVote> votes = new ArrayList<>();
+					for (String num : voteCacheFile.getServerVotes(server)) {
+						JsonElement dataElement = voteCacheFile.getServerVotes(server, num);
+
+						if (dataElement != null && dataElement.isJsonObject()) {
+							JsonObject data = dataElement.getAsJsonObject();
+
+							String name = data.has("Name") ? data.get("Name").getAsString() : "";
+							String uuid = data.has("UUID") ? data.get("UUID").getAsString() : "";
+							String service = data.has("Service") ? data.get("Service").getAsString() : "";
+							long time = data.has("Time") ? data.get("Time").getAsLong() : 0L;
+							boolean real = data.has("Real") && data.get("Real").getAsBoolean();
+							String text = data.has("Text") ? data.get("Text").getAsString() : "";
+
+							votes.add(new OfflineBungeeVote(name, uuid, service, time, real, text));
+						}
+					}
+					getVotingPluginProxy().getCachedVotes().put(server, votes);
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+
+			try {
+				for (String player : voteCacheFile.getPlayers()) {
+					ArrayList<OfflineBungeeVote> votes = new ArrayList<>();
+					for (String num : voteCacheFile.getOnlineVotes(player)) {
+						JsonElement dataElement = voteCacheFile.getOnlineVotes(player, num);
+
+						if (dataElement != null && dataElement.isJsonObject()) {
+							JsonObject data = dataElement.getAsJsonObject();
+
+							String name = data.has("Name") ? data.get("Name").getAsString() : "";
+							String uuid = data.has("UUID") ? data.get("UUID").getAsString() : "";
+							String service = data.has("Service") ? data.get("Service").getAsString() : "";
+							long time = data.has("Time") ? data.get("Time").getAsLong() : 0L;
+							boolean real = data.has("Real") && data.get("Real").getAsBoolean();
+							String text = data.has("Text") ? data.get("Text").getAsString() : "";
+
+							votes.add(new OfflineBungeeVote(name, uuid, service, time, real, text));
+						}
+					}
+					getLogger().info("VoteCache: " + player);
+					getVotingPluginProxy().getCachedOnlineVotes().put(player, votes);
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+
+			voteCacheFile.clearData();
+
+			getProxy().getScheduler().schedule(this, new Runnable() {
+
+				@Override
+				public void run() {
+
+					for (String server : getVotingPluginProxy().getCachedVotes().keySet()) {
+						getVotingPluginProxy().checkCachedVotes(server);
+					}
+
+					for (String player : getVotingPluginProxy().getCachedOnlineVotes().keySet()) {
+						ProxiedPlayer p = getProxy().getPlayer(UUID.fromString(player));
+						if (p != null) {
+							getVotingPluginProxy().checkOnlineVotes(p.getName(), player, null);
+						}
+					}
+				}
+			}, 120l, 60l, TimeUnit.SECONDS);
+
+			getProxy().getScheduler().schedule(this, new Runnable() {
+
+				@Override
+				public void run() {
+					if (nonVotedPlayersCache != null) {
+						debug("Checking nonvotedplayers.yml...");
+						nonVotedPlayersCache.check();
+					}
+					if (voteCacheFile != null) {
+						voteCacheFile.save();
+					}
+				}
+			}, 1l, 60l, TimeUnit.MINUTES);
+
+		}
+
+		if (!getVotingPluginProxy().isVotifierEnabled()) {
+			if (!(getConfig().getMultiProxySupport() && !getConfig().getPrimaryServer())) {
+				getLogger().warning("Votifier event not found, not loading votifier event");
+			}
+		}
+
+		BStatsMetricsBungee metrics = new BStatsMetricsBungee(this, 9453);
+
+		metrics.addCustomChart(
+				new BStatsMetricsBungee.SimplePie("bungee_method", () -> getConfig().getBungeeMethod().toString()));
+
+		metrics.addCustomChart(new BStatsMetricsBungee.SimplePie("sendtoallservers",
+				() -> "" + getConfig().getSendVotesToAllServers()));
+
+		metrics.addCustomChart(
+				new BStatsMetricsBungee.SimplePie("allowunjoined", () -> "" + getConfig().getAllowUnJoined()));
+
+		metrics.addCustomChart(
+				new BStatsMetricsBungee.SimplePie("pointsonvote", () -> "" + getConfig().getPointsOnVote()));
+
+		metrics.addCustomChart(new BStatsMetricsBungee.SimplePie("bungeemanagetotals",
+				() -> "" + getConfig().getBungeeManageTotals()));
+
+		metrics.addCustomChart(
+				new BStatsMetricsBungee.SimplePie("waitforuseronline", () -> "" + getConfig().getWaitForUserOnline()));
+
+		metrics.addCustomChart(
+				new BStatsMetricsBungee.SimplePie("globaldata_enabled", () -> "" + getConfig().getGlobalDataEnabled()));
+		if (getConfig().getGlobalDataEnabled()) {
+			metrics.addCustomChart(new BStatsMetricsBungee.SimplePie("globaldata_usemainmysql",
+					() -> "" + getConfig().getGlobalDataUseMainMySQL()));
+		}
+
+		metrics.addCustomChart(new BStatsMetricsBungee.SimplePie("multi_proxy_support_enabled",
+				() -> "" + getConfig().getMultiProxySupport()));
+
+		if (!buildNumber.equals("NOTSET")) {
+			metrics.addCustomChart(new BStatsMetricsBungee.SimplePie("dev_build_number", () -> "" + buildNumber));
+		}
+
+		loadVersionFile();
+
+		getLogger().info("VotingPlugin loaded, using method: " + getVotingPluginProxy().getMethod().toString()
+				+ ", PluginMessagingVersion: " + BungeeVersion.getPluginMessageVersion());
+		if (!buildNumber.equals("NOTSET")) {
+			getLogger().info("Detected using dev build number: " + buildNumber);
+		}
+		getVotingPluginProxy().sendServerNameMessage();
+
+	}
+
+	@EventHandler
+	public void onPluginMessage(PluginMessageEvent ev) {
+		if (!ev.getTag().equals(getConfig().getPluginMessageChannel().toLowerCase())) {
+			return;
+		}
+
+		ev.setCancelled(true);
+
+		if (!(ev.getSender() instanceof Server)) {
+			debug("Ignore plugin message");
+			return;
+		}
+
+		ByteArrayInputStream instream = new ByteArrayInputStream(ev.getData());
+		DataInputStream in = new DataInputStream(instream);
+		try {
+			getVotingPluginProxy().onPluginMessageReceived(in);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void reloadPlugin(boolean loadMysql) {
+		config.load();
+		if (loadMysql) {
+			try {
+				if (!config.getData().getString("Host", "").isEmpty()) {
+					loadMysql();
+				} else {
+					getLogger().severe("MySQL settings not set in bungeeconfig.yml");
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		getVotingPluginProxy().reload();
+	}
+
+	private void runAsyncNow(Runnable runnable) {
+		getProxy().getScheduler().runAsync(this, runnable);
+	}
+
+}

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

@@ -0,0 +1,42 @@
+package com.bencodez.votingplugin.bungee;
+
+import com.bencodez.votingplugin.bungee.proxy.VotingPluginProxyCommand;
+
+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")) {
+			String result = new VotingPluginProxyCommand(bungee.getVotingPluginProxy()).execute(args);
+			if (result != null) {
+				sender.sendMessage(new TextComponent(result.replace("&", "§")));
+			}
+		} 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/main/java/com/bencodez/votingplugin/bungee/global/multiproxy/MultiProxyHandler.java

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

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

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

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

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

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

@@ -0,0 +1,37 @@
+package com.bencodez.votingplugin.bungee.global.multiproxy;
+
+import java.util.Map;
+
+public class MultiProxyServerSocketConfigurationBungee implements MultiProxyServerSocketConfiguration {
+	private String server;
+	private String host = "";
+	private int port;
+
+	public MultiProxyServerSocketConfigurationBungee(String s, Map<String, Object> config) {
+		server = s;
+		if (config.containsKey("Host")) {
+			host = (String) config.get("Host");
+		}
+		if (config.containsKey("Port")) {
+			port = (int) config.get("Port");
+		} else {
+			port = 1298;
+		}
+	}
+
+	@Override
+	public String getHost() {
+		return host;
+	}
+
+	@Override
+	public int getPort() {
+		return port;
+	}
+
+	@Override
+	public String getServerName() {
+		return server;
+	}
+
+}

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

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

VotingPlugin/src/main/java/com/bencodez/votingplugin/bungee/proxy/VotingPluginProxyCommand.java

@@ -0,0 +1,121 @@
+package com.bencodez.votingplugin.bungee.proxy;
+
+import com.bencodez.advancedcore.api.time.TimeType;
+import com.bencodez.votingplugin.bungee.BungeeMethod;
+
+public class VotingPluginProxyCommand {
+	private VotingPluginProxy plugin;
+
+	public VotingPluginProxyCommand(VotingPluginProxy plugin) {
+		this.plugin = plugin;
+	}
+
+	/**
+	 * Execute the command and return a message as a String.
+	 *
+	 * @param args Command arguments
+	 * @return The resulting message to send
+	 */
+	public String execute(String[] args) {
+		if (args.length == 0)
+			return "&cPlease provide a valid command. Use 'help' to view all commands.";
+
+		switch (args[0].toLowerCase()) {
+		case "reload":
+			plugin.reloadCore(false);
+			return "&aReloading VotingPlugin";
+
+		case "reloadmysql":
+			plugin.reloadCore(true);
+			return "&aReloading VotingPlugin including MySQL";
+
+		case "vote":
+			if (args.length >= 3) {
+				String user = args[1];
+				String site = args[2];
+				plugin.vote(user, site, false, true, 0, null, null);
+				return "&aVote sent for " + user + " on " + site;
+			}
+			return "&cUsage: vote <player> <site>";
+
+		case "forcetimechange":
+			if (args.length >= 2) {
+				plugin.getBungeeTimeChecker().forceChanged(TimeType.getTimeType(args[1]));
+				return "&aTriggered time change to " + args[1];
+			}
+			return "&cUsage: forcetimechange <TimeType>";
+
+		case "status":
+			return handleStatusCommand();
+
+		case "multiproxystatus":
+			plugin.getMultiProxyHandler().sendMultiProxyServerMessage("Status");
+			return "&aSent status message across multi-proxy";
+
+		case "help":
+			return getHelpMessage();
+
+		case "voteparty":
+			return handleVotePartyCommand(args);
+
+		default:
+			return "&cUnknown command. Use 'help' to view all commands.";
+		}
+	}
+
+	private String handleStatusCommand() {
+		BungeeMethod method = plugin.getMethod();
+		switch (method) {
+		case SOCKETS:
+			plugin.status();
+			return "&aChecking status via sockets. Check console for details.";
+
+		case PLUGINMESSAGING:
+		case REDIS:
+			plugin.status();
+			plugin.sendServerNameMessage();
+			return "&aChecking status with method: " + method.toString().toLowerCase();
+
+		default:
+			return "&cStatus command unavailable for the current connection method.";
+		}
+	}
+
+	private String handleVotePartyCommand(String[] args) {
+		if (args.length > 1) {
+			if ("force".equalsIgnoreCase(args[1])) {
+				plugin.setCurrentVotePartyVotes(plugin.getCurrentVotePartyVotesRequired());
+				plugin.checkVoteParty();
+				return "&aVote party forced";
+			} else if ("setvotecount".equalsIgnoreCase(args[1]) && args.length > 2 && isInt(args[2])) {
+				plugin.setCurrentVotePartyVotes(Integer.parseInt(args[2]));
+				return "&aSet current vote party votes to " + args[2];
+			} else {
+				return "&cInvalid usage. Use 'help' for correct syntax.";
+			}
+		}
+		return "&cUsage: voteparty <force/setvotecount>";
+	}
+
+	private String getHelpMessage() {
+		StringBuilder helpBuilder = new StringBuilder("&aVotingPlugin Commands:\n");
+		helpBuilder.append("/votingplugin reload - Reload the plugin\n");
+		helpBuilder.append("/votingplugin reloadmysql - Reload the plugin including MySQL\n");
+		helpBuilder.append("/votingplugin vote <player> <site> - Send a vote\n");
+		helpBuilder.append("/votingplugin forcetimechange <TimeType> - Force a time change\n");
+		helpBuilder.append("/votingplugin status - Check connection status\n");
+		helpBuilder.append("/votingplugin multiproxystatus - Send status message across proxies\n");
+		helpBuilder.append("/votingplugin voteparty <force/setvotecount> - Trigger or modify vote party\n");
+		return helpBuilder.toString();
+	}
+
+	private boolean isInt(String str) {
+		try {
+			Integer.parseInt(str);
+			return true;
+		} catch (NumberFormatException e) {
+			return false;
+		}
+	}
+
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/bungee/proxy/VotingPluginProxyConfig.java

@@ -0,0 +1,127 @@
+package com.bencodez.votingplugin.bungee.proxy;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+public interface VotingPluginProxyConfig {
+
+	public boolean getAllowUnJoined();
+
+	public String getBedrockPlayerPrefix();
+
+	public List<String> getBlockedServers();
+
+	public boolean getBroadcast();
+
+	public String getBungeeHost();
+
+	public boolean getBungeeManageTotals();
+
+	public String getBungeeMethod();
+
+	public int getBungeePort();
+
+	public String getPluginMessageChannel();
+
+	public boolean getPluginMessageEncryption();
+
+	public boolean getDebug();
+
+	public String getFallBack();
+
+	public boolean getGlobalDataEnabled();
+
+	public boolean getGlobalDataUseMainMySQL();
+
+	public int getLimitVotePoints();
+
+	public int getMaxAmountOfVotesPerDay();
+
+	public String getMultiProxyMethod();
+
+	public boolean getMultiProxyOneGlobalReward();
+
+	public String getMultiProxyRedisHost();
+
+	public String getMultiProxyRedisPassword();
+
+	public int getMultiProxyRedisPort();
+
+	public boolean getMultiProxyRedisUseExistingConnection();
+
+	public String getMultiProxyRedisUsername();
+
+	public Collection<String> getMultiProxyServers();
+
+	public Map<String, Object> getMultiProxyServersConfiguration(String s);
+
+	public String getMultiProxySocketHostHost();
+
+	public int getMultiProxySocketHostPort();
+
+	public boolean getMultiProxySupport();
+
+	public boolean getOnlineMode();
+
+	public int getPointsOnVote();
+
+	public boolean getPrimaryServer();
+
+	public String getProxyServerName();
+
+	public List<String> getProxyServers();
+
+	public String getRedisHost();
+
+	public String getRedisPassword();
+
+	public int getRedisPort();
+
+	public String getRedisPrefix();
+
+	public String getRedisUsername();
+
+	public boolean getSendVotesToAllServers();
+
+	public Map<String, Object> getSpigotServerConfiguration(String s);
+
+	public Collection<String> getSpigotServers();
+
+	public boolean getStoreMonthTotalsWithDate();
+
+	public boolean getTimeChangeFailSafeBypass();
+
+	public int getTimeHourOffSet();
+
+	public String getTimeZone();
+
+	public boolean getUseMonthDateTotalsAsPrimaryTotal();
+
+	public boolean getUUIDLookup();
+
+	public int getVoteCacheTime();
+
+	public String getVotePartyBroadcast();
+
+	public List<String> getVotePartyBungeeCommands();
+
+	public boolean getVotePartyEnabled();
+
+	public int getVotePartyIncreaseVotesRequired();
+
+	public boolean getVotePartySendToAllServers();
+
+	public List<String> getVotePartyServersToSend();
+
+	public int getVotePartyVotesRequired();
+
+	public boolean getWaitForUserOnline();
+
+	public List<String> getWhiteListedServers();
+
+	public void load();
+
+	public void save();
+
+}

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

@@ -0,0 +1,288 @@
+package com.bencodez.votingplugin.bungee.velocity;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+import com.bencodez.simpleapi.file.velocity.VelocityYMLFile;
+import com.bencodez.votingplugin.bungee.proxy.VotingPluginProxyConfig;
+
+import ninja.leaping.configurate.ConfigurationNode;
+
+public class Config extends VelocityYMLFile implements VotingPluginProxyConfig {
+
+	public Config(File file) {
+		super(file);
+	}
+
+	public boolean getAllowUnJoined() {
+		return getBoolean(getNode("AllowUnJoined"), false);
+	}
+
+	public String getBedrockPlayerPrefix() {
+		return getString(getNode("BedrockPlayerPrefix"), ".");
+	}
+
+	public List<String> getBlockedServers() {
+		return getStringList(getNode("BlockedServers"), new ArrayList<>());
+	}
+
+	public boolean getBroadcast() {
+		return getBoolean(getNode("Broadcast"), false);
+	}
+
+	public String getBungeeHost() {
+		return getString(getNode("BungeeServer", "Host"), "");
+	}
+
+	public boolean getBungeeManageTotals() {
+		return getBoolean(getNode("BungeeManageTotals"), true);
+	}
+
+	public String getBungeeMethod() {
+		return getString(getNode("BungeeMethod"), "PLUGINMESSAGING");
+	}
+
+	public int getBungeePort() {
+		return getInt(getNode("BungeeServer", "Port"), 1297);
+	}
+
+	public boolean getDebug() {
+		return getBoolean(getNode("Debug"), false);
+	}
+
+	public String getFallBack() {
+		return getString(getNode("FallBackServer"), "");
+	}
+
+	public boolean getGlobalDataEnabled() {
+		return getBoolean(getNode("GlobalData", "Enabled"), false);
+	}
+
+	public boolean getGlobalDataUseMainMySQL() {
+		return getBoolean(getNode("GlobalData", "UseMainMySQL"), true);
+	}
+
+	public int getLimitVotePoints() {
+		return getInt(getNode("LimitVotePoints"), -1);
+	}
+
+	public int getMaxAmountOfVotesPerDay() {
+		return getInt(getNode("MaxAmountOfVotesPerDay"), -1);
+	}
+
+	public String getMultiProxyMethod() {
+		return getString(getNode("MultiProxyMethod"), "SOCKET");
+	}
+
+	public boolean getMultiProxyOneGlobalReward() {
+		return getBoolean(getNode("MultiProxyOneGlobalReward"), false);
+	}
+
+	public String getMultiProxyRedisHost() {
+		return getString(getNode("MultiProxyRedis", "Host"), "");
+	}
+
+	public String getMultiProxyRedisPassword() {
+		return getString(getNode("MultiProxyRedis", "Password"), "");
+	}
+
+	public int getMultiProxyRedisPort() {
+		return getInt(getNode("MultiProxyRedis", "Port"), 6379);
+	}
+
+	public boolean getMultiProxyRedisUseExistingConnection() {
+		return getBoolean(getNode("MultiProxyRedis", "UseExistingConnection"), false);
+	}
+
+	public String getMultiProxyRedisUsername() {
+		return getString(getNode("MultiProxyRedis", "Username"), "");
+	}
+
+	public @NonNull List<String> getMultiProxyServers() {
+		return getChildrenAsList(getNode("MultiProxyServers"));
+	}
+
+	public List<String> getChildrenAsList(ConfigurationNode config) {
+		List<String> children = new ArrayList<>();
+		if (config != null) {
+			for (Map.Entry<Object, ? extends ConfigurationNode> entry : config.getChildrenMap().entrySet()) {
+				children.add(entry.getKey().toString());
+			}
+		}
+		return children;
+	}
+
+	public Map<String, Object> getMultiProxyServersConfiguration(String s) {
+		return configToMap(getNode("MultiProxyServers", s));
+	}
+
+	public String getMultiProxySocketHostHost() {
+		return getString(getNode("MultiProxySocketHost", "Host"), "");
+	}
+
+	public int getMultiProxySocketHostPort() {
+		return getInt(getNode("MultiProxySocketHost", "Port"), 1297);
+	}
+
+	public boolean getMultiProxySupport() {
+		return getBoolean(getNode("MultiProxySupport"), false);
+	}
+
+	public ConfigurationNode getMysqlNode() {
+		return getNode("MySQL");
+	}
+
+	public boolean getOnlineMode() {
+		return getBoolean(getNode("OnlineMode"), true);
+	}
+
+	public int getPointsOnVote() {
+		return getInt(getNode("PointsOnVote"), 1);
+	}
+
+	public boolean getPrimaryServer() {
+		return getBoolean(getNode("PrimaryServer"), false);
+	}
+
+	public String getProxyServerName() {
+		return getString(getNode("ProxyServerName"), "SOCKET");
+	}
+
+	public List<String> getProxyServers() {
+		return getStringList(getNode("ProxyServers"), new ArrayList<>());
+	}
+
+	public String getRedisHost() {
+		return getString(getNode("Redis", "Host"), "");
+	}
+
+	public String getRedisPassword() {
+		return getString(getNode("Redis", "Password"), "");
+	}
+
+	public int getRedisPort() {
+		return getInt(getNode("Redis", "Port"), 6379);
+	}
+
+	public String getRedisPrefix() {
+		return getString(getNode("Redis", "Prefix"), "");
+	}
+
+	public String getRedisUsername() {
+		return getString(getNode("Redis", "Username"), "");
+	}
+
+	public boolean getSendVotesToAllServers() {
+		return getBoolean(getNode("SendVotesToAllServers"), true);
+	}
+
+	public Map<String, Object> getSpigotServerConfiguration(String s) {
+		return configToMap(getNode("SpigotServers", s));
+	}
+
+	public Map<String, Object> configToMap(ConfigurationNode config) {
+		Map<String, Object> map = new HashMap<>();
+		if (config != null) {
+			for (Map.Entry<Object, ? extends ConfigurationNode> entry : config.getChildrenMap().entrySet()) {
+				map.put(entry.getKey().toString(), entry.getValue().getValue());
+			}
+		}
+		return map;
+	}
+
+	public @NonNull List<String> getSpigotServers() {
+		return getChildrenAsList(getNode("SpigotServers"));
+	}
+
+	public boolean getStoreMonthTotalsWithDate() {
+		return getBoolean(getNode("StoreMonthTotalsWithDate"), false);
+	}
+
+	public boolean getTimeChangeFailSafeBypass() {
+		return getBoolean(getNode("TimeChangeFailSafeBypass"), false);
+	}
+
+	public boolean getUseMonthDateTotalsAsPrimaryTotal() {
+		return getBoolean(getNode("UseMonthDateTotalsAsPrimaryTotal"), false);
+	}
+
+	public boolean getUUIDLookup() {
+		return getBoolean(getNode("UUIDLookup"), true);
+	}
+
+	public int getVoteCacheTime() {
+		return getInt(getNode("VoteCacheTime"), -1);
+	}
+
+	public String getVotePartyBroadcast() {
+		return getString(getVotePartyNode().getNode("Broadcast"), "");
+	}
+
+	public List<String> getVotePartyBungeeCommands() {
+		return getStringList(getVotePartyNode().getNode("BungeeCommands"), new ArrayList<>());
+	}
+
+	public boolean getVotePartyEnabled() {
+		return getBoolean(getVotePartyNode().getNode("Enabled"), false);
+	}
+
+	public int getVotePartyIncreaseVotesRequired() {
+		return getInt(getVotePartyNode().getNode("IncreaseVotesRequired"), 0);
+	}
+
+	public ConfigurationNode getVotePartyNode() {
+		return getNode("VoteParty");
+	}
+
+	public boolean getVotePartySendToAllServers() {
+		return getBoolean(getVotePartyNode().getNode("SendToAllServers"), false);
+	}
+
+	public List<String> getVotePartyServersToSend() {
+		return getStringList(getVotePartyNode().getNode("ServersToSend"), new ArrayList<>());
+	}
+
+	public int getVotePartyVotesRequired() {
+		return getInt(getVotePartyNode().getNode("VotesRequired"), 100);
+	}
+
+	public boolean getWaitForUserOnline() {
+		return getBoolean(getNode("WaitForUserOnline"), false);
+	}
+
+	public List<String> getWhiteListedServers() {
+		return getStringList(getNode("WhiteListedServers"), new ArrayList<>());
+	}
+
+	@Override
+	public int getTimeHourOffSet() {
+		return getInt(getNode("TimeHourOffSet"), 0);
+	}
+
+	@Override
+	public String getTimeZone() {
+		return getString(getNode("TimeZone"), "");
+	}
+
+	@Override
+	public void load() {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public String getPluginMessageChannel() {
+		return getString(getNode("PluginMessageChannel"), "vp:vp");
+	}
+
+	@Override
+	public boolean getPluginMessageEncryption() {
+		return getBoolean(getNode("PluginMessageEncryption"), false);
+	}
+
+}

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

@@ -2,10 +2,10 @@ package com.bencodez.votingplugin.bungee.velocity;
 
 import java.io.File;
 
-import com.bencodez.advancedcore.bungeeapi.velocity.VelocityYMLFile;
+import com.bencodez.simpleapi.file.velocity.VelocityJSONFile;
 import com.velocitypowered.api.proxy.Player;
 
-public class NonVotedPlayersCache extends VelocityYMLFile {
+public class NonVotedPlayersCache extends VelocityJSONFile {
 
 	private VotingPluginVelocity plugin;
 
@@ -15,17 +15,23 @@ public class NonVotedPlayersCache extends VelocityYMLFile {
 	}
 
 	public void addPlayer(Player player) {
-		if (!plugin.getMysql().containsKeyQuery(player.getUniqueId().toString())) {
+		if (!plugin.getVotingPluginProxy().getProxyMySQL().containsKeyQuery(player.getUniqueId().toString())) {
 			addPlayer(player.getUniqueId().toString(), player.getUsername());
 		}
 	}
 
-	private void addPlayer(String uuid, String playerName) {
+	public void addPlayer(String uuid, String playerName) {
 		getNode("NonVotedPlayers", playerName, "UUID").setValue(uuid);
 		getNode("NonVotedPlayers", playerName, "LastTime").setValue(System.currentTimeMillis());
 		save();
 	}
 
+	public void addPlayerCheck(String uuid, String playerName) {
+		if (!plugin.getVotingPluginProxy().getProxyMySQL().containsKeyQuery(uuid)) {
+			addPlayer(uuid, playerName);
+		}
+	}
+
 	public void check() {
 		for (String player : getKeys(getNode("NonVotedPlayers"))) {
 			long time = getNode("NonVotedPlayers", player, "LastTime").getLong(0);
@@ -34,7 +40,7 @@ public class NonVotedPlayersCache extends VelocityYMLFile {
 			} else {
 				String uuid = getNode("NonVotedPlayers", player, "UUID").getString("");
 				if (!uuid.isEmpty()) {
-					if (plugin.getMysql().containsKeyQuery(uuid)) {
+					if (plugin.getVotingPluginProxy().getProxyMySQL().containsKeyQuery(uuid)) {
 						remove(player);
 					}
 				} else {

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

@@ -3,74 +3,48 @@ package com.bencodez.votingplugin.bungee.velocity;
 import java.io.File;
 import java.util.Collection;
 
-import com.bencodez.advancedcore.bungeeapi.velocity.VelocityYMLFile;
+import com.bencodez.simpleapi.file.velocity.VelocityJSONFile;
 import com.bencodez.votingplugin.bungee.OfflineBungeeVote;
 import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
 
 import ninja.leaping.configurate.ConfigurationNode;
 
-public class VoteCache extends VelocityYMLFile {
+public class VoteCache extends VelocityJSONFile {
 
 	public VoteCache(File file) {
 		super(file);
 	}
 
-	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 addTimedVote(int num, VoteTimeQueue voteTimedQueue) {
+		getNode("TimedVoteCache", "" + num, "Name").setValue(voteTimedQueue.getName());
+		getNode("TimedVoteCache", "" + num, "Service").setValue(voteTimedQueue.getService());
+		getNode("TimedVoteCache", "" + num, "Time").setValue(voteTimedQueue.getTime());
 	}
 
 	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());
+		getNode("VoteCache", server, "" + num, "Name").setValue(voteData.getPlayerName());
+		getNode("VoteCache", server, "" + num, "Service").setValue(voteData.getService());
+		getNode("VoteCache", server, "" + num, "UUID").setValue(voteData.getUuid());
+		getNode("VoteCache", server, "" + num, "Time").setValue(voteData.getTime());
+		getNode("VoteCache", server, "" + num, "Real").setValue(voteData.isRealVote());
+		getNode("VoteCache", server, "" + num, "Text").setValue(voteData.getText());
 	}
 
 	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());
+		getNode("OnlineCache", player, "" + num, "Name").setValue(voteData.getPlayerName());
+		getNode("OnlineCache", player, "" + num, "Service").setValue(voteData.getService());
+		getNode("OnlineCache", player, "" + num, "UUID").setValue(voteData.getUuid());
+		getNode("OnlineCache", player, "" + num, "Time").setValue(voteData.getTime());
+		getNode("OnlineCache", player, "" + num, "Real").setValue(voteData.isRealVote());
+		getNode("OnlineCache", player, "" + num, "Text").setValue(voteData.getText());
 	}
 
 	public void clearData() {
 		getNode("VoteCache").setValue(null);
 		getNode("OnlineCache").setValue(null);
+		getNode("TimedVoteCache").setValue(null);
 		save();
 	}
 
@@ -78,10 +52,6 @@ public class VoteCache extends VelocityYMLFile {
 		return getKeys(getNode("OnlineCache", name));
 	}
 
-	public ConfigurationNode getTimedVoteCache(String name) {
-		return getNode("TimedVoteCache", name);
-	}
-
 	public ConfigurationNode getOnlineVotes(String name, String num) {
 		return getNode("OnlineCache", name, num);
 	}
@@ -94,16 +64,44 @@ public class VoteCache extends VelocityYMLFile {
 		return getKeys(getNode("VoteCache"));
 	}
 
-	public Collection<String> getTimedVoteCache() {
-		return getKeys(getNode("TimedVoteCache"));
-	}
-
 	public Collection<String> getServerVotes(String server) {
-		return getKeys(getNode("OnlineCache", server));
+		return getKeys(getNode("VoteCache", server));
 	}
 
 	public ConfigurationNode getServerVotes(String server, String num) {
 		return getNode("VoteCache", server, num);
 	}
 
+	public Collection<String> getTimedVoteCache() {
+		return getKeys(getNode("TimedVoteCache"));
+	}
+
+	public ConfigurationNode getTimedVoteCache(String name) {
+		return getNode("TimedVoteCache", name);
+	}
+
+	public int getVotePartyCache(String server) {
+		return getNode("VoteParty").getNode("Cache").getNode(server).getInt(0);
+	}
+
+	public int getVotePartyCurrentVotes() {
+		return getInt(getNode("VoteParty").getNode("CurrentVotes"), 0);
+	}
+
+	public int getVotePartyInreaseVotesRequired() {
+		return getInt(getNode("VoteParty").getNode("IncreaseVotes"), 0);
+	}
+
+	public void setVotePartyCache(String server, int amount) {
+		getNode("VoteParty").getNode("Cache").getNode(server).setValue(amount);
+	}
+
+	public void setVotePartyCurrentVotes(int amount) {
+		getNode("VoteParty").getNode("CurrentVotes").setValue(amount);
+	}
+
+	public void setVotePartyInreaseVotesRequired(int amount) {
+		getNode("VoteParty").getNode("IncreaseVotes").setValue(amount);
+	}
+
 }

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

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

VotingPlugin/src/main/java/com/bencodez/votingplugin/bungee/velocity/VotingPluginVelocity.java

@@ -0,0 +1,925 @@
+package com.bencodez.votingplugin.bungee.velocity;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.security.CodeSource;
+import java.sql.SQLException;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import org.bstats.charts.SimplePie;
+import org.bstats.velocity.Metrics;
+import org.slf4j.Logger;
+
+import com.bencodez.advancedcore.api.time.TimeType;
+import com.bencodez.advancedcore.api.user.userstorage.DataType;
+import com.bencodez.advancedcore.api.user.userstorage.mysql.api.config.MysqlConfigVelocity;
+import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalDataHandlerProxy;
+import com.bencodez.advancedcore.bungeeapi.globaldata.GlobalMySQL;
+import com.bencodez.advancedcore.bungeeapi.mysql.VelocityMySQL;
+import com.bencodez.simpleapi.file.velocity.VelocityYMLFile;
+import com.bencodez.votingplugin.bungee.BungeeMethod;
+import com.bencodez.votingplugin.bungee.BungeeVersion;
+import com.bencodez.votingplugin.bungee.OfflineBungeeVote;
+import com.bencodez.votingplugin.bungee.proxy.VotingPluginProxy;
+import com.bencodez.votingplugin.bungee.proxy.VotingPluginProxyConfig;
+import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
+import com.bencodez.votingplugin.topvoter.TopVoter;
+import com.google.inject.Inject;
+import com.velocitypowered.api.command.CommandMeta;
+import com.velocitypowered.api.event.Subscribe;
+import com.velocitypowered.api.event.connection.PluginMessageEvent;
+import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
+import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
+import com.velocitypowered.api.plugin.Dependency;
+import com.velocitypowered.api.plugin.Plugin;
+import com.velocitypowered.api.plugin.annotation.DataDirectory;
+import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.ProxyServer;
+import com.velocitypowered.api.proxy.ServerConnection;
+import com.velocitypowered.api.proxy.messages.ChannelIdentifier;
+import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
+import com.velocitypowered.api.proxy.server.RegisteredServer;
+
+import lombok.Getter;
+import net.kyori.adventure.text.Component;
+import ninja.leaping.configurate.ConfigurationNode;
+import ninja.leaping.configurate.yaml.YAMLConfigurationLoader;
+
+@Plugin(id = "votingplugin", name = "VotingPlugin", version = "1.0", url = "https://www.spigotmc.org/resources/votingplugin.15358/", description = "VotingPlugin Velocity Version", authors = {
+		"BenCodez" }, dependencies = { @Dependency(id = "nuvotifier", optional = true) })
+public class VotingPluginVelocity {
+
+	private ChannelIdentifier CHANNEL;
+
+	@Getter
+	private Config config;
+	private final Path dataDirectory;
+	@Getter
+	private final Logger logger;
+
+	private final Metrics.Factory metricsFactory;
+
+	private NonVotedPlayersCache nonVotedPlayersCache;
+
+	private final ProxyServer server;
+
+	private VoteCache voteCacheFile;
+
+	private String version = "";
+
+	private File versionFile;
+
+	private String buildNumber = "NOTSET";
+
+	@Getter
+	private ScheduledExecutorService timer;
+
+	@Inject
+	public VotingPluginVelocity(ProxyServer server, Logger logger, Metrics.Factory metricsFactory,
+			@DataDirectory Path dataDirectory) {
+		this.server = server;
+		this.logger = logger;
+		this.dataDirectory = dataDirectory;
+		this.metricsFactory = metricsFactory;
+		timer = Executors.newScheduledThreadPool(1);
+	}
+
+	public void debug(String msg) {
+		if (config.getDebug()) {
+			logger.info("Debug: " + msg);
+		}
+	}
+
+	public void debug2(String msg) {
+		debug(msg);
+	}
+
+	public Set<String> getAvailableAllServers() {
+		Set<String> servers = new HashSet<>();
+		if (config.getWhiteListedServers().isEmpty()) {
+			for (RegisteredServer s : server.getAllServers()) {
+				if (!config.getBlockedServers().contains(s.getServerInfo().getName())) {
+					servers.add(s.getServerInfo().getName());
+				}
+			}
+		} else {
+			for (RegisteredServer s : server.getAllServers()) {
+				if (config.getWhiteListedServers().contains(s.getServerInfo().getName())) {
+					servers.add(s.getServerInfo().getName());
+				}
+			}
+		}
+
+		return servers;
+	}
+
+	public String getProperPlayerName(String uuid, String currentName) {
+		if (server.getPlayer(UUID.fromString(uuid)).isPresent()) {
+			Player p = server.getPlayer(UUID.fromString(uuid)).get();
+			if (p != null && p.isActive()) {
+				return p.getUsername();
+			}
+		}
+		return currentName;
+	}
+
+	private void getVersionFile() {
+		try {
+			CodeSource src = this.getClass().getProtectionDomain().getCodeSource();
+			if (src != null) {
+				URL jar = src.getLocation();
+				ZipInputStream zip = null;
+				zip = new ZipInputStream(jar.openStream());
+				while (true) {
+					ZipEntry e = zip.getNextEntry();
+					if (e != null) {
+						String name = e.getName();
+						if (name.equals("votingpluginversion.yml")) {
+							Reader defConfigStream = new InputStreamReader(zip);
+							if (defConfigStream != null) {
+								versionFile = new File(dataDirectory.toFile(),
+										"tmp" + File.separator + "votingpluginversion.yml");
+								if (!versionFile.exists()) {
+									versionFile.getParentFile().mkdirs();
+									versionFile.createNewFile();
+								}
+								FileWriter fileWriter = new FileWriter(versionFile);
+
+								int charVal;
+								while ((charVal = defConfigStream.read()) != -1) {
+									fileWriter.append((char) charVal);
+								}
+
+								fileWriter.close();
+								YAMLConfigurationLoader loader = YAMLConfigurationLoader.builder().setFile(versionFile)
+										.build();
+								defConfigStream.close();
+								ConfigurationNode node = loader.load();
+								if (node != null) {
+									version = node.getNode("version").getString("");
+									buildNumber = node.getNode("buildnumber").getString("NOTSET");
+								}
+								return;
+							}
+						}
+					}
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	private void loadMysql() {
+		votingPluginProxy.setProxyMySQL(new VelocityMySQL("VotingPlugin_Users", config) {
+
+			@Override
+			public void debug(SQLException e) {
+				if (config.getDebug()) {
+					e.printStackTrace();
+				}
+			}
+
+			@Override
+			public void severe(String str) {
+				getLogger().error(str);
+			}
+		});
+
+		ArrayList<String> servers = new ArrayList<>();
+		for (String s : getAvailableAllServers()) {
+			servers.add(s);
+		}
+
+		if (config.getGlobalDataEnabled()) {
+			if (config.getGlobalDataUseMainMySQL()) {
+				votingPluginProxy.setGlobalDataHandler(new GlobalDataHandlerProxy(
+						new GlobalMySQL("VotingPlugin_GlobalData", getVotingPluginProxy().getProxyMySQL().getMysql()) {
+
+							@Override
+							public void debug(Exception e) {
+								if (config.getDebug()) {
+									e.printStackTrace();
+								}
+							}
+
+							@Override
+							public void debug(String text) {
+								debug2(text);
+							}
+
+							@Override
+							public void info(String text) {
+								logger.info(text);
+							}
+
+							@Override
+							public void severe(String text) {
+								logger.error(text);
+							}
+
+							@Override
+							public void warning(String text) {
+								logger.warn(text);
+							}
+						}, servers) {
+
+					@Override
+					public void onTimeChangedFailed(String server, TimeType type) {
+						getVotingPluginProxy().getGlobalDataHandler().setBoolean(server, type.toString(), false);
+						getVotingPluginProxy().getGlobalDataHandler().setBoolean(server, "FinishedProcessing", true);
+						getVotingPluginProxy().getGlobalDataHandler().setBoolean(server, "Processing", false);
+					}
+
+					@Override
+					public void onTimeChangedFinished(TimeType type) {
+						if (type.equals(TimeType.MONTH)) {
+							getVotingPluginProxy().getProxyMySQL().copyColumnData(TopVoter.Monthly.getColumnName(),
+									"LastMonthTotal");
+						}
+						getVotingPluginProxy().getProxyMySQL().wipeColumnData(TopVoter.of(type).getColumnName(),
+								DataType.INTEGER);
+
+						if (!config.getGlobalDataEnabled()) {
+							return;
+						}
+						for (String s : getAvailableAllServers()) {
+							getVotingPluginProxy().getGlobalDataHandler().setBoolean(s, "ForceUpdate", true);
+							if (getVotingPluginProxy().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
+								getVotingPluginProxy().sendPluginMessageServer(s, "BungeeTimeChange", "");
+							} else if (getVotingPluginProxy().getMethod().equals(BungeeMethod.SOCKETS)) {
+								getVotingPluginProxy().sendServerMessage(s, "BungeeTimeChange");
+							}
+						}
+
+						getVotingPluginProxy().processQueue();
+					}
+				});
+			} else {
+				votingPluginProxy.setGlobalDataHandler(new GlobalDataHandlerProxy(
+						new GlobalMySQL("VotingPlugin_GlobalData", new MysqlConfigVelocity("GlobalData", config)) {
+
+							@Override
+							public void debug(Exception e) {
+								if (config.getDebug()) {
+									e.printStackTrace();
+								}
+							}
+
+							@Override
+							public void debug(String text) {
+								debug2(text);
+							}
+
+							@Override
+							public void info(String text) {
+								logger.info(text);
+							}
+
+							@Override
+							public void severe(String text) {
+								logger.error(text);
+							}
+
+							@Override
+							public void warning(String text) {
+								logger.warn(text);
+							}
+						}, servers) {
+
+					@Override
+					public void onTimeChangedFailed(String server, TimeType type) {
+						getVotingPluginProxy().getGlobalDataHandler().setBoolean(server, type.toString(), false);
+						getVotingPluginProxy().getGlobalDataHandler().setBoolean(server, "FinishedProcessing", true);
+						getVotingPluginProxy().getGlobalDataHandler().setBoolean(server, "Processing", false);
+					}
+
+					@Override
+					public void onTimeChangedFinished(TimeType type) {
+						if (type.equals(TimeType.MONTH)) {
+							getVotingPluginProxy().getProxyMySQL().copyColumnData(TopVoter.Monthly.getColumnName(),
+									"LastMonthTotal");
+						}
+						getVotingPluginProxy().getProxyMySQL().wipeColumnData(TopVoter.of(type).getColumnName(),
+								DataType.INTEGER);
+
+						if (!config.getGlobalDataEnabled()) {
+							return;
+						}
+						for (String s : getAvailableAllServers()) {
+							getVotingPluginProxy().getGlobalDataHandler().setBoolean(s, "ForceUpdate", true);
+							if (getVotingPluginProxy().getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
+								getVotingPluginProxy().sendPluginMessageServer(s, "BungeeTimeChange", "");
+							} else if (getVotingPluginProxy().getMethod().equals(BungeeMethod.SOCKETS)) {
+								getVotingPluginProxy().sendServerMessage(s, "BungeeTimeChange");
+							}
+						}
+
+						getVotingPluginProxy().processQueue();
+					}
+
+				});
+			}
+			getVotingPluginProxy().getGlobalDataHandler().getGlobalMysql().alterColumnType("IgnoreTime", "VARCHAR(5)");
+			getVotingPluginProxy().getGlobalDataHandler().getGlobalMysql().alterColumnType("MONTH", "VARCHAR(5)");
+			getVotingPluginProxy().getGlobalDataHandler().getGlobalMysql().alterColumnType("WEEK", "VARCHAR(5)");
+			getVotingPluginProxy().getGlobalDataHandler().getGlobalMysql().alterColumnType("DAY", "VARCHAR(5)");
+			getVotingPluginProxy().getGlobalDataHandler().getGlobalMysql().alterColumnType("FinishedProcessing",
+					"VARCHAR(5)");
+			getVotingPluginProxy().getGlobalDataHandler().getGlobalMysql().alterColumnType("Processing", "VARCHAR(5)");
+			getVotingPluginProxy().getGlobalDataHandler().getGlobalMysql().alterColumnType("ForceUpdate", "VARCHAR(5)");
+			getVotingPluginProxy().getGlobalDataHandler().getGlobalMysql().alterColumnType("LastUpdated", "MEDIUMTEXT");
+		}
+
+		// column types
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("TopVoterIgnore", "VARCHAR(5)");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("CheckWorld", "VARCHAR(5)");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("Reminded", "VARCHAR(5)");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("DisableBroadcast", "VARCHAR(5)");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("LastOnline", "VARCHAR(20)");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("PlayerName", "VARCHAR(30)");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("DailyTotal", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("WeeklyTotal", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("DayVoteStreak", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("BestDayVoteStreak", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("WeekVoteStreak", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("BestWeekVoteStreak", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("VotePartyVotes", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("MonthVoteStreak", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("Points", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("HighestDailyTotal", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("AllTimeTotal", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("HighestMonthlyTotal", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("MilestoneCount", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("MonthTotal", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("LastWeeklyTotal", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("LastDailyTotal", "INT DEFAULT '0'");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("OfflineRewards", "MEDIUMTEXT");
+		getVotingPluginProxy().getProxyMySQL().alterColumnType("DayVoteStreakLastUpdate", "MEDIUMTEXT");
+		if (config.getStoreMonthTotalsWithDate()) {
+			getVotingPluginProxy().getProxyMySQL().alterColumnType(
+					getVotingPluginProxy().getMonthTotalsWithDatePath(LocalDateTime.now()), "INT DEFAULT '0'");
+			getVotingPluginProxy().getProxyMySQL().alterColumnType(
+					getVotingPluginProxy().getMonthTotalsWithDatePath(LocalDateTime.now().plusMonths(1)),
+					"INT DEFAULT '0'");
+			getVotingPluginProxy().getProxyMySQL().alterColumnType(
+					getVotingPluginProxy().getMonthTotalsWithDatePath(LocalDateTime.now().plusMonths(2)),
+					"INT DEFAULT '0'");
+		}
+	}
+
+	@Subscribe
+	public void onPluginMessagingReceived(PluginMessageEvent event) {
+		if (event.getIdentifier().getId().equals(CHANNEL.getId())) {
+			event.setResult(PluginMessageEvent.ForwardResult.handled());
+
+	        if (!(event.getSource() instanceof ServerConnection)) {
+	            return;
+	        }
+			
+			ByteArrayInputStream instream = new ByteArrayInputStream(event.getData());
+			DataInputStream in = new DataInputStream(instream);
+			try {
+				getVotingPluginProxy().onPluginMessageReceived(in);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	@Subscribe
+	public void onProxyDisable(ProxyShutdownEvent event) {
+		if (votingPluginProxy.getMethod().equals(BungeeMethod.PLUGINMESSAGING)) {
+			logger.info("VotingPlugin saving vote cache: " + getVotingPluginProxy().getCachedVotes().size() + "/"
+					+ getVotingPluginProxy().getCachedOnlineVotes().size());
+			for (Entry<String, ArrayList<OfflineBungeeVote>> entry : getVotingPluginProxy().getCachedVotes()
+					.entrySet()) {
+				String server = entry.getKey();
+				int num = 0;
+				for (OfflineBungeeVote voteData : entry.getValue()) {
+					voteCacheFile.addVote(server, num, voteData);
+					num++;
+				}
+			}
+			for (Entry<String, ArrayList<OfflineBungeeVote>> entry : getVotingPluginProxy().getCachedOnlineVotes()
+					.entrySet()) {
+				String name = entry.getKey();
+				int num = 0;
+				for (OfflineBungeeVote voteData : entry.getValue()) {
+					voteCacheFile.addVoteOnline(name, num, voteData);
+					num++;
+				}
+			}
+		}
+		if (!getVotingPluginProxy().getTimeChangeQueue().isEmpty()) {
+			int num = 0;
+			for (VoteTimeQueue vote : getVotingPluginProxy().getTimeChangeQueue()) {
+				voteCacheFile.addTimedVote(num, vote);
+				num++;
+			}
+		}
+		getVotingPluginProxy().onDisable();
+
+		voteCacheFile.save();
+		nonVotedPlayersCache.save();
+
+		logger.info("VotingPlugin disabled");
+	}
+
+	@Getter
+	public VotingPluginProxy votingPluginProxy;
+
+	@Subscribe
+	public void onProxyInitialization(ProxyInitializeEvent event) {
+		File configFile = new File(dataDirectory.toFile(), "bungeeconfig.yml");
+		configFile.getParentFile().mkdirs();
+		if (!configFile.exists()) {
+			try {
+				configFile.createNewFile();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+
+			InputStream toCopyStream = VotingPluginVelocity.class.getClassLoader()
+					.getResourceAsStream("bungeeconfig.yml");
+
+			try (FileOutputStream fos = new FileOutputStream(configFile)) {
+				byte[] buf = new byte[2048];
+				int r;
+				while (-1 != (r = toCopyStream.read(buf))) {
+					fos.write(buf, 0, r);
+				}
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+
+		config = new Config(configFile);
+		String[] channel = config.getPluginMessageChannel().split(":");
+		CHANNEL = MinecraftChannelIdentifier.create(channel[0].toLowerCase(), channel[1].toLowerCase());
+		server.getChannelRegistrar().register(CHANNEL);
+
+		CommandMeta meta = server.getCommandManager().metaBuilder("votingpluginbungee")
+				// Specify other aliases (optional)
+				.aliases("vpb").build();
+
+		server.getCommandManager().register(meta, new VotingPluginVelocityCommand(this));
+
+		votingPluginProxy = new VotingPluginProxy() {
+
+			@Override
+			public void addNonVotedPlayer(String uuid, String playerName) {
+				nonVotedPlayersCache.addPlayer(uuid, playerName);
+			}
+
+			@Override
+			public void broadcast(String message) {
+				server.getAllPlayers().forEach(player -> player.sendMessage(Component.text(message)));
+			}
+
+			@Override
+			public void debug(String str) {
+				debug2(str);
+			}
+
+			@Override
+			public Set<String> getAllAvailableServers() {
+				return getAvailableAllServers();
+			}
+
+			@Override
+			public VotingPluginProxyConfig getConfig() {
+				return config;
+			}
+
+			@Override
+			public String getCurrentPlayerServer(String player) {
+				if (server.getPlayer(player).isPresent()) {
+					return server.getPlayer(player).get().getCurrentServer().get().getServer().getServerInfo()
+							.getName();
+				}
+				return "";
+			}
+
+			@Override
+			public File getDataFolderPlugin() {
+				return dataDirectory.toFile();
+			}
+
+			@Override
+			public String getProperName(String uuid, String playerName) {
+				return getProperPlayerName(uuid, playerName);
+			}
+
+			@Override
+			public String getUUID(String playerName) {
+
+				if (!config.getOnlineMode()) {
+					return UUID.nameUUIDFromBytes(("OfflinePlayer:" + playerName).getBytes(StandardCharsets.UTF_8))
+							.toString();
+				}
+				if (server.getPlayer(playerName).isPresent()) {
+					Player p = server.getPlayer(playerName).get();
+					if (p != null && p.isActive()) {
+						return p.getUniqueId().toString();
+					}
+				}
+				for (Entry<UUID, String> entry : getVotingPluginProxy().getUuidPlayerNameCache().entrySet()) {
+					if (entry.getValue().equalsIgnoreCase(playerName)) {
+						return entry.getKey().toString();
+					}
+				}
+				if (getVotingPluginProxy().getProxyMySQL() != null) {
+					String str = getVotingPluginProxy().getProxyMySQL().getUUID(playerName);
+					if (str != null) {
+						return str;
+					}
+				}
+				if (nonVotedPlayersCache != null) {
+					return nonVotedPlayersCache.playerExists(playerName);
+				}
+				return "";
+
+			}
+
+			@Override
+			public String getPluginVersion() {
+				return version;
+			}
+
+			@Override
+			public int getVoteCacheCurrentVotePartyVotes() {
+				return voteCacheFile.getVotePartyCurrentVotes();
+			}
+
+			@Override
+			public long getVoteCacheLastUpdated() {
+				return voteCacheFile.getNode("Time", "LastUpdated").getLong();
+			}
+
+			@Override
+			public int getVoteCachePrevDay() {
+				return voteCacheFile.getNode("Time", "Day").getInt();
+			}
+
+			@Override
+			public String getVoteCachePrevMonth() {
+				return voteCacheFile.getNode("Time", "Month").getString("");
+			}
+
+			@Override
+			public int getVoteCachePrevWeek() {
+				return voteCacheFile.getNode("Time", "Week").getInt();
+			}
+
+			@Override
+			public int getVoteCacheVotePartyIncreaseVotesRequired() {
+				return voteCacheFile.getVotePartyInreaseVotesRequired();
+			}
+
+			@Override
+			public boolean isPlayerOnline(String playerName) {
+				if (playerName == null) {
+					return false;
+				}
+				if (server.getPlayer(playerName).isPresent()) {
+					return server.getPlayer(playerName).get().isActive();
+				}
+				return false;
+			}
+
+			@Override
+			public boolean isServerValid(String serverName) {
+				return server.getServer(serverName).isPresent();
+			}
+
+			@Override
+			public boolean isSomeoneOnlineServer(String serverName) {
+				if (server.getServer(serverName).isPresent()) {
+					return !server.getServer(serverName).get().getPlayersConnected().isEmpty();
+				}
+				return false;
+			}
+
+			@Override
+			public boolean isVoteCacheIgnoreTime() {
+				return voteCacheFile.getNode("Time", "IgnoreTime").getBoolean();
+			}
+
+			@Override
+			public void log(String message) {
+				getLogger().info(message);
+			}
+
+			@Override
+			public void logSevere(String message) {
+				logger.error(message);
+			}
+
+			@Override
+			public void runAsync(Runnable run) {
+				runAsyncNow(run);
+			}
+
+			@Override
+			public void runConsoleCommand(String command) {
+				server.getCommandManager().executeAsync(server.getConsoleCommandSource(), command);
+			}
+
+			@Override
+			public void saveVoteCacheFile() {
+				voteCacheFile.save();
+			}
+
+			@Override
+			public void sendPluginMessageData(String serverName, String channel, byte[] data, boolean queue) {
+				if (!server.getServer(serverName).isPresent()) {
+					return;
+				}
+				RegisteredServer send = server.getServer(serverName).get();
+				send.sendPluginMessage(CHANNEL, data);
+			}
+
+			@Override
+			public void setVoteCacheLastUpdated() {
+				voteCacheFile.getNode("Time", "LastUpdated").setValue(System.currentTimeMillis());
+				voteCacheFile.save();
+			}
+
+			@Override
+			public void setVoteCachePrevDay(int day) {
+				voteCacheFile.getNode("Time", "Day").setValue(day);
+				voteCacheFile.save();
+			}
+
+			@Override
+			public void setVoteCachePrevMonth(String text) {
+				voteCacheFile.getNode("Time", "Month").setValue(text);
+				voteCacheFile.save();
+			}
+
+			@Override
+			public void setVoteCachePrevWeek(int week) {
+				voteCacheFile.getNode("Time", "Week").setValue(week);
+				voteCacheFile.save();
+			}
+
+			@Override
+			public void setVoteCacheVoteCacheIgnoreTime(boolean ignore) {
+				voteCacheFile.getNode("Time", "IgnoreTime").setValue(ignore);
+				voteCacheFile.save();
+			}
+
+			@Override
+			public void setVoteCacheVotePartyCurrentVotes(int votes) {
+				voteCacheFile.setVotePartyCurrentVotes(votes);
+			}
+
+			@Override
+			public void setVoteCacheVotePartyIncreaseVotesRequired(int votes) {
+				voteCacheFile.setVotePartyInreaseVotesRequired(votes);
+
+			}
+
+			@Override
+			public void warn(String message) {
+				logger.warn(message);
+			}
+
+			@Override
+			public void reloadCore(boolean mysql) {
+				reloadPlugin(mysql);
+			}
+
+		};
+
+		try {
+			Class.forName("com.vexsoftware.votifier.velocity.event.VotifierEvent");
+		} catch (ClassNotFoundException e) {
+			getVotingPluginProxy().setVotifierEnabled(false);
+		}
+		if (getVotingPluginProxy().isVotifierEnabled()) {
+			try {
+				server.getEventManager().register(this, new VoteEventVelocity(this));
+			} catch (Exception e) {
+				getVotingPluginProxy().setVotifierEnabled(false);
+			}
+		}
+
+		boolean mysqlLoaded = true;
+		try {
+			if (!config.getString(config.getNode("Host"), "").isEmpty()) {
+				loadMysql();
+			} else {
+				mysqlLoaded = false;
+				logger.error("MySQL settings not set in bungeeconfig.yml");
+			}
+		} catch (Exception e) {
+			mysqlLoaded = false;
+			e.printStackTrace();
+		}
+
+		if (mysqlLoaded) {
+
+			voteCacheFile = new VoteCache(new File(dataDirectory.toFile(), "votecache.json"));
+
+			// convert yml file if exists
+			File yamlVoteCacheFile = new File(dataDirectory.toFile(), "votecache.yml");
+			if (yamlVoteCacheFile.exists()) {
+				VelocityYMLFile yamlVoteCache = new VelocityYMLFile(yamlVoteCacheFile);
+				voteCacheFile.setConf(yamlVoteCache.getData());
+				yamlVoteCacheFile.renameTo(new File(dataDirectory.toFile(), "oldvotecache.yml"));
+				VelocityYMLFile oldYamlVoteCache = new VelocityYMLFile(
+						new File(dataDirectory.toFile(), "oldvotecache.yml"));
+				oldYamlVoteCache.setConf(yamlVoteCache.getData());
+				voteCacheFile.save();
+			}
+
+			nonVotedPlayersCache = new NonVotedPlayersCache(
+					new File(dataDirectory.toFile(), "nonvotedplayerscache.json"), this);
+
+			// convert yml file if exists
+			File yamlnonVotedPlayersCacheFile = new File(dataDirectory.toFile(), "nonvotedplayerscache.yml");
+			if (yamlnonVotedPlayersCacheFile.exists()) {
+				VelocityYMLFile yamlnonVotedPlayersCache = new VelocityYMLFile(yamlnonVotedPlayersCacheFile);
+				voteCacheFile.setConf(yamlnonVotedPlayersCache.getData());
+				yamlnonVotedPlayersCacheFile.renameTo(new File(dataDirectory.toFile(), "oldnonvotedplayerscache.yml"));
+				VelocityYMLFile oldYamlnonVotedPlayersCache = new VelocityYMLFile(
+						new File(dataDirectory.toFile(), "oldnonvotedplayerscache.yml"));
+				oldYamlnonVotedPlayersCache.setConf(yamlnonVotedPlayersCache.getData());
+				voteCacheFile.save();
+			}
+
+			getVotingPluginProxy().load();
+
+			try {
+				for (String key : voteCacheFile.getTimedVoteCache()) {
+					ConfigurationNode data = voteCacheFile.getTimedVoteCache(key);
+					getVotingPluginProxy().getTimeChangeQueue().add(new VoteTimeQueue(data.getNode("Name").getString(),
+							data.getNode("Service").getString(), data.getNode("Time").getLong()));
+				}
+
+				getVotingPluginProxy().processQueue();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+
+			try {
+				for (String server : voteCacheFile.getServers()) {
+					ArrayList<OfflineBungeeVote> vote = new ArrayList<>();
+					for (String num : voteCacheFile.getServerVotes(server)) {
+						ConfigurationNode data = voteCacheFile.getServerVotes(server, num);
+						vote.add(new OfflineBungeeVote(data.getNode("Name").getString(),
+								data.getNode("UUID").getString(), data.getNode("Service").getString(),
+								data.getNode("Time").getLong(), data.getNode("Real").getBoolean(),
+								data.getNode("Text").getString()));
+					}
+					getVotingPluginProxy().getCachedVotes().put(server, vote);
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+
+			try {
+				for (String player : voteCacheFile.getPlayers()) {
+					ArrayList<OfflineBungeeVote> vote = new ArrayList<>();
+					for (String num : voteCacheFile.getOnlineVotes(player)) {
+						ConfigurationNode data = voteCacheFile.getOnlineVotes(player, num);
+						vote.add(new OfflineBungeeVote(data.getNode("Name").getString(),
+								data.getNode("UUID").getString(), data.getNode("Service").getString(),
+								data.getNode("Time").getLong(), data.getNode("Real").getBoolean(),
+								data.getNode("Text").getString()));
+					}
+					getVotingPluginProxy().getCachedOnlineVotes().put(player, vote);
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+
+			voteCacheFile.clearData();
+
+			server.getScheduler().buildTask(this, () -> {
+				if (getVotingPluginProxy().getGlobalDataHandler() == null
+						|| !getVotingPluginProxy().getGlobalDataHandler().isTimeChangedHappened()) {
+					for (String server : getVotingPluginProxy().getCachedVotes().keySet()) {
+						getVotingPluginProxy().checkCachedVotes(server);
+					}
+
+					for (String player : getVotingPluginProxy().getCachedOnlineVotes().keySet()) {
+						if (server.getPlayer(UUID.fromString(player)).isPresent()) {
+							getVotingPluginProxy().checkOnlineVotes(
+									server.getPlayer(UUID.fromString(player)).get().getUsername(), player, null);
+						}
+					}
+				}
+			}).delay(120, TimeUnit.SECONDS).repeat(60, TimeUnit.SECONDS).schedule();
+
+			server.getScheduler().buildTask(this, () -> {
+				if (nonVotedPlayersCache != null) {
+					debug("Checking nonvotedplayerscache.yml...");
+					nonVotedPlayersCache.check();
+				}
+				if (voteCacheFile != null) {
+					voteCacheFile.save();
+				}
+			}).delay(1L, TimeUnit.MINUTES).repeat(60l, TimeUnit.MINUTES).schedule();
+
+		}
+
+		try {
+			getVersionFile();
+			if (versionFile != null) {
+				versionFile.delete();
+				versionFile.getParentFile().delete();
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		if (!getVotingPluginProxy().isVotifierEnabled()) {
+			if (!(getConfig().getMultiProxySupport() && !getConfig().getPrimaryServer())) {
+				getLogger().warn("Votifier event not found, not loading votifier event");
+			}
+		}
+
+		Metrics metrics = metricsFactory.make(this, 11547);
+
+		metrics.addCustomChart(new SimplePie("bungee_method", () -> getConfig().getBungeeMethod().toString()));
+
+		metrics.addCustomChart(new SimplePie("sendtoallservers", () -> "" + getConfig().getSendVotesToAllServers()));
+
+		metrics.addCustomChart(new SimplePie("allowunjoined", () -> "" + getConfig().getAllowUnJoined()));
+
+		metrics.addCustomChart(new SimplePie("pointsonvote", () -> "" + getConfig().getPointsOnVote()));
+
+		metrics.addCustomChart(new SimplePie("bungeemanagetotals", () -> "" + getConfig().getBungeeManageTotals()));
+
+		metrics.addCustomChart(new SimplePie("waitforuseronline", () -> "" + getConfig().getWaitForUserOnline()));
+
+		metrics.addCustomChart(new SimplePie("plugin_version", () -> "" + version));
+
+		metrics.addCustomChart(new SimplePie("globaldata_enabled", () -> "" + getConfig().getGlobalDataEnabled()));
+		if (getConfig().getGlobalDataEnabled()) {
+			metrics.addCustomChart(
+					new SimplePie("globaldata_usemainmysql", () -> "" + getConfig().getGlobalDataUseMainMySQL()));
+		}
+
+		metrics.addCustomChart(
+				new SimplePie("multi_proxy_support_enabled", () -> "" + getConfig().getMultiProxySupport()));
+
+		if (!buildNumber.equals("NOTSET")) {
+			metrics.addCustomChart(new SimplePie("dev_build_number", () -> "" + buildNumber));
+		}
+
+		logger.info("VotingPlugin velocity loaded, method: " + getVotingPluginProxy().getMethod().toString()
+				+ ", PluginMessagingVersion: " + BungeeVersion.getPluginMessageVersion() + ", Internal Jar Version: "
+				+ version);
+		if (!buildNumber.equals("NOTSET")) {
+			logger.info("Detected using dev build number: " + buildNumber);
+		}
+		getVotingPluginProxy().sendServerNameMessage();
+	}
+
+	public void reloadPlugin(boolean loadMysql) {
+		config.load();
+		if (loadMysql) {
+			try {
+				if (!config.getString(config.getNode("Host"), "").isEmpty()) {
+					loadMysql();
+				} else {
+					logger.error("MySQL settings not set in bungeeconfig.yml");
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		getVotingPluginProxy().reload();
+	}
+
+	private void runAsyncNow(Runnable runnable) {
+		server.getScheduler().buildTask(this, runnable).schedule();
+	}
+
+}

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

@@ -0,0 +1,47 @@
+package com.bencodez.votingplugin.bungee.velocity;
+
+import com.bencodez.votingplugin.bungee.proxy.VotingPluginProxyCommand;
+import com.velocitypowered.api.command.CommandSource;
+import com.velocitypowered.api.command.SimpleCommand;
+
+import net.kyori.adventure.text.Component;
+
+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();
+
+		String result = new VotingPluginProxyCommand(plugin.getVotingPluginProxy()).execute(args);
+		if (result != null) {
+			source.sendMessage(Component.text(result));
+		}
+
+	}
+
+	@Override
+	public boolean hasPermission(final Invocation invocation) {
+		return invocation.source().hasPermission("votingpluginbungee.admin");
+	}
+
+	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/main/java/com/bencodez/votingplugin/commands/executers/CommandAdminVote.java

@@ -1,11 +1,11 @@
 package com.bencodez.votingplugin.commands.executers;
 
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
 import com.bencodez.advancedcore.api.command.CommandHandler;
+import com.bencodez.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(ChatColor.RED + "No valid arguments, see /adminvote help!");
+		sender.sendMessage(MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandAdminVote()));
 
 		return true;
 	}

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

@@ -2,13 +2,13 @@ package com.bencodez.votingplugin.commands.executers;
 
 import java.util.ArrayList;
 
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
 import com.bencodez.advancedcore.api.command.CommandHandler;
-import com.bencodez.advancedcore.api.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(ChatColor.RED + "No valid arguments, see /adminvote help!");
+			sender.sendMessage(MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandAdminVote()));
 		} else {
-			sender.sendMessage(ChatColor.RED + "No valid arguments, see /vote help!");
+			sender.sendMessage(MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandVote()));
 		}
 		return true;
 	}

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

@@ -1,11 +1,11 @@
 package com.bencodez.votingplugin.commands.executers;
 
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
 import com.bencodez.advancedcore.api.command.CommandHandler;
+import com.bencodez.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(ChatColor.RED + "No valid arguments, see /vote help!");
+		sender.sendMessage(MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandVote()));
 		return true;
 	}
 

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

@@ -19,15 +19,15 @@ 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.AdminVoteBungeeSettings;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVoteVoteParty;
 import com.bencodez.votingplugin.commands.gui.admin.cumulative.AdminVoteCumulative;
 import com.bencodez.votingplugin.commands.gui.admin.milestones.AdminVoteMilestones;
@@ -49,7 +49,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)) {
@@ -167,11 +167,40 @@ public class AdminGUI {
 			}
 		});
 
-		buttons.add(new BInventoryButton(new ItemBuilder("GRASS_BLOCK").setName("&cEdit BungeeSettings.yml")) {
+		buttons.add(new BInventoryButton(
+				new ItemBuilder("GRASS_BLOCK").setName("&cEdit BungeeSettings.yml").addLoreLine("&aCurrently WIP")) {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
-				new AdminVoteBungeeSettings(plugin, clickEvent.getPlayer()).open();
+				new ConfigEditor(plugin, plugin.getBungeeSettings()).open(clickEvent.getPlayer());
+			}
+		});
+
+		buttons.add(new BInventoryButton(
+				new ItemBuilder("GRASS_BLOCK").setName("&cEdit Config.yml").addLoreLine("&aCurrently WIP")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new ConfigEditor(plugin, plugin.getConfigFile(), plugin.getOptions().getYmlConfig(),
+						plugin.getOptions().getClass()).open(clickEvent.getPlayer());
+			}
+		});
+
+		buttons.add(new BInventoryButton(
+				new ItemBuilder(Material.CHEST).setName("&cEdit GUI.yml").addLoreLine("&aCurrently WIP")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new ConfigEditor(plugin, plugin.getGui()).open(clickEvent.getPlayer());
+			}
+		});
+
+		buttons.add(new BInventoryButton(
+				new ItemBuilder("GRASS_BLOCK").setName("&cEdit SpecialRewards.yml").addLoreLine("&aCurrently WIP")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				new ConfigEditor(plugin, plugin.getSpecialRewardsConfig()).open(clickEvent.getPlayer());
 			}
 		});
 
@@ -183,6 +212,17 @@ public class AdminGUI {
 			}
 
 		});
+
+		buttons.add(new BInventoryButton(
+				new ItemBuilder(Material.STONE, 1).setName("&cBackground task time").addLoreLine("&aClick to see")) {
+
+			@Override
+			public void onClick(ClickEvent event) {
+				event.getPlayer().sendMessage("Last background task time: " + plugin.getLastBackgroundTaskTimeTaken());
+			}
+
+		});
+
 		return buttons;
 	}
 
@@ -201,25 +241,27 @@ public class AdminGUI {
 		BInventory inv = new BInventory("VoteSites");
 		int count = 0;
 		for (VoteSite voteSite : plugin.getVoteSites()) {
-			ArrayList<String> lore = new ArrayList<String>();
+			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);
@@ -239,7 +281,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());
 				}
@@ -247,15 +289,21 @@ 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);
-							plugin.getServer().getPluginManager().callEvent(voteEvent);
+							plugin.getVoteTimer().submit(new Runnable() {
+
+								@Override
+								public void run() {
+									plugin.getServer().getPluginManager().callEvent(voteEvent);
+								}
+							});
 						}
 					}
-				}, ArrayUtils.getInstance().convert(playerNames)).usingMethod(InputMethod.INVENTORY)
-						.allowCustomOption(true).request(event.getWhoClicked());
+				}, ArrayUtils.convert(playerNames)).usingMethod(InputMethod.INVENTORY).allowCustomOption(true)
+						.request(event.getWhoClicked());
 			}
 		});
 
@@ -323,6 +371,17 @@ public class AdminGUI {
 			}
 		}));
 
+		inv.addButton(new EditGUIButton(new EditGUIValueNumber("VoteDelayDailyHour", voteSite.getVoteDelayDailyHour()) {
+
+			@Override
+			public void setValue(Player player, Number num) {
+				VoteSite voteSite = (VoteSite) getInv().getMeta(player, "VoteSite");
+				String siteName = voteSite.getKey();
+				plugin.getConfigVoteSites().setVoteDelay(siteName, num.intValue());
+				plugin.reload();
+			}
+		}));
+
 		inv.addButton(new EditGUIButton(new EditGUIValueBoolean("Enabled", voteSite.isEnabled()) {
 
 			@Override

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,17 +61,17 @@ 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().getFormatCommandsVoteHelpRequirePermission();
+		boolean requirePerms = plugin.getConfigFile().isFormatCommandsVoteHelpRequirePermission();
 
 		for (CommandHandler cmdHandle : plugin.getAdminVoteCommand()) {
 			if (!requirePerms || cmdHandle.hasPerm(sender)) {
 				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

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

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

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

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

@@ -0,0 +1,171 @@
+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.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 {
+
+	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.dontCache();
+				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/AdminVoteVoteParty.java

@@ -52,7 +52,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 
 		// to add
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
-				new EditGUIValueBoolean("Enabled", plugin.getSpecialRewardsConfig().getVotePartyEnabled()) {
+				new EditGUIValueBoolean("Enabled", plugin.getSpecialRewardsConfig().isVotePartyEnabled()) {
 
 					@Override
 					public void setValue(Player player, boolean name) {
@@ -70,7 +70,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 				}));
 
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.LADDER, 1), new EditGUIValueNumber(
-				"IncreaseVotesRquired", plugin.getSpecialRewardsConfig().getVotePartyIncreaseVotesRquired()) {
+				"IncreaseVotesRquired", plugin.getSpecialRewardsConfig().getVotePartyIncreaseVotesRequired()) {
 
 			@Override
 			public void setValue(Player player, Number num) {
@@ -106,7 +106,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 		}));
 
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean("GiveAllPlayers",
-				plugin.getSpecialRewardsConfig().getVotePartyGiveAllPlayers()) {
+				plugin.getSpecialRewardsConfig().isVotePartyGiveAllPlayers()) {
 
 			@Override
 			public void setValue(Player player, boolean name) {
@@ -124,7 +124,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 		}));
 
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
-				new EditGUIValueBoolean("ResetEachDay", plugin.getSpecialRewardsConfig().getVotePartyResetEachDay()) {
+				new EditGUIValueBoolean("ResetEachDay", plugin.getSpecialRewardsConfig().isVotePartyResetEachDay()) {
 
 					@Override
 					public void setValue(Player player, boolean name) {
@@ -133,7 +133,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 				}));
 
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
-				new EditGUIValueBoolean("ResetWeekly", plugin.getSpecialRewardsConfig().getVotePartyResetWeekly()) {
+				new EditGUIValueBoolean("ResetWeekly", plugin.getSpecialRewardsConfig().isVotePartyResetWeekly()) {
 
 					@Override
 					public void setValue(Player player, boolean name) {
@@ -142,7 +142,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 				}));
 
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
-				new EditGUIValueBoolean("ResetMonthly", plugin.getSpecialRewardsConfig().getVotePartyResetMontly()) {
+				new EditGUIValueBoolean("ResetMonthly", plugin.getSpecialRewardsConfig().isVotePartyResetMonthly()) {
 
 					@Override
 					public void setValue(Player player, boolean name) {
@@ -151,7 +151,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 				}));
 
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean("OnlyOncePerDay",
-				plugin.getSpecialRewardsConfig().getVotePartyOnlyOncePerDay()) {
+				plugin.getSpecialRewardsConfig().isVotePartyOnlyOncePerDay()) {
 
 			@Override
 			public void setValue(Player player, boolean name) {
@@ -169,7 +169,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 		}));
 
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean("CountFakeVotes",
-				plugin.getSpecialRewardsConfig().getVotePartyCountFakeVotes()) {
+				plugin.getSpecialRewardsConfig().isVotePartyCountFakeVotes()) {
 
 			@Override
 			public void setValue(Player player, boolean name) {
@@ -178,7 +178,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 		}));
 
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueBoolean("CountOfflineVotes",
-				plugin.getSpecialRewardsConfig().getVotePartyCountOfflineVotes()) {
+				plugin.getSpecialRewardsConfig().isVotePartyCountOfflineVotes()) {
 
 			@Override
 			public void setValue(Player player, boolean name) {
@@ -196,7 +196,7 @@ public class AdminVoteVoteParty extends GUIHandler {
 				}));
 
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1),
-				new EditGUIValueList("Commands", plugin.getSpecialRewardsConfig().getVotePartyCommands()) {
+				new EditGUIValueList("Commands", plugin.getSpecialRewardsConfig().getVotePartyGlobalCommands()) {
 
 					@Override
 					public void setValue(Player player, ArrayList<String> value) {

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

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

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

@@ -12,12 +12,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.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.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 public class AdminVoteCumulative extends GUIHandler {
@@ -52,9 +52,9 @@ public class AdminVoteCumulative extends GUIHandler {
 
 					@Override
 					public void onClick(ClickEvent clickEvent) {
-						ArrayList<Integer> nums = new ArrayList<Integer>();
+						ArrayList<Integer> nums = new ArrayList<>();
 						for (String num : plugin.getSpecialRewardsConfig().getCumulativeVotes()) {
-							if (StringParser.getInstance().isInt(num)) {
+							if (MessageAPI.isInt(num)) {
 								nums.add(Integer.parseInt(num));
 							}
 						}

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

@@ -63,7 +63,6 @@ public class AdminVoteCumulativeRemove extends GUIHandler {
 						}
 					}.open();
 
-
 				}
 			});
 		}

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

@@ -63,7 +63,6 @@ public class AdminVoteMilestoneRemove extends GUIHandler {
 						}
 					}.open();
 
-
 				}
 			});
 		}

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

@@ -12,12 +12,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.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.simpleapi.messages.MessageAPI;
 import com.bencodez.votingplugin.VotingPluginMain;
 
 public class AdminVoteMilestones extends GUIHandler {
@@ -52,9 +52,9 @@ public class AdminVoteMilestones extends GUIHandler {
 
 					@Override
 					public void onClick(ClickEvent clickEvent) {
-						ArrayList<Integer> nums = new ArrayList<Integer>();
+						ArrayList<Integer> nums = new ArrayList<>();
 						for (String num : plugin.getSpecialRewardsConfig().getMilestoneVotes()) {
-							if (StringParser.getInstance().isInt(num)) {
+							if (MessageAPI.isInt(num)) {
 								nums.add(Integer.parseInt(num));
 							}
 						}

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

@@ -1,6 +1,8 @@
 package com.bencodez.votingplugin.commands.gui.admin.voteshop;
 
 import java.util.ArrayList;
+import java.util.Map;
+import java.util.Map.Entry;
 
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
@@ -51,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) {
@@ -59,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) {
@@ -67,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) {
@@ -75,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) {
@@ -84,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")) {
 
@@ -109,12 +111,37 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 						setPathData(getKey(), value);
 					}
 				}));
+		inv.addButton(new BInventoryButton(
+				new ItemBuilder(player.getInventory().getItemInMainHand().clone()).addLoreLine("&cClick to add")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				ItemBuilder item = new ItemBuilder(clickEvent.getPlayer().getInventory().getItemInMainHand().clone());
+				Map<String, Object> map = item.getConfiguration(false);
+				for (Entry<String, Object> entry : map.entrySet()) {
+					setPathData(entry.getKey(), entry.getValue());
+				}
+			}
+		});
+		inv.addButton(new BInventoryButton(new ItemBuilder(player.getInventory().getItemInMainHand().clone())
+				.addLoreLine("&cClick to add with exact data")) {
+
+			@Override
+			public void onClick(ClickEvent clickEvent) {
+				ItemBuilder item = new ItemBuilder(clickEvent.getPlayer().getInventory().getItemInMainHand().clone());
+				Map<String, Object> map = item.getConfiguration(true);
+				for (Entry<String, Object> entry : map.entrySet()) {
+					setPathData("ItemStack." + entry.getKey(), entry.getValue());
+				}
+			}
+		});
+
 		inv.addButton(new BInventoryButton(new ItemBuilder(Material.DISPENSER, 1).setName("&cRewards")) {
 
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				RewardEditGUI.getInstance().openRewardGUI(clickEvent.getPlayer(),
-						plugin.getRewardHandler().getDirectlyDefined("CHEST.Shop." + identifier + ".Rewards"));
+						plugin.getRewardHandler().getDirectlyDefined("Shop." + identifier + ".Rewards"));
 			}
 		});
 
@@ -129,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,7 +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;
 
@@ -29,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
@@ -91,6 +93,22 @@ public class VoteBest extends GUIHandler {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 
+		String guiPath = "VoteBest";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
 		inv.openInventory(player);
 	}
 

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

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

VotingPlugin/src/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,10 +34,10 @@ 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().getFormatCommandsVoteHelpRequirePermission();
+		boolean requirePerms = plugin.getConfigFile().isFormatCommandsVoteHelpRequirePermission();
 
 		String colorStr = plugin.getConfigFile().getFormatCommandsVoteHelpHoverColor();
 		ChatColor hoverColor = null;
@@ -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,10 +65,10 @@ 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().getFormatCommandsVoteHelpRequirePermission();
+		boolean requirePerms = plugin.getConfigFile().isFormatCommandsVoteHelpRequirePermission();
 
 		for (CommandHandler cmdHandle : plugin.getVoteCommand()) {
 			if (!requirePerms || cmdHandle.hasPerm(sender)) {
@@ -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

@@ -9,13 +9,15 @@ import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
 import com.bencodez.advancedcore.api.inventory.BInventory;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
-import com.bencodez.advancedcore.api.misc.ArrayUtils;
+import com.bencodez.advancedcore.api.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.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 public class VoteLast extends GUIHandler {
@@ -31,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.getVoteSitesEnabled()) {
 			if (!voteSite.isHidden()) {
 				msg.add(user.voteCommandLastLine(voteSite));
 			}
 		}
 
-		return ArrayUtils.getInstance().colorize(msg);
+		return ArrayUtils.colorize(msg);
 	}
 
 	@Override
@@ -61,10 +63,10 @@ public class VoteLast extends GUIHandler {
 	public void onChest(Player player) {
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteLastName());
 		inv.addPlaceholder("player", user.getPlayerName());
-		for (VoteSite site : plugin.getVoteSites()) {
+		for (VoteSite site : plugin.getVoteSitesEnabled()) {
 			if (!site.isHidden()) {
 				inv.addButton(inv.getNextSlot(),
-						new UpdatingBInventoryButton(site.getItem().setName(site.getDisplayName())
+						new UpdatingBInventoryButton(plugin, site.getItem().setName(site.getDisplayName())
 								.setLore(user.voteCommandLastGUILine(site)).setAmountNone(1), 1000, 1000) {
 
 							@Override
@@ -72,15 +74,16 @@ public class VoteLast extends GUIHandler {
 								if (plugin.getGui().isChestVoteLastClickableLinks()) {
 									Player player = event.getPlayer();
 									if (player != null) {
-										VotingPluginUser user = UserManager.getInstance().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()));
 
@@ -97,7 +100,23 @@ public class VoteLast extends GUIHandler {
 			}
 		}
 
-		if (plugin.getGui().getChestVoteLastBackButton()) {
+		String guiPath = "VoteLast";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
+		if (plugin.getGui().isChestVoteLastBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 

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

@@ -12,9 +12,12 @@ import com.bencodez.advancedcore.api.gui.GUIHandler;
 import com.bencodez.advancedcore.api.gui.GUIMethod;
 import com.bencodez.advancedcore.api.inventory.BInventory;
 import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
 import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
 import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.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;
@@ -34,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.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;
@@ -61,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.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()))
@@ -85,11 +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.getVoteSitesEnabled()) {
 			if (!site.isHidden()) {
+				String siteNameDisplay = plugin.getGui().getChestVoteNextCustomSiteNamesDisplays(site.getKey());
+				if (siteNameDisplay.isEmpty()) {
+					siteNameDisplay = site.getDisplayName();
+				}
 				inv.addButton(inv.getNextSlot(),
-						new UpdatingBInventoryButton(site.getItem().setName(site.getDisplayName())
-								.setLore(user.voteCommandNextInfo(site)).setAmountNone(1), 1000, 1000) {
+						new UpdatingBInventoryButton(plugin,
+								site.getItem().setName(siteNameDisplay)
+										.setLore(PlaceholderUtils.replacePlaceHolder(
+												plugin.getGui().getChestVoteNextLine(), "time",
+												user.voteCommandNextInfo(site)))
+										.setAmountNone(1),
+								1000, 1000) {
 
 							@Override
 							public void onClick(ClickEvent clickEvent) {
@@ -106,7 +116,23 @@ public class VoteNext extends GUIHandler {
 			}
 		}
 
-		if (plugin.getGui().getChestVoteNextBackButton()) {
+		String guiPath = "VoteNext";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
+		if (plugin.getGui().isChestVoteNextBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 		inv.openInventory(player);

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

@@ -0,0 +1,220 @@
+package com.bencodez.votingplugin.commands.gui.player;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+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.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.user.VotingPluginUser;
+
+public class VoteShop extends GUIHandler {
+
+	private VotingPluginMain plugin;
+	private VotingPluginUser user;
+
+	public VoteShop(VotingPluginMain plugin, CommandSender player, VotingPluginUser user) {
+		super(plugin, player);
+		this.plugin = plugin;
+		this.user = user;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender arg0) {
+		return null;
+	}
+
+	@Override
+	public void onBook(Player player) {
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+
+	}
+
+	@Override
+	public void onChest(Player player) {
+		if (!plugin.getShopFile().isVoteShopEnabled()) {
+			player.sendMessage(MessageAPI.colorize(plugin.getShopFile().getVoteShopDisabled()));
+			return;
+		}
+
+		if (this.user == null) {
+			user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
+		}
+		VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
+		/*
+		 * if (!plugin.getConfigFile().isExtraVoteShopCheck()) { user.cacheAsync(); }
+		 */
+		BInventory inv = new BInventory(plugin.getShopFile().getVoteShopName());
+		inv.addPlaceholder("points", "" + user.getPoints());
+		inv.addPlaceholder("sitesavailable", "" + user.getSitesNotVotedOn());
+		inv.dontClose();
+
+		for (final String identifier : plugin.getShopFile().getShopIdentifiers()) {
+
+			String perm = plugin.getShopFile().getVoteShopPermission(identifier);
+			boolean hasPerm = false;
+			if (perm.isEmpty()) {
+				hasPerm = true;
+			} else {
+				String p = "";
+				if (perm.startsWith("!")) {
+					p = PlaceholderUtils.replacePlaceHolders(player, perm.substring(1));
+					hasPerm = !player.hasPermission(p);
+				} else {
+					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.getShopFile().getShopIdentifierLimit(identifier);
+
+			boolean limitPass = true;
+			if (limit > 0) {
+				if (user.getVoteShopIdentifierLimit(identifier) >= limit) {
+					limitPass = false;
+				}
+			}
+
+			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) {
+
+						@Override
+						public void onClick(ClickEvent event) {
+							Player player = event.getWhoClicked();
+
+							VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(player);
+							if (plugin.getConfigFile().isExtraVoteShopCheck()) {
+								user.cache();
+							}
+
+							String identifier = (String) getData("identifier");
+							int limit = (int) getData("Limit");
+							int points = plugin.getShopFile().getShopIdentifierCost(identifier);
+							if (identifier != null) {
+								// if (plugin.getGui().getChestVoteShopCloseGUI(identifier)) {
+								// event.closeInventory();
+								// }
+
+								// limit fail-safe, should never be needed, except in rare cases
+								boolean limitPass = true;
+								if (limit > 0) {
+									if (user.getVoteShopIdentifierLimit(identifier) >= limit) {
+										limitPass = false;
+									}
+								}
+
+								if (limitPass) {
+									if (!plugin.getShopFile().isVoteShopRequireConfirmation(identifier)) {
+										HashMap<String, String> placeholders = new HashMap<>();
+										placeholders.put("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.getShopFile().getData(),
+													plugin.getShopFile().getShopIdentifierRewardsPath(identifier),
+													new RewardOptions().setPlaceholders(placeholders));
+
+											user.sendMessage(PlaceholderUtils.replacePlaceHolder(
+													plugin.getShopFile().getVoteShopPurchase(identifier),
+													placeholders));
+											if (limit > 0) {
+												user.setVoteShopIdentifierLimit(identifier,
+														user.getVoteShopIdentifierLimit(identifier) + 1);
+											}
+										} else {
+											user.sendMessage(PlaceholderUtils.replacePlaceHolder(
+													plugin.getConfigFile().getFormatShopFailedMsg(), placeholders));
+										}
+									} else {
+										plugin.getBukkitScheduler().runTask(plugin, new Runnable() {
+
+											@Override
+											public void run() {
+												new VoteShopConfirm(plugin, player, user, identifier)
+														.open(GUIMethod.CHEST);
+											}
+										});
+
+									}
+								} else {
+									user.sendMessage(plugin.getShopFile().getVoteShopLimitReached());
+								}
+								plugin.getCommandLoader().processSlotClick(player, user, identifier);
+								if (plugin.getShopFile().isVoteShopReopenGUIOnPurchase()) {
+									plugin.getCommandLoader().processSlotClick(player, user, "shop");
+								}
+							}
+						}
+
+					}.addData("identifier", identifier).addData("Limit", limit));
+				}
+			} else {
+				if (hasPerm) {
+					ItemBuilder builder = new ItemBuilder(plugin.getShopFile().getShopIdentifierSection(identifier));
+					inv.addButton(new BInventoryButton(builder) {
+
+						@Override
+						public void onClick(ClickEvent event) {
+							user.sendMessage(plugin.getConfigFile().getFormatShopNotPurchasable());
+						}
+
+					}.addData("identifier", identifier).addData("Limit", limit));
+				}
+			}
+		}
+
+		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.getShopFile().getData(),
+							"ExtraItems." + str + "." + clickEvent.getButton().getLastRewardsPath(player))
+							.setGiveOffline(false).send(clickEvent.getPlayer());
+				}
+			});
+		}
+
+		if (plugin.getShopFile().isVoteShopBackButton()) {
+			inv.addButton(plugin.getCommandLoader().getBackButton(user));
+		}
+
+		inv.openInventory(player);
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.CHEST);
+	}
+
+}

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

@@ -12,9 +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.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.user.VotingPluginUser;
 
@@ -46,38 +46,41 @@ 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.clearCache();
-				int points = plugin.getGui().getChestShopIdentifierCost(identifier);
-				int limit = plugin.getGui().getChestShopIdentifierLimit(identifier);
-				HashMap<String, String> placeholders = new HashMap<String, String>();
+				user.cache();
+				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)) {
+				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));
 					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();
@@ -85,11 +88,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,7 +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,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());
@@ -45,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
@@ -119,7 +121,23 @@ public class VoteStreak extends GUIHandler {
 			}
 		});
 
-		if (plugin.getGui().getChestVoteStreakBackButton()) {
+		String guiPath = "VoteStreak";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+					});
+		}
+
+		if (plugin.getGui().isChestVoteStreakBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 

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

@@ -16,13 +16,13 @@ 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.nms.NMSManager;
+import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
+import com.bencodez.advancedcore.api.rewards.RewardBuilder;
+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.UserManager;
 import com.bencodez.votingplugin.user.VotingPluginUser;
 
 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,25 +91,25 @@ 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) {
 
 					@Override
 					public void onClick(ClickEvent clickEvent) {
-						VotingPluginUser user = UserManager.getInstance().getVotingPluginUser(uuid);
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid);
 						new VoteGUI(plugin, player, user)
 								.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
 					}
@@ -117,7 +117,24 @@ public class VoteToday extends GUIHandler {
 			}
 		}
 
-		if (plugin.getGui().getChestVoteTodayBackButton()) {
+		String guiPath = "VoteToday";
+		for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+			inv.addButton(
+					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+						@Override
+						public void onClick(ClickEvent clickEvent) {
+							new RewardBuilder(plugin.getGui().getData(),
+									"CHEST." + guiPath + ".ExtraItems." + str + "."
+											+ clickEvent.getButton().getLastRewardsPath(player))
+									.setGiveOffline(false).send(clickEvent.getPlayer());
+
+						}
+
+					});
+		}
+
+		if (plugin.getGui().isChestVoteTodayBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 		inv.openInventory(player);
@@ -129,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;
@@ -164,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

@@ -0,0 +1,217 @@
+package com.bencodez.votingplugin.commands.gui.player;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
+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.simpleapi.array.ArrayUtils;
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.topvoter.TopVoter;
+import com.bencodez.votingplugin.topvoter.TopVoterPlayer;
+import com.bencodez.votingplugin.user.VotingPluginUser;
+
+public class VoteTopVoter extends GUIHandler {
+
+	private int page;
+	private VotingPluginMain plugin;
+	private TopVoter top;
+	private VotingPluginUser user;
+
+	public VoteTopVoter(VotingPluginMain plugin, CommandSender player, VotingPluginUser user, TopVoter top, int page) {
+		super(plugin, player);
+		this.plugin = plugin;
+		this.user = user;
+		this.top = top;
+		this.page = page;
+	}
+
+	@Override
+	public ArrayList<String> getChat(CommandSender sender) {
+		switch (top) {
+		case AllTime:
+			return ArrayUtils.convert(plugin.getTopVoterHandler().topVoterAllTime(page));
+		case Daily:
+			return ArrayUtils.convert(plugin.getTopVoterHandler().topVoterDaily(page));
+		case Monthly:
+			return ArrayUtils.convert(plugin.getTopVoterHandler().topVoterMonthly(page));
+		case Weekly:
+			return ArrayUtils.convert(plugin.getTopVoterHandler().topVoterWeekly(page));
+		default:
+			break;
+		}
+		return new ArrayList<>();
+	}
+
+	@Override
+	public void onBook(Player player) {
+		// TODO
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+		sendMessage(getChat(sender));
+	}
+
+	@Override
+	public void onChest(Player player) {
+		try {
+			if (top == null) {
+				top = TopVoter.getDefault();
+			}
+			Set<Entry<TopVoterPlayer, Integer>> users = null;
+
+			String topVoter = top.getName();
+			@SuppressWarnings("unchecked")
+			LinkedHashMap<TopVoterPlayer, Integer> topVotes = (LinkedHashMap<TopVoterPlayer, Integer>) plugin
+					.getTopVoter(top).clone();
+			users = topVotes.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(plugin.getGui().getChestVoteTopName());
+			inv.addPlaceholder("topvoter", topVoter);
+			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++;
+			}
+
+			TopVoter newTops = top;
+			ArrayList<String> tops = plugin.getGui().getChestVoteTopSwitchItemTopVoters();
+			if (!tops.isEmpty()) {
+				for (String name : tops) {
+					newTops.getSwitchItems().add(TopVoter.getTopVoter(name));
+				}
+			}
+
+			final TopVoter cur = newTops;
+			if (!customzationEnabled) {
+				inv.getPageButtons().add(new BInventoryButton(
+						new ItemBuilder(plugin.getGui().getChestVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
+							new VoteTopVoter(plugin, player, user, cur.next(), 0).open(GUIMethod.CHEST);
+						} else {
+							new VoteTopVoter(plugin, player, user, cur.prev(), 0).open(GUIMethod.CHEST);
+						}
+					}
+				});
+			} else {
+				inv.addButton(new BInventoryButton(
+						new ItemBuilder(plugin.getGui().getChestVoteTopSwitchItem()).addPlaceholder("Top", topVoter)) {
+
+					@Override
+					public void onClick(ClickEvent clickEvent) {
+						if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
+							new VoteTopVoter(plugin, player, user, cur.next(), 0).open(GUIMethod.CHEST);
+						} else {
+							new VoteTopVoter(plugin, player, user, cur.prev(), 0).open(GUIMethod.CHEST);
+						}
+					}
+				});
+			}
+
+			if (plugin.getGui().isChestVoteTopBackButton()) {
+				if (customzationEnabled) {
+					inv.addButton(plugin.getCommandLoader().getBackButton(user)
+							.setSlot(customization.getInt("BackButtonSlot", 0)));
+				} else {
+					inv.getPageButtons().add(plugin.getCommandLoader().getBackButton(user).setSlot(1));
+				}
+			}
+
+			String guiPath = "VoteTop.Customization";
+			for (final String str : plugin.getGui().getChestGUIExtraItems(guiPath)) {
+				inv.addButton(
+						new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIExtraItemsItem(guiPath, str))) {
+
+							@Override
+							public void onClick(ClickEvent clickEvent) {
+								plugin.getCommandLoader().processSlotClick(player, user, str);
+								new RewardBuilder(plugin.getGui().getData(),
+										"CHEST." + guiPath + ".ExtraItems." + str + ".Rewards").setGiveOffline(false)
+										.send(clickEvent.getPlayer());
+
+							}
+						});
+			}
+
+			if (customization == null || !customzationEnabled || !customization.getBoolean("RemoveBottomBar")) {
+				inv.setPages(true);
+			}
+			inv.setMaxInvSize(plugin.getGui().getChestVoteTopSize());
+			inv.openInventory(player);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.valueOf(plugin.getGui().getGuiMethodTopVoter().toUpperCase()));
+	}
+
+}

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

VotingPlugin/src/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

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

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

@@ -0,0 +1,283 @@
+package com.bencodez.votingplugin.commands.gui.player;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+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;
+import com.bencodez.advancedcore.api.gui.GUIHandler;
+import com.bencodez.advancedcore.api.gui.GUIMethod;
+import com.bencodez.advancedcore.api.inventory.BInventory;
+import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
+import com.bencodez.advancedcore.api.inventory.BInventoryButton;
+import com.bencodez.advancedcore.api.inventory.UpdatingBInventoryButton;
+import com.bencodez.advancedcore.api.item.ItemBuilder;
+import com.bencodez.advancedcore.api.messages.MessageBuilder;
+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 xyz.upperlevel.spigot.book.BookUtil;
+
+public class VoteURL extends GUIHandler {
+
+	private boolean json;
+	private VotingPluginMain plugin;
+	private VotingPluginUser user;
+
+	public VoteURL(VotingPluginMain plugin, CommandSender player, VotingPluginUser user, boolean json) {
+		super(plugin, player);
+		this.plugin = plugin;
+		this.user = user;
+		this.json = json;
+		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 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) {
+			sites.addAll(title);
+		}
+		if (plugin.getConfigFile().isFormatCommandsVoteAutoInputSites()) {
+			int counter = 0;
+			for (VoteSite voteSite : plugin.getVoteSitesEnabled()) {
+				if (!voteSite.isHidden()) {
+					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());
+						}
+					}
+				}
+			}
+		}
+		if (user != null) {
+			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 = PlaceholderUtils.replacePlaceHolder(sites, phs);
+		}
+
+		return ArrayUtils.colorize(sites);
+	}
+
+	private ItemBuilder getItemAll() {
+		ItemBuilder builderAll = new ItemBuilder(plugin.getGui().getChestVoteURLAlreadyVotedAllUrlsButtonItemSection());
+		if (plugin.getGui().isChestVoteURLAllUrlsButtonrequireAllSitesVoted()) {
+			if (user.canVoteAny()) {
+				builderAll = new ItemBuilder(plugin.getGui().getChestVoteURLCanVoteAllUrlsButtonItemSection());
+			}
+		} else {
+			if (user.canVoteAll()) {
+				builderAll = new ItemBuilder(plugin.getGui().getChestVoteURLCanVoteAllUrlsButtonItemSection());
+			}
+		}
+
+		if (!builderAll.hasCustomDisplayName()) {
+			builderAll.setName("&4All Voting Sites");
+		}
+		if (!builderAll.hasCustomLore()) {
+			builderAll.setLore("&cClick Me");
+		}
+		int slot = plugin.getGui().getChestVoteURLAllUrlsButtonSlot();
+		if (slot >= 0) {
+			builderAll.setSlot(slot);
+		}
+		return builderAll;
+	}
+
+	private ItemBuilder getItemVoteSite(VoteSite voteSite) {
+		ItemBuilder builder = new ItemBuilder(plugin.getGui().getChestVoteURLAlreadyVotedItemSection());
+
+		if (user.canVoteSite(voteSite)) {
+			builder = new ItemBuilder(plugin.getGui().getChestVoteURLCanVoteItemSection());
+			builder.setName(plugin.getGui().getChestVoteURLGUISiteNameCanVote());
+		} else {
+			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;
+	}
+
+	@Override
+	public void onBook(Player player) {
+		BookWrapper book = new BookWrapper(plugin.getGui().getBookVoteURLBookGUITitle());
+
+		if (plugin.getGui().isBookVoteURLBookGUIManual()) {
+			Layout layout = new Layout(plugin.getGui().getBookVoteURLBookGUITopLayout());
+			book.addLayout(layout);
+		}
+		int i = 1;
+		for (VoteSite site : plugin.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++;
+				}
+			}
+		}
+
+		book.open(player);
+	}
+
+	@Override
+	public void onChat(CommandSender sender) {
+		sendMessage(getChat(sender));
+	}
+
+	@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;
+					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.getVoteSitesEnabled()) {
+			if (!voteSite.isHidden()) {
+				if (voteSite.getPermissionToView().isEmpty() || player.hasPermission(voteSite.getPermissionToView())) {
+					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);
+								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);
+						}
+
+					});
+				}
+			}
+		}
+
+		for (
+
+		final String str : plugin.getGui().getChestVoteURLExtraItems()) {
+			inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestVoteURLExtraItemsItem(str))) {
+
+				@Override
+				public void onClick(ClickEvent clickEvent) {
+					new RewardBuilder(plugin.getGui().getData(),
+							"CHEST.VoteURL.ExtraItems." + str + "." + clickEvent.getButton().getLastRewardsPath(player))
+							.setGiveOffline(false).send(clickEvent.getPlayer());
+
+				}
+			});
+		}
+
+		if (plugin.getGui().isChestVoteURLBackButton()) {
+			inv.addButton(plugin.getCommandLoader().getBackButton(user));
+		}
+
+		inv.openInventory(player);
+
+	}
+
+	@Override
+	public void open() {
+		open(GUIMethod.valueOf(plugin.getGui().getGuiMethodURL().toUpperCase()));
+	}
+
+}

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

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

VotingPlugin/src/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);
 			}
 		}