From 4de081efdaf72c6c3f50790f7401e71d5cbfc0ed Mon Sep 17 00:00:00 2001
From: creeper123123321 <creeper123123321@gmail.com>
Date: Wed, 21 Feb 2018 19:25:56 -0300
Subject: [PATCH] 18w08a sound rewrite

---
 bukkit/pom.xml                                |  2 +-
 bungee/pom.xml                                |  2 +-
 common/pom.xml                                |  2 +-
 .../api/protocol/ProtocolVersion.java         |  2 +-
 .../ProtocolSnapshotTo1_12_2.java             | 28 +++++++++++++++----
 jar/pom.xml                                   |  2 +-
 pom.xml                                       |  2 +-
 sponge-legacy/pom.xml                         |  2 +-
 sponge/pom.xml                                |  2 +-
 9 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index 07135888b..fdaa6bb94 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>1.4.0-18w07c</version>
+        <version>1.4.0-18w08a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bungee/pom.xml b/bungee/pom.xml
index 38bde2cfa..2515403d2 100644
--- a/bungee/pom.xml
+++ b/bungee/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>1.4.0-18w07c</version>
+        <version>1.4.0-18w08a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/common/pom.xml b/common/pom.xml
index 53fa96b64..f79c01add 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>1.4.0-18w07c</version>
+        <version>1.4.0-18w08a</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 8d526456f..cd7751d87 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
@@ -62,7 +62,7 @@ public class ProtocolVersion {
         register(v1_12 = new ProtocolVersion(335, "1.12"));
         register(v1_12_1 = new ProtocolVersion(338, "1.12.1"));
         register(v1_12_2 = new ProtocolVersion(340, "1.12.2"));
-        register(v1_13 = new ProtocolVersion(360, "18w07c"));
+        register(v1_13 = new ProtocolVersion(361, "18w08a"));
         register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
     }
 
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/ProtocolSnapshotTo1_12_2.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/ProtocolSnapshotTo1_12_2.java
index bd779ea2a..1f95eaaec 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/ProtocolSnapshotTo1_12_2.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/ProtocolSnapshotTo1_12_2.java
@@ -299,10 +299,7 @@ public class ProtocolSnapshotTo1_12_2 extends Protocol {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
                         int soundId = wrapper.get(Type.VAR_INT, 0);
-
-                        // Handle new 'Pumpkin Carve' sound
-                        if (soundId >= 86)
-                            wrapper.set(Type.VAR_INT, 0, soundId + 1);
+                        wrapper.set(Type.VAR_INT, 0, getNewSoundID(soundId));
                     }
                 });
             }
@@ -377,8 +374,6 @@ public class ProtocolSnapshotTo1_12_2 extends Protocol {
                 });
             }
         });
-
-        // TODO: Sound effect
     }
 
     @Override
@@ -395,4 +390,25 @@ public class ProtocolSnapshotTo1_12_2 extends Protocol {
         providers.register(BlockEntityProvider.class, new BlockEntityProvider());
         providers.register(PaintingProvider.class, new PaintingProvider());
     }
+
+    private int getNewSoundID(final int oldID){
+        int newID = oldID;
+        if (oldID >= 10)
+            newID += 5;
+        if (oldID >= 86)
+            newID++;
+        if (oldID >= 352)
+            newID += 5;
+        if (oldID >= 438)
+            newID++;
+        if (oldID >= 443)
+            newID += 12;
+        if (oldID >= 485)
+            newID++;
+        if (oldID >= 508)
+            newID += 2;
+        if (oldID >= 524)
+            newID += 8;
+        return newID;
+    }
 }
diff --git a/jar/pom.xml b/jar/pom.xml
index a1044107f..736d9d443 100644
--- a/jar/pom.xml
+++ b/jar/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>1.4.0-18w07c</version>
+        <version>1.4.0-18w08a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>viaversion-jar</name>
diff --git a/pom.xml b/pom.xml
index e73e9f196..0e7e6fdc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>us.myles</groupId>
     <artifactId>viaversion-parent</artifactId>
-    <version>1.4.0-18w07c</version>
+    <version>1.4.0-18w08a</version>
     <packaging>pom</packaging>
 
     <name>viaversion-parent</name>
diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml
index d17fcb2a3..59e0f2b21 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.4.0-18w07c</version>
+        <version>1.4.0-18w08a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sponge/pom.xml b/sponge/pom.xml
index 51d8b5b19..1616f4ae6 100644
--- a/sponge/pom.xml
+++ b/sponge/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>1.4.0-18w07c</version>
+        <version>1.4.0-18w08a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>