From 68e578a04e46c5d3e346181f83fff3377c71b553 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Sat, 18 Mar 2023 13:16:22 +0100
Subject: [PATCH] Handle translatables in 1.13.1 entity display names

---
 .../api/rewriters/EntityRewriterBase.java     | 25 +++++++++++++++----
 .../Protocol1_13To1_13_1.java                 |  7 +++++-
 .../packets/EntityPackets1_13_1.java          |  4 +++
 .../packets/EntityPackets1_19_4.java          |  4 +++
 4 files changed, 34 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 9aee0bee..bc006929 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
@@ -175,17 +175,32 @@ public abstract class EntityRewriterBase<C extends ClientboundPacketType, T exte
         }
     }
 
-    public void registerMetaTypeHandler(@Nullable MetaType itemType, @Nullable MetaType blockType, @Nullable MetaType particleType, @Nullable MetaType optionalComponentType) {
+    public void registerMetaTypeHandler(
+            @Nullable MetaType itemType,
+            @Nullable MetaType blockType,
+            @Nullable MetaType particleType,
+            @Nullable MetaType optionalComponentType
+    ) {
+        this.registerMetaTypeHandler(itemType, blockType, particleType, optionalComponentType, null);
+    }
+
+    public void registerMetaTypeHandler(
+            @Nullable MetaType itemType,
+            @Nullable MetaType blockType,
+            @Nullable MetaType particleType,
+            @Nullable MetaType optionalComponentType,
+            @Nullable MetaType componentType
+    ) {
         filter().handler((event, meta) -> {
             MetaType type = meta.metaType();
-            if (itemType != null && type == itemType) {
+            if (type == itemType) {
                 protocol.getItemRewriter().handleItemToClient(meta.value());
-            } else if (blockType != null && type == blockType) {
+            } else if (type == blockType) {
                 int data = meta.value();
                 meta.setValue(protocol.getMappingData().getNewBlockStateId(data));
-            } else if (particleType != null && type == particleType) {
+            } else if (type == particleType) {
                 rewriteParticle(meta.value());
-            } else if (optionalComponentType != null && type == optionalComponentType) {
+            } 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/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java
index fbd88bd0..8b6d9cce 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java
@@ -49,6 +49,7 @@ public class Protocol1_13To1_13_1 extends BackwardsProtocol<ClientboundPackets1_
     public static final BackwardsMappings MAPPINGS = new BackwardsMappings("1.13.2", "1.13", Protocol1_13_1To1_13.class);
     private final EntityPackets1_13_1 entityRewriter = new EntityPackets1_13_1(this);
     private final InventoryPackets1_13_1 itemRewriter = new InventoryPackets1_13_1(this);
+    private final TranslatableRewriter<ClientboundPackets1_13> translatableRewriter = new TranslatableRewriter<>(this);
 
     public Protocol1_13To1_13_1() {
         super(ClientboundPackets1_13.class, ClientboundPackets1_13.class, ServerboundPackets1_13.class, ServerboundPackets1_13.class);
@@ -60,7 +61,6 @@ public class Protocol1_13To1_13_1 extends BackwardsProtocol<ClientboundPackets1_
 
         WorldPackets1_13_1.register(this);
 
-        TranslatableRewriter<ClientboundPackets1_13> translatableRewriter = new TranslatableRewriter<>(this);
         translatableRewriter.registerComponentPacket(ClientboundPackets1_13.CHAT_MESSAGE);
         translatableRewriter.registerCombatEvent(ClientboundPackets1_13.COMBAT_EVENT);
         translatableRewriter.registerDisconnect(ClientboundPackets1_13.DISCONNECT);
@@ -227,4 +227,9 @@ public class Protocol1_13To1_13_1 extends BackwardsProtocol<ClientboundPackets1_
     public InventoryPackets1_13_1 getItemRewriter() {
         return itemRewriter;
     }
+
+    @Override
+    public TranslatableRewriter<ClientboundPackets1_13> getTranslatableRewriter() {
+        return translatableRewriter;
+    }
 }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java
index d3ac3320..92623e91 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java
@@ -28,6 +28,7 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.Particle;
 import com.viaversion.viaversion.api.type.types.version.Types1_13;
+import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
 import java.util.List;
 
@@ -139,6 +140,9 @@ public class EntityPackets1_13_1 extends LegacyEntityRewriter<ClientboundPackets
                 meta.setValue(protocol.getMappingData().getNewBlockStateId(data));
             } else if (meta.metaType() == Types1_13.META_TYPES.particleType) {
                 rewriteParticle((Particle) meta.getValue());
+            } else if (meta.metaType() == Types1_13.META_TYPES.optionalComponentType) {
+                JsonElement element = meta.value();
+                protocol.getTranslatableRewriter().processText(element);
             }
         });
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/EntityPackets1_19_4.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/EntityPackets1_19_4.java
index 8d91dd6b..3b3d00e4 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/EntityPackets1_19_4.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/EntityPackets1_19_4.java
@@ -27,6 +27,7 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_19_3;
 import com.viaversion.viaversion.api.type.types.version.Types1_19_4;
+import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.ByteTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
@@ -161,6 +162,9 @@ public final class EntityPackets1_19_4 extends EntityRewriter<ClientboundPackets
             event.setIndex(2);
             meta.setMetaType(Types1_19_3.META_TYPES.optionalComponentType);
             event.createExtraMeta(new Metadata(3, Types1_19_3.META_TYPES.booleanType, true)); // Show custom name
+
+            final JsonElement element = meta.value();
+            protocol.getTranslatableRewriter().processText(element);
         }));
         filter().filterFamily(Entity1_19_4Types.DISPLAY).handler((event, meta) -> {
             // TODO Maybe spawn an extra entity to ride the armor stand for blocks and items