From ff891c000ecf4b65f9a30f092aba3d7642f5fc11 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 8 Jun 2017 18:00:00 +1000
Subject: [PATCH] Update to Minecraft 1.12

---
 chat/pom.xml                                              | 2 +-
 config/pom.xml                                            | 2 +-
 pom.xml                                                   | 2 +-
 .../java/net/md_5/bungee/protocol/ProtocolConstants.java  | 2 +-
 proxy/pom.xml                                             | 8 +-------
 proxy/src/main/java/net/md_5/bungee/BungeeCord.java       | 2 +-
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/chat/pom.xml b/chat/pom.xml
index dc097e11..970e3097 100644
--- a/chat/pom.xml
+++ b/chat/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.3.1</version>
+            <version>2.8.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/config/pom.xml b/config/pom.xml
index ac980914..253bfdff 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.14</version>
+            <version>1.18</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index c817bcfa..f96997a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>18.0</version>
+            <version>20.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
index 856fac6b..caa77637 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
@@ -14,7 +14,7 @@ public class ProtocolConstants
     public static final int MINECRAFT_1_10 = 210;
     public static final int MINECRAFT_1_11 = 315;
     public static final int MINECRAFT_1_11_1 = 316;
-    public static final int MINECRAFT_1_12 = 333;
+    public static final int MINECRAFT_1_12 = 335;
     public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
             "1.8.x",
             "1.9.x",
diff --git a/proxy/pom.xml b/proxy/pom.xml
index d2e864b2..48c13305 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -77,13 +77,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.40</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <version>3.20.0-GA</version>
+            <version>5.1.42</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index f31faa99..653a4720 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -597,7 +597,7 @@ public class BungeeCord extends ProxyServer
     @Override
     public String getGameVersion()
     {
-        return Joiner.on( ", " ).join( ProtocolConstants.SUPPORTED_VERSIONS );
+        return ProtocolConstants.SUPPORTED_VERSIONS.get( 0 ) + "-" + ProtocolConstants.SUPPORTED_VERSIONS.get( ProtocolConstants.SUPPORTED_VERSIONS.size() - 1 );
     }
 
     @Override