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

ItemStackAdapter for Json: deserialized json cannot contains both old and new data. When both are present (because old server needs the old one), keeping only the new data.

Browse Source
This commit is contained in:
Marc Baloup
2025-07-18 17:09:30 +02:00
parent 1716e0b5a8
commit 843d9c3509
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,6 +41,7 @@ import java.util.Map;
return context.deserialize(jsonObj, ConfigurationSerializable.class); return context.deserialize(jsonObj, ConfigurationSerializable.class);
if (jsonObj.has("meta") if (jsonObj.has("meta")
&& jsonObj.get("meta") instanceof JsonObject metaJson && jsonObj.get("meta") instanceof JsonObject metaJson
&& !metaJson.has(ConfigurationSerialization.SERIALIZED_TYPE_KEY)) { && !metaJson.has(ConfigurationSerialization.SERIALIZED_TYPE_KEY)) {
@@ -50,6 +51,16 @@ import java.util.Map;
Map<String, Object> map = context.deserialize(jsonObj, MAP_STR_OBJ_TYPE.getType()); Map<String, Object> map = context.deserialize(jsonObj, MAP_STR_OBJ_TYPE.getType());
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);
Class<? extends ItemMeta> metaClass = is.getItemMeta().getClass(); Class<? extends ItemMeta> metaClass = is.getItemMeta().getClass();