From ae70dbeece0094814b80ed2edd9e39add53b033d Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+DoctorMacc@users.noreply.github.com>
Date: Sat, 17 Oct 2020 23:13:04 -0400
Subject: [PATCH] JavaOpenWindowTranslator: Use MessageUtils for inventory name
 (#1416)

* JavaOpenWindowTranslator: Use MessageUtils for inventory name

* Remove important messaging
---
 .../java/window/JavaOpenWindowTranslator.java | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaOpenWindowTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaOpenWindowTranslator.java
index 820639b3..099de317 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaOpenWindowTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaOpenWindowTranslator.java
@@ -25,11 +25,9 @@
 
 package org.geysermc.connector.network.translators.java.window;
 
+import com.github.steveice10.mc.protocol.data.message.MessageSerializer;
 import com.github.steveice10.mc.protocol.packet.ingame.client.window.ClientCloseWindowPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.window.ServerOpenWindowPacket;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.inventory.Inventory;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;
@@ -37,6 +35,7 @@ import org.geysermc.connector.network.translators.Translator;
 import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
 import org.geysermc.connector.utils.InventoryUtils;
 import org.geysermc.connector.utils.LocaleUtils;
+import org.geysermc.connector.utils.MessageUtils;
 
 @Translator(packet = ServerOpenWindowPacket.class)
 public class JavaOpenWindowTranslator extends PacketTranslator<ServerOpenWindowPacket> {
@@ -58,18 +57,8 @@ public class JavaOpenWindowTranslator extends PacketTranslator<ServerOpenWindowP
             return;
         }
 
-        String name = packet.getName();
-        try {
-            JsonParser parser = new JsonParser();
-            JsonObject jsonObject = parser.parse(packet.getName()).getAsJsonObject();
-            if (jsonObject.has("text")) {
-                name = jsonObject.get("text").getAsString();
-            } else if (jsonObject.has("translate")) {
-                name = jsonObject.get("translate").getAsString();
-            }
-        } catch (Exception e) {
-            GeyserConnector.getInstance().getLogger().debug("JavaOpenWindowTranslator: " + e.toString());
-        }
+        String name = MessageUtils.getTranslatedBedrockMessage(MessageSerializer.fromString(packet.getName()),
+                session.getClientData().getLanguageCode());
 
         name = LocaleUtils.getLocaleString(name, session.getClientData().getLanguageCode());