From ef5125e972d4fad62efcedb8883d1c162f0b9c54 Mon Sep 17 00:00:00 2001
From: Marco Neuhaus <mneuhaus44@gmail.com>
Date: Wed, 23 Jan 2019 15:02:55 +0100
Subject: [PATCH] fix rewrite

---
 .../packets/BlockItemPackets1_13.java         | 21 +++++++++++++++----
 .../packets/EntityPackets1_13.java            |  3 ++-
 .../packets/PlayerPacket1_13.java             | 12 ++++-------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java
index d9ecd5ec..3df10655 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java
@@ -190,9 +190,9 @@ public class BlockItemPackets1_13 extends BlockItemRewriter<Protocol1_12_2To1_13
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
                         Item[] items = wrapper.get(Type.ITEM_ARRAY, 0);
-                        for (Item item : items) {
-                            item  = handleItemToClient(item);
-                        }
+                        for (int i = 0; i < items.length; i++)
+                            items[i] = handleItemToClient(items[i]);
+                        wrapper.set(Type.ITEM_ARRAY,0,  items);
                     }
                 });
             }
@@ -210,6 +210,7 @@ public class BlockItemPackets1_13 extends BlockItemRewriter<Protocol1_12_2To1_13
                     public void handle(PacketWrapper wrapper) throws Exception {
                         Item item = wrapper.get(Type.ITEM, 0);
                         item = handleItemToClient(item);
+                        wrapper.set(Type.ITEM, 0, item);
                     }
                 });
             }
@@ -351,6 +352,7 @@ public class BlockItemPackets1_13 extends BlockItemRewriter<Protocol1_12_2To1_13
                     public void handle(PacketWrapper wrapper) throws Exception {
                         Item item = wrapper.get(Type.ITEM, 0);
                         item = handleItemToClient(item);
+                        wrapper.set(Type.ITEM, 0, item);
                     }
                 });
             }
@@ -368,6 +370,7 @@ public class BlockItemPackets1_13 extends BlockItemRewriter<Protocol1_12_2To1_13
                     public void handle(PacketWrapper wrapper) throws Exception {
                         Item item = wrapper.get(Type.FLAT_ITEM, 0);
                         item = handleItemToServer(item);
+                        wrapper.set(Type.FLAT_ITEM, 0, item);
                     }
                 });
             }
@@ -388,6 +391,7 @@ public class BlockItemPackets1_13 extends BlockItemRewriter<Protocol1_12_2To1_13
                     public void handle(PacketWrapper wrapper) throws Exception {
                         Item item = wrapper.get(Type.FLAT_ITEM, 0);
                         item = handleItemToServer(item);
+                        wrapper.set(Type.FLAT_ITEM, 0, item);
                     }
                 });
             }
@@ -411,6 +415,12 @@ public class BlockItemPackets1_13 extends BlockItemRewriter<Protocol1_12_2To1_13
         rewrite(441).repItem(new Item((short) 103, (byte) 1, (short) -1, getNamedTag("1.12 Fire Coral")));
         rewrite(442).repItem(new Item((short) 98, (byte) 1, (short) -1, getNamedTag("1.12 Horn Coral")));
 
+        rewrite(438).repItem(new Item((short) 78, (byte) 1, (short) -1, getNamedTag("1.12 Tube Coral")));
+        rewrite(439).repItem(new Item((short) 78, (byte) 1, (short) -1, getNamedTag("1.12 Brain Coral")));
+        rewrite(440).repItem(new Item((short) 78, (byte) 1, (short) -1, getNamedTag("1.12 Bubble Coral")));
+        rewrite(441).repItem(new Item((short) 78, (byte) 1, (short) -1, getNamedTag("1.12 Fire Coral")));
+        rewrite(442).repItem(new Item((short) 78, (byte) 1, (short) -1, getNamedTag("1.12 Horn Coral")));
+
         rewrite(427).repItem(new Item((short) 561, (byte) 1, (short) -1, getNamedTag("1.12 Turtle Egg")));
 
         rewrite(781).repItem(new Item((short) 488, (byte) 1, (short) -1, getNamedTag("1.12 Trident")));
@@ -426,8 +436,10 @@ public class BlockItemPackets1_13 extends BlockItemRewriter<Protocol1_12_2To1_13
 
     @Override
     protected Item handleItemToClient(Item item) {
-        item = super.handleItemToClient(item);
         if (item == null) return null;
+        System.out.println("Input ID: " + item.getId());
+        item = super.handleItemToClient(item);
+        System.out.println("Backwards ID:  " + item.getId());
 
         Integer rawId = null;
         boolean gotRawIdFromTag = false;
@@ -623,6 +635,7 @@ public class BlockItemPackets1_13 extends BlockItemRewriter<Protocol1_12_2To1_13
                 tag.put(newCanDestroy);
             }
         }
+        System.out.println("ViaVer Id: " + item.getId());
         return item;
     }
 
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java
index 3d27455a..a36b0261 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java
@@ -403,7 +403,8 @@ public class EntityPackets1_13 extends EntityRewriter<Protocol1_12_2To1_13> {
             // Rewrite items
             else if (typeId == 6) {
                 meta.setMetaType(MetaType1_12.Slot);
-                getProtocol().getBlockItemPackets().handleItemToClient((Item) meta.getValue());
+                Item item = (Item) meta.getValue();
+                meta.setValue(getProtocol().getBlockItemPackets().handleItemToClient(item));
             }
 
             // Discontinue particles
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java
index 44edf8ff..6137d1ee 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java
@@ -34,19 +34,16 @@ public class PlayerPacket1_13 extends Rewriter<Protocol1_12_2To1_13> {
 							for (int i = 0; i < size; i++) {
 								//Input Item
 								Item input = wrapper.read(Type.FLAT_ITEM);
-								getProtocol().getBlockItemPackets().handleItemToClient(input);
-								wrapper.write(Type.ITEM, input);
+								wrapper.write(Type.ITEM, getProtocol().getBlockItemPackets().handleItemToClient(input));
 								//Output Item
 								Item output = wrapper.read(Type.FLAT_ITEM);
-								getProtocol().getBlockItemPackets().handleItemToClient(output);
-								wrapper.write(Type.ITEM, output);
+								wrapper.write(Type.ITEM, getProtocol().getBlockItemPackets().handleItemToClient(output));
 
 								boolean secondItem = wrapper.passthrough(Type.BOOLEAN); //Has second item
 								if (secondItem) {
 									//Second Item
 									Item second = wrapper.read(Type.FLAT_ITEM);
-									getProtocol().getBlockItemPackets().handleItemToClient(second);
-									wrapper.write(Type.ITEM, second);
+									wrapper.write(Type.ITEM, getProtocol().getBlockItemPackets().handleItemToClient(second));
 								}
 
 								wrapper.passthrough(Type.BOOLEAN); //Trade disabled
@@ -207,8 +204,7 @@ public class PlayerPacket1_13 extends Rewriter<Protocol1_12_2To1_13> {
                         if (channel.equals("MC|BSign") || channel.equals("MC|BEdit")) {
                             wrapper.setId(0x0B);
                             Item book = wrapper.read(Type.ITEM);
-                            getProtocol().getBlockItemPackets().handleItemToServer(book);
-                            wrapper.write(Type.FLAT_ITEM, book);
+                            wrapper.write(Type.FLAT_ITEM, getProtocol().getBlockItemPackets().handleItemToServer(book));
                             boolean signing = channel.equals("MC|BSign");
                             wrapper.write(Type.BOOLEAN, signing);
                         } else if (channel.equals("MC|ItemName")) {