Bug fixes.

toxicity188 · May 15, 2024 · 39f6c9f · 39f6c9f
1 parent bcd42c1
commit 39f6c9f
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,7 +11,7 @@ allprojects {
     apply(plugin = "java")
 
     group = "kr.toxicity.libraries.datacomponent"
-    version = "1.0.7"
+    version = "1.0.8"
 
     repositories {
         mavenCentral()

diff --git a/nms/v1_20_R4/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_20_R4/CodecImpl.java b/nms/v1_20_R4/src/main/java/kr/toxicity/libraries/datacomponent/nms/v1_20_R4/CodecImpl.java
@@ -11,6 +11,7 @@
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.ComponentSerialization;
+import net.minecraft.network.chat.contents.PlainTextContents;
 import net.minecraft.resources.RegistryOps;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Unit;
@@ -30,7 +31,7 @@ final class CodecImpl<T> implements kr.toxicity.libraries.datacomponent.api.Code
 
     private static final RegistryOps<JsonElement> OPS = RegistryAccess.fromRegistryOfRegistries(BuiltInRegistries.REGISTRY).createSerializationContext(JsonOps.INSTANCE);
 
-    static final CodecImpl<Component> COMPONENT = of(ComponentSerialization.CODEC, t -> new JsonObject());
+    static final CodecImpl<Component> COMPONENT = of(ComponentSerialization.CODEC, t -> t.getContents() instanceof PlainTextContents textContents ? new JsonPrimitive(textContents.text()) : new JsonObject());
     static final CodecImpl<ItemLore> ITEM_LORE = of(ItemLore.CODEC, t -> new JsonArray());
     static final CodecImpl<Rarity> RARITY = of(Rarity.CODEC, t -> new JsonPrimitive(t.name().toLowerCase()));
     static final CodecImpl<Unit> UNIT = of(Codec.unit(Unit.INSTANCE), t -> new JsonPrimitive(true));

diff --git a/test-plugin/library/src/main/java/kr/toxicity/test/TestPlugin.java b/test-plugin/library/src/main/java/kr/toxicity/test/TestPlugin.java
@@ -27,5 +27,15 @@ public void onEnable() {
 
         var value = data.get(NMS.nms().rarity());
         if (value != null) getLogger().info(value.name());
+
+        for (Material material : Material.values()) {
+            if (material.isItem()) {
+                try {
+                    DataComponentAPI.api().adapter(new ItemStack(material)).serialize();
+                } catch (Exception e) {
+                    getLogger().info(material.name());
+                }
+            }
+        }
     }
 }
diff --git a/test-plugin/shade/src/main/java/kr/toxicity/test/TestPlugin.java b/test-plugin/shade/src/main/java/kr/toxicity/test/TestPlugin.java
@@ -3,12 +3,20 @@
 import com.google.gson.JsonParser;
 import kr.toxicity.libraries.datacomponent.DataComponentAPIBukkit;
 import kr.toxicity.libraries.datacomponent.api.DataComponentAPI;
+import kr.toxicity.libraries.datacomponent.api.DataComponentType;
 import kr.toxicity.libraries.datacomponent.api.NMS;
+import kr.toxicity.libraries.datacomponent.api.wrapper.CompoundTag;
+import kr.toxicity.libraries.datacomponent.api.wrapper.CustomData;
 import kr.toxicity.libraries.datacomponent.api.wrapper.Rarity;
+import kr.toxicity.libraries.datacomponent.api.wrapper.Tag;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.util.HashMap;
+import java.util.List;
+
 public class TestPlugin extends JavaPlugin {
     @Override
     public void onEnable() {
@@ -31,5 +39,18 @@ public void onEnable() {
 
         var value = data.get(NMS.nms().rarity());
         if (value != null) getLogger().info(value.name());
+
+        for (Material material : Material.values()) {
+            if (material.isItem()) {
+                try {
+                    DataComponentAPI.api().adapter(new ItemStack(material)).serialize();
+                } catch (Exception e) {
+                    getLogger().info(material.name());
+                }
+            }
+        }
+        var test = DataComponentAPI.api().adapter(new ItemStack(Material.DIAMOND));
+        test.set(NMS.nms().customName(), Component.empty());
+        System.out.println(test.serialize());
     }
 }