Sync with master

README.md

@@ -1,4 +1,4 @@
-# ViaVersion 0.8.2
+# ViaVersion 0.8.3
 [![Build Status](https://travis-ci.org/MylesIsCool/ViaVersion.svg?branch=master)](https://travis-ci.org/MylesIsCool/ViaVersion)
 [![Gitter](https://badges.gitter.im/MylesIsCool/ViaVersion.svg)](https://gitter.im/MylesIsCool/ViaVersion)
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>us.myles</groupId>
     <artifactId>viaversion</artifactId>
-    <version>0.8.3-SNAPSHOT</version>
+    <version>0.8.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>ViaVersion</name>

src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java

@@ -28,6 +28,7 @@ public class ProtocolVersion {
         register(v1_9 = new ProtocolVersion(107, "1.9"));
         register(v1_9_1 = new ProtocolVersion(108, "1.9.1"));
         register(v1_9_2 = new ProtocolVersion(109, "1.9.2"));
+        register(v1_9_3 = new ProtocolVersion(110, "1.9.3/4"));
         register(v1_9_3 = new ProtocolVersion(110, "1.9.3"));
         register(SNAPSHOT = new ProtocolVersion(201, "16w20a"));
     }

src/main/resources/config.yml

@@ -1,5 +1,46 @@
+# Thanks for downloading ViaVersion
+# Ensure you look through all these options
+# If you need help:
+# viaversion.com - Discussion tab
+# IRC - https://elmer.spi.gt/iris/?nick=&channels=viaversion #viaversion on irc.spi.gt
+#
+#----------------------------------------------------------#
+#                     GLOBAL OPTIONS                        #
+#----------------------------------------------------------#
+#
 # Should ViaVersion check for updates?
 checkforupdates: true
+# Send the supported versions with the Status (Ping) response packet
+send-supported-versions: false
+#
+#----------------------------------------------------------#
+#                  GLOBAL PACKET LIMITER                    #
+#----------------------------------------------------------#
+#
+# Anti-Cheat, Packets Per Second (PPS) limiter
+# Clients by default send around 20-90 packets per second.
+
+# What is the maximum per second a client can send
+# Use -1 to disable.
+max-pps: 400
+max-pps-kick-msg: "You are sending too many packets!"
+
+# We can also kick them if over a period they send over a threshold a certain amount of times.
+
+# Period to track (in seconds)
+# Use -1 to disable.
+tracking-period: 6
+# How many packets per second counts as a warning
+tracking-warning-pps: 120
+# How many warnings over the interval can we have
+# This can never be higher than "tracking-interval"
+tracking-max-warnings: 4
+tracking-max-kick-msg: "You are sending too many packets, :("
+#
+#----------------------------------------------------------#
+#           1.9 CLIENTS ON 1.8 SERVERS OPTIONS              #
+#----------------------------------------------------------#
+#
 # No collide options, these allow you to configure how collision works.
 # Do you want us to prevent collision?
 prevent-collision: true
@@ -33,26 +74,5 @@ suppress-entityid-errors: false
 block-break-patch: true
 # Should we cache our items, this will prevent server from being lagged out, however the cost is a constant task caching items
 item-cache: true
-# Anti-Cheat, Packets Per Second (PPS) limiter
-# Clients by default send around 20-90 packets per second.
-
-# What is the maximum per second a client can send
-# Use -1 to disable.
-max-pps: 400
-max-pps-kick-msg: "You are sending too many packets!"
-
-# We can also kick them if over a period they send over a threshold a certain amount of times.
-
-# Period to track (in seconds)
-# Use -1 to disable.
-tracking-period: 6
-# How many packets per second counts as a warning
-tracking-warning-pps: 120
-# How many warnings over the interval can we have
-# This can never be higher than "tracking-interval"
-tracking-max-warnings: 4
-tracking-max-kick-msg: "You are sending too many packets, :("
 # Patch the Anti xray to work on 1.9 (If your server is 1.8) This can cost more performance, so disable it if you don't use it.
-anti-xray-patch: true
+anti-xray-patch: true
-# Send the supported versions with the Status response packet
-send-supported-versions: false