Add missing translation mappings and component rewriter (#761)

Author: FlorianMichael

common/src/main/java/com/viaversion/viabackwards/protocol/v1_10to1_9_3/Protocol1_10To1_9_3.java

@@ -21,6 +21,7 @@
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
 import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
+import com.viaversion.viabackwards.api.rewriters.TranslatableRewriter;
 import com.viaversion.viabackwards.protocol.v1_10to1_9_3.rewriter.BlockItemPacketRewriter1_10;
 import com.viaversion.viabackwards.protocol.v1_10to1_9_3.rewriter.EntityPacketRewriter1_10;
 import com.viaversion.viaversion.api.connection.UserConnection;
@@ -33,6 +34,7 @@
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ClientboundPackets1_9_3;
 import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ServerboundPackets1_9_3;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
 
 public class Protocol1_10To1_9_3 extends BackwardsProtocol<ClientboundPackets1_9_3, ClientboundPackets1_9_3, ServerboundPackets1_9_3, ServerboundPackets1_9_3> {
 
@@ -89,6 +91,9 @@ public void register() {
                 map(Types.VAR_INT); // 1 - Result
             }
         });
+
+        TranslatableRewriter<ClientboundPackets1_9_3> componentRewriter = new TranslatableRewriter<>(this, ComponentRewriter.ReadType.JSON);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_9_3.CHAT);
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/v1_11to1_10/Protocol1_11To1_10.java

@@ -21,6 +21,7 @@
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
 import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
+import com.viaversion.viabackwards.api.rewriters.TranslatableRewriter;
 import com.viaversion.viabackwards.protocol.v1_11to1_10.rewriter.BlockItemPacketRewriter1_11;
 import com.viaversion.viabackwards.protocol.v1_11to1_10.rewriter.EntityPacketRewriter1_11;
 import com.viaversion.viabackwards.protocol.v1_11to1_10.rewriter.PlayerPacketRewriter1_11;
@@ -29,14 +30,17 @@
 import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_11;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
+import com.viaversion.viaversion.protocols.v1_11_1to1_12.packet.ClientboundPackets1_12;
 import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ClientboundPackets1_9_3;
 import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ServerboundPackets1_9_3;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
 
 public class Protocol1_11To1_10 extends BackwardsProtocol<ClientboundPackets1_9_3, ClientboundPackets1_9_3, ServerboundPackets1_9_3, ServerboundPackets1_9_3> {
 
     public static final BackwardsMappingData MAPPINGS = new BackwardsMappingData("1.11", "1.10");
     private final EntityPacketRewriter1_11 entityRewriter = new EntityPacketRewriter1_11(this);
     private final BlockItemPacketRewriter1_11 itemRewriter = new BlockItemPacketRewriter1_11(this);
+    private TranslatableRewriter<ClientboundPackets1_9_3> componentRewriter;
 
     public Protocol1_11To1_10() {
         super(ClientboundPackets1_9_3.class, ClientboundPackets1_9_3.class, ServerboundPackets1_9_3.class, ServerboundPackets1_9_3.class);
@@ -51,6 +55,9 @@ protected void registerPackets() {
         SoundRewriter<ClientboundPackets1_9_3> soundRewriter = new SoundRewriter<>(this);
         soundRewriter.registerNamedSound(ClientboundPackets1_9_3.CUSTOM_SOUND);
         soundRewriter.registerSound(ClientboundPackets1_9_3.SOUND);
+
+        componentRewriter = new TranslatableRewriter<>(this, ComponentRewriter.ReadType.JSON);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_9_3.CHAT);
     }
 
     @Override
@@ -81,6 +88,10 @@ public BlockItemPacketRewriter1_11 getItemRewriter() {
         return itemRewriter;
     }
 
+    public TranslatableRewriter<ClientboundPackets1_9_3> getComponentRewriter() {
+        return componentRewriter;
+    }
+
     @Override
     public boolean hasMappingDataToLoad() {
         return true;

common/src/main/java/com/viaversion/viabackwards/protocol/v1_11to1_10/rewriter/BlockItemPacketRewriter1_11.java

@@ -229,6 +229,8 @@ public void register() {
                     if (wrapper.get(Types.STRING, 0).equals("EntityHorse")) {
                         entityId = wrapper.passthrough(Types.INT);
                     }
+                    // Rewrite window title
+                    protocol.getComponentRewriter().processText(wrapper.user(), wrapper.get(Types.COMPONENT, 0));
 
                     // Track Inventory
                     String inventory = wrapper.get(Types.STRING, 0);

common/src/main/java/com/viaversion/viabackwards/protocol/v1_12to1_11_1/Protocol1_12To1_11_1.java

@@ -42,6 +42,7 @@ public class Protocol1_12To1_11_1 extends BackwardsProtocol<ClientboundPackets1_
     private static final BackwardsMappingData MAPPINGS = new BackwardsMappingData("1.12", "1.11");
     private final EntityPacketRewriter1_12 entityRewriter = new EntityPacketRewriter1_12(this);
     private final BlockItemPacketRewriter1_12 itemRewriter = new BlockItemPacketRewriter1_12(this);
+    private final ComponentRewriter1_12 componentRewriter = new ComponentRewriter1_12(this);
 
     public Protocol1_12To1_11_1() {
         super(ClientboundPackets1_12.class, ClientboundPackets1_9_3.class, ServerboundPackets1_12.class, ServerboundPackets1_9_3.class);
@@ -51,8 +52,8 @@ public Protocol1_12To1_11_1() {
     protected void registerPackets() {
         itemRewriter.register();
         entityRewriter.register();
+        componentRewriter.registerComponentPacket(ClientboundPackets1_12.CHAT);
         new SoundPacketRewriter1_12(this).register();
-        new ComponentRewriter1_12(this).register();
 
         registerClientbound(ClientboundPackets1_12.SET_TITLES, wrapper -> {
             int action = wrapper.passthrough(Types.VAR_INT);
@@ -94,6 +95,10 @@ public BlockItemPacketRewriter1_12 getItemRewriter() {
         return itemRewriter;
     }
 
+    public ComponentRewriter1_12 getComponentRewriter() {
+        return componentRewriter;
+    }
+
     @Override
     public boolean hasMappingDataToLoad() {
         return true;

common/src/main/java/com/viaversion/viabackwards/protocol/v1_12to1_11_1/data/AdvancementTranslations1_11_1.java

@@ -18,54 +18,34 @@
 
 package com.viaversion.viabackwards.protocol.v1_12to1_11_1.rewriter;
 
+import com.viaversion.viabackwards.api.rewriters.TranslatableRewriter;
 import com.viaversion.viabackwards.protocol.v1_12to1_11_1.Protocol1_12To1_11_1;
-import com.viaversion.viabackwards.protocol.v1_12to1_11_1.data.AdvancementTranslations1_11_1;
 import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.rewriter.RewriterBase;
-import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.libs.gson.JsonObject;
 import com.viaversion.viaversion.protocols.v1_11_1to1_12.packet.ClientboundPackets1_12;
 import com.viaversion.viaversion.rewriter.ComponentRewriter;
 
-public class ComponentRewriter1_12 extends RewriterBase<Protocol1_12To1_11_1> {
+public class ComponentRewriter1_12 extends TranslatableRewriter<ClientboundPackets1_12> {
 
-    public static final ComponentRewriter<ClientboundPackets1_12> COMPONENT_REWRITER = new ComponentRewriter<>(null, ComponentRewriter.ReadType.JSON) {
-        @Override
-        public void processText(UserConnection connection, JsonElement element) {
-            super.processText(connection, element);
-            if (element == null || !element.isJsonObject()) {
-                return;
-            }
-
-            JsonObject object = element.getAsJsonObject();
-            JsonElement keybind = object.remove("keybind");
-            if (keybind == null) {
-                return;
-            }
+    public ComponentRewriter1_12(Protocol1_12To1_11_1 protocol) {
+        super(protocol, ComponentRewriter.ReadType.JSON);
+    }
 
-            //TODO Add nicer text for the key, also use this component rewriter in more packets
-            object.addProperty("text", keybind.getAsString());
+    @Override
+    public void processText(UserConnection connection, JsonElement element) {
+        super.processText(connection, element);
+        if (element == null || !element.isJsonObject()) {
+            return;
         }
 
-        @Override
-        protected void handleTranslate(JsonObject object, String translate) {
-            String text = AdvancementTranslations1_11_1.get(translate);
-            if (text != null) {
-                object.addProperty("translate", text);
-            }
+        JsonObject object = element.getAsJsonObject();
+        JsonElement keybind = object.remove("keybind");
+        if (keybind == null) {
+            return;
         }
-    };
 
-    public ComponentRewriter1_12(Protocol1_12To1_11_1 protocol) {
-        super(protocol);
-    }
-
-    @Override
-    protected void registerPackets() {
-        protocol.registerClientbound(ClientboundPackets1_12.CHAT, wrapper -> {
-            JsonElement element = wrapper.passthrough(Types.COMPONENT);
-            COMPONENT_REWRITER.processText(wrapper.user(), element);
-        });
+        //TODO Add nicer text for the key, also use this component rewriter in more packets
+        object.addProperty("text", keybind.getAsString());
     }
 }