Fix anvil item rename (GeyserMC#992)

* fix anvil item rename * fix anvil item rename
bundabrg · Jul 21, 2020 · 765efe8 · 765efe8
1 parent 30c007d
commit 765efe8
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/...n/java/org/geysermc/connector/network/translators/inventory/AnvilInventoryTranslator.java b/...n/java/org/geysermc/connector/network/translators/inventory/AnvilInventoryTranslator.java
@@ -32,6 +32,9 @@
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.nukkitx.nbt.NbtMap;
 import com.nukkitx.protocol.bedrock.data.inventory.*;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.geysermc.connector.inventory.Inventory;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.inventory.updater.CursorInventoryUpdater;
@@ -106,7 +109,9 @@ public void translateActions(GeyserSession session, Inventory inventory, List<In
             String rename;
             NbtMap tag = itemName.getTag();
             if (tag != null) {
-                rename = tag.getCompound("display").getString("Name");
+                String name = tag.getCompound("display").getString("Name");
+                Component component = GsonComponentSerializer.gson().deserialize(name);
+                rename = LegacyComponentSerializer.legacy().serialize(component);
             } else {
                 rename = "";
             }
@@ -138,8 +143,8 @@ public void updateSlot(GeyserSession session, Inventory inventory, int slot) {
                     CompoundTag displayTag = tag.get("display");
                     if (displayTag != null && displayTag.contains("Name")) {
                         String itemName = displayTag.get("Name").getValue().toString();
-                        TextMessage message = (TextMessage) MessageSerializer.fromString(itemName);
-                        rename = message.getText();
+                        Component component = GsonComponentSerializer.gson().deserialize(itemName);
+                        rename = LegacyComponentSerializer.legacy().serialize(component);
                     } else {
                         rename = "";
                     }