From f4d1631f8119d8bf95b422856ae324aa7dbcac83 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Wed, 25 Jun 2025 17:15:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=8C=85=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../craftengine/core/pack/model/SelectItemModel.java | 4 ++-- .../core/pack/model/condition/SimpleConditionProperty.java | 2 +- .../pack/model/rangedisptach/SimpleRangeDispatchProperty.java | 2 +- .../core/pack/model/select/SimpleSelectProperty.java | 2 +- .../core/pack/model/special/SimpleSpecialModel.java | 2 +- gradle.properties | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/model/SelectItemModel.java b/core/src/main/java/net/momirealms/craftengine/core/pack/model/SelectItemModel.java index ac9596f0b..8f449f423 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/model/SelectItemModel.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/model/SelectItemModel.java @@ -167,11 +167,11 @@ public class SelectItemModel implements ItemModel { if (whenObj instanceof JsonArray array) { List whens = new ArrayList<>(array.size()); for (JsonElement o : array) { - whens.add(o.toString()); + whens.add(o.getAsString()); } either = Either.ofFallback(whens); } else if (whenObj instanceof JsonPrimitive primitive) { - either = Either.ofPrimary(primitive.toString()); + either = Either.ofPrimary(primitive.getAsString()); } else { throw new IllegalArgumentException("when is expected to be either JsonPrimitive or JsonArray"); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/model/condition/SimpleConditionProperty.java b/core/src/main/java/net/momirealms/craftengine/core/pack/model/condition/SimpleConditionProperty.java index 879df1828..61ff846fd 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/model/condition/SimpleConditionProperty.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/model/condition/SimpleConditionProperty.java @@ -35,7 +35,7 @@ public class SimpleConditionProperty implements ConditionProperty { public static class Reader implements ConditionPropertyReader { @Override public ConditionProperty read(JsonObject json) { - return new SimpleConditionProperty(Key.of(json.get("property").toString())); + return new SimpleConditionProperty(Key.of(json.get("property").getAsString())); } } } diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/model/rangedisptach/SimpleRangeDispatchProperty.java b/core/src/main/java/net/momirealms/craftengine/core/pack/model/rangedisptach/SimpleRangeDispatchProperty.java index 9e30fb5a8..5c637e301 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/model/rangedisptach/SimpleRangeDispatchProperty.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/model/rangedisptach/SimpleRangeDispatchProperty.java @@ -35,7 +35,7 @@ public class SimpleRangeDispatchProperty implements RangeDispatchProperty { public static class Reader implements RangeDispatchPropertyReader { @Override public RangeDispatchProperty read(JsonObject json) { - Key type = Key.of(json.get("property").toString()); + Key type = Key.of(json.get("property").getAsString()); return new SimpleRangeDispatchProperty(type); } } diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/model/select/SimpleSelectProperty.java b/core/src/main/java/net/momirealms/craftengine/core/pack/model/select/SimpleSelectProperty.java index dbb000fa4..c108fc94f 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/model/select/SimpleSelectProperty.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/model/select/SimpleSelectProperty.java @@ -35,7 +35,7 @@ public class SimpleSelectProperty implements SelectProperty { public static class Reader implements SelectPropertyReader { @Override public SelectProperty read(JsonObject json) { - Key type = Key.of(json.get("property").toString()); + Key type = Key.of(json.get("property").getAsString()); return new SimpleSelectProperty(type); } } diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/model/special/SimpleSpecialModel.java b/core/src/main/java/net/momirealms/craftengine/core/pack/model/special/SimpleSpecialModel.java index 9b7fa9d43..facbc1d4b 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/model/special/SimpleSpecialModel.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/model/special/SimpleSpecialModel.java @@ -45,7 +45,7 @@ public class SimpleSpecialModel implements SpecialModel { public static class Reader implements SpecialModelReader { @Override public SpecialModel read(JsonObject json) { - Key type = Key.of(json.get("type").toString()); + Key type = Key.of(json.get("type").getAsString()); return new SimpleSpecialModel(type); } } diff --git a/gradle.properties b/gradle.properties index 41c4e936d..69bc2be33 100644 --- a/gradle.properties +++ b/gradle.properties @@ -41,7 +41,7 @@ commons_io_version=2.18.0 commons_imaging_version=1.0.0-alpha6 commons_lang3_version=3.17.0 sparrow_nbt_version=0.9.1 -sparrow_util_version=0.49.2 +sparrow_util_version=0.50 fastutil_version=8.5.15 netty_version=4.1.121.Final joml_version=1.10.8