From b2514a9e5030547c760d0f30eac8474c9c3f8e92 Mon Sep 17 00:00:00 2001
From: KennyTV <kennytv@t-online.de>
Date: Sat, 27 Jun 2020 19:51:42 +0200
Subject: [PATCH] Map a few removed translation keys Fixes #1818

---
 .../Protocol1_16To1_15_2.java                 |  8 +++-
 .../data/TranslationMappings.java             | 46 +++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/data/TranslationMappings.java

diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
index d96bbd12b..1b5f19137 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
@@ -7,6 +7,7 @@ import us.myles.ViaVersion.api.Via;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.protocol.Protocol;
 import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.rewriters.ComponentRewriter;
 import us.myles.ViaVersion.api.rewriters.SoundRewriter;
 import us.myles.ViaVersion.api.rewriters.TagRewriter;
 import us.myles.ViaVersion.api.rewriters.TagType;
@@ -15,6 +16,7 @@ import us.myles.ViaVersion.packets.State;
 import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14;
 import us.myles.ViaVersion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15;
 import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.data.MappingData;
+import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.data.TranslationMappings;
 import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.metadata.MetadataRewriter1_16To1_15_2;
 import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.packets.EntityPackets;
 import us.myles.ViaVersion.protocols.protocol1_16to1_15_2.packets.InventoryPackets;
@@ -97,12 +99,16 @@ public class Protocol1_16To1_15_2 extends Protocol<ClientboundPackets1_15, Clien
             }
         });
 
+        ComponentRewriter componentRewriter = new TranslationMappings();
         registerOutgoing(ClientboundPackets1_15.CHAT_MESSAGE, new PacketRemapper() {
             @Override
             public void registerMap() {
                 map(Type.COMPONENT);
                 map(Type.BYTE);
-                handler(wrapper -> wrapper.write(Type.UUID, ZERO_UUID)); // sender uuid
+                handler(wrapper -> {
+                    componentRewriter.processText(wrapper.get(Type.COMPONENT, 0));
+                    wrapper.write(Type.UUID, ZERO_UUID); // Sender uuid - always send as 'system'
+                });
             }
         });
 
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/data/TranslationMappings.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/data/TranslationMappings.java
new file mode 100644
index 000000000..70252c6e3
--- /dev/null
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/data/TranslationMappings.java
@@ -0,0 +1,46 @@
+package us.myles.ViaVersion.protocols.protocol1_16to1_15_2.data;
+
+import com.google.gson.JsonObject;
+import us.myles.ViaVersion.api.rewriters.ComponentRewriter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class TranslationMappings extends ComponentRewriter {
+    private final Map<String, String> mappings = new HashMap<>();
+
+    public TranslationMappings() {
+        mappings.put("block.minecraft.flowing_water", "Flowing Water");
+        mappings.put("block.minecraft.flowing_lava", "Flowing Lava");
+        mappings.put("block.minecraft.bed", "Bed");
+        mappings.put("block.minecraft.bed.not_valid", "Your home bed was missing or obstructed");
+        mappings.put("block.minecraft.bed.set_spawn", "Respawn point set");
+        mappings.put("block.minecraft.two_turtle_eggs", "Two Turtle Eggs");
+        mappings.put("block.minecraft.three_turtle_eggs", "Three Turtle Eggs");
+        mappings.put("block.minecraft.four_turtle_eggs", "Four Turtle Eggs");
+        mappings.put("block.minecraft.banner", "Banner");
+        mappings.put("block.minecraft.wall_banner", "Wall Banner");
+        mappings.put("item.minecraft.zombie_pigman_spawn_egg", "Zombie Pigman Spawn Egg");
+        mappings.put("item.minecraft.skeleton_skull", "Skeleton Skull");
+        mappings.put("item.minecraft.wither_skeleton_skull", "Wither Skeleton Skull");
+        mappings.put("item.minecraft.zombie_head", "Zombie Head");
+        mappings.put("item.minecraft.creeper_head", "Creeper Head");
+        mappings.put("item.minecraft.dragon_head", "Dragon Head");
+        mappings.put("entity.minecraft.zombie_pigman", "Zombie Pigman");
+        mappings.put("death.fell.accident.water", "%1$s fell out of the water");
+        mappings.put("death.attack.netherBed.message", "%1$s was killed by %2$s");
+        mappings.put("death.attack.netherBed.link", "Intentional Game Design");
+        mappings.put("advancements.husbandry.break_diamond_hoe.title", "Serious Dedication");
+        mappings.put("advancements.husbandry.break_diamond_hoe.description", "Completely use up a diamond hoe, and then reevaluate your life choices");
+        mappings.put("biome.minecraft.nether", "Nether");
+    }
+
+    @Override
+    protected void handleTranslate(JsonObject object, String translate) {
+        // A few keys were removed - manually set the text of relevant ones
+        String mappedTranslation = mappings.get(translate);
+        if (mappedTranslation != null) {
+            object.addProperty("translate", mappedTranslation);
+        }
+    }
+}