PandacubeFr/PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

ItemStackAdapter for Json: fix again deserialization

Browse Source
This commit is contained in:
Marc Baloup
2025-07-18 17:17:08 +02:00
parent 843d9c3509
commit 34809d4618
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pandalib-paper/src/main/java/fr/pandacube/lib/paper/json/ItemStackAdapter.java
View File

@@ -37,6 +37,16 @@ import java.util.Map;
public ItemStack deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { public ItemStack deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
if (!(json instanceof JsonObject jsonObj)) if (!(json instanceof JsonObject jsonObj))
throw new JsonParseException("Unable to deserialize a ConfigurationSerializable from the provided json structure."); throw new JsonParseException("Unable to deserialize a ConfigurationSerializable from the provided json structure.");
// the deserialized json may contain older data compatible with pre 1.21.5 but not compatible after.
// if it contains both old and new data, delete the old one introduced for compatibility
if (jsonObj.has("DataVersion")) { // it uses the new DataVersion data
jsonObj.remove("v");
}
if (jsonObj.has("id")) {
jsonObj.remove("type");
}
if (jsonObj.has(ConfigurationSerialization.SERIALIZED_TYPE_KEY)) if (jsonObj.has(ConfigurationSerialization.SERIALIZED_TYPE_KEY))
return context.deserialize(jsonObj, ConfigurationSerializable.class); return context.deserialize(jsonObj, ConfigurationSerializable.class);
@@ -52,14 +62,6 @@ import java.util.Map;
fixDeserializationVersion(map); fixDeserializationVersion(map);
map.remove("meta"); map.remove("meta");
// the deserialized json may contain older data compatible with pre 1.21.5 but not compatible after.
// if it contains both old and new data, delete the old one introduced for compatibility
if (map.containsKey("DataVersion")) { // it uses the new DataVersion data
map.remove("v");
}
if (map.containsKey("id")) {
map.remove("type");
}
ItemStack is = ItemStack.deserialize(map); ItemStack is = ItemStack.deserialize(map);