Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-28 19:39:11 +00:00
Code Issues Releases Activity

Merge branch 'Xiao-MoMi:dev' into dev

Browse Source
This commit is contained in:
jhqwqmc
2025-06-25 19:01:34 +08:00
committed by GitHub
parent 99a786ab2e f4d1631f81
commit f925a1ee15
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/net/momirealms/craftengine/core/pack/model/SelectItemModel.java
View File

@@ -167,11 +167,11 @@ public class SelectItemModel implements ItemModel {
if (whenObj instanceof JsonArray array) {
List<String> 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");
}

2
core/src/main/java/net/momirealms/craftengine/core/pack/model/condition/SimpleConditionProperty.java
View File

@@ -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()));
}
}
}

2
core/src/main/java/net/momirealms/craftengine/core/pack/model/rangedisptach/SimpleRangeDispatchProperty.java
View File

@@ -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);
}
}

2
core/src/main/java/net/momirealms/craftengine/core/pack/model/select/SimpleSelectProperty.java
View File

@@ -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);
}
}

2
core/src/main/java/net/momirealms/craftengine/core/pack/model/special/SimpleSpecialModel.java
View File

@@ -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);
}
}