From edd525cfcc9f7940cc3cfcbd72896b19dbc73d85 Mon Sep 17 00:00:00 2001 From: YuTian <2953516620@qq.com> Date: Fri, 19 Jul 2024 17:41:10 +0800 Subject: [PATCH] v1.6.1 --- .../java/com/io/yutian/aulib/serialize/SerializeHelper.java | 5 +++++ .../aulib/serialize/serializers/ItemStackSerializer.java | 2 +- src/main/resources/plugin.yml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/io/yutian/aulib/serialize/SerializeHelper.java b/src/main/java/com/io/yutian/aulib/serialize/SerializeHelper.java index 331b969..962ea72 100644 --- a/src/main/java/com/io/yutian/aulib/serialize/SerializeHelper.java +++ b/src/main/java/com/io/yutian/aulib/serialize/SerializeHelper.java @@ -4,6 +4,7 @@ import com.io.yutian.aulib.exception.SerializeException; import com.io.yutian.aulib.serialize.serializers.ItemStackSerializer; import com.io.yutian.aulib.serialize.serializers.UUIDSerializer; import com.io.yutian.aulib.util.ReflectionUtil; +import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack; import org.bukkit.inventory.ItemStack; import org.json.JSONArray; import org.json.JSONObject; @@ -164,6 +165,9 @@ public class SerializeHelper { } return jsonObject; } else { + if (clazz.toString().startsWith("net.minecraft")) { + return null; + } return serialize(value); } } @@ -179,6 +183,7 @@ public class SerializeHelper { WRAPPER_TO_PRIMITIVE.put(Long.class, long.class); WRAPPER_TO_PRIMITIVE.put(Float.class, float.class); WRAPPER_TO_PRIMITIVE.put(Double.class, double.class); + WRAPPER_TO_PRIMITIVE.put(CraftItemStack.class, ItemStack.class); registerSerializer(UUID.class, new UUIDSerializer()); registerSerializer(ItemStack.class, new ItemStackSerializer()); diff --git a/src/main/java/com/io/yutian/aulib/serialize/serializers/ItemStackSerializer.java b/src/main/java/com/io/yutian/aulib/serialize/serializers/ItemStackSerializer.java index a589f6c..e427ffe 100644 --- a/src/main/java/com/io/yutian/aulib/serialize/serializers/ItemStackSerializer.java +++ b/src/main/java/com/io/yutian/aulib/serialize/serializers/ItemStackSerializer.java @@ -17,7 +17,7 @@ public class ItemStackSerializer implements Serializer { jsonObject.put("Count", nmsItemStack.J()); NBTTagCompound nbtTagCompound = nmsItemStack.u(); jsonObject.put("Tag", nbtTagCompound.toString()); - return null; + return jsonObject; } @Override diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 1f683ef..9825133 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: AuLib main: com.io.yutian.aulib.AuLib -version: 1.6 +version: 1.6.1 api-version: 1.18 author: SuperYuTian \ No newline at end of file