From 71e24d979718a75d413a4127b52de8559ba60d50 Mon Sep 17 00:00:00 2001
From: KennyTV <28825609+KennyTV@users.noreply.github.com>
Date: Mon, 13 Jan 2020 22:24:44 +0100
Subject: [PATCH] Map new 1.15 particles, fix remap in 1.14

---
 .../packets/EntityPackets1_14.java            |  8 +++++---
 .../data/ParticleMapping.java                 | 19 +++++++++++++++++++
 .../packets/BlockItemPackets1_15.java         |  6 ++++++
 3 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/ParticleMapping.java

diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
index 9e2a80c9..046cae10 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
@@ -576,11 +576,13 @@ public class EntityPackets1_14 extends EntityRewriter<Protocol1_13_2To1_14> {
         if (id >= 28) {
             id -= 1; // new 24 -> 27
         }
-        if (id >= 14) {
+        if (id >= 13) {
             id -= 1; // new water drip 11 -> 13
         }
-        if (id >= 12) {
-            id -= 2; // new lava drips 10, 11
+        if (id == 10 || id == 11) {
+            id = 9; // set both landing/falling lava to dripping lava
+        } else if (id > 11) {
+            id -= 2;
         }
         return id;
     }
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/ParticleMapping.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/ParticleMapping.java
new file mode 100644
index 00000000..c68432f9
--- /dev/null
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/ParticleMapping.java
@@ -0,0 +1,19 @@
+package nl.matsv.viabackwards.protocol.protocol1_14_4to1_15.data;
+
+public class ParticleMapping {
+
+    public static int getOldId(int newId) {
+        switch (newId) {
+            case 58: // dripping honey -> dripping lava
+                return 9;
+            case 59: // falling honey -> falling lava
+                return 10;
+            case 60: // landing honey -> landing lava
+                return 11;
+            case 61: // falling nectar -> falling water
+                return 13;
+            default:
+                return newId;
+        }
+    }
+}
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java
index 38dab121..0d658212 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java
@@ -4,6 +4,7 @@ import nl.matsv.viabackwards.ViaBackwards;
 import nl.matsv.viabackwards.api.rewriters.BlockItemRewriter;
 import nl.matsv.viabackwards.api.rewriters.RecipeRewriter;
 import nl.matsv.viabackwards.protocol.protocol1_14_4to1_15.Protocol1_14_4To1_15;
+import nl.matsv.viabackwards.protocol.protocol1_14_4to1_15.data.ParticleMapping;
 import nl.matsv.viabackwards.protocol.protocol1_14_4to1_15.data.RecipeRewriter1_15;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
@@ -188,6 +189,11 @@ public class BlockItemPackets1_15 extends BlockItemRewriter<Protocol1_14_4To1_15
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
                         int id = wrapper.get(Type.INT, 0);
+                        int mappedId = ParticleMapping.getOldId(id);
+                        if (id != mappedId) {
+                            wrapper.set(Type.INT, 0, mappedId);
+                        }
+
                         if (id == 3 || id == 23) {
                             int data = wrapper.passthrough(Type.VAR_INT);
                             wrapper.set(Type.VAR_INT, 0, Protocol1_14_4To1_15.getNewBlockStateId(data));