From a6491cf7929b33f0cf5de5fe88a6f97f0729e92a Mon Sep 17 00:00:00 2001
From: Myles <myles@myles.us>
Date: Thu, 20 Apr 2017 16:23:09 +0100
Subject: [PATCH] 17w16a support

---
 bukkit/pom.xml                                |  2 +-
 bungee/pom.xml                                |  4 ++--
 common/pom.xml                                |  2 +-
 .../api/protocol/ProtocolVersion.java         |  2 +-
 .../ProtocolSnapshotTo1_11_1.java             | 19 ++++++++++++++++---
 jar/pom.xml                                   |  2 +-
 pom.xml                                       |  2 +-
 sponge-legacy/pom.xml                         |  2 +-
 sponge/pom.xml                                |  2 +-
 9 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index dfdf909ee..153eddc04 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>1.0.5-17w15a</version>
+        <version>1.0.5-17w16a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bungee/pom.xml b/bungee/pom.xml
index f25b6deed..320b3ea4d 100644
--- a/bungee/pom.xml
+++ b/bungee/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>1.0.5-17w15a</version>
+        <version>1.0.5-17w16a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>us.myles</groupId>
             <artifactId>viaversion-common</artifactId>
-            <version>1.0.5-17w15a</version>
+            <version>1.0.5-17w16a</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/common/pom.xml b/common/pom.xml
index 2e177ab8a..704edf48e 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>1.0.5-17w15a</version>
+        <version>1.0.5-17w16a</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java
index 611f7a6db..62296ef65 100644
--- a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java
+++ b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java
@@ -55,7 +55,7 @@ public class ProtocolVersion {
         register(v1_10 = new ProtocolVersion(210, "1.10"));
         register(v1_11 = new ProtocolVersion(315, "1.11"));
         register(v1_11_1 = new ProtocolVersion(316, "1.11.1"));
-        register(snapshot = new ProtocolVersion(321, "17w15a"));
+        register(snapshot = new ProtocolVersion(322, "17w16a"));
         register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
     }
 
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_11_1/ProtocolSnapshotTo1_11_1.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_11_1/ProtocolSnapshotTo1_11_1.java
index 4a1eaa15f..d8439f884 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_11_1/ProtocolSnapshotTo1_11_1.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_11_1/ProtocolSnapshotTo1_11_1.java
@@ -12,7 +12,7 @@ public class ProtocolSnapshotTo1_11_1 extends Protocol {
 
     @Override
     protected void registerPackets() {
-        // As of 17w15a
+        // As of 17w16a
 
         // Outgoing
         // New packet at 0x08
@@ -173,9 +173,22 @@ public class ProtocolSnapshotTo1_11_1 extends Protocol {
 
     private int getNewSoundId(int id) { //TODO Make it better, suggestions are welcome. It's ugly and hardcoded now.
         int newId = id;
-        if (id >= 301) // Hello shulker boxes
+        if (id >= 26) // End Portal Sounds
+            newId += 2;
+        if (id >= 70) // New Block Notes
+            newId += 4;
+        if (id >= 74) // New Block Note 2
+            newId += 1;
+        if (id >= 143) // Boat Sounds
+            newId += 3;
+        if (id >= 185) // Endereye death
+            newId += 1;
+        if (id >= 263) // Illagers
+            newId += 3;
+        if (id >= 301) // Parrots
             newId += 6;
-
+        if (id >= 317) // Player Sounds
+            newId += 2;
         return newId;
     }
 
diff --git a/jar/pom.xml b/jar/pom.xml
index 9cb30d41c..ffed5d45f 100644
--- a/jar/pom.xml
+++ b/jar/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>1.0.5-17w15a</version>
+        <version>1.0.5-17w16a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>viaversion-jar</name>
diff --git a/pom.xml b/pom.xml
index e467c6267..333ea8937 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>us.myles</groupId>
     <artifactId>viaversion-parent</artifactId>
-    <version>1.0.5-17w15a</version>
+    <version>1.0.5-17w16a</version>
     <packaging>pom</packaging>
 
     <name>viaversion-parent</name>
diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml
index e1952d245..8445da879 100644
--- a/sponge-legacy/pom.xml
+++ b/sponge-legacy/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>1.0.5-17w15a</version>
+        <version>1.0.5-17w16a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sponge/pom.xml b/sponge/pom.xml
index 772a0e2da..d28e63027 100644
--- a/sponge/pom.xml
+++ b/sponge/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>1.0.5-17w15a</version>
+        <version>1.0.5-17w16a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>