bump to 2.3.7

Copying and pasting is not an appropriate development strategy.

.drone.yml

@@ -0,0 +1,16 @@
+pipeline:
+  build:
+    image: cogniteev/oracle-java
+    commands: ./gradlew build test --no-daemon
+  publish:
+    image: cogniteev/oracle-java
+    commands: 
+    - ./gradlew publishversionedPublicationToParallelBlockRepository
+    - ./gradlew publishLatestToParallelBlockRaw
+    environment:
+      - PUBLISH=yes
+      - LATEST_BUILD=yes
+    secrets: [SNAPSHOT_REPO, RELEASE_REPO, REPO_USERNAME, REPO_PASSWORD, RAW_UPLOAD_PATH]
+    when:
+      branch: master
+      event: push

.gitignore

@@ -11,13 +11,14 @@
 /build.xml
 
 # maven
-/target
+/*/target/
+dependency-reduced-pom.xml
 
 # vim
 .*.sw[a-p]
 
 # various other potential build files
-/build
+build/
 /bin
 /dist
 /manifest.mf
@@ -42,3 +43,6 @@ debug.log
 # Doxygen
 /docs/html
 debug.txt
+
+# gradle stuff
+.gradle/

.travis.yml

@@ -1,11 +0,0 @@
-sudo: false
-language: java
-jdk:
-- oraclejdk8
-deploy:
-  provider: releases
-  api_key:
-    secure: j8y4qeDOXAYjmf6WU6EbpUA6AKTz26yJ4zNb6oAuB4h9Y3PpBRjFjCIBL6jJQnMxZMLjdgk72/3uqS7+//jJ8/iiY/OJhO2L+2us8TJDcQhH5EI1USe/lcZKf60iJjmd9Q9pjh1eHNYhxr6kyNLnpa6fw5b/hIBT6CvNZAJV1qbhRpHwtzbgdlMFaHGnpX192vJNw7E3uuJuSwue5XNK2ybDp81oTrM0Q16JCq/UsQhGq4Ba3JffOhdBhpfg4EI2jJfe3vN8CFqojCYKNSp7eL6DPFPaV4x8Ly8cRIOZ5Zb60m5SyWAcagPKJuUq3ZOTHfeVTjkI9ymZMHe1pla2Mq6eitIBwZIGnonjyMxcTdkR9EJgq9jo+1PzdStR/NlGLakBiwPzk8Ov0DZ+iOwpYUkISUkMU0UgKWwoFoRu18CHtp+ALEsoYZhBQGlcShq+4EGv9VMNBYk9vN3KXNRMVGKqXd6O3T6shvSQgoUn/3mvksOTAuhS5J4U3woHecDrXwl/RfP2aqiHhX/S7p7yY4hVcHu8kiSYpNQMbay+rNd6HxFcRe/U9HOUt6kW8/yo1ROyCxs3ze+N6LtGDHspgzkFaay6I6wMHYNDnzzRP4MC3Zc73zxViXol6dGBk4Tawsm16VaI6b1uyWLBGKvuU23azkmMTHUmGFXl2/BTaYw=
-  file: universal/target/nuvotifier-universal-2.3.2.jar
-  on:
-    tags: true

README.md

@@ -0,0 +1,35 @@
+# NuVotifier
+
+NuVotifier is a Bukkit plugin whose purpose is to be notified (aka *votified*)
+when a vote is made on a Minecraft server top list for the server.  NuVotifier
+creates a *lightweight* server that waits for connections by Minecraft server
+lists and uses a simple protocol to get the required information.  NuVotifier is
+*secure*, and makes sure that all vote notifications are delivered by authentic
+top lists.
+
+## Why fork Votifier?
+
+Votifier has lagged in activity, has severe security flaws in its protocol, and
+is vulnerable to denial of service attacks.
+
+## Is NuVotifier a drop-in replacement for Votifier?
+
+Yes! Except for some minor non-breaking changes (look into the [technical qa
+docs](docs/technical_qa.md) for more info), NuVotifier is 100% compatible with
+the old Votifier with many more features.
+
+# Documentation / Configuration Guide
+
+All documentation is located under the [docs](docs/) directory. A server admin
+configuration guide is available [here](docs/usage.md).
+
+# Support
+
+Feel free to join the MOSS Discord server using the below link:
+
+[![Discord](https://i.imgur.com/HLPoNnY.png)](https://discord.gg/anUtuAC)
+
+# License
+
+NuVotifier is GNU GPLv3 licensed. This project's license can be viewed
+[here](LICENSE).

build.gradle

@@ -0,0 +1,34 @@
+
+import org.apache.tools.ant.filters.ReplaceTokens
+
+allprojects {
+    group 'com.vexsoftware'
+    version '2.3.7'
+}
+
+subprojects {
+    apply plugin: 'java'
+
+    sourceCompatibility = 1.8
+
+    repositories {
+        mavenCentral()
+        maven {
+            url 'https://hub.spigotmc.org/nexus/content/groups/public/'
+        }
+        maven {
+            url "https://oss.sonatype.org/content/groups/public/"
+        }
+        maven {
+            url "http://repo.spongepowered.org/maven"
+        }
+    }
+
+    processResources {
+        filter(ReplaceTokens, tokens: ["app.version": this.project.version])
+    }
+}
+
+if (System.env.PUBLISH) {
+    apply from: 'publish.gradle'
+}

bukkit/build.gradle

@@ -0,0 +1,5 @@
+dependencies {
+    compileOnly group: "org.spigotmc", name: "spigot-api", version: "1.8.8-R0.1-SNAPSHOT"
+    compile project(":nuvotifier-common")
+}
+

bukkit/pom.xml

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <parent>
-        <artifactId>nuvotifier</artifactId>
-        <groupId>com.vexsoftware</groupId>
-        <version>2.3.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>nuvotifier-bukkit</artifactId>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.google.code.maven-replacer-plugin</groupId>
-                <artifactId>maven-replacer-plugin</artifactId>
-                <version>1.3.8</version>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>replace</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <file>target/classes/plugin.yml</file>
-                    <replacements>
-                        <replacement>
-                            <token>maven-version-number</token>
-                            <value>${project.version}</value>
-                        </replacement>
-                    </replacements>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9</version>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.vexsoftware</groupId>
-            <artifactId>nuvotifier-common</artifactId>
-            <version>${project.parent.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>1.7.2-R0.1</version>
-            <type>jar</type>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-</project>

bukkit/src/main/java/com/vexsoftware/votifier/NuVotifierBukkit.java

@@ -190,45 +190,42 @@ public class NuVotifierBukkit extends JavaPlugin implements VoteHandler, Votifie
 
         debug = cfg.getBoolean("debug", false);
 
-        boolean setUpPort = cfg.getBoolean("enableExternal", true); //Always default to running the external port
+// Load Votifier tokens.
+        ConfigurationSection tokenSection = cfg.getConfigurationSection("tokens");
 
-        if (setUpPort) {
-            // Load Votifier tokens.
-            ConfigurationSection tokenSection = cfg.getConfigurationSection("tokens");
-
-            if (tokenSection != null) {
-                Map<String, Object> websites = tokenSection.getValues(false);
-                for (Map.Entry<String, Object> website : websites.entrySet()) {
-                    tokens.put(website.getKey(), KeyCreator.createKeyFrom(website.getValue().toString()));
-                    getLogger().info("Loaded token for website: " + website.getKey());
-                }
-            } else {
-                String token = TokenUtil.newToken();
-                tokenSection = cfg.createSection("tokens");
-                tokenSection.set("default", token);
-                tokens.put("default", KeyCreator.createKeyFrom(token));
-                try {
-                    cfg.save(config);
-                } catch (IOException e) {
-                    getLogger().log(Level.SEVERE,
-                            "Error generating Votifier token", e);
-                    gracefulExit();
-                    return;
-                }
-                getLogger().info("------------------------------------------------------------------------------");
-                getLogger().info("No tokens were found in your configuration, so we've generated one for you.");
-                getLogger().info("Your default Votifier token is " + token + ".");
-                getLogger().info("You will need to provide this token when you submit your server to a voting");
-                getLogger().info("list.");
-                getLogger().info("------------------------------------------------------------------------------");
+        if (tokenSection != null) {
+            Map<String, Object> websites = tokenSection.getValues(false);
+            for (Map.Entry<String, Object> website : websites.entrySet()) {
+                tokens.put(website.getKey(), KeyCreator.createKeyFrom(website.getValue().toString()));
+                getLogger().info("Loaded token for website: " + website.getKey());
             }
+        } else {
+            String token = TokenUtil.newToken();
+            tokenSection = cfg.createSection("tokens");
+            tokenSection.set("default", token);
+            tokens.put("default", KeyCreator.createKeyFrom(token));
+            try {
+                cfg.save(config);
+            } catch (IOException e) {
+                getLogger().log(Level.SEVERE,
+                        "Error generating Votifier token", e);
+                gracefulExit();
+                return;
+            }
+            getLogger().info("------------------------------------------------------------------------------");
+            getLogger().info("No tokens were found in your configuration, so we've generated one for you.");
+            getLogger().info("Your default Votifier token is " + token + ".");
+            getLogger().info("You will need to provide this token when you submit your server to a voting");
+            getLogger().info("list.");
+            getLogger().info("------------------------------------------------------------------------------");
+        }
 
-            // Initialize the receiver.
-            final String host = cfg.getString("host", hostAddr);
-            final int port = cfg.getInt("port", 8192);
-            if (debug)
-                getLogger().info("DEBUG mode enabled!");
-
+        // Initialize the receiver.
+        final String host = cfg.getString("host", hostAddr);
+        final int port = cfg.getInt("port", 8192);
+        if (debug)
+            getLogger().info("DEBUG mode enabled!");
+        if (port >= 0) {
             final boolean disablev1 = cfg.getBoolean("disable-v1-protocol");
             if (disablev1) {
                 getLogger().info("------------------------------------------------------------------------------");
@@ -258,7 +255,7 @@ public class NuVotifierBukkit extends JavaPlugin implements VoteHandler, Votifie
                         public void operationComplete(ChannelFuture future) throws Exception {
                             if (future.isSuccess()) {
                                 serverChannel = future.channel();
-                                getLogger().info("Votifier enabled.");
+                                getLogger().info("Votifier enabled on socket " + serverChannel.localAddress() + ".");
                             } else {
                                 SocketAddress socketAddress = future.channel().localAddress();
                                 if (socketAddress == null) {
@@ -269,7 +266,11 @@ public class NuVotifierBukkit extends JavaPlugin implements VoteHandler, Votifie
                         }
                     });
         } else {
-            getLogger().info("You have enableExternal set to false in your config.yml. NuVotifier will NOT listen to votes coming in from an external voting list.");
+            getLogger().info("------------------------------------------------------------------------------");
+            getLogger().info("Your Votifier port is less than 0, so we assume you do NOT want to start the");
+            getLogger().info("votifier port server! Votifier will not listen for votes over any port, and");
+            getLogger().info("will only listen for pluginMessaging forwarded votes!");
+            getLogger().info("------------------------------------------------------------------------------");
         }
 
         ConfigurationSection forwardingConfig = cfg.getConfigurationSection("forwarding");
@@ -342,12 +343,12 @@ public class NuVotifierBukkit extends JavaPlugin implements VoteHandler, Votifie
     }
 
     @Override
-    public void onVoteReceived(final Vote vote, VotifierSession.ProtocolVersion protocolVersion) throws Exception {
+    public void onVoteReceived(Channel channel, final Vote vote, VotifierSession.ProtocolVersion protocolVersion) throws Exception {
         if (debug) {
             if (protocolVersion == VotifierSession.ProtocolVersion.ONE) {
-                getLogger().info("Got a protocol v1 vote record -> " + vote);
+                getLogger().info("Got a protocol v1 vote record from " + channel.remoteAddress() + " -> " + vote);
             } else {
-                getLogger().info("Got a protocol v2 vote record -> " + vote);
+                getLogger().info("Got a protocol v2 vote record from " + channel.remoteAddress() + " -> " + vote);
             }
         }
         Bukkit.getScheduler().runTask(this, new Runnable() {
@@ -359,10 +360,15 @@ public class NuVotifierBukkit extends JavaPlugin implements VoteHandler, Votifie
     }
 
     @Override
-    public void onError(Channel channel, Throwable throwable) {
+    public void onError(Channel channel, boolean alreadyHandledVote, Throwable throwable) {
         if (debug) {
-            getLogger().log(Level.SEVERE, "Unable to process vote from " + channel.remoteAddress(), throwable);
-        } else {
+            if (alreadyHandledVote) {
+                getLogger().log(Level.SEVERE, "Vote processed, however an exception " +
+                        "occurred with a vote from " + channel.remoteAddress(), throwable);
+            } else {
+                getLogger().log(Level.SEVERE, "Unable to process vote from " + channel.remoteAddress(), throwable);
+            }
+        } else if (!alreadyHandledVote) {
             getLogger().log(Level.SEVERE, "Unable to process vote from " + channel.remoteAddress());
         }
     }

bukkit/src/main/java/com/vexsoftware/votifier/forwarding/BukkitPluginMessagingForwardingSink.java

@@ -1,13 +1,14 @@
 package com.vexsoftware.votifier.forwarding;
 
+import com.google.gson.JsonObject;
 import com.vexsoftware.votifier.NuVotifierBukkit;
 import com.vexsoftware.votifier.model.Vote;
+import com.vexsoftware.votifier.util.GsonInst;
 import org.apache.commons.lang.Validate;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.messaging.PluginMessageListener;
-import org.json.JSONObject;
 
 import java.nio.charset.StandardCharsets;
 import java.util.logging.Level;
@@ -38,7 +39,7 @@ public class BukkitPluginMessagingForwardingSink implements ForwardingVoteSink,
     public void onPluginMessageReceived(String s, Player player, byte[] bytes) {
         try {
             String message = new String(bytes, StandardCharsets.UTF_8);
-            JSONObject jsonObject = new JSONObject(message);
+            JsonObject jsonObject = GsonInst.gson.fromJson(message, JsonObject.class);
             Vote v = new Vote(jsonObject);
             listener.onForward(v);
         } catch (Exception e) {

bukkit/src/main/resources/bukkitConfig.yml

@@ -9,10 +9,6 @@ port: 8192
 # This is useful when initially setting up NuVotifier to ensure votes are being delivered.
 debug: false
 
-# Setting this value to false will turn off the votifier port listening for external votes. This is beneficial if the server
-# is only listening for votes coming from NuVotifier running on your BungeeCord.
-enableExternal: true
-
 # Setting this option to true will disable handling of Protocol v1 packets. While the old protocol is not secure, this
 # option is currently not recommended as most voting sites only support the old protocol at present. However, if you are
 # using NuVotifier's proxy forwarding mechanism, enabling this option will increase your server's security.

bukkit/src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: Votifier
 main: com.vexsoftware.votifier.NuVotifierBukkit
-version: maven-version-number
+version: @app.version@
 description: A plugin that gets notified when votes are made for the server on toplists.
-authors: [blakeman8192, Kramer, tuxed]
+authors: [ParallelBlock, blakeman8192, Kramer, tuxed]

bungeecord/build.gradle

@@ -0,0 +1,4 @@
+dependencies {
+    compileOnly group: "net.md-5", name: "bungeecord-api", version: "1.8-SNAPSHOT"
+    compile project(":nuvotifier-common")
+}

bungeecord/pom.xml

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <parent>
-        <artifactId>nuvotifier</artifactId>
-        <groupId>com.vexsoftware</groupId>
-        <version>2.3.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>nuvotifier-bungeecord</artifactId>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.google.code.maven-replacer-plugin</groupId>
-                <artifactId>maven-replacer-plugin</artifactId>
-                <version>1.3.8</version>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>replace</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <file>target/classes/bungee.yml</file>
-                    <replacements>
-                        <replacement>
-                            <token>maven-version-number</token>
-                            <value>${project.version}</value>
-                        </replacement>
-                    </replacements>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9</version>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>net.md-5</groupId>
-            <artifactId>bungeecord-api</artifactId>
-            <version>1.8-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.vexsoftware</groupId>
-            <artifactId>nuvotifier-common</artifactId>
-            <version>${project.parent.version}</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-</project>

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/NuVotifier.java

@@ -221,7 +221,7 @@ public class NuVotifier extends Plugin implements VoteHandler, VotifierPlugin {
                             public void operationComplete(ChannelFuture future) throws Exception {
                                 if (future.isSuccess()) {
                                     serverChannel = future.channel();
-                                    getLogger().info("Votifier enabled.");
+                                    getLogger().info("Votifier enabled on socket " + serverChannel.localAddress() + ".");
                                 } else {
                                     SocketAddress socketAddress = future.channel().localAddress();
                                     if (socketAddress == null) {
@@ -255,8 +255,10 @@ public class NuVotifier extends Plugin implements VoteHandler, VotifierPlugin {
                 getLogger().info("Using in-memory cache for votes that are not able to be delivered.");
             } else if ("file".equals(cacheMethod)) {
                 try {
-                    voteCache = new FileVoteCache(ProxyServer.getInstance().getServers().size(), this, new File(getDataFolder(),
-                            fwdCfg.getString("pluginMessaging.file.name")));
+                    voteCache = new FileVoteCache(
+                            ProxyServer.getInstance().getServers().size(), this,
+                            new File(getDataFolder(), fwdCfg.getString("pluginMessaging.file.name")),
+                            fwdCfg.getInt("pluginMessaging.file.cacheTime", -1));
                 } catch (IOException e) {
                     getLogger().log(Level.SEVERE, "Unload to load file cache. Votes will be lost!", e);
                 }
@@ -292,9 +294,22 @@ public class NuVotifier extends Plugin implements VoteHandler, VotifierPlugin {
                     getLogger().info("Address " + section.getString("address") + " couldn't be looked up. Ignoring!");
                     continue;
                 }
-                ProxyForwardingVoteSource.BackendServer server = new ProxyForwardingVoteSource.BackendServer(s,
-                        new InetSocketAddress(address, section.getShort("port")), KeyCreator.createKeyFrom(section.getString("key")));
-                serverList.add(server);
+
+                Key token = null;
+                try {
+                    token = KeyCreator.createKeyFrom(section.getString("token", section.getString("key")));
+                } catch (IllegalArgumentException e) {
+                    getLogger().log(Level.SEVERE,
+                            "An exception occurred while attempting to add proxy target '" + s + "' - maybe your token is wrong? " +
+                                    "Votes will not be forwarded to this server!", e);
+                }
+
+                if (token != null) {
+                    ProxyForwardingVoteSource.BackendServer server = new ProxyForwardingVoteSource.BackendServer(s,
+                            new InetSocketAddress(address, section.getInt("port")),
+                            token);
+                    serverList.add(server);
+                }
             }
 
             forwardingMethod = new ProxyForwardingVoteSource(this, serverGroup, serverList, null);
@@ -320,12 +335,12 @@ public class NuVotifier extends Plugin implements VoteHandler, VotifierPlugin {
     }
 
     @Override
-    public void onVoteReceived(final Vote vote, VotifierSession.ProtocolVersion protocolVersion) throws Exception {
+    public void onVoteReceived(Channel channel, final Vote vote, VotifierSession.ProtocolVersion protocolVersion) throws Exception {
         if (debug) {
             if (protocolVersion == VotifierSession.ProtocolVersion.ONE) {
-                getLogger().info("Got a protocol v1 vote record -> " + vote);
+                getLogger().info("Got a protocol v1 vote record from " + channel.remoteAddress() + " -> " + vote);
             } else {
-                getLogger().info("Got a protocol v2 vote record -> " + vote);
+                getLogger().info("Got a protocol v2 vote record from " + channel.remoteAddress() + " -> " + vote);
             }
         }
 
@@ -347,10 +362,15 @@ public class NuVotifier extends Plugin implements VoteHandler, VotifierPlugin {
     }
 
     @Override
-    public void onError(Channel channel, Throwable throwable) {
+    public void onError(Channel channel, boolean alreadyHandledVote, Throwable throwable) {
         if (debug) {
-            getLogger().log(Level.SEVERE, "Unable to process vote from " + channel.remoteAddress(), throwable);
-        } else {
+            if (alreadyHandledVote) {
+                getLogger().log(Level.SEVERE, "Vote processed, however an exception " +
+                        "occurred with a vote from " + channel.remoteAddress(), throwable);
+            } else {
+                getLogger().log(Level.SEVERE, "Unable to process vote from " + channel.remoteAddress(), throwable);
+            }
+        } else if (!alreadyHandledVote) {
             getLogger().log(Level.SEVERE, "Unable to process vote from " + channel.remoteAddress());
         }
     }

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/AbstractPluginMessagingForwardingSource.java

@@ -0,0 +1,141 @@
+package com.vexsoftware.votifier.bungee.forwarding;
+
+import com.vexsoftware.votifier.bungee.NuVotifier;
+import com.vexsoftware.votifier.bungee.forwarding.cache.FileVoteCache;
+import com.vexsoftware.votifier.bungee.forwarding.cache.VoteCache;
+import com.vexsoftware.votifier.model.Vote;
+import net.md_5.bungee.api.ProxyServer;
+import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.event.PluginMessageEvent;
+import net.md_5.bungee.api.event.ServerConnectedEvent;
+import net.md_5.bungee.event.EventHandler;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+
+public abstract class AbstractPluginMessagingForwardingSource implements ForwardingVoteSource {
+
+    public AbstractPluginMessagingForwardingSource(String channel, List<String> ignoredServers, NuVotifier nuVotifier, VoteCache cache) {
+        ProxyServer.getInstance().registerChannel(channel);
+        this.channel = channel;
+        this.nuVotifier = nuVotifier;
+        this.cache = cache;
+        this.ignoredServers = ignoredServers;
+    }
+
+    protected AbstractPluginMessagingForwardingSource(String channel, NuVotifier nuVotifier, VoteCache voteCache) {
+        this(channel, null, nuVotifier, voteCache);
+    }
+
+    protected final NuVotifier nuVotifier;
+    protected final String channel;
+    protected final VoteCache cache;
+    protected final List<String> ignoredServers;
+
+    @Override
+    public void forward(Vote v) {
+        byte[] rawData = v.serialize().toString().getBytes(StandardCharsets.UTF_8);
+        for (ServerInfo s : ProxyServer.getInstance().getServers().values()) {
+            if (ignoredServers != null && ignoredServers.contains(s.getName())) continue;
+            if (!forwardSpecific(s, rawData)) attemptToAddToCache(v, s.getName());
+        }
+    }
+
+    protected boolean forwardSpecific(ServerInfo connection, Vote vote) {
+        byte[] rawData = vote.serialize().toString().getBytes(StandardCharsets.UTF_8);
+        return connection.sendData(channel, rawData, false);
+    }
+
+    private boolean forwardSpecific(ServerInfo connection, byte[] data) {
+        return connection.sendData(channel, data, false);
+    }
+
+    @Override
+    public void halt() {
+        ProxyServer.getInstance().unregisterChannel(channel);
+
+        if (cache != null && cache instanceof FileVoteCache) {
+            try {
+                ((FileVoteCache) cache).halt();
+            } catch (IOException e) {
+                nuVotifier.getLogger().log(Level.SEVERE, "Unable to save cached votes, votes will be lost.", e);
+            }
+        }
+    }
+
+    protected void handleServerConnected(final ServerConnectedEvent e) {
+        if (cache == null) return;
+        final String serverName = e.getServer().getInfo().getName();
+        final Collection<Vote> cachedVotes = cache.evict(serverName);
+        final Collection<Vote> failedVotes = dumpVotesToServer(cachedVotes, e.getServer().getInfo(), "server '" + serverName + "'");
+        for (Vote v : failedVotes)
+            cache.addToCache(v, serverName);
+    }
+
+    protected void attemptToAddToCache(Vote v, String server) {
+        if (cache != null) {
+            cache.addToCache(v, server);
+            if (nuVotifier.isDebug())
+                nuVotifier.getLogger().info("Added to forwarding cache: " + v + " -> " + server);
+        } else if (nuVotifier.isDebug())
+            nuVotifier.getLogger().severe("Could not immediately send vote to backend, vote lost! " + v + " -> " + server);
+    }
+
+    protected void attempToAddToPlayerCache(Vote v, String player) {
+        if (cache != null) {
+            cache.addToCachePlayer(v, player);
+            if (nuVotifier.isDebug())
+                nuVotifier.getLogger().info("Added to forwarding cache: " + v + " -> (player) " + player);
+        } else if (nuVotifier.isDebug())
+            nuVotifier.getLogger().severe("Could not immediately send vote to backend, vote lost! " + v + " -> (player) " + player);
+
+    }
+
+    // returns a collection of failed votes
+    private Collection<Vote> dumpVotesToServer(Collection<Vote> cachedVotes, ServerInfo target, String identifier) {
+        List<Vote> failures = new ArrayList<>();
+
+        if (!cachedVotes.isEmpty()) {
+            nuVotifier.getProxy().getScheduler().schedule(nuVotifier, new Runnable() {
+                @Override
+                public void run() {
+                    int evicted = 0;
+                    int unsuccessfulEvictions = 0;
+                    for (Vote v : cachedVotes) {
+                        if (forwardSpecific(target, v)) {
+                            evicted++;
+                        } else {
+                            // Re-add to cache to send later.
+                            failures.add(v);
+                            unsuccessfulEvictions++;
+                        }
+                    }
+                    if (nuVotifier.isDebug()) {
+                        nuVotifier.getLogger().info("Successfully evicted " + evicted + " votes to " + identifier + ".");
+                        if (unsuccessfulEvictions > 0) {
+                            nuVotifier.getLogger().info("Held " + unsuccessfulEvictions + " votes for " + identifier + ".");
+                        }
+                    }
+                }
+            }, 1, TimeUnit.SECONDS);
+        }
+        return failures;
+    }
+
+    protected void handlePlayerSwitch(ServerConnectedEvent e) {
+        if (cache == null) return;
+        if (ignoredServers != null && ignoredServers.contains(e.getServer().getInfo().getName())) return;
+
+        String playerName = e.getPlayer().getName();
+
+        final Collection<Vote> cachedVotes = cache.evictPlayer(playerName);
+        final Collection<Vote> failedVotes = dumpVotesToServer(cachedVotes, e.getServer().getInfo(), "player '" + playerName);
+        for (Vote v : failedVotes)
+            cache.addToCachePlayer(v, playerName);
+    }
+}

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/OnlineForwardPluginMessagingForwardingSource.java

@@ -8,16 +8,18 @@ import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.PluginMessageEvent;
 import net.md_5.bungee.api.event.ServerConnectedEvent;
+import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 
 /**
  * @author Joseph Hirschfeld
  * @date 12/31/2015
  */
-public final class OnlineForwardPluginMessagingForwardingSource extends PluginMessagingForwardingSource {
+public final class OnlineForwardPluginMessagingForwardingSource extends AbstractPluginMessagingForwardingSource implements Listener {
     public OnlineForwardPluginMessagingForwardingSource(String channel, NuVotifier nuVotifier, VoteCache cache, String fallbackServer) {
         super(channel, nuVotifier, cache);
         this.fallbackServer = fallbackServer;
+        ProxyServer.getInstance().getPluginManager().registerListener(nuVotifier, this);
     }
 
     private final String fallbackServer;
@@ -27,9 +29,13 @@ public final class OnlineForwardPluginMessagingForwardingSource extends PluginMe
         ProxiedPlayer p = ProxyServer.getInstance().getPlayer(v.getUsername());
         if (p == null || !forwardSpecific(p.getServer().getInfo(), v)) {
             ServerInfo serverInfo = ProxyServer.getInstance().getServers().get(fallbackServer);
-            if (serverInfo == null || !forwardSpecific(serverInfo, v)) {
+
+            // nowhere to fall back to, yet still not online. lets save this vote yet!
+            if (serverInfo == null)
+                attempToAddToPlayerCache(v, v.getUsername());
+
+            else if (!forwardSpecific(serverInfo, v))
                 attemptToAddToCache(v, fallbackServer);
-            }
         }
     }
 
@@ -44,4 +50,9 @@ public final class OnlineForwardPluginMessagingForwardingSource extends PluginMe
     public void onServerConnected(final ServerConnectedEvent e) { //Attempt to resend any votes that were previously cached.
         handleServerConnected(e);
     }
+
+    @EventHandler
+    public void onPlayerSwitch(ServerConnectedEvent e) {
+        handlePlayerSwitch(e);
+    }
 }

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/PluginMessagingForwardingSource.java

@@ -1,75 +1,25 @@
 package com.vexsoftware.votifier.bungee.forwarding;
 
 import com.vexsoftware.votifier.bungee.NuVotifier;
-import com.vexsoftware.votifier.bungee.forwarding.cache.FileVoteCache;
 import com.vexsoftware.votifier.bungee.forwarding.cache.VoteCache;
-import com.vexsoftware.votifier.model.Vote;
 import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.event.PluginMessageEvent;
 import net.md_5.bungee.api.event.ServerConnectedEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
 
-/**
- * Created by Joe Hirschfeld on 10/20/2015.
- */
-public class PluginMessagingForwardingSource implements ForwardingVoteSource, Listener {
+public class PluginMessagingForwardingSource extends AbstractPluginMessagingForwardingSource implements Listener {
 
     public PluginMessagingForwardingSource(String channel, List<String> ignoredServers, NuVotifier nuVotifier, VoteCache cache) {
-        ProxyServer.getInstance().registerChannel(channel);
+        super(channel, ignoredServers, nuVotifier, cache);
         ProxyServer.getInstance().getPluginManager().registerListener(nuVotifier, this);
-        this.channel = channel;
-        this.nuVotifier = nuVotifier;
-        this.cache = cache;
-        this.ignoredServers = ignoredServers;
     }
 
     protected PluginMessagingForwardingSource(String channel, NuVotifier nuVotifier, VoteCache voteCache) {
-        this(channel, null, nuVotifier, voteCache);
-    }
-
-    protected final NuVotifier nuVotifier;
-    protected final String channel;
-    protected final VoteCache cache;
-    protected final List<String> ignoredServers;
-
-    @Override
-    public void forward(Vote v) {
-        byte[] rawData = v.serialize().toString().getBytes(StandardCharsets.UTF_8);
-        for (ServerInfo s : ProxyServer.getInstance().getServers().values()) {
-            if (ignoredServers != null && ignoredServers.contains(s.getName())) continue;
-            if (!forwardSpecific(s, rawData)) attemptToAddToCache(v, s.getName());
-        }
-    }
-
-    protected boolean forwardSpecific(ServerInfo connection, Vote vote) {
-        byte[] rawData = vote.serialize().toString().getBytes(StandardCharsets.UTF_8);
-        return connection.sendData(channel, rawData, false);
-    }
-
-    private boolean forwardSpecific(ServerInfo connection, byte[] data) {
-        return connection.sendData(channel, data, false);
-    }
-
-    @Override
-    public void halt() {
-        ProxyServer.getInstance().unregisterChannel(channel);
-
-        if (cache != null && cache instanceof FileVoteCache) {
-            try {
-                ((FileVoteCache) cache).halt();
-            } catch (IOException e) {
-                nuVotifier.getLogger().log(Level.SEVERE, "Unable to save cached votes, votes will be lost.", e);
-            }
-        }
+        super(channel, nuVotifier, voteCache);
+        ProxyServer.getInstance().getPluginManager().registerListener(nuVotifier, this);
     }
 
     @EventHandler
@@ -81,43 +31,4 @@ public class PluginMessagingForwardingSource implements ForwardingVoteSource, Li
     public void onServerConnected(final ServerConnectedEvent e) { //Attempt to resend any votes that were previously cached.
         handleServerConnected(e);
     }
-
-    protected void handleServerConnected(final ServerConnectedEvent e) {
-        if (cache == null) return;
-        final String serverName = e.getServer().getInfo().getName();
-        final Collection<Vote> cachedVotes = cache.evict(serverName);
-        if (!cachedVotes.isEmpty()) {
-            nuVotifier.getProxy().getScheduler().schedule(nuVotifier, new Runnable() {
-                @Override
-                public void run() {
-                    int evicted = 0;
-                    int unsuccessfulEvictions = 0;
-                    for (Vote v : cachedVotes) {
-                        if (forwardSpecific(e.getServer().getInfo(), v)) {
-                            evicted++;
-                        } else {
-                            // Re-add to cache to send later.
-                            cache.addToCache(v, serverName);
-                            unsuccessfulEvictions++;
-                        }
-                    }
-                    if (nuVotifier.isDebug()) {
-                        nuVotifier.getLogger().info("Successfully evicted " + evicted + " votes to server '" + serverName + "'.");
-                        if (unsuccessfulEvictions > 0) {
-                            nuVotifier.getLogger().info("Held " + unsuccessfulEvictions + " votes for server '" + serverName + "'.");
-                        }
-                    }
-                }
-            }, 1, TimeUnit.SECONDS);
-        }
-    }
-
-    protected void attemptToAddToCache(Vote v, String server) {
-        if (cache != null) {
-            cache.addToCache(v, server);
-            if (nuVotifier.isDebug())
-                nuVotifier.getLogger().info("Added to forwarding cache: " + v + " -> " + server);
-        } else if (nuVotifier.isDebug())
-            nuVotifier.getLogger().severe("Could not immediately send vote to backend, vote lost! " + v + " -> " + server);
-    }
 }

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/cache/FileVoteCache.java

@@ -1,32 +1,34 @@
 package com.vexsoftware.votifier.bungee.forwarding.cache;
 
 import com.google.common.io.Files;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
 import com.vexsoftware.votifier.model.Vote;
+import com.vexsoftware.votifier.util.GsonInst;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.api.scheduler.ScheduledTask;
-import org.json.JSONArray;
-import org.json.JSONObject;
 
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.IOException;
+import java.io.*;
 import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class FileVoteCache extends MemoryVoteCache {
 
+    private final Logger l;
     private final File cacheFile;
+    private final int voteTTL;
     private final ScheduledTask saveTask;
 
-    public FileVoteCache(int initialMemorySize, final Plugin plugin, File cacheFile) throws IOException {
+    public FileVoteCache(int initialMemorySize, final Plugin plugin, File cacheFile, int voteTTL) throws IOException {
         super(initialMemorySize);
         this.cacheFile = cacheFile;
+        this.voteTTL = voteTTL;
+        this.l = plugin.getLogger();
+
         load();
 
         saveTask = ProxyServer.getInstance().getScheduler().schedule(plugin, new Runnable() {
@@ -35,53 +37,131 @@ public class FileVoteCache extends MemoryVoteCache {
                 try {
                     save();
                 } catch (IOException e) {
-                    plugin.getLogger().log(Level.SEVERE, "Unable to save cached votes, votes will be lost if you restart.", e);
+                    l.log(Level.SEVERE, "Unable to save cached votes, votes will be lost if you restart.", e);
                 }
             }
         }, 3, 3, TimeUnit.MINUTES);
     }
 
     private void load() throws IOException {
-        if (cacheFile.exists()) {
-            // Load the cache from disk
-            JSONObject object = new JSONObject(Files.toString(cacheFile, StandardCharsets.UTF_8));
-
-            // Deserialize all votes contained
-            for (Object server : object.keySet()) {
-                JSONArray voteArray = object.optJSONArray(((String) server));
-                if (voteArray == null) continue;
-                Set<Vote> votes = new LinkedHashSet<>(voteArray.length());
-                for (int i = 0; i < voteArray.length(); i++) {
-                    votes.add(new Vote(voteArray.getJSONObject(i)));
-                }
-                voteCache.put(((String) server), votes);
-            }
-        } else {
-            cacheFile.createNewFile();
+        // Load the cache from disk
+        JsonObject object;
+        try (BufferedReader reader = Files.newReader(cacheFile, StandardCharsets.UTF_8)) {
+            object = GsonInst.gson.fromJson(reader, JsonObject.class);
+        } catch (FileNotFoundException e) {
+            object = new JsonObject();
         }
+
+        boolean resave = false;
+
+        // First, lets figure out if we are converting from a pre2.3.6 cache
+        if (!object.has("players") || !object.has("servers") || !object.has("version") || object.size() != 3) {
+            JsonObject oldObject = object;
+            object = new JsonObject();
+            object.add("servers", oldObject);
+            object.add("players", new JsonObject());
+            object.addProperty("version", 2);
+            resave = true;
+        }
+
+        if (object.get("version").getAsInt() != 2)
+            throw new IllegalStateException("Could not read cache file! Unknown version '" + object.get("version").getAsInt() + "' read.");
+
+        JsonObject players = object.getAsJsonObject("players");
+        JsonObject servers = object.getAsJsonObject("servers");
+
+        for (String player : players.keySet()) {
+            playerVoteCache.put(player, readVotes(players.getAsJsonArray(player)));
+        }
+
+        for (String server : servers.keySet()) {
+            voteCache.put(server, readVotes(servers.getAsJsonArray(server)));
+        }
+
+        if (resave) {
+            File replacementFile;
+            for (int i = 0; ; i++) {
+                replacementFile = new File(cacheFile.getParentFile(), cacheFile.getName() + ".bak." + i);
+                if (!replacementFile.exists())
+                    break;
+            }
+
+            if (!cacheFile.renameTo(replacementFile)) {
+                l.log(Level.SEVERE, "Backup movement failed! Will not save.");
+                return;
+            }
+
+            l.log(Level.WARNING, "Saving new vote cache format to file - backup moved to " + replacementFile.getAbsolutePath());
+            save();
+        }
+    }
+
+    private Collection<Vote> readVotes(JsonArray voteArray) {
+        List<Vote> votes = new ArrayList<>(voteArray.size());
+        for (int i = 0; i < voteArray.size(); i++) {
+            JsonObject voteObject = voteArray.get(i).getAsJsonObject();
+            Vote v = new Vote(voteObject);
+            if (hasTimedOut(v))
+                l.log(Level.WARNING, "Purging out of date vote.", v);
+            else
+                votes.add(v);
+        }
+        return votes;
     }
 
     public void save() throws IOException {
         cacheLock.lock();
-        // Create a copy of the votes.
-        JSONObject votesObject = new JSONObject();
-        for (Map.Entry<String, Collection<Vote>> entry : voteCache.entrySet()) {
-            JSONArray array = new JSONArray();
-            for (Vote vote : entry.getValue()) {
-                array.put(vote.serialize());
-            }
-            votesObject.put(entry.getKey(), array);
+        JsonObject votesObject = new JsonObject();
+        votesObject.addProperty("version", 2);
+        try {
+            votesObject.add("players", serializeMap(playerVoteCache));
+            votesObject.add("servers", serializeMap(voteCache));
+        } finally {
+            cacheLock.unlock();
         }
-        cacheLock.unlock();
 
         try (BufferedWriter writer = Files.newWriter(cacheFile, StandardCharsets.UTF_8)) {
-            votesObject.write(writer);
+            GsonInst.gson.toJson(votesObject, writer);
         }
     }
 
+    public JsonObject serializeMap(Map<String, Collection<Vote>> map) {
+        JsonObject o = new JsonObject();
+
+        Iterator<Map.Entry<String, Collection<Vote>>> entryItr = map.entrySet().iterator();
+        while (entryItr.hasNext()) {
+            Map.Entry<String, Collection<Vote>> entry = entryItr.next();
+            JsonArray array = new JsonArray();
+            Iterator<Vote> voteItr = entry.getValue().iterator();
+            while (voteItr.hasNext()) {
+                Vote vote = voteItr.next();
+
+                // if the vote is no longer valid, notify and remove
+                if (hasTimedOut(vote)) {
+                    l.log(Level.WARNING, "Purging out of date vote.", vote);
+                    voteItr.remove();
+                } else {
+                    array.add(vote.serialize());
+                }
+
+            }
+
+            // if, during our iteration, we TTL invalidated all of the votes
+            if (entry.getValue().isEmpty())
+                entryItr.remove();
+            o.add(entry.getKey(), array);
+        }
+        return o;
+    }
+
+    private boolean hasTimedOut(Vote v) {
+        if (voteTTL == -1) return false;
+        // scale voteTTL to milliseconds
+        return v.getLocalTimestamp() + voteTTL * 24 * 60 * 60 * 1000 < System.currentTimeMillis();
+    }
+
     public void halt() throws IOException {
         saveTask.cancel();
         save();
     }
-
 }

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/cache/MemoryVoteCache.java

@@ -1,6 +1,6 @@
 package com.vexsoftware.votifier.bungee.forwarding.cache;
 
-import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableList;
 import com.vexsoftware.votifier.model.Vote;
 
 import java.util.*;
@@ -13,37 +13,78 @@ public class MemoryVoteCache implements VoteCache {
 
     public MemoryVoteCache(int initialSize) {
         voteCache = new HashMap<>(initialSize);
+        this.playerVoteCache = new HashMap<>();
     }
 
     protected final Map<String, Collection<Vote>> voteCache;
 
+    protected final Map<String, Collection<Vote>> playerVoteCache;
+
     protected final ReentrantLock cacheLock = new ReentrantLock();
 
     @Override
     public Collection<String> getCachedServers() {
         cacheLock.lock();
-        Set<String> servers = ImmutableSet.copyOf(voteCache.keySet());
-        cacheLock.unlock();
-        return servers;
+        try {
+            return ImmutableList.copyOf(voteCache.keySet());
+        } finally {
+            cacheLock.unlock();
+        }
     }
 
     @Override
     public void addToCache(Vote v, String server) {
+        if (server == null) throw new NullPointerException();
         cacheLock.lock();
-        Collection<Vote> voteCollection = voteCache.get(server);
-        if (voteCollection == null) {
-            voteCollection = new LinkedHashSet<>();
-            voteCache.put(server, voteCollection);
+        try {
+            Collection<Vote> voteCollection = voteCache.get(server);
+            if (voteCollection == null) {
+                voteCollection = new ArrayList<>();
+                voteCache.put(server, voteCollection);
+            }
+            voteCollection.add(v);
+        } finally {
+            cacheLock.unlock();
+        }
+    }
+
+    @Override
+    public void addToCachePlayer(Vote v, String player) {
+        if (player == null) throw new NullPointerException();
+        cacheLock.lock();
+        try {
+            Collection<Vote> voteCollection = playerVoteCache.get(player);
+            if (voteCollection == null) {
+                voteCollection = new ArrayList<>();
+                playerVoteCache.put(player, voteCollection);
+            }
+            voteCollection.add(v);
+        } finally {
+            cacheLock.unlock();
+        }
+    }
+
+    @Override
+    public Collection<Vote> evictPlayer(String player) {
+        if (player == null) throw new NullPointerException();
+        cacheLock.lock();
+        try {
+            Collection<Vote> fromCollection = playerVoteCache.remove(player);
+            return fromCollection != null ? fromCollection : ImmutableList.of();
+        } finally {
+            cacheLock.unlock();
         }
-        voteCollection.add(v);
-        cacheLock.unlock();
     }
 
     @Override
     public Collection<Vote> evict(String server) {
+        if (server == null) throw new NullPointerException();
         cacheLock.lock();
-        Collection<Vote> fromCollection = voteCache.remove(server);
-        cacheLock.unlock();
-        return fromCollection != null ? ImmutableSet.copyOf(fromCollection) : ImmutableSet.<Vote>of();
+        try {
+            Collection<Vote> fromCollection = voteCache.remove(server);
+            return fromCollection != null ? fromCollection : ImmutableList.of();
+        } finally {
+            cacheLock.unlock();
+        }
     }
 }

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/cache/VoteCache.java

@@ -3,6 +3,7 @@ package com.vexsoftware.votifier.bungee.forwarding.cache;
 import com.vexsoftware.votifier.model.Vote;
 
 import java.util.Collection;
+import java.util.Collections;
 
 /**
  * Represents a method of caching votes for forwarding to a server that it was not previously capable of sending.
@@ -24,6 +25,16 @@ public interface VoteCache {
      */
     void addToCache(Vote v, String server);
 
+    /**
+     * Adds a vote to the vote cache for later sending, specifically keyed to a player. This is for the instance when the
+     * player is rewarded, however is not online any servers able to recieve said vote.
+     *
+     * @param v      Vote to add to the cache
+     * @param player Server to add vote under
+     */
+    default void addToCachePlayer(Vote v, String player) {
+    }
+
     /**
      * Evicts all votes from the vote cache and returns a collection of vote objects
      *
@@ -31,4 +42,15 @@ public interface VoteCache {
      * @return A collection of all votes which were previously in the cache under the server
      */
     Collection<Vote> evict(String server);
+
+    /**
+     * Evicts all votes from the vote cache for a specific player not assigned to a server and returns a collection of
+     * vote objects
+     *
+     * @param player Player name of the votes to evict from the cache
+     * @return A collection of all votes which were previously in the cache under the player
+     */
+    default Collection<Vote> evictPlayer(String player) {
+        return Collections.EMPTY_LIST;
+    }
 }

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/proxy/ProxyForwardingVoteSource.java

@@ -76,7 +76,7 @@ public class ProxyForwardingVoteSource implements ForwardingVoteSource {
                             public void onFailure(Throwable error) {
                                 handleFailure(server, v, error, tries);
                             }
-                        }));
+                        }, plugin));
                     }
                 })
                 .connect(server.address)

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/proxy/client/VotifierProtocol2Encoder.java

@@ -1,15 +1,15 @@
 package com.vexsoftware.votifier.bungee.forwarding.proxy.client;
 
+import com.google.gson.JsonObject;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
-import org.json.JSONObject;
 
 import javax.crypto.Mac;
-import javax.xml.bind.DatatypeConverter;
 import java.nio.charset.StandardCharsets;
 import java.security.Key;
+import java.util.Base64;
 
 public class VotifierProtocol2Encoder extends MessageToByteEncoder<VoteRequest> {
     private static final short MAGIC = 0x733A;
@@ -22,18 +22,18 @@ public class VotifierProtocol2Encoder extends MessageToByteEncoder<VoteRequest>
 
     @Override
     protected void encode(ChannelHandlerContext ctx, VoteRequest req, ByteBuf buf) throws Exception {
-        JSONObject object = new JSONObject();
-        JSONObject payloadObject = req.getVote().serialize();
-        payloadObject.put("challenge", req.getChallenge());
+        JsonObject object = new JsonObject();
+        JsonObject payloadObject = req.getVote().serialize();
+        payloadObject.addProperty("challenge", req.getChallenge());
         String payload = payloadObject.toString();
-        object.put("payload", payload);
+        object.addProperty("payload", payload);
 
         // Generate the MAC
         Mac mac = Mac.getInstance("HmacSHA256");
         mac.init(key);
         mac.update(payload.getBytes(StandardCharsets.UTF_8));
-        String computed = DatatypeConverter.printBase64Binary(mac.doFinal());
-        object.put("signature", computed);
+        String computed = Base64.getEncoder().encodeToString(mac.doFinal());
+        object.addProperty("signature", computed);
 
         // JSON message is ready for encoding.
         String finalMessage = object.toString();

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/proxy/client/VotifierProtocol2HandshakeHandler.java

@@ -1,5 +1,6 @@
 package com.vexsoftware.votifier.bungee.forwarding.proxy.client;
 
+import com.vexsoftware.votifier.bungee.NuVotifier;
 import com.vexsoftware.votifier.model.Vote;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
@@ -8,10 +9,12 @@ import io.netty.handler.codec.CorruptedFrameException;
 public class VotifierProtocol2HandshakeHandler extends SimpleChannelInboundHandler<String> {
     private final Vote toSend;
     private final VotifierResponseHandler responseHandler;
+    private final NuVotifier nuVotifier;
 
-    public VotifierProtocol2HandshakeHandler(Vote toSend, VotifierResponseHandler responseHandler) {
+    public VotifierProtocol2HandshakeHandler(Vote toSend, VotifierResponseHandler responseHandler, NuVotifier nuVotifier) {
         this.toSend = toSend;
         this.responseHandler = responseHandler;
+        this.nuVotifier = nuVotifier;
     }
 
     @Override
@@ -22,7 +25,9 @@ public class VotifierProtocol2HandshakeHandler extends SimpleChannelInboundHandl
         }
 
         VoteRequest request = new VoteRequest(handshakeContents[2], toSend);
-        System.out.println(request);
+        if (nuVotifier.isDebug()) {
+            nuVotifier.getLogger().info("Sent request: " + request.toString());
+        }
         ctx.writeAndFlush(request);
         ctx.pipeline().addLast(new VotifierProtocol2ResponseHandler(responseHandler));
         ctx.pipeline().remove(this);

bungeecord/src/main/java/com/vexsoftware/votifier/bungee/forwarding/proxy/client/VotifierProtocol2ResponseHandler.java

@@ -1,8 +1,9 @@
 package com.vexsoftware.votifier.bungee.forwarding.proxy.client;
 
+import com.google.gson.JsonObject;
+import com.vexsoftware.votifier.util.GsonInst;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
-import org.json.JSONObject;
 
 public class VotifierProtocol2ResponseHandler extends SimpleChannelInboundHandler<String> {
     private final VotifierResponseHandler responseHandler;
@@ -13,12 +14,13 @@ public class VotifierProtocol2ResponseHandler extends SimpleChannelInboundHandle
 
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, String msg) throws Exception {
-        JSONObject object = new JSONObject(msg);
-        String status = object.getString("status");
+        JsonObject object = GsonInst.gson.fromJson(msg, JsonObject.class);
+        String status = object.get("status").getAsString();
         if (status.equals("ok")) {
             responseHandler.onSuccess();
         } else {
-            responseHandler.onFailure(new Exception("Remote server error: " + object.getString("cause") + ": " + object.getString("error")));
+            responseHandler.onFailure(new Exception("Remote server error: " + object.get("cause").getAsString() +
+                    ": " + object.get("error").getAsString()));
         }
         ctx.close();
     }

bungeecord/src/main/resources/bungee.yml

@@ -1,4 +1,4 @@
 name: NuVotifier
 main: com.vexsoftware.votifier.bungee.NuVotifier
-version: maven-version-number
-author: blakeman8192, Kramer, tuxed
+version: @app.version@
+author: ParallelBlock, blakeman8192, Kramer, tuxed

bungeecord/src/main/resources/bungeeConfig.yml

@@ -53,13 +53,15 @@ forwarding:
     # Options for file caching.
     file:
       name: cached-votes.json
+      # days before a vote is considered 'dead' - removed from cache with a console warning
+      voteTTL: 10
   # Specify servers to proxy votes for.
   proxy:
     Hub:
       address: 127.0.0.1
       port: 8193
-      key: MyKeyHere
+      token: MyKeyHere
     Hub2:
       address: 127.0.0.1
       port: 8194
-      key: AnotherKeyHere
+      token: AnotherKeyHere

common/build.gradle

@@ -0,0 +1,7 @@
+dependencies {
+    compile group: "io.netty", name: "netty-handler", version: "4.1.16.Final"
+    compile 'com.google.code.gson:gson:2.8.2'
+    compile 'com.google.guava:guava:24.1-jre'
+    testCompile group: "junit", name: "junit", version: "4.12"
+    testCompile group: "org.json", name: "json", version: "20180130" // retain this for testing reasons
+}

common/pom.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <parent>
-        <artifactId>nuvotifier</artifactId>
-        <groupId>com.vexsoftware</groupId>
-        <version>2.3.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>nuvotifier-common</artifactId>
-
-    <dependencies>
-        <!-- Netty Dependency -->
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-handler</artifactId>
-            <version>4.0.31.Final</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <!-- JSON Dependency -->
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20140107</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <!-- JUnit, for tests -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>

common/src/main/java/com/vexsoftware/votifier/VoteHandler.java

@@ -5,7 +5,16 @@ import com.vexsoftware.votifier.net.VotifierSession;
 import io.netty.channel.Channel;
 
 public interface VoteHandler {
-    void onVoteReceived(Vote vote, VotifierSession.ProtocolVersion protocolVersion) throws Exception;
+    void onVoteReceived(Channel channel, Vote vote, VotifierSession.ProtocolVersion protocolVersion) throws Exception;
 
-    void onError(Channel channel, Throwable throwable);
+    // these default members are kept for compatibility sake - there probably isn't anyone out there implementing these
+    // on their own, but we still deprecate them before removing them because we are nice!
+    default void onError(Channel channel, boolean voteAlreadyCompleted, Throwable throwable) {
+        onError(channel, throwable);
+    }
+
+    @Deprecated
+    default void onError(Channel channel, Throwable throwable) {
+        throw new RuntimeException("Unimplemented onError handler");
+    }
 }

common/src/main/java/com/vexsoftware/votifier/model/Vote.java

@@ -18,7 +18,8 @@
 
 package com.vexsoftware.votifier.model;
 
-import org.json.JSONObject;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 
 /**
  * A model for a vote.
@@ -47,36 +48,50 @@ public class Vote {
      */
     private String timeStamp;
 
+    /**
+     * Timestamp (unix-millis) normalized and taken from a known source
+     */
+    private final long localTimestamp;
+
     @Deprecated
     public Vote() {
+        localTimestamp = System.currentTimeMillis();
     }
 
     public Vote(String serviceName, String username, String address, String timeStamp) {
-        if (username.length() > 16) {
-            throw new IllegalArgumentException("Username is too long.");
-        }
+        this(serviceName, username, address, timeStamp, System.currentTimeMillis());
+    }
+
+    public Vote(String serviceName, String username, String address, String timeStamp, long localTimestamp) {
         this.serviceName = serviceName;
         this.username = username;
         this.address = address;
         this.timeStamp = timeStamp;
+        this.localTimestamp = localTimestamp;
     }
 
-    private static String getTimestamp(JSONObject object) {
+    private static String getTimestamp(JsonElement object) {
         try {
-            return Long.toString(object.getLong("timestamp"));
+            return Long.toString(object.getAsLong());
         } catch (Exception e) {
-            return object.getString("timestamp");
+            return object.getAsString();
         }
     }
 
-    public Vote(JSONObject jsonObject) {
-        this(jsonObject.getString("serviceName"), jsonObject.getString("username"), jsonObject.getString("address"), getTimestamp(jsonObject));
+    public Vote(JsonObject jsonObject) {
+        this(jsonObject.get("serviceName").getAsString(),
+                jsonObject.get("username").getAsString(),
+                jsonObject.get("address").getAsString(),
+                getTimestamp(jsonObject.get("timestamp")),
+                // maintained for backwards compatibility with <2.3.6 peers
+                (jsonObject.has("localTimestamp") ? jsonObject.get("localTimestamp").getAsLong() : System.currentTimeMillis()));
     }
 
     @Override
     public String toString() {
         return "Vote (from:" + serviceName + " username:" + username
-                + " address:" + address + " timeStamp:" + timeStamp + ")";
+                + " address:" + address + " timeStamp:" + timeStamp
+                + " localTimestamp:" + localTimestamp + ")";
     }
 
     /**
@@ -105,9 +120,6 @@ public class Vote {
      */
     @Deprecated
     public void setUsername(String username) {
-        if (username.length() > 16) {
-            throw new IllegalArgumentException("Username is too long.");
-        }
         this.username = username;
     }
 
@@ -158,12 +170,22 @@ public class Vote {
         return timeStamp;
     }
 
-    public JSONObject serialize() {
-        JSONObject ret = new JSONObject();
-        ret.put("serviceName", serviceName);
-        ret.put("username", username);
-        ret.put("address", address);
-        ret.put("timestamp", timeStamp);
+    /**
+     * Gets the local timestamp, in unix-millis. Calculated locally by a NuVotifier instance
+     *
+     * @return The local timestamp
+     */
+    public long getLocalTimestamp() {
+        return localTimestamp;
+    }
+
+    public JsonObject serialize() {
+        JsonObject ret = new JsonObject();
+        ret.addProperty("serviceName", serviceName);
+        ret.addProperty("username", username);
+        ret.addProperty("address", address);
+        ret.addProperty("timestamp", timeStamp);
+        ret.addProperty("localTimestamp", localTimestamp);
         return ret;
     }
 
@@ -178,7 +200,6 @@ public class Vote {
         if (!username.equals(vote.username)) return false;
         if (!address.equals(vote.address)) return false;
         return timeStamp.equals(vote.timeStamp);
-
     }
 
     @Override

common/src/main/java/com/vexsoftware/votifier/net/VotifierSession.java

@@ -7,6 +7,7 @@ public class VotifierSession {
     public static final AttributeKey<VotifierSession> KEY = AttributeKey.valueOf("votifier_session");
     private ProtocolVersion version = ProtocolVersion.UNKNOWN;
     private final String challenge;
+    private boolean hasCompletedVote = false;
 
     public VotifierSession() {
         challenge = TokenUtil.newToken();
@@ -27,6 +28,17 @@ public class VotifierSession {
         return challenge;
     }
 
+    public void completeVote() {
+        if (hasCompletedVote)
+            throw new IllegalStateException("Protocol completed vote twice!");
+
+        hasCompletedVote = true;
+    }
+
+    public boolean hasCompletedVote() {
+        return hasCompletedVote;
+    }
+
     public enum ProtocolVersion {
         UNKNOWN,
         ONE,

common/src/main/java/com/vexsoftware/votifier/net/protocol/VoteInboundHandler.java

@@ -1,12 +1,13 @@
 package com.vexsoftware.votifier.net.protocol;
 
+import com.google.gson.JsonObject;
 import com.vexsoftware.votifier.VoteHandler;
 import com.vexsoftware.votifier.model.Vote;
 import com.vexsoftware.votifier.net.VotifierSession;
+import com.vexsoftware.votifier.util.GsonInst;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
-import org.json.JSONObject;
 
 public class VoteInboundHandler extends SimpleChannelInboundHandler<Vote> {
     private final VoteHandler handler;
@@ -19,14 +20,15 @@ public class VoteInboundHandler extends SimpleChannelInboundHandler<Vote> {
     protected void channelRead0(ChannelHandlerContext ctx, final Vote vote) throws Exception {
         VotifierSession session = ctx.channel().attr(VotifierSession.KEY).get();
 
-        handler.onVoteReceived(vote, session.getVersion());
+        handler.onVoteReceived(ctx.channel(), vote, session.getVersion());
+        session.completeVote();
 
         if (session.getVersion() == VotifierSession.ProtocolVersion.ONE) {
             ctx.close();
         } else {
-            JSONObject object = new JSONObject();
-            object.put("status", "ok");
-            ctx.writeAndFlush(object.toString() + "\r\n").addListener(ChannelFutureListener.CLOSE);
+            JsonObject object = new JsonObject();
+            object.addProperty("status", "ok");
+            ctx.writeAndFlush(GsonInst.gson.toJson(object) + "\r\n").addListener(ChannelFutureListener.CLOSE);
         }
     }
 
@@ -34,14 +36,15 @@ public class VoteInboundHandler extends SimpleChannelInboundHandler<Vote> {
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
         VotifierSession session = ctx.channel().attr(VotifierSession.KEY).get();
 
-        handler.onError(ctx.channel(), cause);
+        handler.onError(ctx.channel(), session.hasCompletedVote(), cause);
 
         if (session.getVersion() == VotifierSession.ProtocolVersion.TWO) {
-            JSONObject object = new JSONObject();
-            object.put("status", "error");
-            object.put("cause", cause.getClass().getSimpleName());
-            object.put("error", cause.getMessage());
-            ctx.writeAndFlush(object.toString() + "\r\n").addListener(ChannelFutureListener.CLOSE);
+
+            JsonObject object = new JsonObject();
+            object.addProperty("status", "error");
+            object.addProperty("cause", cause.getClass().getSimpleName());
+            object.addProperty("error", cause.getMessage());
+            ctx.writeAndFlush(GsonInst.gson.toJson(object) + "\r\n").addListener(ChannelFutureListener.CLOSE);
         } else {
             ctx.close();
         }

common/src/main/java/com/vexsoftware/votifier/net/protocol/VotifierProtocol1Decoder.java

@@ -17,10 +17,14 @@ import java.util.List;
 public class VotifierProtocol1Decoder extends ByteToMessageDecoder {
     @Override
     protected void decode(ChannelHandlerContext ctx, ByteBuf buf, List<Object> list) throws Exception {
-        byte[] block = new byte[256];
+        if (buf.readableBytes() < 256) {
+            return;
+        }
+
+        byte[] block = new byte[buf.readableBytes()];
         buf.getBytes(0, block);
         // "Drain" the whole buffer
-        buf.readerIndex(buf.capacity());
+        buf.readerIndex(buf.readableBytes());
 
         VotifierPlugin plugin = ctx.channel().attr(VotifierPlugin.KEY).get();
 

common/src/main/java/com/vexsoftware/votifier/net/protocol/VotifierProtocol2Decoder.java

@@ -1,22 +1,19 @@
 package com.vexsoftware.votifier.net.protocol;
 
+import com.google.gson.JsonObject;
 import com.vexsoftware.votifier.VotifierPlugin;
 import com.vexsoftware.votifier.model.Vote;
 import com.vexsoftware.votifier.net.VotifierSession;
+import com.vexsoftware.votifier.util.GsonInst;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.handler.codec.MessageToMessageDecoder;
-import org.json.JSONObject;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
-import javax.xml.bind.DatatypeConverter;
 import java.nio.charset.StandardCharsets;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.util.Arrays;
+import java.security.*;
+import java.util.Base64;
 import java.util.List;
 import java.util.UUID;
 
@@ -28,39 +25,44 @@ public class VotifierProtocol2Decoder extends MessageToMessageDecoder<String> {
 
     @Override
     protected void decode(ChannelHandlerContext ctx, String s, List<Object> list) throws Exception {
-        JSONObject voteMessage = new JSONObject(s);
+        JsonObject voteMessage = GsonInst.gson.fromJson(s, JsonObject.class);
         VotifierSession session = ctx.channel().attr(VotifierSession.KEY).get();
 
         // Deserialize the payload.
-        JSONObject votePayload = new JSONObject(voteMessage.getString("payload"));
+        String payload = voteMessage.get("payload").getAsString();
+        JsonObject votePayload = GsonInst.gson.fromJson(payload, JsonObject.class);
 
         // Verify challenge.
-        if (!votePayload.getString("challenge").equals(session.getChallenge())) {
+        if (!votePayload.get("challenge").getAsString().equals(session.getChallenge())) {
             throw new CorruptedFrameException("Challenge is not valid");
         }
 
         // Verify that we have keys available.
         VotifierPlugin plugin = ctx.channel().attr(VotifierPlugin.KEY).get();
-        Key key = plugin.getTokens().get(votePayload.getString("serviceName"));
+        Key key = plugin.getTokens().get(votePayload.get("serviceName").getAsString());
 
         if (key == null) {
             key = plugin.getTokens().get("default");
             if (key == null) {
-                throw new RuntimeException("Unknown service '" + votePayload.getString("serviceName") + "'");
+                throw new RuntimeException("Unknown service '" + votePayload.get("serviceName").getAsString() + "'");
             }
         }
 
         // Verify signature.
-        String sigHash = voteMessage.getString("signature");
-        byte[] sigBytes = DatatypeConverter.parseBase64Binary(sigHash);
+        String sigHash = voteMessage.get("signature").getAsString();
+        byte[] sigBytes = Base64.getDecoder().decode(sigHash);
 
-        if (!hmacEqual(sigBytes, voteMessage.getString("payload").getBytes(StandardCharsets.UTF_8), key)) {
+        if (!hmacEqual(sigBytes, payload.getBytes(StandardCharsets.UTF_8), key)) {
             throw new CorruptedFrameException("Signature is not valid (invalid token?)");
         }
 
         // Stopgap: verify the "uuid" field is valid, if provided.
         if (votePayload.has("uuid")) {
-            UUID.fromString(votePayload.getString("uuid"));
+            UUID.fromString(votePayload.get("uuid").getAsString());
+        }
+
+        if (votePayload.get("username").getAsString().length() > 16) {
+            throw new CorruptedFrameException("Username too long");
         }
 
         // Create the vote.
@@ -75,16 +77,19 @@ public class VotifierProtocol2Decoder extends MessageToMessageDecoder<String> {
         // This randomizes the byte order to make timing attacks more difficult.
         Mac mac = Mac.getInstance("HmacSHA256");
         mac.init(key);
-        byte[] messageCalc = mac.doFinal(message);
+        byte[] calculatedSig = mac.doFinal(message);
 
-        Mac mac2 = Mac.getInstance("HmacSHA256");
+        // Generate a random key for use in comparison
         byte[] randomKey = new byte[32];
         RANDOM.nextBytes(randomKey);
+
+        // Then generate two HMACs for the different signatures found
+        Mac mac2 = Mac.getInstance("HmacSHA256");
         mac2.init(new SecretKeySpec(randomKey, "HmacSHA256"));
         byte[] clientSig = mac2.doFinal(sig);
         mac2.reset();
-        byte[] realSig = mac2.doFinal(messageCalc);
+        byte[] realSig = mac2.doFinal(calculatedSig);
 
-        return Arrays.equals(clientSig, realSig);
+        return MessageDigest.isEqual(clientSig, realSig);
     }
 }

common/src/main/java/com/vexsoftware/votifier/net/protocol/VotifierProtocolDifferentiator.java

@@ -29,12 +29,10 @@ public class VotifierProtocolDifferentiator extends ByteToMessageDecoder {
     protected void decode(ChannelHandlerContext ctx, ByteBuf buf, List<Object> list) throws Exception {
         // Determine the number of bytes that are available.
         int readable = buf.readableBytes();
-        buf.retain(); // TODO: Is this needed?
 
         if (readable < 2) {
             // Some retarded voting sites (PMC?) seem to send empty buffers for no good reason.
-            // TODO: How can we handle this?
-            throw new CorruptedFrameException("Frame is too short");
+            return;
         }
 
         short readMagic = buf.readShort();
@@ -46,6 +44,8 @@ public class VotifierProtocolDifferentiator extends ByteToMessageDecoder {
 
         if (readMagic == PROTOCOL_2_MAGIC) {
             // Short 0x733A + Message = Protocol v2 Vote
+            session.setVersion(VotifierSession.ProtocolVersion.TWO);
+
             if (!testMode) {
                 ctx.pipeline().addAfter("protocolDifferentiator", "protocol2LengthDecoder", new LengthFieldBasedFrameDecoder(1024, 2, 2, 0, 4));
                 ctx.pipeline().addAfter("protocol2LengthDecoder", "protocol2StringDecoder", new StringDecoder(StandardCharsets.UTF_8));
@@ -53,17 +53,16 @@ public class VotifierProtocolDifferentiator extends ByteToMessageDecoder {
                 ctx.pipeline().addAfter("protocol2VoteDecoder", "protocol2StringEncoder", new StringEncoder(StandardCharsets.UTF_8));
                 ctx.pipeline().remove(this);
             }
-            session.setVersion(VotifierSession.ProtocolVersion.TWO);
         } else {
             if (!allowv1) {
                 throw new CorruptedFrameException("This server only accepts well-formed Votifier v2 packets.");
             }
             // Probably Protocol v1 Vote Message
+            session.setVersion(VotifierSession.ProtocolVersion.ONE);
             if (!testMode) {
                 ctx.pipeline().addAfter("protocolDifferentiator", "protocol1Handler", new VotifierProtocol1Decoder());
                 ctx.pipeline().remove(this);
             }
-            session.setVersion(VotifierSession.ProtocolVersion.ONE);
         }
     }
 }

common/src/main/java/com/vexsoftware/votifier/net/protocol/v1crypto/RSAIO.java

@@ -18,9 +18,10 @@
 
 package com.vexsoftware.votifier.net.protocol.v1crypto;
 
-import javax.xml.bind.DatatypeConverter;
+import java.util.Base64;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.security.KeyFactory;
 import java.security.KeyPair;
@@ -45,21 +46,17 @@ public class RSAIO {
         PrivateKey privateKey = keyPair.getPrivate();
         PublicKey publicKey = keyPair.getPublic();
 
-        // Store the public key.
+        // Store the public and private keys.
         X509EncodedKeySpec publicSpec = new X509EncodedKeySpec(
                 publicKey.getEncoded());
-        FileOutputStream out = new FileOutputStream(directory + "/public.key");
-        out.write(DatatypeConverter.printBase64Binary(publicSpec.getEncoded())
-                .getBytes());
-        out.close();
-
-        // Store the private key.
         PKCS8EncodedKeySpec privateSpec = new PKCS8EncodedKeySpec(
                 privateKey.getEncoded());
-        out = new FileOutputStream(directory + "/private.key");
-        out.write(DatatypeConverter.printBase64Binary(privateSpec.getEncoded())
-                .getBytes());
-        out.close();
+        try (FileOutputStream publicOut = new FileOutputStream(directory + "/public.key");
+             FileOutputStream privateOut = new FileOutputStream(directory + "/private.key")) {
+
+            publicOut.write(Base64.getEncoder().encode(publicSpec.getEncoded()));
+            privateOut.write(Base64.getEncoder().encode(privateSpec.getEncoded()));
+        }
     }
 
     /**
@@ -74,14 +71,12 @@ public class RSAIO {
         // Read the public key file.
         File publicKeyFile = new File(directory + "/public.key");
         byte[] encodedPublicKey = Files.readAllBytes(publicKeyFile.toPath());
-        encodedPublicKey = DatatypeConverter.parseBase64Binary(new String(
-                encodedPublicKey));
+        encodedPublicKey = Base64.getDecoder().decode(new String(encodedPublicKey, StandardCharsets.UTF_8));
 
         // Read the private key file.
         File privateKeyFile = new File(directory + "/private.key");
         byte[] encodedPrivateKey = Files.readAllBytes(privateKeyFile.toPath());
-        encodedPrivateKey = DatatypeConverter.parseBase64Binary(new String(
-                encodedPrivateKey));
+        encodedPrivateKey = Base64.getDecoder().decode(new String(encodedPrivateKey, StandardCharsets.UTF_8));
 
         // Instantiate and return the key pair.
         KeyFactory keyFactory = KeyFactory.getInstance("RSA");

common/src/main/java/com/vexsoftware/votifier/util/GsonInst.java

@@ -0,0 +1,10 @@
+package com.vexsoftware.votifier.util;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+public class GsonInst {
+
+    public static final Gson gson = new GsonBuilder().create();
+
+}

common/src/main/java/com/vexsoftware/votifier/util/standalone/StandaloneVotifierPlugin.java

@@ -0,0 +1,89 @@
+package com.vexsoftware.votifier.util.standalone;
+
+import com.vexsoftware.votifier.VoteHandler;
+import com.vexsoftware.votifier.VotifierPlugin;
+import com.vexsoftware.votifier.model.Vote;
+import com.vexsoftware.votifier.net.VotifierSession;
+import com.vexsoftware.votifier.net.protocol.VoteInboundHandler;
+import com.vexsoftware.votifier.net.protocol.VotifierGreetingHandler;
+import com.vexsoftware.votifier.net.protocol.VotifierProtocolDifferentiator;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+
+import java.net.InetSocketAddress;
+import java.security.Key;
+import java.security.KeyPair;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public class StandaloneVotifierPlugin implements VotifierPlugin, VoteHandler {
+    private final Map<String, Key> tokens;
+    private final VoteReceiver receiver;
+    private final KeyPair v1Key;
+    private final InetSocketAddress bind;
+    private NioEventLoopGroup group;
+
+    public StandaloneVotifierPlugin(Map<String, Key> tokens, VoteReceiver receiver, KeyPair v1Key, InetSocketAddress bind) {
+        this.receiver = receiver;
+        this.bind = bind;
+        this.tokens = Collections.unmodifiableMap(new HashMap<>(tokens));
+        this.v1Key = v1Key;
+    }
+
+    public Throwable start() throws Throwable {
+        group = new NioEventLoopGroup(2);
+
+        ChannelFuture future = new ServerBootstrap()
+                .channel(NioServerSocketChannel.class)
+                .group(group)
+                .childHandler(new ChannelInitializer<NioSocketChannel>() {
+                    @Override
+                    protected void initChannel(NioSocketChannel channel) throws Exception {
+                        channel.attr(VotifierSession.KEY).set(new VotifierSession());
+                        channel.attr(VotifierPlugin.KEY).set(StandaloneVotifierPlugin.this);
+                        channel.pipeline().addLast("greetingHandler", new VotifierGreetingHandler());
+                        channel.pipeline().addLast("protocolDifferentiator", new VotifierProtocolDifferentiator(false, v1Key != null));
+                        channel.pipeline().addLast("voteHandler", new VoteInboundHandler(StandaloneVotifierPlugin.this));
+                    }
+                })
+                .bind(bind)
+                .syncUninterruptibly();
+
+        if (!future.isSuccess()) {
+            return future.cause();
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public Map<String, Key> getTokens() {
+        return tokens;
+    }
+
+    @Override
+    public KeyPair getProtocolV1Key() {
+        return v1Key;
+    }
+
+    @Override
+    public String getVersion() {
+        return "2.3.5";
+    }
+
+    @Override
+    public void onVoteReceived(Channel channel, Vote vote, VotifierSession.ProtocolVersion protocolVersion) throws Exception {
+        receiver.onVote(vote);
+    }
+
+    @Override
+    public void onError(Channel channel, boolean alreadyHandledVote, Throwable throwable) {
+        receiver.onException(throwable);
+    }
+}

common/src/main/java/com/vexsoftware/votifier/util/standalone/VoteReceiver.java

@@ -0,0 +1,8 @@
+package com.vexsoftware.votifier.util.standalone;
+
+import com.vexsoftware.votifier.model.Vote;
+
+public interface VoteReceiver {
+    void onVote(Vote vote) throws Exception;
+    void onException(Throwable throwable);
+}

common/src/main/java/com/vexsoftware/votifier/util/standalone/VotifierServerBuilder.java

@@ -0,0 +1,57 @@
+package com.vexsoftware.votifier.util.standalone;
+
+import com.vexsoftware.votifier.net.protocol.v1crypto.RSAIO;
+import com.vexsoftware.votifier.util.KeyCreator;
+
+import java.io.File;
+import java.net.InetSocketAddress;
+import java.security.Key;
+import java.security.KeyPair;
+import java.security.interfaces.RSAKey;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+public class VotifierServerBuilder {
+    private final Map<String, Key> keyMap = new HashMap<>();
+    private KeyPair v1Key;
+    private InetSocketAddress bind;
+    private VoteReceiver receiver;
+
+    public VotifierServerBuilder addToken(String service, String token) {
+        Objects.requireNonNull(service, "service");
+        Objects.requireNonNull(token, "key");
+
+        keyMap.put(service, KeyCreator.createKeyFrom(token));
+        return this;
+    }
+
+    public VotifierServerBuilder v1Key(KeyPair v1Key) {
+        this.v1Key = Objects.requireNonNull(v1Key, "v1Key");
+        if (!(v1Key.getPrivate() instanceof RSAKey)) {
+            throw new IllegalArgumentException("Provided key is not an RSA key.");
+        }
+        return this;
+    }
+
+    public VotifierServerBuilder v1KeyFolder(File file) throws Exception {
+        this.v1Key = RSAIO.load(Objects.requireNonNull(file, "file"));
+        return this;
+    }
+
+    public VotifierServerBuilder bind(InetSocketAddress bind) {
+        this.bind = Objects.requireNonNull(bind, "bind");
+        return this;
+    }
+
+    public VotifierServerBuilder receiver(VoteReceiver receiver) {
+        this.receiver = Objects.requireNonNull(receiver, "receiver");
+        return this;
+    }
+
+    public StandaloneVotifierPlugin create() {
+        Objects.requireNonNull(bind, "need an address to bind to");
+        Objects.requireNonNull(receiver, "need a receiver for votes");
+        return new StandaloneVotifierPlugin(keyMap, receiver, v1Key, bind);
+    }
+}

common/src/test/java/com/vexsoftware/votifier/net/protocol/TestVotifierPlugin.java

@@ -3,7 +3,6 @@ package com.vexsoftware.votifier.net.protocol;
 import com.vexsoftware.votifier.VotifierPlugin;
 import com.vexsoftware.votifier.util.KeyCreator;
 
-import javax.xml.bind.DatatypeConverter;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -12,6 +11,7 @@ import java.nio.file.Paths;
 import java.security.*;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -23,7 +23,7 @@ public class TestVotifierPlugin implements VotifierPlugin {
         URL resourceUrl = TestVotifierPlugin.class.getResource(u);
         Path resourcePath = Paths.get(resourceUrl.toURI());
 
-        return DatatypeConverter.parseBase64Binary(new String(Files.readAllBytes(resourcePath), StandardCharsets.UTF_8));
+        return Base64.getDecoder().decode(new String(Files.readAllBytes(resourcePath), StandardCharsets.UTF_8));
     }
 
     static {

common/src/test/java/com/vexsoftware/votifier/net/protocol/VoteUtil.java

@@ -0,0 +1,31 @@
+package com.vexsoftware.votifier.net.protocol;
+
+import com.vexsoftware.votifier.model.Vote;
+import com.vexsoftware.votifier.net.protocol.v1crypto.RSA;
+
+import java.nio.charset.StandardCharsets;
+import java.security.PublicKey;
+import java.util.ArrayList;
+import java.util.List;
+
+public class VoteUtil {
+    public static byte[] encodePOJOv1(Vote vote) throws Exception {
+        return encodePOJOv1(vote, TestVotifierPlugin.getI().getProtocolV1Key().getPublic());
+    }
+
+    public static byte[] encodePOJOv1(Vote vote, PublicKey key) throws Exception {
+        List<String> ordered = new ArrayList<>();
+        ordered.add("VOTE");
+        ordered.add(vote.getServiceName());
+        ordered.add(vote.getUsername());
+        ordered.add(vote.getAddress());
+        ordered.add(vote.getTimeStamp());
+
+        StringBuilder builder = new StringBuilder();
+        for (String s : ordered) {
+            builder.append(s).append('\n'); // naive join needed!
+        }
+
+        return RSA.encrypt(builder.toString().getBytes(StandardCharsets.UTF_8), key);
+    }
+}

common/src/test/java/com/vexsoftware/votifier/net/protocol/VotifierProtocol1DecoderTest.java

@@ -29,16 +29,12 @@ public class VotifierProtocol1DecoderTest {
 
     @Test
     public void testSuccessfulDecode() throws Exception {
-        // Encode a test vote.
-        String voteString = "VOTE\nTest\ntest\ntest\ntest\n";
-
-        // For reference, this is the same vote as a POJO:
         Vote votePojo = new Vote("Test", "test", "test", "test");
 
         // Send the vote
         EmbeddedChannel channel = createChannel();
 
-        byte[] encrypted = RSA.encrypt(voteString.getBytes(StandardCharsets.UTF_8), TestVotifierPlugin.getI().getProtocolV1Key().getPublic());
+        byte[] encrypted = VoteUtil.encodePOJOv1(votePojo);
         ByteBuf encryptedByteBuf = Unpooled.wrappedBuffer(encrypted);
 
         assertTrue(channel.writeInbound(encryptedByteBuf));
@@ -81,8 +77,7 @@ public class VotifierProtocol1DecoderTest {
         // Send the bad vote
         EmbeddedChannel channel = createChannel();
 
-        String voteString = "VOTE\nTest\ntest\ntest\ntest\n";
-        byte[] encrypted = RSA.encrypt(voteString.getBytes(StandardCharsets.UTF_8), badPublicKey);
+        byte[] encrypted = VoteUtil.encodePOJOv1(new Vote("Test", "test", "test", "test"), badPublicKey);
         ByteBuf encryptedByteBuf = Unpooled.wrappedBuffer(encrypted);
 
         try {

common/src/test/java/com/vexsoftware/votifier/net/protocol/VotifierProtocol2DecoderTest.java

@@ -1,8 +1,10 @@
 package com.vexsoftware.votifier.net.protocol;
 
+import com.google.gson.JsonObject;
 import com.vexsoftware.votifier.VotifierPlugin;
 import com.vexsoftware.votifier.model.Vote;
 import com.vexsoftware.votifier.net.VotifierSession;
+import com.vexsoftware.votifier.util.GsonInst;
 import com.vexsoftware.votifier.util.KeyCreator;
 import io.netty.channel.embedded.EmbeddedChannel;
 import io.netty.handler.codec.CorruptedFrameException;
@@ -11,9 +13,9 @@ import org.json.JSONObject;
 import org.junit.Test;
 
 import javax.crypto.Mac;
-import javax.xml.bind.DatatypeConverter;
 import java.nio.charset.StandardCharsets;
 import java.security.Key;
+import java.util.Base64;
 
 import static org.junit.Assert.*;
 
@@ -32,13 +34,14 @@ public class VotifierProtocol2DecoderTest {
         EmbeddedChannel channel = createChannel();
 
         JSONObject object = new JSONObject();
-        JSONObject payload = vote.serialize();
-        payload.put("challenge", SESSION.getChallenge());
-        object.put("payload", payload.toString());
+        JsonObject payload = vote.serialize();
+        payload.addProperty("challenge", SESSION.getChallenge());
+        String payloadEncoded = GsonInst.gson.toJson(payload);
+        object.put("payload", payloadEncoded);
         Mac mac = Mac.getInstance("HmacSHA256");
         mac.init(key);
         object.put("signature",
-                DatatypeConverter.printBase64Binary(mac.doFinal(payload.toString().getBytes(StandardCharsets.UTF_8))));
+                Base64.getEncoder().encodeToString(mac.doFinal(payloadEncoded.getBytes(StandardCharsets.UTF_8))));
 
         if (expectSuccess) {
             assertTrue(channel.writeInbound(object.toString()));
@@ -65,9 +68,9 @@ public class VotifierProtocol2DecoderTest {
 
         Vote vote = new Vote("Test", "test", "test", "0");
         JSONObject object = new JSONObject();
-        JSONObject payload = vote.serialize();
-        payload.put("challenge", SESSION.getChallenge());
-        object.put("payload", payload.toString());
+        JsonObject payload = vote.serialize();
+        payload.addProperty("challenge", SESSION.getChallenge());
+        object.put("payload", GsonInst.gson.toJson(payload));
         // We "forget" the signature.
 
         try {
@@ -84,13 +87,14 @@ public class VotifierProtocol2DecoderTest {
 
         Vote vote = new Vote("Test", "test", "test", "0");
         JSONObject object = new JSONObject();
-        JSONObject payload = vote.serialize();
+        JsonObject payload = vote.serialize();
+        String payloadEncoded = GsonInst.gson.toJson(payload);
         // We "forget" the challenge.
-        object.put("payload", payload.toString());
+        object.put("payload", payloadEncoded);
         Mac mac = Mac.getInstance("HmacSHA256");
         mac.init(TestVotifierPlugin.getI().getTokens().get("default"));
         object.put("signature",
-                DatatypeConverter.printBase64Binary(mac.doFinal(payload.toString().getBytes(StandardCharsets.UTF_8))));
+                Base64.getEncoder().encodeToString(mac.doFinal(payloadEncoded.getBytes(StandardCharsets.UTF_8))));
 
         try {
             channel.writeInbound(object.toString());
@@ -106,14 +110,15 @@ public class VotifierProtocol2DecoderTest {
 
         Vote vote = new Vote("Test", "test", "test", "0");
         JSONObject object = new JSONObject();
-        JSONObject payload = vote.serialize();
+        JsonObject payload = vote.serialize();
         // We provide the wrong challenge.
-        payload.put("challenge", "not a challenge for me");
+        payload.addProperty("challenge", "not a challenge for me");
         object.put("payload", payload.toString());
+        String payloadEncoded = GsonInst.gson.toJson(payload);
         Mac mac = Mac.getInstance("HmacSHA256");
         mac.init(TestVotifierPlugin.getI().getTokens().get("default"));
         object.put("signature",
-                DatatypeConverter.printBase64Binary(mac.doFinal(payload.toString().getBytes(StandardCharsets.UTF_8))));
+                Base64.getEncoder().encode(mac.doFinal(payloadEncoded.getBytes(StandardCharsets.UTF_8))));
 
         try {
             channel.writeInbound(object.toString());

common/src/test/java/com/vexsoftware/votifier/net/protocol/VotifierProtocolDifferentiatorTest.java

@@ -1,5 +1,6 @@
 package com.vexsoftware.votifier.net.protocol;
 
+import com.vexsoftware.votifier.model.Vote;
 import com.vexsoftware.votifier.net.VotifierSession;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -24,7 +25,6 @@ public class VotifierProtocolDifferentiatorTest {
         channel.writeInbound(test);
 
         assertEquals(VotifierSession.ProtocolVersion.ONE, session.getVersion());
-        test.release();
         channel.close();
     }
 
@@ -40,7 +40,6 @@ public class VotifierProtocolDifferentiatorTest {
         channel.writeInbound(test);
 
         assertEquals(VotifierSession.ProtocolVersion.TWO, session.getVersion());
-        test.release();
         channel.close();
     }
 
@@ -58,25 +57,9 @@ public class VotifierProtocolDifferentiatorTest {
         channel.writeInbound(test);
 
         assertEquals(VotifierSession.ProtocolVersion.ONE, session.getVersion());
-        test.release();
         channel.close();
     }
 
-    @Test(expected = DecoderException.class)
-    public void failOnSmallBufferTest() {
-        EmbeddedChannel channel = new EmbeddedChannel(new VotifierProtocolDifferentiator(true, false));
-
-        ByteBuf buf = Unpooled.buffer(1);
-        buf.writeByte(0);
-
-        try {
-            channel.writeInbound(buf);
-        } finally {
-            buf.release();
-            channel.close();
-        }
-    }
-
     @Test(expected = DecoderException.class)
     public void failOnBadPacketTest() {
         EmbeddedChannel channel = new EmbeddedChannel(new VotifierProtocolDifferentiator(true, false));
@@ -89,8 +72,24 @@ public class VotifierProtocolDifferentiatorTest {
         try {
             channel.writeInbound(buf);
         } finally {
-            buf.release();
             channel.close();
         }
     }
+
+    @Test
+    public void tryIdentifyRealVotev1() throws Exception {
+        EmbeddedChannel channel = new EmbeddedChannel(new VotifierProtocolDifferentiator(true, true));
+
+        VotifierSession session = new VotifierSession();
+        channel.attr(VotifierSession.KEY).set(session);
+
+        Vote votePojo = new Vote("Test", "test", "test", "test");
+        byte[] encrypted = VoteUtil.encodePOJOv1(votePojo);
+        ByteBuf encryptedByteBuf = Unpooled.wrappedBuffer(encrypted);
+
+        channel.writeInbound(encryptedByteBuf);
+
+        assertEquals(VotifierSession.ProtocolVersion.ONE, session.getVersion());
+        channel.close();
+    }
 }

docs/developer.md

@@ -0,0 +1,80 @@
+This document outlines various developer resources concerning NuVotifier.
+
+# Contributing
+
+NuVotifier is an open source GNU GPLv3 licensed project. We accept contributions
+through pull requests, and will make sure to credit you for your gracious
+contribution.
+
+# Building NuVotifier
+
+NuVotifier can be built by running the following: `./gradlew build` or
+`./gradlew.bat build` on Windows. The resultant universal jar is built and
+written to `universal/build/libs/nuvotifier-{version}.jar`.
+
+The build directories can be cleaned instead using the `./gradlew clean` (and
+`./gradlew.bat build`) command.
+
+# NuVotifier as a plugin dependency
+
+ParallelBlock now maintains an independent Maven repository for free use by the
+community. Builds are automatically published by a CI operated by ParallelBlock.
+
+## Maven
+
+You can have your project depend on NuVotifier as a dependency through the
+following code snippets:
+
+```
+<project>
+...
+    <repositories>
+        <repository>
+            <id>parallelblock-public</id>
+            <name>ParallelBlock Public Repository</name>
+            <url>https://repo.parallelblock.com/repository/maven-public/</url>
+        </repository>
+        ...
+    </repositories>
+...
+    <dependencies>
+        <dependency>
+            <groupId>com.vexsoftware</groupId>
+            <artifactId>nuvotifier-universal</artifactId>
+            <version>...</version>
+            <scope>provided</scope>
+        </dependency>
+        ...
+    </dependencies>
+...
+</project>
+```
+
+## Gradle
+
+You can include NuVotifier into your gradle project using the following lines:
+
+```
+...
+repositories {
+    maven {
+        url 'https://repo.parallelblock.com/repository/maven-public/'
+    }
+    ...
+}
+...
+dependencies {
+    compileOnly "com.vexsoftware:nuvotifier-universal:verison"
+    ...
+}
+...
+```
+
+# Implementing NuVotifier v2 protocol in a server list
+
+NuVotifier provides production ready reference implementations for interacting
+with NuVotifier servers. These libraries are available below:
+
+- [NodeJS](https://github.com/NuVotifier/votifier2-js)
+- [PHP](https://github.com/NuVotifier/votifier2-php)
+- [Golang](https://github.com/minecrafter/go-votifier)

docs/readme.md

@@ -0,0 +1,16 @@
+# Documentation
+
+This directory holds documentation for NuVotifier.
+
+# Usage Guide
+
+The usage/configuration guide may be found [here](usage.md).
+
+# Developer Guide
+
+The developer guide for NuVotifier may be found [here](developer.md).
+
+# Technical QA
+
+Some assorted technical questions not important to most people are found
+[here](technical_qa.md).

docs/technical_qa.md

@@ -1,19 +1,6 @@
-# NuVotifier
+This document outlines some of the technical reasons for a new NuVotifier.
 
-NuVotifier is a Bukkit plugin whose purpose is to be notified (aka *votified*) when a vote is made on a Minecraft server top list for the server.  NuVotifier creates a *lightweight* server that waits for connections by Minecraft server lists and uses a simple protocol to get the required information.  NuVotifier is *secure*, and makes sure that all vote notifications are delivered by authentic top lists.
-
-## Why fork Votifier?
-
-Votifier has lagged in activity, has severe security flaws in its protocol, and is vulnerable to denial of service attacks.
-
-### Is NuVotifier a drop-in replacement for Votifier?
-
-Yes. NuVotifier is compatible with Votifier server lists and Votifier listeners, with some differences:
-
-* The `Vote` object's setters are deprecated.
-* Support for standalone vote listeners (`.class` files) has been removed, as handling `VotifierEvent` is more flexible.
-
-### Why a new protocol?
+# Why a new protocol?
 
 The old Votifier protocol has three major flaws, which we feel are corrected in the new protocol.
 
@@ -21,39 +8,20 @@ The old Votifier protocol has three major flaws, which we feel are corrected in
 * The canonical Votifier protocol is vulnerable to replay attacks.
 * The canonical Votifier is one key for all clients, which is weak. While NuVotifier still supports a default key (for the less paranoid), this ability can be disabled and force per-server keys.
 
-## Configuring NuVotifier
+# Is NuVotifier a drop-in replacement for Votifier?
 
-NuVotifier configures itself the first time it is run. If you have an existing Votifier configuration, NuVotifier will copy it over and use it.
+Yes. NuVotifier is compatible with Votifier server lists and Votifier listeners, with some differences:
 
-If you want to customize NuVotifier, simply the edit `./plugins/(Nu)Votifier/config.yml` file.
+* The `Vote` object's setters are deprecated.
+* Support for standalone vote listeners (`.class` files) has been removed, as handling `VotifierEvent` is more flexible.
 
-An in-depth configuration guide is located in `usage.md` of this repository.
-
-### Tokens
-
-In `config.yml`, you will notice a `tokens` section. NuVotifier has a new protocol version that requires tokens. The `tokens` section can be used to easily grant or revoke access to a server list based on the keys it uses.
-
-### RSA Keys
-
-RSA keys for use with the old Votifier protocol are available under the `plugins/(Nu)Votifier/rsa` directory.
-
-### Vote Forwarding
-
-Starting from NuVotifier 2.2, there is a feature to forward votes from NuVotifier running on BungeeCord to your Bukkit servers without complicated setup.
-
-You must enable the feature on both your Bukkit and BungeeCord servers. This feature is still in beta but is stable.
-
-## Building NuVotifier
-
-NuVotifier can be built by running `mvn clean package` from within the root directory of NuVotifier. A universal Bukkit/Spigot & BungeeCord plugin will be built to `universal/target/nuvotifier-universal-{version}.jar`
-
-## Protocol Documentation
+# Protocol Documentation
 
 This documentation is for server lists that wish to add NuVotifier support.
 
 There are two versions of the NuVotifier protocol.
 
-### Handshake
+## Handshake
 
 A connection is made to the NuVotifier server by the server list, and immediately NuVotifier will send its version in the following packet:
 
@@ -61,7 +29,7 @@ A connection is made to the NuVotifier server by the server list, and immediatel
 
 The challenge will not be present in version 1.x servers.
 
-### Protocol v2
+## Protocol v2
 
 NuVotifier expects a message composed of `0x733A` (16-bit big-endian integer) and the length of the following JSON message (as a 16-bit big-endian integer) sent plus the message.
 
@@ -72,9 +40,9 @@ The message is JSON-encoded containing the following data:
 
 A response is given after the vote has been received and parsed, but not yet processed.
 
-For your convenience, the NuVotifier team has provided client libraries in [JavaScript](https://github.com/NuVotifier/votifier2-js) and [PHP](https://github.com/NuVotifier/votifier2-php). If you are stuck, these libraries may help you.
+For your convenience, the NuVotifier team has provided client libraries in [JavaScript](https://github.com/NuVotifier/votifier2-js), [PHP](https://github.com/NuVotifier/votifier2-php) and [Go](https://github.com/minecrafter/go-votifier). If you are stuck, these libraries may help you.
 
-### Protocol v1 (deprecated)
+## Protocol v1 (deprecated)
 
 For better compatibility, NuVotifier supports the old Votifier protocol as well.
 
@@ -107,4 +75,4 @@ NuVotifier expects a 256 byte RSA encrypted block (the public key should be obta
   </tr>
 </table>
 
-The first string of value "VOTE" is an opcode check to ensure that RSA was encoded and decoded properly, if this value is wrong then NuVotifier assumes that there was a problem with encryption and drops the connection. `serviceName` is the name of the top list service, `username` is the username (entered by the voter) of the person who voted, `address` is the IP address of the voter, and `timeStamp` is the time stamp of the vote.  Each string is delimited by the newline character `\n` (byte value 10).  The `space` block is the empty space that is left over, **the block must be exactly 256 bytes** regardless of how much information it holds.
+The first string of value "VOTE" is an opcode check to ensure that RSA was encoded and decoded properly, if this value is wrong then NuVotifier assumes that there was a problem with encryption and drops the connection. `serviceName` is the name of the top list service, `username` is the username (entered by the voter) of the person who voted, `address` is the IP address of the voter, and `timeStamp` is the time stamp of the vote.  Each string is delimited by the newline character `\n` (byte value 10).  The `space` block is the empty space that is left over, **the block must be exactly 256 bytes** regardless of how much information it holds.

docs/usage.md

@@ -0,0 +1,231 @@
+This document outlines how to configure NuVotifier for a variety of different
+configurations. It should be used by server administrators looking to set up
+NuVotifier on their network.
+
+# Key vs Token
+
+This document uses the terms `token` and `key`. These are two separate terms,
+and it is important to understand the differences.
+
+## Key
+
+Keys in terms of NuVotifier refer to the old Votifier style RSA keys. They
+are typically distributed as a pair of files - a public and private key. When
+dealing with RSA keys, you can share your public key with server lists, but make
+sure to keep your private key safe with you. You can find these keys
+auto-generated under `plugins/(Nu)Votifier/rsa/`, where your public key is
+named `public.key`, while your private key is labeled `private.key`. Make sure
+not to separate the two, as they won't work together.
+
+## Token
+
+Tokens in terms of NuVotifier refer to a new short string of characters. This
+string of characters is secret, and should never be exposed to anyone but you or
+server lists which support NuVotifier voting (check with the server list
+first). Tokens are most commonly used internally within a network for use when
+using the proxy vote forwarding method.
+
+# Single Server Configuration (Bukkit / Spigot / Sponge)
+
+You will want to set up your server using these instructions when you only have
+one Minecraft server (Bukkit / Sponge). These are the most trivial installation
+steps.
+
+## Installing the plugin on a server
+
+To install NuVotifier, you should get a copy from one of the following
+locations:
+
++ [Github](https://github.com/parallelblock/NuVotifier/releases) - Official
+  release location
++ [SpigotMC](https://www.spigotmc.org/resources/nuvotifier.13449/) - SpigotMC
+  release mirror
++ [repo.parallelblock.com](https://repo.parallelblock.com/repository/public-raw/nuvotifier/nuvotifier.jar) - ParallelBlock CI 'hot off the presses' releases
+
+The NuVotifier jar should then be placed within the `plugins/` folder of your
+Minecraft server. When you then start your server, NuVotifier will generate
+the necessary configuration and initial keys for you.
+
+## Configuring the plugin
+
+When running in a single server configuration, NuVotifier's default
+configuration works well. The only value which you may need to change is the
+`port` configuration value - this specifies the port on which NuVotifier
+listens to new votes. This port cannot be any port you are already using. For
+example, if Minecraft is running on the default port (25565), you cannot set
+`port` also to 25565. Make sure port is a number from 1-65535.
+
+You can then add your server to server lists using the port you configured while
+also supplying your public key. At this point, you should be able to send a test
+vote to your server!
+
+# Multi-server / Network configuration
+
+You will want to use these instructions when you have more than one server and
+are using a Minecraft proxy (Bungeecord / Lilypad)
+
+## Single Bungeecord Networks
+
+When running a single-bungeecord network, NuVotifier is able to operate as both
+a Bungeecord vote receiver (emitting events for Bungeecord based vote listeners)
+as well as a vote forwarder. NuVotifier's vote forwarding logic is also advanced
+enough to be used in a wide variety of ways.
+
+### Installing the plugin on the servers
+
+NuVotifier should be installed on each of the servers you wish to process votes
+on, as well as the Bungeecord server. The Bungeecord server will act as the
+public facing Votifier instance, where as the Minecraft servers will instead
+receive instructions from the Bungeecord Nuvotifier for forwarding votes.
+
+Like, the single server installation, you can download NuVotifier at any one of
+the following locations:
+
++ [Github](https://github.com/parallelblock/NuVotifier/releases) - Official
+  release location
++ [SpigotMC](https://www.spigotmc.org/resources/nuvotifier.13449/) - SpigotMC
+  release mirror
++ [repo.parallelblock.com](https://repo.parallelblock.com/repository/public-raw/nuvotifier/nuvotifier.jar) - ParallelBlock CI 'hot off the presses' releases
+
+The plugin should then be placed in the `plugins/` directory of the Bungeecord
+server as well as each of the Minecraft servers.
+
+### Vote Forwarding
+
+The following sections describe how vote forwarding works. Vote forwarding is an
+advanced configurable operation, and requires a lot of configuration to get
+correct.
+
+### Plugin messaging based forwarding
+
+This section describes how to set up plugin messaging forwarding. This will only
+work correctly if you have one Bungeecord server, however may also work with
+some exceptions in multi Bungeecord networks.
+
+First off, we should configure each of the Minecraft servers. Open each of the
+servers' NuVotifier configurations. Each one should have `method` under the
+`forwarding` configuration section set to `pluginMessaging`. Under the
+`pluginMessaging` configuration section, `channel` is set to `NuVotifier`. This
+is a safe default (and is protected from injection by a hacked Minecraft
+client), but feel free to change it. If you choose to change it, make sure you
+change it everywhere all around your network!
+
+Since we are receiving forwarded votes through plugin messaging and not through
+network ports, we should set `port` on each of the Minecraft servers to -1. This
+will disable NuVotifier's port, while still allowing it to receive forwarded
+plugin messaging votes. This will only work when using pluginMessaging!
+
+Since we have all of that configured, we can now move to the Bungeecord
+NuVotifier configuration. It is once again located under `plugins/NuVotifier/`
+directory (`config.yml`). Like the single server, `port` should be set to an
+unbound port. The default `8192` works well, however you may have to change it
+depending on your hosting provider.
+
+Since we are using pluginMessaging based forwarding, lets set `method` under
+`forwarding` to `pluginMessaging`. Make sure that `channel` is the same channel
+that you configured your servers to listen to - if you didn't change this value,
+then the default will work.
+
+NuVotifier saves when it can't immediately forward in a user defined cache. In
+almost all installations this should be `file`, however, some installations may
+instead want `none` or `memory`. If you don't know, the `cache` should be set to
+it's default, `file`.
+
+By default, NuVotifier will forward the vote to all of the connected Minecraft
+servers (all servers you can get to when typing /server). You can manually
+exclude some of these servers by first uncommenting `excludedServers`, then
+adding the server's name to the `excludedServers` list. After adding, NuVotifier
+will not send any votes to this server. If you only send the vote to the server
+the player joined, these servers are ignored.
+
+NuVotifier can also selectively send the vote to only the server which the
+player has joined. This option can be turned on by setting
+`onlySendToJoinedServer` to true. When this option is on, the vote will attempt
+to go to the server which the player is currently on. If the player is currently
+not on a server (offline), then NuVotifier will then attempt to send the vote to
+the `joinedServerFallback`. If the vote cannot be sent to the
+`joinedServerFallback`, then the vote is saved in the cache until the vote can
+be sent to the `joinedServerFallback` server - note this will not send it to the
+next server the player joins! If you do not want a fallback server and would
+rather the vote be applied when the player next joins, set
+`joinedServerFallback` to `''`. This will cause NuVotifier to save the vote
+until the player joins again.
+
+By default, votes are saved for 10 days in the cache. This time can be increased
+or decreased by changing the `voteTTL` field. This number can be as high or low
+as you want. It is measured in days within the cache.
+
+### Proxy based vote forwarding
+
+In more complex network situations, it may be required to instead use the proxy
+based vote forwarding. This configuration is less flexible and more difficult to
+set up properly - most people should use plugin messaging based forwarding.
+Proxy based forwarding does not support vote caching or advanced forwarding
+configurations. If you cannot use plugin messaging forwarding, then the
+following section will describe how to set up proxy based vote forwarding. If
+you still require advanced forwarding features or more advanced behaviors, it
+may be worthwhile to write your own Bungeecord plugin to perform the proper
+forwarding logic (you will know if you need to do this).
+
+In proxy based vote forwarding, one of your Bungeecord servers acts as the head
+vote receiver. This server will be the one you configure the voting websites to
+vote to. You can set up multiple vote receivers and load balance between them,
+however this configuration has limited benefit and is probably more work than it
+is worth. Instead of communicating through plugin messaging like the plugin
+messaging forwarding strategy, proxy forwarding instead acts like a voting
+website to each of the backend servers and duplicates the vote it receives to
+each of the backend servers it is configured with.
+
+First, we will set up all of the Minecraft servers before setting up the head
+vote receiver. For each of the servers, NuVotifier should be configured to bind
+to an unused port. This port must be valid. If you have multiple votifiers on
+the same IP/server, make sure that the port which you are using between
+NuVotifier instances are different. Remember where to find the port number as we
+will need it later to insert into the vote receiver Bungeecord NuVotifier
+configuration. In addition to the port number, you will also need the default
+token - this is the string auto generated by NuVotifier under the `default` key
+under `tokens`. Since we are using proxy forwarding, change
+`disable-v1-protocol` to true - we will only be using the new NuVotifier
+votifier protocol within our network (vote receiver -> minecraft server). Once
+all configured, that is all we need to do. The rest of the defaults will work.
+
+Now we will configure the vote receiving NuVotifier Bungeecord server. The port
+should be configured as described many times above, being a unique port. Instead
+of setting `method` to `pluginMessaging` like above, we will set `method` to
+`proxy`. This will tell NuVotifier that we instead want to proxy the votes
+instead of forward them through plugin messaging channels.
+
+The last step is to set up the proxy forwaring settings. Under the `proxy`
+section is a place to enter each server. Create a unique name for each of the
+server's you will be forwarding votes to. The default Bungeecord NuVotifier
+configuration already has two Minecraft servers filled in - Hub and Hub2. You
+should replace these with your own servers - the names of the servers do not
+matter. Under each of these servers, we need to configure `address`, `port`, and
+`token`. `address` is the IP address of the Bukkit/Sponge server. This may be
+`localhost` or `127.0.0.1` if the Minecraft server is on the same physical
+server as the vote receiving NuVotifier server. `port` is the port of the
+Bukkit/Sponge NuVotifier server. `token` is the default token of the
+Bukkit/Sponge NuVotifier server. This can be found within its configuration,
+usually under the `token` section. Once the servers are configured, NuVotifier
+will forward all votes it receives to the servers configured under the `proxy`
+section.
+
+# Debugging NuVotifier
+
+NuVotifier can be difficult to set up in some configurations. If you find you
+don't know what is wrong, you may want to try setting `debug` in each of the
+server's NuVotifier configurations to `true`. This will increase logging within
+your console. 
+
+# Default Configurations
+
+If you find you have messed up NuVotifier beyond repair, you can grab a default
+configuration from the following locations (depending on the server it is
+installed on):
+
++ [Bukkit](https://github.com/parallelblock/NuVotifier/blob/master/bukkit/src/main/resources/bukkitConfig.yml)
++ [Sponge](https://github.com/parallelblock/NuVotifier/blob/master/sponge/src/main/resources/com/vexsoftware/votifier/sponge/spongeConfig.yml)
++ [Bungeecord](https://github.com/parallelblock/NuVotifier/blob/master/bungeecord/src/main/resources/bungeeConfig.yml)
+
+You can also regenerate this configuration by deleting the old configuration and
+restarting the server.

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Sat Feb 24 13:39:00 EST 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip

gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

pom.xml

@@ -1,57 +0,0 @@
-<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.vexsoftware</groupId>
-    <artifactId>nuvotifier</artifactId>
-    <packaging>pom</packaging>
-    <version>2.3.2</version>
-    <modules>
-        <module>common</module>
-        <module>bukkit</module>
-        <module>bungeecord</module>
-        <module>universal</module>
-        <module>sponge</module>
-    </modules>
-    <name>NuVotifier</name>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>sonatype</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-        </repository>
-        <repository>
-            <id>bukkit</id>
-            <url>http://repo.bukkit.org/content/groups/public/</url>
-        </repository>
-    </repositories>
-
-    <distributionManagement>
-        <repository>
-            <id>minimumio-repo</id>
-            <url>http://repo.minimum.io/content/repositories/releases/</url>
-        </repository>
-        <snapshotRepository>
-            <id>minimumio-repo-snapshots</id>
-            <url>http://repo.minimum.io/content/repositories/snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-    <build>
-        <defaultGoal>clean package</defaultGoal>
-        <plugins>
-            <!-- Compiler -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

publish.gradle

@@ -0,0 +1,52 @@
+// This file contains special build instructions specifically for the ParallelBlock CI in order to instruct it how to
+// build the project. Usually, this shouldn't be interacted with by a human.
+
+import com.mashape.unirest.http.*
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.mashape.unirest:unirest-java:1.4.9'
+    }
+}
+
+subprojects {
+    apply plugin: "maven-publish"
+    publishing {
+        repositories {
+            maven {
+                name 'parallelBlock'
+                if (project.version.endsWith("-SNAPSHOT"))
+                    url "$System.env.SNAPSHOT_REPO"
+                else
+                    url "$System.env.RELEASE_REPO"
+                credentials {
+                    username "$System.env.REPO_USERNAME"
+                    password "$System.env.REPO_PASSWORD"
+                }
+            }
+        }
+        publications {
+            versioned(MavenPublication) {
+                from components.java
+            }
+        }
+    }
+
+    if (System.env.LATEST_BUILD) {
+        task publishLatestToParallelBlockRaw {
+            inputs.files(configurations.archives.artifacts.files)
+            outputs.upToDateWhen {false}
+            doLast {
+                configurations.archives.artifacts.each {
+                    def resp = Unirest.put("$System.env.RAW_UPLOAD_PATH/${it.name}.${it.extension}")
+                            .basicAuth("$System.env.REPO_USERNAME", "$System.env.REPO_PASSWORD")
+                            .body(it.file.bytes).asString()
+                    assert resp.status >= 200 && resp.status <= 299
+                }
+            }
+        }
+    }
+}

settings.gradle

@@ -0,0 +1,14 @@
+rootProject.name = 'nuvotifier'
+
+include 'common'
+findProject(':common')?.name = 'nuvotifier-common'
+
+include 'bukkit'
+findProject(':bukkit')?.name = 'nuvotifier-bukkit'
+include 'bungeecord'
+findProject(':bungeecord')?.name = 'nuvotifier-bungeecord'
+include 'sponge'
+findProject(':sponge')?.name = 'nuvotifier-sponge'
+
+include 'universal'
+findProject(':universal')?.name = 'nuvotifier-universal'

sponge/build.gradle

@@ -0,0 +1,4 @@
+dependencies {
+    compileOnly group: "org.spongepowered", name: "spongeapi", version: "7.0.0-SNAPSHOT"
+    compile project(":nuvotifier-common")
+}

sponge/pom.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <parent>
-        <artifactId>nuvotifier</artifactId>
-        <groupId>com.vexsoftware</groupId>
-        <version>2.3.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>nuvotifier-sponge</artifactId>
-
-    <repositories>
-        <repository>
-            <id>sponge-maven-repo</id>
-            <name>Sponge maven repo</name>
-            <url>http://repo.spongepowered.org/maven</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9</version>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.vexsoftware</groupId>
-            <artifactId>nuvotifier-common</artifactId>
-            <version>${project.parent.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.spongepowered</groupId>
-            <artifactId>spongeapi</artifactId>
-            <version>3.0.0</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-</project>

sponge/src/main/java/com/vexsoftware/votifier/sponge/VotifierPlugin.java

@@ -33,7 +33,6 @@ import org.slf4j.Logger;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.config.ConfigDir;
 import org.spongepowered.api.event.Listener;
-import org.spongepowered.api.event.cause.Cause;
 import org.spongepowered.api.event.game.state.GameStartedServerEvent;
 import org.spongepowered.api.event.game.state.GameStoppingServerEvent;
 import org.spongepowered.api.plugin.Plugin;
@@ -52,7 +51,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
-@Plugin(id = "nuvotifier", name = "NuVotifier", version = "2.3.2")
+@Plugin(id = "nuvotifier", name = "NuVotifier", version = "2.3.7", authors = "ParallelBlock LLC",
+        description = "Safe, smart, and secure Votifier server plugin")
 public class VotifierPlugin implements VoteHandler, com.vexsoftware.votifier.VotifierPlugin, ForwardedVoteListener {
     private Logger logger;
     @Inject
@@ -162,44 +162,42 @@ public class VotifierPlugin implements VoteHandler, com.vexsoftware.votifier.Vot
 
         debug = node.getNode("debug").getBoolean(false);
 
-        boolean setUpPort = node.getNode("enableExternal").getBoolean(true); //Always default to running the external port
+// Load Votifier tokens.
+        ConfigurationNode tokenSection = node.getNode("tokens");
 
-        if (setUpPort) {
-            // Load Votifier tokens.
-            ConfigurationNode tokenSection = node.getNode("tokens");
-
-            if (tokenSection.hasMapChildren()) {
-                for (Map.Entry<Object, ? extends ConfigurationNode> entry : tokenSection.getChildrenMap().entrySet()) {
-                    if (entry.getKey() instanceof String) {
-                        tokens.put((String) entry.getKey(), KeyCreator.createKeyFrom(entry.getValue().getString()));
-                        logger.info("Loaded token for website: " + entry.getKey());
-                    }
+        if (tokenSection.hasMapChildren()) {
+            for (Map.Entry<Object, ? extends ConfigurationNode> entry : tokenSection.getChildrenMap().entrySet()) {
+                if (entry.getKey() instanceof String) {
+                    tokens.put((String) entry.getKey(), KeyCreator.createKeyFrom(entry.getValue().getString()));
+                    logger.info("Loaded token for website: " + entry.getKey());
                 }
-            } else {
-                String token = TokenUtil.newToken();
-                tokenSection.setValue(ImmutableMap.of("default", token));
-                tokens.put("default", KeyCreator.createKeyFrom(token));
-                try {
-                    loader.save(node);
-                } catch (IOException e) {
-                    logger.error("Error generating Votifier token", e);
-                    gracefulExit();
-                    return;
-                }
-                logger.info("------------------------------------------------------------------------------");
-                logger.info("No tokens were found in your configuration, so we've generated one for you.");
-                logger.info("Your default Votifier token is " + token + ".");
-                logger.info("You will need to provide this token when you submit your server to a voting");
-                logger.info("list.");
-                logger.info("------------------------------------------------------------------------------");
             }
+        } else {
+            String token = TokenUtil.newToken();
+            tokenSection.setValue(ImmutableMap.of("default", token));
+            tokens.put("default", KeyCreator.createKeyFrom(token));
+            try {
+                loader.save(node);
+            } catch (IOException e) {
+                logger.error("Error generating Votifier token", e);
+                gracefulExit();
+                return;
+            }
+            logger.info("------------------------------------------------------------------------------");
+            logger.info("No tokens were found in your configuration, so we've generated one for you.");
+            logger.info("Your default Votifier token is " + token + ".");
+            logger.info("You will need to provide this token when you submit your server to a voting");
+            logger.info("list.");
+            logger.info("------------------------------------------------------------------------------");
+        }
 
-            // Initialize the receiver.
-            final String host = node.getNode("host").getString(hostAddr);
-            final int port = node.getNode("port").getInt(8192);
-            if (debug)
-                logger.info("DEBUG mode enabled!");
+        // Initialize the receiver.
+        final String host = node.getNode("host").getString(hostAddr);
+        final int port = node.getNode("port").getInt(8192);
+        if (debug)
+            logger.info("DEBUG mode enabled!");
 
+        if (port >= 0) {
             final boolean disablev1 = node.getNode("disable-v1-protocol").getBoolean(false);
             if (disablev1) {
                 logger.info("------------------------------------------------------------------------------");
@@ -229,7 +227,7 @@ public class VotifierPlugin implements VoteHandler, com.vexsoftware.votifier.Vot
                         public void operationComplete(ChannelFuture future) throws Exception {
                             if (future.isSuccess()) {
                                 serverChannel = future.channel();
-                                logger.info("Votifier enabled.");
+                                logger.info("Votifier enabled on socket " + serverChannel.localAddress() + ".");
                             } else {
                                 SocketAddress socketAddress = future.channel().localAddress();
                                 if (socketAddress == null) {
@@ -240,7 +238,11 @@ public class VotifierPlugin implements VoteHandler, com.vexsoftware.votifier.Vot
                         }
                     });
         } else {
-            logger.info("You have enableExternal set to false in your config.yml. NuVotifier will NOT listen to votes coming in from an external voting list.");
+            getLogger().info("------------------------------------------------------------------------------");
+            getLogger().info("Your Votifier port is less than 0, so we assume you do NOT want to start the");
+            getLogger().info("votifier port server! Votifier will not listen for votes over any port, and");
+            getLogger().info("will only listen for pluginMessaging forwarded votes!");
+            getLogger().info("------------------------------------------------------------------------------");
         }
 
         ConfigurationNode forwardingConfig = node.getNode("forwarding");
@@ -339,31 +341,35 @@ public class VotifierPlugin implements VoteHandler, com.vexsoftware.votifier.Vot
     }
 
     @Override
-    public void onVoteReceived(final Vote vote, VotifierSession.ProtocolVersion protocolVersion) throws Exception {
+    public void onVoteReceived(Channel channel, final Vote vote, VotifierSession.ProtocolVersion protocolVersion) throws Exception {
         if (debug) {
             if (protocolVersion == VotifierSession.ProtocolVersion.ONE) {
-                logger.info("Got a protocol v1 vote record -> " + vote);
+                logger.info("Got a protocol v1 vote record from " + channel.remoteAddress() + " -> " + vote);
             } else {
-                logger.info("Got a protocol v2 vote record -> " + vote);
+                logger.info("Got a protocol v2 vote record from " + channel.remoteAddress() + " -> " + vote);
             }
         }
         Sponge.getScheduler().createTaskBuilder()
                 .execute(new Runnable() {
                     @Override
                     public void run() {
-                        VotifierEvent event = new VotifierEvent(vote, Cause.of(VotifierPlugin.this));
+                        VotifierEvent event = new VotifierEvent(vote, Sponge.getCauseStackManager().getCurrentCause());
                         Sponge.getEventManager().post(event);
                     }
                 })
-                .async()
                 .submit(this);
     }
 
     @Override
-    public void onError(Channel channel, Throwable throwable) {
+    public void onError(Channel channel, boolean alreadyHandledVote, Throwable throwable) {
         if (debug) {
-            logger.error("Unable to process vote from " + channel.remoteAddress(), throwable);
-        } else {
+            if (alreadyHandledVote) {
+                logger.error("Vote processed, however an exception " +
+                        "occurred with a vote from " + channel.remoteAddress(), throwable);
+            } else {
+                logger.error("Unable to process vote from " + channel.remoteAddress(), throwable);
+            }
+        } else if (!alreadyHandledVote) {
             logger.error("Unable to process vote from " + channel.remoteAddress());
         }
     }
@@ -377,11 +383,10 @@ public class VotifierPlugin implements VoteHandler, com.vexsoftware.votifier.Vot
                 .execute(new Runnable() {
                     @Override
                     public void run() {
-                        VotifierEvent event = new VotifierEvent(v, Cause.of(VotifierPlugin.this));
+                        VotifierEvent event = new VotifierEvent(v, Sponge.getCauseStackManager().getCurrentCause());
                         Sponge.getEventManager().post(event);
                     }
                 })
-                .async()
                 .submit(this);
     }
 }

sponge/src/main/java/com/vexsoftware/votifier/sponge/forwarding/SpongePluginMessagingForwardingSink.java

@@ -1,8 +1,9 @@
 package com.vexsoftware.votifier.sponge.forwarding;
 
+import com.google.gson.JsonObject;
 import com.vexsoftware.votifier.model.Vote;
 import com.vexsoftware.votifier.sponge.VotifierPlugin;
-import org.json.JSONObject;
+import com.vexsoftware.votifier.util.GsonInst;
 import org.spongepowered.api.Platform;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.network.ChannelBinding;
@@ -33,8 +34,9 @@ public class SpongePluginMessagingForwardingSink implements ForwardingVoteSink,
     @Override
     public void handlePayload(ChannelBuf channelBuf, RemoteConnection remoteConnection, Platform.Type type) {
         try {
-            String message = new String(channelBuf.array(), StandardCharsets.UTF_8);
-            JSONObject jsonObject = new JSONObject(message);
+            byte[] msgDirBuf = channelBuf.readBytes(channelBuf.available());
+            String message = new String(msgDirBuf, StandardCharsets.UTF_8);
+            JsonObject jsonObject  = GsonInst.gson.fromJson(message, JsonObject.class);
             Vote v = new Vote(jsonObject);
             listener.onForward(v);
         } catch (Exception e) {

sponge/src/main/resources/com/vexsoftware/votifier/sponge/spongeConfig.yml

@@ -9,10 +9,6 @@ port: 8192
 # This is useful when initially setting up NuVotifier to ensure votes are being delivered.
 debug: false
 
-# Setting this value to false will turn off the votifier port listening for external votes. This is beneficial if the server
-# is only listening for votes coming from NuVotifier running on your BungeeCord.
-enableExternal: true
-
 # Setting this option to true will disable handling of Protocol v1 packets. While the old protocol is not secure, this
 # option is currently not recommended as most voting sites only support the old protocol at present. However, if you are
 # using NuVotifier's proxy forwarding mechanism, enabling this option will increase your server's security.

universal/build.gradle

@@ -0,0 +1,35 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
+    }
+}
+
+apply plugin: 'com.github.johnrengelman.shadow'
+
+dependencies {
+    compile project(":nuvotifier-bukkit")
+    compile project(":nuvotifier-bungeecord")
+    compile project(":nuvotifier-sponge")
+}
+
+shadowJar {
+    baseName = 'nuvotifier'
+    classifier = null
+    relocate "io.netty", "com.vexsoftware.votifier.netty"
+    relocate "org.json", "com.vexsoftware.votifier.json"
+    relocate "com.google", "com.vexsoftware.votifier.google"
+    relocate "org.apache.commons.io", "com.vexsoftware.votifier.commons.io"
+}
+
+artifacts {
+    tasks.shadowJar.outputs.files.each {
+        archives(it) {
+            builtBy shadowJar
+        }
+    }
+}
+
+build.dependsOn shadowJar

universal/pom.xml

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <parent>
-        <artifactId>nuvotifier</artifactId>
-        <groupId>com.vexsoftware</groupId>
-        <version>2.3.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>nuvotifier-universal</artifactId>
-    <name>nuvotifier</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.3</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <relocations>
-                        <relocation>
-                            <pattern>io.netty</pattern>
-                            <shadedPattern>com.vexsoftware.votifier.netty</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.json</pattern>
-                            <shadedPattern>com.vexsoftware.votifier.json</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.apache.commons.io</pattern>
-                            <shadedPattern>com.vexsoftware.votifier.commons.io</shadedPattern>
-                        </relocation>
-                    </relocations>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.vexsoftware</groupId>
-            <artifactId>nuvotifier-bukkit</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.vexsoftware</groupId>
-            <artifactId>nuvotifier-bungeecord</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.vexsoftware</groupId>
-            <artifactId>nuvotifier-sponge</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-    </dependencies>
-</project>

usage.md

@@ -1,151 +0,0 @@
-This document outlines how to use NuVotifier as a plugin on both Bukkit based servers, as well as BungeeCord/Bukkit based
-networks.
-
-# Installation
-
-The NuVotifier Universal jar (the default jar that is distributed on spigotmc.org) can be installed on Bukkit, BungeeCord,
-and Sponge servers as-is without modification.
-
-The Universal JAR can be downloaded off our [SpigotMC resource page](https://www.spigotmc.org/resources/nuvotifier.13449/).
-
-# Votifier v1 vs NuVotifier v2 Protocols
-
-NuVotifier introduces a more secure and failure tolerant protocol for sending votes. In this document, this new protocol
-will be referred to as v2. NuVotifier also supports the legacy Votifier protocol (using public key encryption). In this document,
-the legacy protocol will be referred to v1. As of writing, most if not all vote websites still use v1.
-
-# Configuration
-
-## Enabling the NuVotifier Server port
-
-NuVotifier allows for the server port to be turned off when NuVotifier is only being used to forward votes. This is only
-an option on Bukkit based servers, since it would not make logical sense for the port to be turned off on Bungee servers.
-
-If you are receiving votes from a server list directly on the server in question (votes are not being forwarded through plugin
-messaging), or if votes are being forwarded through the `proxy` method, then `enableExternal` should be set to true. Only
-if you are receiving forwarded votes from your bungee through the `pluginMessaging` forwarding method should `enableExternal`
-be set to false.
-
-## Port Configuration
-
-One of NuVotifier's functions is acting as a vote server (receiver). The IP for NuVotifier to bind to is configured
-by the `host` and `ip` configuration values within the config.yml files within the NuVotifier plugin folder.
-Most times, you will want this `host` value to be set to `0.0.0.0` or your server's ip. `0.0.0.0` will bind to all
-ip ports on your machine, while specifying a certain IP will only bind to that ip. If you don't know what to set this
-to, `0.0.0.0` is a safe bet. By default, NuVotifier listens on port 8192. This is the same as the default Votifier port.
-If you change this, you will have to remember this when setting up forwarding or server lists.
-
-## Debug mode
-
-When first setting up NuVotifier, you will probably want debug mode to be enabled. This prints extra information to the
-console, ensuring that votes are being processed as they should. If you are experiencing an error, or having issues with
-votes being processed, you should first look to enable this. Debug mode can be turned on by setting `debug` in the config.yml
-to true.
-
-## Tokens vs Public Key
-
-As explained earlier, NuVotifier supports 2 different protocols for receiving votes, v1 and v2. v1 uses the private and public
-key pair located in `rsa/` in NuVotifier's plugin folder. When setting up voting websites, the public key, `rsa/public.key`
-should be used. When setting up the `proxy` forwarding method, tokens should be used.
-
-Making a new token is as easy as adding another entry into `tokens` with the serviceName as the key and whatever string you want
-as the value. You can usually find the serviceName of a vote provider on their setup page if they use v2.
-
-Unless a website specifies it, you should assume that the website is using v1, and you should enter your `rsa/public.key`.
-
-## Forwarding
-
-NuVotifier allows for various methods for forwarding the vote from an upstream Bungeecord instance. Currently, 2 methods
-are supported: `proxy` and `pluginMessaging`. These are configured through the `forwarding` configuration section in your
-config.yml files.
-
-### Plugin Messaging Based Forwarding
-
-Plugin Messaging based forwarding works by sending a forwarded vote over Minecraft's plugin messaging system. NuVotifier
-is only capable of forwarding the vote if a player is on each backend server through the BungeeCord running NuVotifier.
-Plugin Messaging can be enabled by setting `method` in `forwarding` to `pluginMessaging`. You may also set the plugin messaging
-channel NuVotifier is to use by setting `channel` in the `pluginMessaging` section. This may be whatever you want, but it
-must be the same on your BungeeCord as well as your backend Bukkit servers. If they are not the same, the backend will not
-be able to receive the vote.
-
-#### Filtering servers
-
-If you only wish to send votes to some servers, but not all, there is a section within `pluginMessaging` called `excludedServers`.
-By default, this section is commented out, and will never filter out any servers. If you wish to filter out servers, uncomment
-this list and fill it with the names of servers you do not want to send votes to.
-
-#### Plugin Messaging Vote Caching
-
-In the event that the backend server does not have anyone on it from the BungeeCord instance, the vote will need to be cached
-until a player joins and the vote may be sent. There are 3 options for caching, however one is only suitable for actual
-production.
-
-##### Memory Vote Caching
-
-For votes to simply be cached in memory, you can set the `cache` setting of the `pluginMessaging` section of your BungeeCord's
-NuVotifier's config.yml to `memory`. This stores votes in memory. The votes are lost when the BungeeCord server shuts down.
-This is suitable for testing, but not for production system.
-
-##### File Vote Caching
-
-Votes can also be cached in a file located in the NuVotifier plugin folder. To enable this, you can set `cache` to file.
-If you want to change the file location from the default, you can set this under the `name` config under the `file` section.
-This caching method is suitable for most people.
-
-##### No Caching
-
-Caching can also be turned off. This is the default option. You can do this by setting `cache` to `none`. This is also not
-recommended, and is only suitable for a certain number of setups.
-
-### Proxy Based Forwarding
-
-You can also forward votes using the proxy method. This will cause the BungeeCord to act as a voting websites, sending votes
-to each server's NuVotifier port. To enable this method, you must set the `method` under `forwarding` to `proxy` in your
-BungeeCord config.yml. Within the server's config.yml, `forwarding` should be set to `none`.
-
-For each server you wish to forward to, you must add each to your BungeeCord config.yml under the `proxy` section of `forwarding`.
-For each, you must specify the ip address (`address`), port (`port`) and token (`key`). Each backend Bukkit server should have
-1 default token under the `tokens` section. This is the token that should be used as the token for the `key` in that server's
-section within the `proxy` section. If the server is on the same server (same ip) as the BungeeCord server, you may
-use the `127.0.0.1` or `localhost` address, setting both the `proxy` forwarding address and Bukkit config.yml address to it.
-
-In order for vote proxying to work, the backend server __must__ have `enableExternal` set to true. If it is set to
-false, the Bungee server will not be able to forward the vote. 
-
-
-## Default Configurations
-
-The default configuration for Bukkit can be found [here](https://github.com/NuVotifier/NuVotifier/blob/master/bukkit/src/main/resources/bukkitConfig.yml),
-for BungeeCord [here](https://github.com/NuVotifier/NuVotifier/blob/master/bungeecord/src/main/resources/bungeeConfig.yml),
-and for Sponge [here](https://github.com/NuVotifier/NuVotifier/blob/master/sponge/src/main/resources/com/vexsoftware/votifier/sponge/spongeConfig.yml).
-
-
-## Testing
-
-There is a free resource for testing your NuVotifier setups at [ibj.io/v](https://ibj.io/v). If you are setting up your
-network or server and want a server to get test votes on, you are more than welcome to use it.
-
-
-## Basic Setups
-
-### Single Server Quickstart
-
-A single server setup should have `enableExternal` set to `true`, and `forwarding.method` set to `none`. The IP and port
-should also be set to appropriate values. For server lists, you should use the public key found in `rsa/public.key`.
-
-## Advanced Setups
-
-### Multi BungeeCord Setups
-
-Using NuVotifier with multiple BungeeCords is a more tricky setup. You can use one of your player-facing proxies for the
-NuVotifier server, or use a separate one. You are not guaranteed to have players on all of your servers to allow votes to
-be dispatched, so proxy forwarding (requiring `enableExternal` set to `true` on your Bukkit servers) is highly recommended.
-
-## Contributing
-
-If you wish to contribute code wise, feel free to submit a pull request!
-
-## Client Libraries
-
-NuVotifier has libraries available for [NodeJS](https://github.com/NuVotifier/votifier2-js) and [PHP](https://github.com/NuVotifier/votifier2-php).
-Both are free to use by serverlists.