From 7b8fd2b0614337fdda77a44f578f72b19af54018 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Sat, 9 Dec 2023 14:59:43 +0100
Subject: [PATCH] Fix 1.17->1.16 map data type reading Fixes #646

---
 .../viabackwards/api/rewriters/EntityRewriterBase.java    | 1 +
 .../viabackwards/api/rewriters/MapColorRewriter.java      | 4 +---
 .../protocol/rewriter/BlockItemPacketRewriter1_99.java    | 8 +++++---
 .../protocol/rewriter/EntityPacketRewriter1_99.java       | 1 +
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java
index 525b5b09..f5450cde 100644
--- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java
+++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java
@@ -199,6 +199,7 @@ public abstract class EntityRewriterBase<C extends ClientboundPacketType, T exte
             } else if (type == particleType) {
                 rewriteParticle(meta.value());
             } else if (type == optionalComponentType || type == componentType) {
+
                 JsonElement text = meta.value();
                 if (text != null) {
                     protocol.getTranslatableRewriter().processText(text);
diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/MapColorRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/MapColorRewriter.java
index e38c9b0d..d9f45915 100644
--- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/MapColorRewriter.java
+++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/MapColorRewriter.java
@@ -37,9 +37,7 @@ public final class MapColorRewriter {
                 wrapper.passthrough(Type.BYTE); // X
                 wrapper.passthrough(Type.BYTE); // Z
                 wrapper.passthrough(Type.BYTE); // Direction
-                if (wrapper.passthrough(Type.BOOLEAN)) {
-                    wrapper.passthrough(Type.COMPONENT); // Display Name
-                }
+                wrapper.passthrough(Type.OPTIONAL_COMPONENT); // Display Name
             }
 
             short columns = wrapper.passthrough(Type.UNSIGNED_BYTE);
diff --git a/template/src/main/java/com/viaversion/viabackwards/template/protocol/rewriter/BlockItemPacketRewriter1_99.java b/template/src/main/java/com/viaversion/viabackwards/template/protocol/rewriter/BlockItemPacketRewriter1_99.java
index 0772a7c7..b9585cdd 100644
--- a/template/src/main/java/com/viaversion/viabackwards/template/protocol/rewriter/BlockItemPacketRewriter1_99.java
+++ b/template/src/main/java/com/viaversion/viabackwards/template/protocol/rewriter/BlockItemPacketRewriter1_99.java
@@ -21,14 +21,14 @@ import com.viaversion.viabackwards.api.rewriters.ItemRewriter;
 import com.viaversion.viabackwards.template.protocol.Protocol1_98To_99;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_20_2;
-import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.rewriter.RecipeRewriter1_20_2;
 import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundPackets1_20_3;
 import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ServerboundPackets1_20_3;
+import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.rewriter.RecipeRewriter1_20_3;
 import com.viaversion.viaversion.rewriter.BlockRewriter;
 
 // To replace if needed:
 //   ChunkType1_20_2
-//   RecipeRewriter1_20_2
+//   RecipeRewriter1_20_3
 public final class BlockItemPacketRewriter1_99 extends ItemRewriter<ClientboundPackets1_20_3, ServerboundPackets1_20_3, Protocol1_98To_99> {
 
     public BlockItemPacketRewriter1_99(final Protocol1_98To_99 protocol) {
@@ -57,6 +57,8 @@ public final class BlockItemPacketRewriter1_99 extends ItemRewriter<ClientboundP
         registerWindowPropertyEnchantmentHandler(ClientboundPackets1_20_3.WINDOW_PROPERTY);
         registerSpawnParticle1_19(ClientboundPackets1_20_3.SPAWN_PARTICLE);
 
-        new RecipeRewriter1_20_2<>(protocol).register(ClientboundPackets1_20_3.DECLARE_RECIPES);
+        //TODO Particles in explosion packet
+
+        new RecipeRewriter1_20_3<>(protocol).register(ClientboundPackets1_20_3.DECLARE_RECIPES);
     }
 }
\ No newline at end of file
diff --git a/template/src/main/java/com/viaversion/viabackwards/template/protocol/rewriter/EntityPacketRewriter1_99.java b/template/src/main/java/com/viaversion/viabackwards/template/protocol/rewriter/EntityPacketRewriter1_99.java
index b7470c58..644762e5 100644
--- a/template/src/main/java/com/viaversion/viabackwards/template/protocol/rewriter/EntityPacketRewriter1_99.java
+++ b/template/src/main/java/com/viaversion/viabackwards/template/protocol/rewriter/EntityPacketRewriter1_99.java
@@ -93,6 +93,7 @@ public final class EntityPacketRewriter1_99 extends EntityRewriter<ClientboundPa
             meta.setMetaType(Types1_20_3.META_TYPES.byId(id));
         });*/
 
+        //TODO Component needs to handle tags
         registerMetaTypeHandler(
                 Types1_20_3.META_TYPES.itemType,
                 Types1_20_3.META_TYPES.blockStateType,