Fix RGB colors on signs causing chunk issues, fix items names not bei…

…ng displayed correctly
GeyserMC · Jul 6, 2020 · ba73657 · ba73657
1 parent 545dfa3
commit ba73657
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 29 deletions.
diff --git a/connector/pom.xml b/connector/pom.xml
@@ -127,20 +127,20 @@
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
-            <artifactId>text-api</artifactId>
-            <version>3.0.3</version>
+            <artifactId>adventure-api</artifactId>
+            <version>4.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
-            <artifactId>text-serializer-gson</artifactId>
-            <version>3.0.3</version>
+            <artifactId>adventure-text-serializer-gson</artifactId>
+            <version>4.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
-            <artifactId>text-serializer-legacy</artifactId>
-            <version>3.0.3</version>
+            <artifactId>adventure-text-serializer-legacy</artifactId>
+            <version>4.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/item/ItemTranslator.java
@@ -28,29 +28,22 @@
 
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
 import com.github.steveice10.mc.protocol.data.message.MessageSerializer;
-import com.github.steveice10.opennbt.tag.builtin.ByteArrayTag;
-import com.github.steveice10.opennbt.tag.builtin.ByteTag;
-import com.github.steveice10.opennbt.tag.builtin.DoubleTag;
-import com.github.steveice10.opennbt.tag.builtin.FloatTag;
-import com.github.steveice10.opennbt.tag.builtin.IntArrayTag;
-import com.github.steveice10.opennbt.tag.builtin.IntTag;
-import com.github.steveice10.opennbt.tag.builtin.ListTag;
-import com.github.steveice10.opennbt.tag.builtin.LongArrayTag;
-import com.github.steveice10.opennbt.tag.builtin.LongTag;
-import com.github.steveice10.opennbt.tag.builtin.ShortTag;
-import com.github.steveice10.opennbt.tag.builtin.StringTag;
+import com.github.steveice10.opennbt.tag.builtin.*;
 import com.nukkitx.nbt.NbtList;
 import com.nukkitx.nbt.NbtMap;
 import com.nukkitx.nbt.NbtMapBuilder;
 import com.nukkitx.nbt.NbtType;
 import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.utils.MessageUtils;
 import org.geysermc.connector.utils.LanguageUtils;
+import org.geysermc.connector.utils.MessageUtils;
 import org.reflections.Reflections;
 
 import java.util.*;
@@ -167,6 +160,12 @@ public static ItemData translateToBedrock(GeyserSession session, ItemStack stack
             if (display != null) {
                 String name = display.getString("Name");
 
+                // If its not a message convert it
+                if (!MessageUtils.isMessage(name)) {
+                    TextComponent component = LegacyComponentSerializer.legacy().deserialize(name);
+                    name = GsonComponentSerializer.gson().serialize(component);
+                }
+
                 // Check if its a message to translate
                 if (MessageUtils.isMessage(name)) {
                     // Get the translated name

diff --git a/.../org/geysermc/connector/network/translators/item/translators/nbt/BasicItemTranslator.java b/.../org/geysermc/connector/network/translators/item/translators/nbt/BasicItemTranslator.java
@@ -29,13 +29,13 @@
 import com.github.steveice10.opennbt.tag.builtin.ListTag;
 import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
-import net.kyori.text.Component;
-import net.kyori.text.TextComponent;
-import net.kyori.text.serializer.gson.GsonComponentSerializer;
-import net.kyori.text.serializer.legacy.LegacyComponentSerializer;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.geysermc.connector.network.translators.ItemRemapper;
-import org.geysermc.connector.network.translators.item.NbtItemStackTranslator;
 import org.geysermc.connector.network.translators.item.ItemEntry;
+import org.geysermc.connector.network.translators.item.NbtItemStackTranslator;
 import org.geysermc.connector.utils.MessageUtils;
 
 import java.util.ArrayList;
@@ -101,7 +101,7 @@ private String toJavaMessage(StringTag tag) {
             message = message.replaceFirst("§r", "");
         }
         Component component = TextComponent.of(message);
-        return GsonComponentSerializer.INSTANCE.serialize(component);
+        return GsonComponentSerializer.gson().serialize(component);
     }
 
     private String toBedrockMessage(StringTag tag) {

diff --git a/connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java b/connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java
@@ -35,9 +35,9 @@
 import com.github.steveice10.mc.protocol.data.message.style.MessageStyle;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import net.kyori.text.Component;
-import net.kyori.text.serializer.gson.GsonComponentSerializer;
-import net.kyori.text.serializer.legacy.LegacyComponentSerializer;
+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.network.session.GeyserSession;
 
 import java.util.*;
@@ -263,12 +263,12 @@ public static String getBedrockMessage(String message) {
     }
 
     public static Component phraseJavaMessage(String message) {
-        return GsonComponentSerializer.INSTANCE.deserialize(message);
+        return GsonComponentSerializer.gson().deserialize(message);
     }
 
     public static String getJavaMessage(String message) {
         Component component = LegacyComponentSerializer.legacy().deserialize(message);
-        return GsonComponentSerializer.INSTANCE.serialize(component);
+        return GsonComponentSerializer.gson().serialize(component);
     }
 
     /**