Release 2.6.0

Remove jenkinsfile
Do not error when server filter does not have a list
2019-12-24 18:54:24 -08:00 · 2019-12-24 18:54:14 -08:00 · 2019-12-24 18:50:49 -08:00 · 2019-12-24 18:47:56 -08:00 · 2019-12-24 17:35:12 -08:00 · 2019-06-03 11:57:33 -04:00
69 changed files with 131 additions and 1781 deletions
@@ -1,16 +0,0 @@
-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
@@ -1,9 +1,17 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.+'
+    }
+}

 import org.apache.tools.ant.filters.ReplaceTokens

 allprojects {
    group 'com.vexsoftware'
-    version '2.5.0'
+    version '2.6.0'
 }

 subprojects {
@@ -12,18 +20,19 @@ subprojects {
    sourceCompatibility = 1.8

    repositories {
+        jcenter()
        mavenCentral()
        maven {
-            url 'https://repo.parallelblock.com/repository/maven-public/'
+            url "https://hub.spigotmc.org/nexus/content/repositories/snapshots"
        }
        maven {
-            url 'https://hub.spigotmc.org/nexus/content/groups/public/'
+            url "https://oss.sonatype.org/content/repositories/snapshots"
        }
        maven {
-            url "https://oss.sonatype.org/content/groups/public/"
+            url "https://repo.spongepowered.org/maven"
        }
        maven {
-            url "http://repo.spongepowered.org/maven"
+            url "https://repo.velocitypowered.com/snapshots/"
        }
    }

@@ -176,7 +176,13 @@ public class NuVotifierBukkit extends JavaPlugin implements VoteHandler, Votifie
            return false;
        }

-        debug = cfg.getBoolean("debug", false);
+        // the quiet flag always runs priority to the debug flag
+        if (cfg.isBoolean("quiet")) {
+            debug = !cfg.getBoolean("quiet");
+        } else {
+            // otherwise, default to being noisy
+            debug = cfg.getBoolean("debug", true);
+        }

        // Load Votifier tokens.
        ConfigurationSection tokenSection = cfg.getConfigurationSection("tokens");
@@ -210,8 +216,9 @@ public class NuVotifierBukkit extends JavaPlugin implements VoteHandler, Votifie
        // 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 (!debug)
+            getLogger().info("QUIET mode enabled!");
+
        if (port >= 0) {
            final boolean disablev1 = cfg.getBoolean("disable-v1-protocol");
            if (disablev1) {
@@ -5,10 +5,6 @@ host: %ip%
 # Port to listen for new votes on
 port: 8192

-# Whether or not to print debug messages. In a production system, this should be set to false.
-# This is useful when initially setting up NuVotifier to ensure votes are being delivered.
-debug: false
-
 # 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.
@@ -2,7 +2,7 @@ name: Votifier
 main: com.vexsoftware.votifier.NuVotifierBukkit
 version: @app.version@
 description: A plugin that gets notified when votes are made for the server on toplists.
-authors: [ParallelBlock, blakeman8192, Kramer, tuxed]
+authors: [Ichbinjoe, blakeman8192, Kramer, tuxed]
 api-version: 1.13

 commands:
@@ -179,9 +179,14 @@ public class NuVotifier extends Plugin implements VoteHandler, ProxyVotifierPlug
        // Initialize the receiver.
        final String host = configuration.getString("host", "0.0.0.0");
        final int port = configuration.getInt("port", 8192);
-        debug = configuration.getBoolean("debug", false);
-        if (debug)
-            getLogger().info("DEBUG mode enabled!");
+
+        if (configuration.get("quiet") != null)
+            debug = !configuration.getBoolean("quiet");
+        else
+            debug = configuration.getBoolean("debug", true);
+
+        if (!debug)
+            getLogger().info("QUIET mode enabled!");

        final boolean disablev1 = configuration.getBoolean("disable-v1-protocol");
        if (disablev1) {
@@ -1,4 +1,4 @@
 name: NuVotifier
 main: com.vexsoftware.votifier.bungee.NuVotifier
 version: @app.version@
-author: ParallelBlock, blakeman8192, Kramer, tuxed
+author: Ichbinjoe, blakeman8192, Kramer, tuxed
@@ -5,10 +5,6 @@ host: 0.0.0.0
 # Port to listen for new votes on
 port: 8192

-# Whether or not to print debug messages. In a production system, this should be set to false.
-# This is useful when initially setting up NuVotifier to ensure votes are being delivered.
-debug: false
-
 # All tokens, labeled by the serviceName of each server list.
 tokens:
  # Default token for all server lists, if another isn't supplied.
@@ -1,5 +1,5 @@
 dependencies {
-    compile group: "io.netty", name: "netty-handler", version: "4.1.16.Final"
+    compile group: "io.netty", name: "netty-handler", version: "4.1.32.Final"
    compile 'com.google.code.gson:gson:2.8.0'
    compile 'com.google.guava:guava:24.1-jre'
    testCompile group: "junit", name: "junit", version: "4.12"
@@ -64,7 +64,7 @@ public class VotifierServerBootstrap {
                        if (socketAddress == null) {
                            socketAddress = new InetSocketAddress(host, port);
                        }
-                        plugin.getPluginLogger().error("Votifier was not able to bind to {}", socketAddress, future.cause());
+                        plugin.getPluginLogger().error("Votifier was not able to bind to " + socketAddress.toString(), future.cause());
                        error.accept(future.cause());
                    }
                });
@@ -39,7 +39,6 @@ public class VoteInboundHandler extends SimpleChannelInboundHandler<Vote> {
        handler.onError(ctx.channel(), session.hasCompletedVote(), cause);

        if (session.getVersion() == VotifierSession.ProtocolVersion.TWO) {
-
            JsonObject object = new JsonObject();
            object.addProperty("status", "error");
            object.addProperty("cause", cause.getClass().getSimpleName());
@@ -18,6 +18,7 @@

 package com.vexsoftware.votifier.net.protocol.v1crypto;

+import java.io.IOException;
 import java.util.Base64;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -59,6 +60,19 @@ public class RSAIO {
        }
    }

+    public static byte[] readB64File(File directory, String name) throws IOException {
+        File f = new File(directory, name);
+        byte[] contents = Files.readAllBytes(f.toPath());
+        String strContents = new String(contents);
+        strContents = strContents.trim();
+        try {
+            return Base64.getDecoder().decode(strContents);
+        } catch (IllegalArgumentException e) {
+            throw new IllegalArgumentException("Base64 decoding exception: This is probably due to a corrupted file, " +
+                    "but in case it isn't, here is a b64 representation of what we read: " + new String(Base64.getEncoder().encode(contents), StandardCharsets.UTF_8), e);
+        }
+    }
+
    /**
     * Loads an RSA key pair from a directory. The directory must have the files
     * "public.key" and "private.key".
@@ -69,14 +83,10 @@ public class RSAIO {
     */
    public static KeyPair load(File directory) throws Exception {
        // Read the public key file.
-        File publicKeyFile = new File(directory, "public.key");
-        byte[] encodedPublicKey = Files.readAllBytes(publicKeyFile.toPath());
-        encodedPublicKey = Base64.getDecoder().decode(new String(encodedPublicKey, StandardCharsets.UTF_8));
+        byte[] encodedPublicKey = readB64File(directory, "public.key");

        // Read the private key file.
-        File privateKeyFile = new File(directory, "private.key");
-        byte[] encodedPrivateKey = Files.readAllBytes(privateKeyFile.toPath());
-        encodedPrivateKey = Base64.getDecoder().decode(new String(encodedPrivateKey, StandardCharsets.UTF_8));
+        byte[] encodedPrivateKey = readB64File(directory, "private.key");

        // Instantiate and return the key pair.
        KeyFactory keyFactory = KeyFactory.getInstance("RSA");
@@ -6,6 +6,9 @@ import java.util.Collections;
 public class ServerFilter {

    public ServerFilter(Collection<String> names, boolean whitelist) {
+        if (names == null)
+            names = Collections.EMPTY_SET;
+
        this.names = names;
        this.whitelist = whitelist;
    }
@@ -92,8 +92,13 @@ public class MemoryVoteCache implements VoteCache {
    }

    public void sweep() {
-        sweep(voteCache);
-        sweep(playerVoteCache);
+        cacheLock.lock();
+        try {
+            sweep(voteCache);
+            sweep(playerVoteCache);
+        } finally {
+            cacheLock.unlock();
+        }
    }

    private void sweep(Multimap<?, Vote> m) {
@@ -1 +0,0 @@
-resources/
@@ -1,22 +0,0 @@
-
-.PHONY: clean, all, run
-
-all : resources/paper.jar resources/proxy.jar
-
-resources :
-	mkdir resources
-
-resources/paper.jar : resources
-	wget -O resources/paper.jar https://papermc.io/ci/job/Paper-1.13/lastSuccessfulBuild/artifact/paperclip.jar
-
-resources/proxy.jar : resources
-	wget -O resources/proxy.jar https://papermc.io/ci/job/Waterfall/lastSuccessfulBuild/artifact/Waterfall-Proxy/bootstrap/target/Waterfall.jar
-
-clean :
-	rm -r resources/
-
-run :
-	tmux new-session './proxy/run.sh' \; \
-		split-window -h './s1/run.sh' \; \
-		split-window -h './s2/run.sh' \; \
-		select-layout even-horizontal
@@ -1,26 +0,0 @@
-## Using this testbed
-
-This testbed runs one Bungeecord as well as two Paper servers behind it, labeled
-s1 and s2. Ports for where everything is bound is listed below.
-
-First, download required sources using the following command:
-
-```
-make
-```
-
-Then, each time you want to launch a session, run:
-
-```
-make run
-```
-
-FYI, this only works in Linux afaik because thats what I do my development on.
-
-# Ports
-
-| Server | MC Port | Votifier Port |
-| ------ | ------- | ------------- |
-| proxy  | 25577   | 8192          |
-| s1     | 25565   | 8193          |
-| s2     | 25566   | 8194          |
@@ -1,4 +0,0 @@
-logs/
-modules/
-locations.yml
-
@@ -1,48 +0,0 @@
-forge_support: true
-timeout: 30000
-online_mode: true
-log_commands: false
-listeners:
- query_port: 25577
-  motd: '&4its a bungee cord surbur'
-  tab_list: GLOBAL_PING
-  query_enabled: false
-  proxy_protocol: false
-  forced_hosts: {}
-  ping_passthrough: false
-  priorities:
-  - s1
-  bind_local_address: true
-  host: 0.0.0.0:25577
-  max_players: 1
-  tab_size: 60
-  force_default_server: false
-connection_throttle: 1
-groups:
-  md_5:
-  - admin
-log_pings: true
-ip_forward: true
-prevent_proxy_connections: true
-network_compression_threshold: 256
-disabled_commands: []
-stats: bf8a54ea-2917-4b9e-b463-2c05bd7f1ac6
-permissions:
-  default:
-  - bungeecord.command.server
-  - bungeecord.command.list
-  admin:
-  - bungeecord.command.alert
-  - bungeecord.command.end
-  - bungeecord.command.ip
-  - bungeecord.command.reload
-servers:
-  s1:
-    motd: SERVER 1
-    address: localhost:25565
-    restricted: false
-  s2:
-    motd: SERVER 2
-    address: localhost:25566
-    restricted: false
-player_limit: -1
@@ -1,8 +0,0 @@
-version: 2
-modules:
- jenkins://cmd_alert
- jenkins://cmd_find
- jenkins://cmd_list
- jenkins://cmd_send
- jenkins://cmd_server
- jenkins://reconnect_yaml
@@ -1 +0,0 @@
-rsa/
@@ -1,74 +0,0 @@
-# The IP to listen to. Use 0.0.0.0 if you wish to listen to all interfaces on your server. (All IP addresses)
-# This defaults to the IP you have configured your server to listen on, or 0.0.0.0 if you have not configured this.
-host: 0.0.0.0
-
-# Port to listen for new votes on
-port: 8192
-
-# Whether or not to print debug messages. In a production system, this should be set to false.
-# This is useful when initially setting up NuVotifier to ensure votes are being delivered.
-debug: false
-
-# All tokens, labeled by the serviceName of each server list.
-tokens:
-  # Default token for all server lists, if another isn't supplied.
-  default: jqpli3gnd8l67qsg2d81vje09h
-
-# 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.
-disable-v1-protocol: false
-
-# Configuration section for all vote forwarding to NuVotifier
-forwarding:
-  # Sets whether to set up a remote method for fowarding. Supported methods:
-  # - none - Does not set up a forwarding method.
-  # - pluginMessaging - Sets up plugin messaging.
-  # - proxy - Proxies votes to other NuVotifier servers from this server.
-  method: none
-  pluginMessaging:
-    channel: nuvotifier:votes
-
-    #Only send votes to certain servers. If a server is present on excludedServers, then votes will NOT be forwarded
-    #to them. If excludedServers is not present, votes will be sent to all servers.
-    # If onlySendToJoinedServer is true and a player is on one of these servers, NuVotifier will process the vote as if the
-    # player was not on the network at all.
-    #excludedServers:
-    #- server1
-    #- server2
-
-    # If uncommented, turns excludedServers into an includedServers, where only servers on the list will be used.
-    #whitelist: true
-
-    # Sets which cache to use if there are no players on the server that the vote is being sent to. Supported caches:
-    # - none - Votes will simply be lost when no players are present on the server.
-    # - memory - Votes will be cached in memory when no players are present. When Bungee is restarted, the votes will be lost.
-    # - file - Votes will be saved to a local file every 3 minutes and on shutdown and reloaded when Bungee is restarted. This is suitable for
-    #   most set ups.
-    cache: file
-    # Only sends the vote to the server in which the player is currently joined.
-    onlySendToJoinedServer: false
-    #Sets which server to send the vote in the event the player is not online when the vote is cast
-    #If you do not want the vote forwarded to a fallback, set this value to empty ('')
-    #ONLY USED IF onlySendToJoinedServer is true!!
-    joinedServerFallback: 'Hub'
-    # Defines how quickly to dump votes over a player's connection when offloading a cache in votes per second
-    dumpRate: 5
-    # Options for file caching.
-    file:
-      name: cached-votes.json
-      # days before a vote is considered 'dead' - removed from cache with a console warning
-      cacheTime: 10
-    # Options for memory caching.
-    memory:
-      # days before a vote is considered 'dead' and removed from memory. All votes are removed when the server restarts. -1 signifies no TTL
-      cacheTime: -1
-  # Specify servers to proxy votes for.
-  proxy:
-    Hub:
-      address: 127.0.0.1
-      port: 8193
-      token: MyKeyHere
-    Hub2:
-      address: 127.0.0.1
-      port: 8194
-      token: AnotherKeyHere
@@ -1 +0,0 @@
-../../../universal/build/libs/nuvotifier.jar
@@ -1 +0,0 @@
-../resources/proxy.jar
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-cd $DIR
-
-java -jar proxy.jar
@@ -1,8 +0,0 @@
-use_netty_dns_resolver: true
-disable_modern_tab_limiter: true
-log_initial_handler_connections: true
-throttling:
-  tab_complete: 1000
-game_version: ''
-log_server_list_ping: false
-allow_empty_packets: false
@@ -1,10 +0,0 @@
-#!/bin/sh
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-cd $DIR
-echo <<WARNING
-Hey! Just so you know, I am using the IReallyKnowWhatIAmDoingISwear flag, as
-well as overriding the eula check. If you don't agree to the Mojang EULA
-thingie, then uh, smash your computer or something because you totally agreed
-to it so just fyi
-WARNING
-java -DIReallyKnowWhatIAmDoingISwear -Dcom.mojang.eula.agree=true -jar paper.jar
@@ -1,19 +0,0 @@
-banned-ips.json
-banned-players.json
-
-cache/
-
-eula.txt
-
-logs/
-
-permissions.yml
-
-ops.json
-usercache.json
-version_history.json
-whitelist.json
-
-world/
-world_nether/
-world_the_end/
@@ -1,37 +0,0 @@
-# This is the main configuration file for Bukkit.
-# As you can see, there's actually not that much to configure without any plugins.
-# For a reference for any variable inside this file, check out the Bukkit Wiki at
-# https://www.spigotmc.org/go/bukkit-yml
-# 
-# If you need help on this file, feel free to join us on irc or leave a message
-# on the forums asking for advice.
-# 
-# IRC: #spigot @ irc.spi.gt
-#    (If this means nothing to you, just go to https://www.spigotmc.org/go/irc )
-# Forums: https://www.spigotmc.org/
-# Bug tracker: https://www.spigotmc.org/go/bugs
-
-
-settings:
-  allow-end: true
-  warn-on-overload: true
-  permissions-file: permissions.yml
-  update-folder: update
-  plugin-profiling: false
-  connection-throttle: 4000
-  query-plugins: true
-  deprecated-verbose: default
-  shutdown-message: Server closed
-spawn-limits:
-  monsters: 70
-  animals: 10
-  water-animals: 15
-  ambient: 15
-chunk-gc:
-  period-in-ticks: 600
-  load-threshold: 0
-ticks-per:
-  animal-spawns: 400
-  monster-spawns: 1
-  autosave: 6000
-aliases: now-in-commands.yml
@@ -1,17 +0,0 @@
-# This is the commands configuration file for Bukkit.
-# For documentation on how to make use of this file, check out the Bukkit Wiki at
-# https://www.spigotmc.org/go/commands-yml
-# 
-# If you need help on this file, feel free to join us on irc or leave a message
-# on the forums asking for advice.
-# 
-# IRC: #spigot @ irc.spi.gt
-#    (If this means nothing to you, just go to https://www.spigotmc.org/go/irc )
-# Forums: https://www.spigotmc.org/
-# Bug tracker: https://www.spigotmc.org/go/bugs
-
-command-block-overrides: []
-ignore-vanilla-permissions: false
-aliases:
-  icanhasbukkit:
-  - version $1-
@@ -1,56 +0,0 @@
-# This is the help configuration file for Bukkit.
-# 
-# By default you do not need to modify this file. Help topics for all plugin commands are automatically provided by
-# or extracted from your installed plugins. You only need to modify this file if you wish to add new help pages to
-# your server or override the help pages of existing plugin commands.
-# 
-# This file is divided up into the following parts:
-# -- general-topics: lists admin defined help topics
-# -- index-topics:   lists admin defined index topics
-# -- amend-topics:   lists topic amendments to apply to existing help topics
-# -- ignore-plugins: lists any plugins that should be excluded from help
-# 
-# Examples are given below. When amending command topic, the string <text> will be replaced with the existing value
-# in the help topic. Color codes can be used in topic text. The color code character is & followed by 0-F.
-# ================================================================
-# 
-# Set this to true to list the individual command help topics in the master help.
-# command-topics-in-master-index: true
-# 
-# Each general topic will show up as a separate topic in the help index along with all the plugin command topics.
-# general-topics:
-#     Rules:
-#         shortText: Rules of the server
-#         fullText: |
-#             &61. Be kind to your fellow players.
-#             &B2. No griefing.
-#             &D3. No swearing.
-#         permission: topics.rules
-# 
-# Each index topic will show up as a separate sub-index in the help index along with all the plugin command topics.
-# To override the default help index (displayed when the user executes /help), name the index topic "Default".
-# index-topics:
-#     Ban Commands:
-#         shortText: Player banning commands
-#         preamble: Moderator - do not abuse these commands
-#         permission: op
-#         commands:
-#             - /ban
-#             - /ban-ip
-#             - /banlist
-# 
-# Topic amendments are used to change the content of automatically generated plugin command topics.
-# amended-topics:
-#     /stop:
-#         shortText: Stops the server cold....in its tracks!
-#         fullText: <text> - This kills the server.
-#         permission: you.dont.have
-# 
-# Any plugin in the ignored plugins list will be excluded from help. The name must match the name displayed by
-# the /plugins command. Ignore "Bukkit" to remove the standard bukkit commands from the index. Ignore "All"
-# to completely disable automatic help topic generation.
-# ignore-plugins:
-#    - PluginNameOne
-#    - PluginNameTwo
-#    - PluginNameThree
-
@@ -1 +0,0 @@
-../resources/paper.jar
@@ -1,178 +0,0 @@
-# This is the main configuration file for Paper.
-# As you can see, there's tons to configure. Some options may impact gameplay, so use
-# with caution, and make sure you know what each option does before configuring.
-# 
-# If you need help with the configuration or have any questions related to Paper,
-# join us in our Discord or IRC channel.
-# 
-# Discord: https://paperdiscord.emc.gs
-# IRC: #paper @ irc.spi.gt ( http://irc.spi.gt/iris/?channels=paper )
-# Website: https://papermc.io/ 
-# Docs: https://paper.readthedocs.org/ 
-
-verbose: false
-config-version: 16
-settings:
-  load-permissions-yml-before-plugins: true
-  bungee-online-mode: true
-  use-versioned-world: false
-  velocity-support:
-    enabled: false
-    online-mode: false
-    secret: ''
-  queue-light-updates-max-loss: 10
-  suggest-player-names-when-null-tab-completions: true
-  watchdog:
-    early-warning-every: 5000
-    early-warning-delay: 10000
-  spam-limiter:
-    tab-spam-increment: 1
-    tab-spam-limit: 500
-  save-player-data: true
-  sleep-between-chunk-saves: false
-  region-file-cache-size: 256
-  save-empty-scoreboard-teams: false
-  incoming-packet-spam-threshold: 300
-  book-size:
-    page-max: 2560
-    total-multiplier: 0.98
-  enable-player-collisions: true
-  player-auto-save-rate: -1
-  max-player-auto-save-per-tick: -1
-  async-chunks:
-    enable: true
-    generation: true
-    thread-per-world-generation: true
-    load-threads: -1
-  use-alternative-luck-formula: false
-messages:
-  no-permission: '&cI''m sorry, but you do not have permission to perform this command.
-    Please contact the server administrators if you believe that this is in error.'
-  kick:
-    connection-throttle: Connection throttled! Please wait before reconnecting.
-    flying-player: Flying is not enabled on this server
-    flying-vehicle: Flying is not enabled on this server
-    authentication-servers-down: ''
-timings:
-  enabled: true
-  verbose: true
-  server-name-privacy: false
-  hidden-config-entries:
-  - database
-  - settings.bungeecord-addresses
-  history-interval: 300
-  history-length: 3600
-world-settings:
-  default:
-    game-mechanics:
-      villages-load-chunks: false
-      scan-for-legacy-ender-dragon: true
-      disable-chest-cat-detection: false
-      disable-end-credits: false
-      disable-player-crits: false
-      disable-sprint-interruption-on-attack: false
-      shield-blocking-delay: 5
-      disable-unloaded-chunk-enderpearl-exploit: true
-    remove-corrupt-tile-entities: false
-    queue-light-updates: false
-    portal-search-radius: 128
-    optimize-explosions: false
-    disable-teleportation-suffocation-check: false
-    fixed-chunk-inhabited-time: -1
-    use-vanilla-world-scoreboard-name-coloring: false
-    delay-chunk-unloads-by: 10s
-    max-auto-save-chunks-per-tick: 24
-    save-queue-limit-for-auto-save: 50
-    enable-treasure-maps: true
-    treasure-maps-return-already-discovered: false
-    experience-merge-max-value: -1
-    max-chunk-sends-per-tick: 81
-    max-chunk-gens-per-tick: 10
-    prevent-moving-into-unloaded-chunks: false
-    max-growth-height:
-      cactus: 3
-      reeds: 3
-    fishing-time-range:
-      MinimumTicks: 100
-      MaximumTicks: 600
-    despawn-ranges:
-      soft: 32
-      hard: 128
-    falling-block-height-nerf: 0
-    tnt-entity-height-nerf: 0
-    lightning-strike-distance-limit:
-      sound: -1
-      impact-sound: -1
-      flash: -1
-    frosted-ice:
-      enabled: true
-      delay:
-        min: 20
-        max: 40
-    lootables:
-      auto-replenish: false
-      restrict-player-reloot: true
-      reset-seed-on-fill: true
-      max-refills: -1
-      refresh-min: 12h
-      refresh-max: 2d
-    filter-nbt-data-from-spawn-eggs-and-related: true
-    max-entity-collisions: 8
-    disable-creeper-lingering-effect: false
-    hopper:
-      cooldown-when-full: true
-      disable-move-event: false
-    duplicate-uuid-resolver: saferegen
-    duplicate-uuid-saferegen-delete-range: 32
-    keep-spawn-loaded-range: 8
-    auto-save-interval: -1
-    disable-thunder: false
-    skeleton-horse-thunder-spawn-chance: 0.01
-    disable-ice-and-snow: false
-    fire-physics-event-for-redstone: false
-    keep-spawn-loaded: true
-    anti-xray:
-      enabled: false
-      engine-mode: 1
-      chunk-edge-mode: 1
-      max-chunk-section-index: 3
-      update-radius: 2
-      hidden-blocks:
-      - gold_ore
-      - iron_ore
-      - coal_ore
-      - lapis_ore
-      - mossy_cobblestone
-      - obsidian
-      - chest
-      - diamond_ore
-      - redstone_ore
-      - lit_redstone_ore
-      - clay
-      - emerald_ore
-      - ender_chest
-      replacement-blocks:
-      - stone
-      - planks
-    skip-entity-ticking-in-chunks-scheduled-for-unload: true
-    armor-stands-do-collision-entity-lookups: true
-    grass-spread-tick-rate: 1
-    water-over-lava-flow-speed: 5
-    bed-search-radius: 1
-    use-faster-eigencraft-redstone: false
-    nether-ceiling-void-damage: false
-    allow-non-player-entities-on-scoreboards: false
-    container-update-tick-rate: 1
-    parrots-are-unaffected-by-player-movement: false
-    prevent-tnt-from-moving-in-water: false
-    non-player-arrow-despawn-rate: -1
-    creative-arrow-despawn-rate: -1
-    disable-explosion-knockback: false
-    armor-stands-tick: true
-    spawner-nerfed-mobs-should-jump: false
-    baby-zombie-movement-speed: 0.5
-    allow-leashing-undead-horse: false
-    all-chunks-are-slime-chunks: false
-    mob-spawner-tick-rate: 1
-    squid-spawn-height:
-      maximum: 0.0
@@ -1 +0,0 @@
-rsa/
@@ -1,29 +0,0 @@
-# The IP to listen to. Use 0.0.0.0 if you wish to listen to all interfaces on your server. (All IP addresses)
-# This defaults to the IP you have configured your server to listen on, or 0.0.0.0 if you have not configured this.
-host: 0.0.0.0
-
-# Port to listen for new votes on
-port: 8193
-
-# Whether or not to print debug messages. In a production system, this should be set to false.
-# This is useful when initially setting up NuVotifier to ensure votes are being delivered.
-debug: 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.
-disable-v1-protocol: false
-
-# All tokens, labeled by the serviceName of each server list.
-tokens:
-  # Default token for all server lists, if another isn't supplied.
-  default: server1token
-
-# Configuration section for all vote forwarding to NuVotifier
-forwarding:
-  # Sets whether to set up a remote method for fowarding. Supported methods:
-  # - none - Does not set up a forwarding method.
-  # - pluginMessaging - Sets up plugin messaging
-  method: pluginMessaging
-  pluginMessaging:
-    channel: nuvotifier:votes
@@ -1,7 +0,0 @@
-# bStats collects some data for plugin authors like how many servers are using their plugins.
-# To honor their work, you should not disable it.
-# This has nearly no effect on the server performance!
-# Check out https://bStats.org/ to learn more :)
-enabled: true
-serverUuid: 44d2e780-6de3-4b18-a28c-745f58727b99
-logFailedRequests: false
@@ -1 +0,0 @@
-../../../universal/build/libs/nuvotifier.jar
@@ -1 +0,0 @@
-../s-run.sh
@@ -1,39 +0,0 @@
-#Minecraft server properties
-#Fri Dec 21 00:58:41 EST 2018
-generator-settings=
-force-gamemode=false
-allow-nether=true
-enforce-whitelist=false
-gamemode=0
-broadcast-console-to-ops=true
-enable-query=false
-player-idle-timeout=0
-difficulty=1
-spawn-monsters=true
-op-permission-level=4
-pvp=true
-snooper-enabled=true
-level-type=DEFAULT
-hardcore=false
-enable-command-block=false
-max-players=20
-network-compression-threshold=256
-resource-pack-sha1=
-max-world-size=29999984
-server-port=25565
-server-ip=
-spawn-npcs=true
-allow-flight=false
-level-name=world
-view-distance=10
-resource-pack=
-spawn-animals=true
-white-list=false
-generate-structures=true
-online-mode=false
-max-build-height=256
-level-seed=
-prevent-proxy-connections=false
-use-native-transport=true
-motd=A Minecraft Server
-enable-rcon=false
@@ -1,128 +0,0 @@
-# This is the main configuration file for Spigot.
-# As you can see, there's tons to configure. Some options may impact gameplay, so use
-# with caution, and make sure you know what each option does before configuring.
-# For a reference for any variable inside this file, check out the Spigot wiki at
-# http://www.spigotmc.org/wiki/spigot-configuration/
-# 
-# If you need help with the configuration or have any questions related to Spigot,
-# join us at the IRC or drop by our forums and leave a post.
-# 
-# IRC: #spigot @ irc.spi.gt ( http://www.spigotmc.org/pages/irc/ )
-# Forums: http://www.spigotmc.org/
-
-config-version: 11
-settings:
-  save-user-cache-on-stop-only: false
-  sample-count: 12
-  user-cache-size: 1000
-  moved-wrongly-threshold: 0.0625
-  moved-too-quickly-multiplier: 10.0
-  bungeecord: true
-  late-bind: false
-  player-shuffle: 0
-  timeout-time: 60
-  restart-on-crash: true
-  restart-script: ./start.sh
-  netty-threads: 4
-  attribute:
-    maxHealth:
-      max: 2048.0
-    movementSpeed:
-      max: 2048.0
-    attackDamage:
-      max: 2048.0
-  debug: false
-messages:
-  whitelist: You are not whitelisted on this server!
-  unknown-command: Unknown command. Type "/help" for help.
-  server-full: The server is full!
-  outdated-client: Outdated client! Please use {0}
-  outdated-server: Outdated server! I'm still on {0}
-  restart: Server is restarting
-stats:
-  disable-saving: false
-  forced-stats: {}
-commands:
-  tab-complete: 0
-  send-namespaced: true
-  log: true
-  spam-exclusions:
-  - /skill
-  silent-commandblock-console: false
-  replace-commands:
-  - setblock
-  - summon
-  - testforblock
-  - tellraw
-advancements:
-  disable-saving: false
-  disabled:
-  - minecraft:story/disabled
-world-settings:
-  default:
-    verbose: true
-    entity-tracking-range:
-      players: 48
-      animals: 48
-      monsters: 48
-      misc: 32
-      other: 64
-    ticks-per:
-      hopper-transfer: 8
-      hopper-check: 1
-    hopper-amount: 1
-    random-light-updates: false
-    dragon-death-sound-radius: 0
-    seed-village: 10387312
-    seed-desert: 14357617
-    seed-igloo: 14357618
-    seed-jungle: 14357619
-    seed-swamp: 14357620
-    seed-monument: 10387313
-    seed-shipwreck: 165745295
-    seed-ocean: 14357621
-    seed-slime: 987234911
-    hunger:
-      jump-walk-exhaustion: 0.05
-      jump-sprint-exhaustion: 0.2
-      combat-exhaustion: 0.1
-      regen-exhaustion: 6.0
-      swim-multiplier: 0.01
-      sprint-multiplier: 0.1
-      other-multiplier: 0.0
-    max-tnt-per-tick: 100
-    max-tick-time:
-      tile: 50
-      entity: 50
-    squid-spawn-range:
-      min: 45.0
-    merge-radius:
-      exp: 3.0
-      item: 2.5
-    mob-spawn-range: 8
-    growth:
-      cactus-modifier: 100
-      cane-modifier: 100
-      melon-modifier: 100
-      mushroom-modifier: 100
-      pumpkin-modifier: 100
-      sapling-modifier: 100
-      wheat-modifier: 100
-      netherwart-modifier: 100
-      vine-modifier: 100
-      cocoa-modifier: 100
-    entity-activation-range:
-      animals: 32
-      monsters: 32
-      misc: 16
-      water: 16
-      tick-inactive-villagers: true
-    wither-spawn-sound-radius: 0
-    enable-zombie-pigmen-portal-spawns: true
-    item-despawn-rate: 6000
-    view-distance: 10
-    arrow-despawn-rate: 1200
-    hanging-tick-frequency: 100
-    zombie-aggressive-towards-villager: true
-    nerf-spawner-mobs: false
-    max-entity-collisions: 8
@@ -1,19 +0,0 @@
-banned-ips.json
-banned-players.json
-
-cache/
-
-eula.txt
-
-logs/
-
-permissions.yml
-
-ops.json
-usercache.json
-version_history.json
-whitelist.json
-
-world/
-world_nether/
-world_the_end/
@@ -1,37 +0,0 @@
-# This is the main configuration file for Bukkit.
-# As you can see, there's actually not that much to configure without any plugins.
-# For a reference for any variable inside this file, check out the Bukkit Wiki at
-# https://www.spigotmc.org/go/bukkit-yml
-# 
-# If you need help on this file, feel free to join us on irc or leave a message
-# on the forums asking for advice.
-# 
-# IRC: #spigot @ irc.spi.gt
-#    (If this means nothing to you, just go to https://www.spigotmc.org/go/irc )
-# Forums: https://www.spigotmc.org/
-# Bug tracker: https://www.spigotmc.org/go/bugs
-
-
-settings:
-  allow-end: true
-  warn-on-overload: true
-  permissions-file: permissions.yml
-  update-folder: update
-  plugin-profiling: false
-  connection-throttle: 4000
-  query-plugins: true
-  deprecated-verbose: default
-  shutdown-message: Server closed
-spawn-limits:
-  monsters: 70
-  animals: 10
-  water-animals: 15
-  ambient: 15
-chunk-gc:
-  period-in-ticks: 600
-  load-threshold: 0
-ticks-per:
-  animal-spawns: 400
-  monster-spawns: 1
-  autosave: 6000
-aliases: now-in-commands.yml
@@ -1,17 +0,0 @@
-# This is the commands configuration file for Bukkit.
-# For documentation on how to make use of this file, check out the Bukkit Wiki at
-# https://www.spigotmc.org/go/commands-yml
-# 
-# If you need help on this file, feel free to join us on irc or leave a message
-# on the forums asking for advice.
-# 
-# IRC: #spigot @ irc.spi.gt
-#    (If this means nothing to you, just go to https://www.spigotmc.org/go/irc )
-# Forums: https://www.spigotmc.org/
-# Bug tracker: https://www.spigotmc.org/go/bugs
-
-command-block-overrides: []
-ignore-vanilla-permissions: false
-aliases:
-  icanhasbukkit:
-  - version $1-
@@ -1,56 +0,0 @@
-# This is the help configuration file for Bukkit.
-# 
-# By default you do not need to modify this file. Help topics for all plugin commands are automatically provided by
-# or extracted from your installed plugins. You only need to modify this file if you wish to add new help pages to
-# your server or override the help pages of existing plugin commands.
-# 
-# This file is divided up into the following parts:
-# -- general-topics: lists admin defined help topics
-# -- index-topics:   lists admin defined index topics
-# -- amend-topics:   lists topic amendments to apply to existing help topics
-# -- ignore-plugins: lists any plugins that should be excluded from help
-# 
-# Examples are given below. When amending command topic, the string <text> will be replaced with the existing value
-# in the help topic. Color codes can be used in topic text. The color code character is & followed by 0-F.
-# ================================================================
-# 
-# Set this to true to list the individual command help topics in the master help.
-# command-topics-in-master-index: true
-# 
-# Each general topic will show up as a separate topic in the help index along with all the plugin command topics.
-# general-topics:
-#     Rules:
-#         shortText: Rules of the server
-#         fullText: |
-#             &61. Be kind to your fellow players.
-#             &B2. No griefing.
-#             &D3. No swearing.
-#         permission: topics.rules
-# 
-# Each index topic will show up as a separate sub-index in the help index along with all the plugin command topics.
-# To override the default help index (displayed when the user executes /help), name the index topic "Default".
-# index-topics:
-#     Ban Commands:
-#         shortText: Player banning commands
-#         preamble: Moderator - do not abuse these commands
-#         permission: op
-#         commands:
-#             - /ban
-#             - /ban-ip
-#             - /banlist
-# 
-# Topic amendments are used to change the content of automatically generated plugin command topics.
-# amended-topics:
-#     /stop:
-#         shortText: Stops the server cold....in its tracks!
-#         fullText: <text> - This kills the server.
-#         permission: you.dont.have
-# 
-# Any plugin in the ignored plugins list will be excluded from help. The name must match the name displayed by
-# the /plugins command. Ignore "Bukkit" to remove the standard bukkit commands from the index. Ignore "All"
-# to completely disable automatic help topic generation.
-# ignore-plugins:
-#    - PluginNameOne
-#    - PluginNameTwo
-#    - PluginNameThree
-
@@ -1 +0,0 @@
-../resources/paper.jar
@@ -1,178 +0,0 @@
-# This is the main configuration file for Paper.
-# As you can see, there's tons to configure. Some options may impact gameplay, so use
-# with caution, and make sure you know what each option does before configuring.
-# 
-# If you need help with the configuration or have any questions related to Paper,
-# join us in our Discord or IRC channel.
-# 
-# Discord: https://paperdiscord.emc.gs
-# IRC: #paper @ irc.spi.gt ( http://irc.spi.gt/iris/?channels=paper )
-# Website: https://papermc.io/ 
-# Docs: https://paper.readthedocs.org/ 
-
-verbose: false
-config-version: 16
-settings:
-  load-permissions-yml-before-plugins: true
-  bungee-online-mode: true
-  save-player-data: true
-  sleep-between-chunk-saves: false
-  region-file-cache-size: 256
-  save-empty-scoreboard-teams: false
-  incoming-packet-spam-threshold: 300
-  velocity-support:
-    enabled: false
-    online-mode: false
-    secret: ''
-  use-versioned-world: false
-  queue-light-updates-max-loss: 10
-  suggest-player-names-when-null-tab-completions: true
-  watchdog:
-    early-warning-every: 5000
-    early-warning-delay: 10000
-  spam-limiter:
-    tab-spam-increment: 1
-    tab-spam-limit: 500
-  book-size:
-    page-max: 2560
-    total-multiplier: 0.98
-  enable-player-collisions: true
-  async-chunks:
-    enable: true
-    generation: true
-    thread-per-world-generation: true
-    load-threads: -1
-  player-auto-save-rate: -1
-  max-player-auto-save-per-tick: -1
-  use-alternative-luck-formula: false
-messages:
-  no-permission: '&cI''m sorry, but you do not have permission to perform this command.
-    Please contact the server administrators if you believe that this is in error.'
-  kick:
-    authentication-servers-down: ''
-    connection-throttle: Connection throttled! Please wait before reconnecting.
-    flying-player: Flying is not enabled on this server
-    flying-vehicle: Flying is not enabled on this server
-timings:
-  enabled: true
-  verbose: true
-  server-name-privacy: false
-  hidden-config-entries:
-  - database
-  - settings.bungeecord-addresses
-  history-interval: 300
-  history-length: 3600
-world-settings:
-  default:
-    portal-search-radius: 128
-    game-mechanics:
-      villages-load-chunks: false
-      scan-for-legacy-ender-dragon: true
-      disable-chest-cat-detection: false
-      disable-end-credits: false
-      disable-player-crits: false
-      disable-sprint-interruption-on-attack: false
-      shield-blocking-delay: 5
-      disable-unloaded-chunk-enderpearl-exploit: true
-    queue-light-updates: false
-    optimize-explosions: false
-    disable-teleportation-suffocation-check: false
-    fixed-chunk-inhabited-time: -1
-    use-vanilla-world-scoreboard-name-coloring: false
-    delay-chunk-unloads-by: 10s
-    max-auto-save-chunks-per-tick: 24
-    save-queue-limit-for-auto-save: 50
-    enable-treasure-maps: true
-    treasure-maps-return-already-discovered: false
-    experience-merge-max-value: -1
-    max-chunk-sends-per-tick: 81
-    max-chunk-gens-per-tick: 10
-    prevent-moving-into-unloaded-chunks: false
-    max-growth-height:
-      cactus: 3
-      reeds: 3
-    fishing-time-range:
-      MinimumTicks: 100
-      MaximumTicks: 600
-    despawn-ranges:
-      soft: 32
-      hard: 128
-    falling-block-height-nerf: 0
-    tnt-entity-height-nerf: 0
-    remove-corrupt-tile-entities: false
-    lightning-strike-distance-limit:
-      sound: -1
-      impact-sound: -1
-      flash: -1
-    frosted-ice:
-      enabled: true
-      delay:
-        min: 20
-        max: 40
-    lootables:
-      auto-replenish: false
-      restrict-player-reloot: true
-      reset-seed-on-fill: true
-      max-refills: -1
-      refresh-min: 12h
-      refresh-max: 2d
-    filter-nbt-data-from-spawn-eggs-and-related: true
-    max-entity-collisions: 8
-    disable-creeper-lingering-effect: false
-    hopper:
-      cooldown-when-full: true
-      disable-move-event: false
-    duplicate-uuid-resolver: saferegen
-    duplicate-uuid-saferegen-delete-range: 32
-    disable-thunder: false
-    skeleton-horse-thunder-spawn-chance: 0.01
-    disable-ice-and-snow: false
-    fire-physics-event-for-redstone: false
-    keep-spawn-loaded-range: 8
-    auto-save-interval: -1
-    keep-spawn-loaded: true
-    anti-xray:
-      enabled: false
-      engine-mode: 1
-      chunk-edge-mode: 1
-      max-chunk-section-index: 3
-      update-radius: 2
-      hidden-blocks:
-      - gold_ore
-      - iron_ore
-      - coal_ore
-      - lapis_ore
-      - mossy_cobblestone
-      - obsidian
-      - chest
-      - diamond_ore
-      - redstone_ore
-      - lit_redstone_ore
-      - clay
-      - emerald_ore
-      - ender_chest
-      replacement-blocks:
-      - stone
-      - planks
-    skip-entity-ticking-in-chunks-scheduled-for-unload: true
-    armor-stands-do-collision-entity-lookups: true
-    prevent-tnt-from-moving-in-water: false
-    grass-spread-tick-rate: 1
-    water-over-lava-flow-speed: 5
-    bed-search-radius: 1
-    use-faster-eigencraft-redstone: false
-    nether-ceiling-void-damage: false
-    allow-non-player-entities-on-scoreboards: false
-    container-update-tick-rate: 1
-    non-player-arrow-despawn-rate: -1
-    creative-arrow-despawn-rate: -1
-    parrots-are-unaffected-by-player-movement: false
-    disable-explosion-knockback: false
-    armor-stands-tick: true
-    spawner-nerfed-mobs-should-jump: false
-    allow-leashing-undead-horse: false
-    baby-zombie-movement-speed: 0.5
-    mob-spawner-tick-rate: 1
-    all-chunks-are-slime-chunks: false
-    squid-spawn-height:
-      maximum: 0.0
@@ -1 +0,0 @@
-rsa/
@@ -1,29 +0,0 @@
-# The IP to listen to. Use 0.0.0.0 if you wish to listen to all interfaces on your server. (All IP addresses)
-# This defaults to the IP you have configured your server to listen on, or 0.0.0.0 if you have not configured this.
-host: 0.0.0.0
-
-# Port to listen for new votes on
-port: 8194
-
-# Whether or not to print debug messages. In a production system, this should be set to false.
-# This is useful when initially setting up NuVotifier to ensure votes are being delivered.
-debug: 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.
-disable-v1-protocol: false
-
-# All tokens, labeled by the serviceName of each server list.
-tokens:
-  # Default token for all server lists, if another isn't supplied.
-  default: server2token
-
-# Configuration section for all vote forwarding to NuVotifier
-forwarding:
-  # Sets whether to set up a remote method for fowarding. Supported methods:
-  # - none - Does not set up a forwarding method.
-  # - pluginMessaging - Sets up plugin messaging
-  method: pluginMessaging
-  pluginMessaging:
-    channel: nuvotifier:votes
@@ -1,7 +0,0 @@
-# bStats collects some data for plugin authors like how many servers are using their plugins.
-# To honor their work, you should not disable it.
-# This has nearly no effect on the server performance!
-# Check out https://bStats.org/ to learn more :)
-enabled: true
-serverUuid: ef382803-14ce-4a3a-82a9-3611593c622d
-logFailedRequests: false
@@ -1 +0,0 @@
-../../../universal/build/libs/nuvotifier.jar
@@ -1 +0,0 @@
-../s-run.sh
@@ -1,39 +0,0 @@
-#Minecraft server properties
-#Fri Dec 21 00:58:41 EST 2018
-generator-settings=
-force-gamemode=false
-allow-nether=true
-enforce-whitelist=false
-gamemode=0
-broadcast-console-to-ops=true
-enable-query=false
-player-idle-timeout=0
-difficulty=1
-spawn-monsters=true
-op-permission-level=4
-pvp=true
-snooper-enabled=true
-level-type=DEFAULT
-hardcore=false
-enable-command-block=false
-max-players=20
-network-compression-threshold=256
-resource-pack-sha1=
-max-world-size=29999984
-server-port=25566
-server-ip=
-spawn-npcs=true
-allow-flight=false
-level-name=world
-view-distance=10
-resource-pack=
-spawn-animals=true
-white-list=false
-generate-structures=true
-online-mode=false
-max-build-height=256
-level-seed=
-prevent-proxy-connections=false
-use-native-transport=true
-motd=A Minecraft Server
-enable-rcon=false
@@ -1,128 +0,0 @@
-# This is the main configuration file for Spigot.
-# As you can see, there's tons to configure. Some options may impact gameplay, so use
-# with caution, and make sure you know what each option does before configuring.
-# For a reference for any variable inside this file, check out the Spigot wiki at
-# http://www.spigotmc.org/wiki/spigot-configuration/
-# 
-# If you need help with the configuration or have any questions related to Spigot,
-# join us at the IRC or drop by our forums and leave a post.
-# 
-# IRC: #spigot @ irc.spi.gt ( http://www.spigotmc.org/pages/irc/ )
-# Forums: http://www.spigotmc.org/
-
-config-version: 11
-settings:
-  debug: false
-  save-user-cache-on-stop-only: false
-  sample-count: 12
-  user-cache-size: 1000
-  moved-wrongly-threshold: 0.0625
-  moved-too-quickly-multiplier: 10.0
-  bungeecord: true
-  late-bind: false
-  player-shuffle: 0
-  timeout-time: 60
-  restart-on-crash: true
-  restart-script: ./start.sh
-  netty-threads: 4
-  attribute:
-    maxHealth:
-      max: 2048.0
-    movementSpeed:
-      max: 2048.0
-    attackDamage:
-      max: 2048.0
-messages:
-  whitelist: You are not whitelisted on this server!
-  unknown-command: Unknown command. Type "/help" for help.
-  server-full: The server is full!
-  outdated-client: Outdated client! Please use {0}
-  outdated-server: Outdated server! I'm still on {0}
-  restart: Server is restarting
-stats:
-  disable-saving: false
-  forced-stats: {}
-commands:
-  tab-complete: 0
-  send-namespaced: true
-  log: true
-  spam-exclusions:
-  - /skill
-  silent-commandblock-console: false
-  replace-commands:
-  - setblock
-  - summon
-  - testforblock
-  - tellraw
-advancements:
-  disable-saving: false
-  disabled:
-  - minecraft:story/disabled
-world-settings:
-  default:
-    verbose: true
-    random-light-updates: false
-    dragon-death-sound-radius: 0
-    seed-village: 10387312
-    seed-desert: 14357617
-    seed-igloo: 14357618
-    seed-jungle: 14357619
-    seed-swamp: 14357620
-    seed-monument: 10387313
-    seed-shipwreck: 165745295
-    seed-ocean: 14357621
-    seed-slime: 987234911
-    hunger:
-      jump-walk-exhaustion: 0.05
-      jump-sprint-exhaustion: 0.2
-      combat-exhaustion: 0.1
-      regen-exhaustion: 6.0
-      swim-multiplier: 0.01
-      sprint-multiplier: 0.1
-      other-multiplier: 0.0
-    max-tnt-per-tick: 100
-    max-tick-time:
-      tile: 50
-      entity: 50
-    squid-spawn-range:
-      min: 45.0
-    merge-radius:
-      exp: 3.0
-      item: 2.5
-    mob-spawn-range: 8
-    growth:
-      cactus-modifier: 100
-      cane-modifier: 100
-      melon-modifier: 100
-      mushroom-modifier: 100
-      pumpkin-modifier: 100
-      sapling-modifier: 100
-      wheat-modifier: 100
-      netherwart-modifier: 100
-      vine-modifier: 100
-      cocoa-modifier: 100
-    entity-activation-range:
-      animals: 32
-      monsters: 32
-      misc: 16
-      water: 16
-      tick-inactive-villagers: true
-    entity-tracking-range:
-      players: 48
-      animals: 48
-      monsters: 48
-      misc: 32
-      other: 64
-    ticks-per:
-      hopper-transfer: 8
-      hopper-check: 1
-    hopper-amount: 1
-    wither-spawn-sound-radius: 0
-    item-despawn-rate: 6000
-    enable-zombie-pigmen-portal-spawns: true
-    view-distance: 10
-    arrow-despawn-rate: 1200
-    hanging-tick-frequency: 100
-    zombie-aggressive-towards-villager: true
-    nerf-spawner-mobs: false
-    max-entity-collisions: 8
@@ -1,10 +0,0 @@
-# Changing the version of NuVotifier
-
-So since I keep forgetting, here are the places which need to have their version
-numbers changed:
-
-+ build.gradle
-+ com.vexsoftware.votifier.sponge.VotifierPlugin @Plugin
-+ com.vexsoftware.votifier.velocity.VotifierPlugin @Plugin
-
-This is really annoying.
@@ -1,80 +0,0 @@
-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:version"
-    ...
-}
-...
-```
-
-# 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)
@@ -1,16 +0,0 @@
-# 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).
@@ -1,78 +0,0 @@
-This document outlines some of the technical reasons for a new NuVotifier.
-
-# Why a new protocol?
-
-The old Votifier protocol has three major flaws, which we feel are corrected in the new protocol.
-
-* The data is encrypted (with RSA) but not hashed to verify its integrity. The new protocol utilizes HMAC with SHA256 (but no encryption, given that the data sent is eventually revealed in some form or another).
-* 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.
-
-# 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.
-
-# Protocol Documentation
-
-This documentation is for server lists that wish to add NuVotifier support.
-
-There are two versions of the NuVotifier protocol.
-
-## Handshake
-
-A connection is made to the NuVotifier server by the server list, and immediately NuVotifier will send its version in the following packet:
-
-	"VOTIFIER <version> <challenge>"
-
-The challenge will not be present in version 1.x servers.
-
-## 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.
-
-The message is JSON-encoded containing the following data:
-
-* `payload` contains the fully encoded vote. It is a JSON message containing the `serviceName` (string), `username` (string), `address` (string, but must be a valid IPv4 or IPv6 address), `timestamp` (a long with the time this vote was taken in _milliseconds_), and `challenge` (from the handshake). It is optional, but recommended to supply a `uuid` field with the player's UUID (with dashes, e.g. `652a2bc4-e8cd-405d-b7b6-98156ee2dc09`).
-* `signature` is a HMAC-SHA256 digest of the payload with a owner-provided key.
-
-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), [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)
-
-For better compatibility, NuVotifier supports the old Votifier protocol as well.
-
-NuVotifier expects a 256 byte RSA encrypted block (the public key should be obtained by the NuVotifier user), with the following format:
-
-<table>
-  <tr>
-	<th>Type</th>
-	<th>Value</th>
-  </tr>
-  <tr>
-	<td>string</td>
-	<td>VOTE</td>
-  </tr>
-  <tr>
-	<td>string</td>
-	<td>serviceName</td>
-  </tr>
-  <tr>
-	<td>string</td>
-	<td>username</td>
-  </tr>
-  <tr>
-	<td>string</td>
-	<td>address</td>
-  </tr>
-  <tr>
-	<td>string</td>
-	<td>timeStamp</td>
-  </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.
@@ -1,244 +0,0 @@
-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 (such as BungeeCord, LilyPad, or Velocity).
-
-## Single-Proxy BungeeCord/Velocity Networks
-
-When running a single-proxy network, NuVotifier is able to operate as both
-a vote receiver (emitting events for proxy 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 proxy server. The proxy's NuVotifier server will act as the
-public facing Votifier instance, where as the Minecraft servers will instead
-receive votes forwarded from the proxy's NuVotifier.
-
-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 is
-recommended if you have just one proxy, however this may also work with
-some exceptions in multi-proxy 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:votes`.
-Since 1.13, Spigot has decided that channels must now contain a colon. While
-this is a completely senseless change, it is easier to simply conform and change
-the channel name.  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 plugin messaging!
-
-Since we have all of that configured, we can now move to the proxy's NuVotifier
-configuration. It is once again located under `plugins/NuVotifier/` directory
-(`config.yml` for BungeeCord, `config.toml` for Velocity). 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 plugin messaging 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
-its 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 `cacheTime` field. This number can be as high or low
-as you want. It is measured in days within the cache. This is valid for both the
-`file` and `memory` cache.
-
-Sometimes, caches can grow quite large and try to dump lots of votes back over the
-player's game connection. This is a problem, as the Bukkit server may think it is
-instead the player spamming packets! NuVotifier rate-limits the votes which are
-evicted per second over a plugin messaging channel using the `dumpRate` parameter.
-
-### 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 plugin to perform the proper forwarding logic
-(you will know if you need to do this).
-
-In proxy based vote forwarding, one of your proxy 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 the the port number as we will need
-it later to insert into the proxy 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 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 proxy 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 proxy 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. 
-
-# Reloading NuVotifier
-
-For Bukkit and Bungee, you may reload NuVotifier through the `/nvreload` command
-in your console only - this command will not work in-game by design. Make sure to
-ensure that it completed correctly before assuming NuVotifier works!
-
-# 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.
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
@@ -1,52 +1,27 @@
-// 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"
-                }
+    buildscript {
+    }
+    apply plugin: 'maven-publish'
+    apply plugin: 'com.jfrog.bintray'
+
+    bintray {
+        user = System.getenv("BINTRAY_USER")
+        key = System.getenv("BINTRAY_KEY")
+        pkg {
+            repo = 'public'
+            name = 'nuvotifier'
+            version {
+                name = project.version
            }
+            publications = ['DefaultPublication']
        }
+    }
+
+    publishing {
        publications {
-            versioned(MavenPublication) {
+            DefaultPublication(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
-                }
-            }
-        }
-    }
 }
@@ -1,4 +1,18 @@
+plugins {
+    id 'org.spongepowered.plugin' version '0.9.0'
+}
+
 dependencies {
-    compileOnly group: "org.spongepowered", name: "spongeapi", version: "7.0.0-SNAPSHOT"
+    compileOnly group: "org.spongepowered", name: "spongeapi", version: "7.1.0"
+    annotationProcessor group: "org.spongepowered", name: "spongeapi", version: "7.1.0"
    compile project(":nuvotifier-common")
 }
+
+sponge {
+    plugin {
+        id = 'nuvotifier'
+        meta {
+            version = project.version
+        }
+    }
+}
@@ -30,7 +30,7 @@ import java.security.KeyPair;
 import java.util.HashMap;
 import java.util.Map;

-@Plugin(id = "nuvotifier", name = "NuVotifier", version = "2.5.0", authors = "ParallelBlock LLC",
+@Plugin(id = "nuvotifier", name = "NuVotifier", version="SOMEONE_FUCKED_UP_THE_BUILD", authors = "Ichbinjoe",
        description = "Safe, smart, and secure Votifier server plugin")
 public class VotifierPlugin implements VoteHandler, com.vexsoftware.votifier.platform.VotifierPlugin, ForwardedVoteListener {

@@ -83,8 +83,9 @@ public class VotifierPlugin implements VoteHandler, com.vexsoftware.votifier.pla
        // Initialize the receiver.
        final String host = ConfigLoader.getSpongeConfig().host;
        final int port = ConfigLoader.getSpongeConfig().port;
-        if (debug)
-            logger.info("DEBUG mode enabled!");
+
+        if (!debug)
+            logger.info("QUIET mode enabled!");

        if (port >= 0) {
            final boolean disablev1 = ConfigLoader.getSpongeConfig().disableV1Protocol;
@@ -20,7 +20,7 @@ public class SpongeConfig {

    @Setting(comment = "Whether or not to print debug messages. In a production system, this should be set to false.\n" +
            "This is useful when initially setting up NuVotifier to ensure votes are being delivered.")
-    public boolean debug = false;
+    public boolean debug = true;

    @Setting( value = "disable-v1-protocol", comment = "Setting this option to true will disable handling of Protocol v1 packets. While the old protocol is not secure, this\n" +
            "option is currently not recommended as most voting sites only support the old protocol at present. However, if you are\n" +
@@ -5,10 +5,6 @@ host: %ip%
 # Port to listen for new votes on
 port: 8192

-# Whether or not to print debug messages. In a production system, this should be set to false.
-# This is useful when initially setting up NuVotifier to ensure votes are being delivered.
-debug: false
-
 # 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.
@@ -1,3 +1,6 @@
+import com.github.jengelman.gradle.plugins.shadow.relocation.SimpleRelocator
+
+import java.nio.file.FileAlreadyExistsException
 import java.nio.file.Files
 import java.nio.file.Paths
 import java.util.regex.Pattern
@@ -21,12 +24,18 @@ dependencies {
 }

 shadowJar {
+    dependencies {
+        // All current implementations include Google Guava already, and explicitly shading in Guava causes the plugin
+        // to fail to initialize on Sponge.
+        exclude(dependency('com.google.guava:guava:24.1-jre'))
+    }
+    
    baseName = 'nuvotifier'
    classifier = null
    relocate "io.netty", "com.vexsoftware.votifier.netty"
    relocate "org.json", "com.vexsoftware.votifier.json"
-    relocate "com.google.code", "com.vexsoftware.votifier.google"
-    relocate "com.google.guava", "com.vexsoftware.votifier.google"
+    relocate new SimpleRelocator("com.google.code", "com.vexsoftware.votifier.google.code", new ArrayList<String>(), Collections.singletonList("com.vexsoftware.votifier.sponge"))
+    relocate "com.google.guava", "com.vexsoftware.votifier.google.guava"
    relocate "org.apache.commons.io", "com.vexsoftware.votifier.commons.io"
 }

@@ -51,8 +60,9 @@ task('linkLatest') {

            def noVer = Paths.get(noVerMatcher.group(1) + ".jar")
            def versnd = it.toPath()
-
-            Files.createSymbolicLink(noVer, versnd)
+            try {
+                Files.createSymbolicLink(noVer, versnd)
+            } catch (FileAlreadyExistsException ignored) {}
        }
    }
 }
@@ -1,4 +1,5 @@
 dependencies {
    compileOnly group: "com.velocitypowered", name: "velocity-api", version: "1.0-SNAPSHOT"
+    annotationProcessor group: "com.velocitypowered", name: "velocity-api", version: "1.0-SNAPSHOT"
    compile project(":nuvotifier-common")
 }
@@ -6,7 +6,6 @@ import com.moandjiezana.toml.Toml;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
 import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
-import com.velocitypowered.api.plugin.Plugin;
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import com.velocitypowered.api.proxy.ProxyServer;
 import com.vexsoftware.votifier.VoteHandler;
@@ -47,8 +46,6 @@ import java.security.KeyPair;
 import java.util.*;
 import java.util.stream.Collectors;

-@Plugin(id = "nuvotifier", name = "NuVotifier", version = "2.5.0", authors = "ParallelBlock LLC",
-        description = "Safe, smart, and secure Votifier server plugin")
 public class VotifierPlugin implements VoteHandler, ProxyVotifierPlugin {

    @Inject
@@ -96,7 +93,10 @@ public class VotifierPlugin implements VoteHandler, ProxyVotifierPlugin {
            return;
        }

-        debug = config.getBoolean("debug");
+        if (config.contains("quiet"))
+            debug = !config.getBoolean("quiet");
+        else
+            debug = config.getBoolean("debug", true);

        // Load Votifier tokens.
        config.getTable("tokens").toMap().forEach((service, key) -> {
@@ -109,8 +109,8 @@ public class VotifierPlugin implements VoteHandler, ProxyVotifierPlugin {
        // Initialize the receiver.
        final String host = config.getString("host");
        final int port = Math.toIntExact(config.getLong("port"));
-        if (debug)
-            logger.info("DEBUG mode enabled!");
+        if (!debug)
+            logger.info("QUIET mode enabled!");

        final boolean disablev1 = config.getBoolean("disable-v1-protocol", false);
        if (disablev1) {
@@ -5,10 +5,6 @@ host = "%ip%"
 # Port to listen for new votes on
 port = 8192

-# Whether or not to print debug messages. In a production system, this should be set to false.
-# This is useful when initially setting up NuVotifier to ensure votes are being delivered.
-debug = false
-
 # 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.
@@ -0,0 +1,9 @@
+{
+  "id":"nuvotifier",
+  "name":"NuVotifier",
+  "version":"@app.version@",
+  "description":"Safe, smart, and secure Votifier server plugin",
+  "authors":["Ichbinjoe"],
+  "dependencies":[],
+  "main":"com.vexsoftware.votifier.velocity.VotifierPlugin"
+}
Author	SHA1	Message	Date
Joe Hirschfeld	904ed87619	Release 2.6.0	2019-12-24 18:54:24 -08:00
Joe Hirschfeld	45b2a7a8a9	Remove jenkinsfile	2019-12-24 18:54:14 -08:00
Joe Hirschfeld	0ef4793df3	Do not error when server filter does not have a list	2019-12-24 18:50:49 -08:00
Joe Hirschfeld	4aa276a2d0	Update buildscript to upload to bintray	2019-12-24 18:47:56 -08:00
Joe Hirschfeld	1e2b22f06c	Clean up repository Bump plugin version Use sponge gradle plugin for setting version in sponge Use replacement for Velocity plugin version Update repositories	2019-12-24 17:35:12 -08:00
Joseph Hirschfeld	dbd9f86be9	Hotpatch 2.5.3	2019-06-03 11:57:33 -04:00
Andrew Steinborn	e71ff635e3	Fix ConcurrentModificationException whilst sweeping votes (#141 ) Fixes #139	2019-05-31 14:19:48 -04:00
Andrew Steinborn	4d52ef42e4	Fix plugin initialization on Sponge. (#142 ) NOTE: In the future, should we support a platform that doesn't provide Guava, we should simply remove the dependency from nuvotifier-common.	2019-05-31 13:25:16 -04:00
Joseph Hirschfeld	c21d18594d	Bump version to 3.0.0-SNAPSHOT	2019-04-27 00:21:50 -04:00
Joseph Hirschfeld	9944bb7077	Release 2.5.2	2019-04-27 00:20:31 -04:00
Joseph Hirschfeld	7d43b7399f	Do not relocate google code from sponge Fixes an issue where our shaded google code collided with Sponge, causing mass sadness. Caused due to `b745236`	2019-04-27 00:17:04 -04:00
Joseph Hirschfeld	5d797065cb	Update version to 2.5.2-SNAPSHOT	2019-04-25 23:58:10 -04:00
Joseph Hirschfeld	43c8489574	Release 2.5.1	2019-04-25 23:55:53 -04:00
Joseph Hirschfeld	348dbca900	Trim whitespace on either side of b64 encoded keys	2019-04-25 23:52:47 -04:00
Joseph Hirschfeld	395c63a80b	update dev repo	2019-03-29 23:35:14 -04:00
Joseph Hirschfeld	99afd0ca71	rework env	2019-03-23 16:39:25 -04:00
Joseph Hirschfeld	2243be4954	missing env	2019-03-23 16:37:31 -04:00
Joseph Hirschfeld	8a73b0bf9c	fix	2019-03-23 16:37:09 -04:00
Joseph Hirschfeld	595b7ed75f	use ibj.io nexus	2019-03-23 16:16:43 -04:00
Joseph Hirschfeld	759b7a886b	use openjdk 12	2019-03-23 16:14:14 -04:00
Joseph Hirschfeld	eb68085746	fix some stuff in the jenkinsfile	2019-03-23 15:48:44 -04:00
Joseph Hirschfeld	16b093e4d6	psh this should be safe	2019-03-23 15:25:06 -04:00
Joseph Hirschfeld	a2848e43d0	remove drone	2019-03-23 15:19:06 -04:00
Joseph Hirschfeld	1bfa28af48	Add jenkinsfile	2019-03-23 15:18:59 -04:00
Joseph Hirschfeld	b745236131	Changes to packaging to fix issues with thermos	2019-03-11 16:50:15 -04:00
Joseph Hirschfeld	4330d41286	Fix FAQ formatting	2019-03-11 16:37:07 -04:00
Andrew Steinborn	75228868f8	Fix annotation processor-based implementations (Sponge and Velocity) (#122 ) Fixes #121.	2019-02-05 18:51:07 -05:00
Joseph Hirschfeld	671c6e17a9	Do not try to use format args for displaying bind error	2019-01-24 13:44:52 -05:00
Joseph Hirschfeld	c3030d56e8	Add FAQ	2019-01-22 17:16:14 -05:00
Joseph Hirschfeld	9fe4d6b9c3	change authorship	2019-01-22 16:06:32 -05:00
Joseph Hirschfeld	99dbaa703a	Default to debug mode People are incapable of turning on debug mode. This should help.	2019-01-22 15:54:31 -05:00
Joseph Hirschfeld	0fa42b44cc	Add more debug from RSAIO decoding	2019-01-17 12:24:30 -05:00
Joseph Hirschfeld	7d75bce02c	update netty to 4.1.32.Final	2019-01-04 13:59:53 -05:00
Joseph Hirschfeld	60923598b9	Bump to 2.5.1-SNAPSHOT	2019-01-03 14:40:06 -05:00
				`@@ -1 +0,0 @@`
				`../../../universal/build/libs/nuvotifier.jar`