fix: バイバイン

Author: acrylic-style

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 
 allprojects {
     group = "net.azisaba.loreeditor"
-    version = "1.3.2"
+    version = "1.3.3"
 
     apply {
         plugin("java")
@@ -76,7 +76,9 @@ allprojects {
         shadowJar {
             relocate("xyz.acrylicstyle.util", "net.azisaba.loreeditor.libs.xyz.acrylicstyle.util")
             relocate("net.kyori", "net.azisaba.loreeditor.libs.net.kyori")
-            relocate("com.google.gson", "net.azisaba.loreeditor.libs.com.google.gson")
+            // exclude gson
+            exclude("com/google/gson/**")
+            //relocate("com.google.gson", "net.azisaba.loreeditor.libs.com.google.gson")
             archiveBaseName.set("LoreEditor-${project.name}")
         }
     }

v1_21_11/src/main/java/net/azisaba/loreeditor/v1_21_11/chat/ComponentImpl.java

@@ -1,6 +1,7 @@
 package net.azisaba.loreeditor.v1_21_11.chat;
 
 import com.google.gson.Gson;
+import com.google.gson.JsonObject;
 import com.mojang.serialization.JsonOps;
 import net.azisaba.loreeditor.common.chat.ChatModifier;
 import net.azisaba.loreeditor.common.chat.Component;
@@ -36,7 +37,7 @@ public ComponentImpl(@Nullable net.minecraft.network.chat.Component handle) {
     }
 
     public static MutableComponent deserializeFromJson(@NotNull String input) {
-        return ComponentSerialization.CODEC.decode(JsonOps.INSTANCE, GSON.toJsonTree(input)).getOrThrow().getFirst().copy();
+        return ComponentSerialization.CODEC.decode(JsonOps.INSTANCE, GSON.fromJson(input, JsonObject.class)).getOrThrow().getFirst().copy();
     }
 
     public static String serializeToJson(@NotNull net.minecraft.network.chat.Component component) {

v1_21_11/src/main/java/net/azisaba/loreeditor/v1_21_11/item/ItemStackImpl.java

@@ -10,6 +10,7 @@
 import net.minecraft.core.component.DataComponentMap;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.nbt.StringTag;
+import net.minecraft.nbt.StringTagVisitor;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.component.CustomData;
 import net.minecraft.world.item.component.ItemLore;
@@ -96,11 +97,14 @@ public void setTag(@Nullable CompoundTag tag) {
                         ((ListTagImpl) listTag).getHandle()
                                 .stream()
                                 .map(t -> {
-                                    if (t instanceof StringTag) {
-                                        return t.asString().orElse("");
-                                    } else {
-                                        return t.toString();
+                                    StringTagVisitor visitor = new StringTagVisitor();
+                                    t.accept(visitor);
+                                    String json = visitor.build();
+                                    // strip a single quote around JSON, if any
+                                    if (json.startsWith("'") && json.endsWith("'")) {
+                                        json = json.substring(1, json.length() - 1);
                                     }
+                                    return json;
                                 })
                                 .map(ComponentImpl::deserializeFromJson)
                                 .collect(Collectors.toUnmodifiableList());