ItemStackAdapter for Json: removed backward compatibility of serialized data (was temporary during the server upgrade)

-> temporary fix so the older servers does not throw an error when trying to deserialize (e.g. when using the lobby compass menu)

pandalib-chat/pom.xml

@@ -54,7 +54,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <version>${gson.version}</version>
         </dependency>
     </dependencies>
 

pandalib-commands/pom.xml

@@ -45,7 +45,7 @@
         <dependency>
             <groupId>com.mojang</groupId>
             <artifactId>brigadier</artifactId>
-            <version>1.0.18</version>
+            <version>${brigadier.version}</version>
         </dependency>
 
     </dependencies>

pandalib-core/src/main/java/fr/pandacube/lib/core/json/Json.java

@@ -3,6 +3,7 @@ package fr.pandacube.lib.core.json;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParseException;
+import com.google.gson.Strictness;
 import com.google.gson.ToNumberStrategy;
 import com.google.gson.TypeAdapter;
 import com.google.gson.TypeAdapterFactory;
@@ -74,21 +75,21 @@ public class Json {
 	public static final Gson gson = build(Function.identity());
 
 	/**
-	 * {@link Gson} instance with {@link GsonBuilder#setLenient()}, {@link GsonBuilder#setPrettyPrinting()} and support
+	 * {@link Gson} instance with {@link Strictness#LENIENT}, {@link GsonBuilder#setPrettyPrinting()} and support
 	 * for Java records and additional {@link TypeAdapterFactory} provided with
 	 * {@link #registerTypeAdapterFactory(TypeAdapterFactory)}.
 	 */
 	public static final Gson gsonPrettyPrinting = build(GsonBuilder::setPrettyPrinting);
 
 	/**
-	 * {@link Gson} instance with {@link GsonBuilder#setLenient()}, {@link GsonBuilder#serializeNulls()} and support for
+	 * {@link Gson} instance with {@link Strictness#LENIENT}, {@link GsonBuilder#serializeNulls()} and support for
 	 * Java records and additional {@link TypeAdapterFactory} provided with
 	 * {@link #registerTypeAdapterFactory(TypeAdapterFactory)}.
 	 */
 	public static final Gson gsonSerializeNulls = build(GsonBuilder::serializeNulls);
 
 	/**
-	 * {@link Gson} instance with {@link GsonBuilder#setLenient()}, {@link GsonBuilder#serializeNulls()},
+	 * {@link Gson} instance with {@link Strictness#LENIENT}, {@link GsonBuilder#serializeNulls()},
 	 * {@link GsonBuilder#setPrettyPrinting()} and support for Java records and additional {@link TypeAdapterFactory}
 	 * provided with {@link #registerTypeAdapterFactory(TypeAdapterFactory)}.
 	 */
@@ -105,7 +106,7 @@ public class Json {
 				.registerTypeAdapterFactory(new CustomAdapterFactory())
 				.disableHtmlEscaping()
 				.setObjectToNumberStrategy(YAML_EQUIVALENT_NUMBER_STRATEGY)
-				.setLenient();
+				.setStrictness(Strictness.LENIENT);
 		return builderModifier.apply(base).create();
 	}
 

pandalib-core/src/main/resources/fr/pandacube/lib/core/mc_version/mcversion.json

@@ -74,7 +74,8 @@
     "1.21.4": 769,
     "1.21.5": 770,
     "1.21.6": 771,
-    "1.21.7": 772
+    "1.21.7": 772,
+    "1.21.8": 772
   },
   "versionsOfProtocol": {
     "4": [
@@ -244,7 +245,8 @@
       "1.21.6"
     ],
     "772": [
-      "1.21.7"
+      "1.21.7",
+      "1.21.8"
     ]
   }
 }

pandalib-paper/pom.xml

@@ -22,6 +22,11 @@
             <id>fabricmc</id>
             <url>https://maven.fabricmc.net/</url>
         </repository>
+        <repository>
+            <id>minecraft-libraries</id>
+            <name>Minecraft Libraries</name>
+            <url>https://libraries.minecraft.net</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -84,6 +89,12 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.mojang</groupId>
+            <artifactId>datafixerupper</artifactId>
+            <version>${datafixerupper.version}</version>
+        </dependency>
+
         <!-- Paper -->
         <dependency>
             <groupId>io.papermc.paper</groupId>

pandalib-paper/src/main/java/fr/pandacube/lib/paper/inventory/DummyPlayerInventory.java

@@ -18,6 +18,9 @@ import java.util.Objects;
  */
 public class DummyPlayerInventory extends InventoryWrapper implements PlayerInventory {
 
+    /**
+     * Total number of item slots in the player inventory.
+     */
     public static final int PLAYER_INVENTORY_SIZE = 43; // 36 base inventory + 4 armor slots + 1 off hand + 2 hidden slots (body and saddle)
 
     private int heldItemSlot;
@@ -116,18 +119,34 @@ public class DummyPlayerInventory extends InventoryWrapper implements PlayerInve
         setItem(36, boots);
     }
 
+    /**
+     * Gets the item stack in the SADDLE {@link EquipmentSlot}.
+     * @return the SADDLE item stack.
+     */
     public ItemStack getSaddle() {
         return getItem(42);
     }
 
+    /**
+     * Puts the provided item stack in the SADDLE {@link EquipmentSlot}.
+     * @param saddle the item.
+     */
     public void setSaddle(@Nullable ItemStack saddle) {
         setItem(42, saddle);
     }
 
+    /**
+     * Gets the item stack in the BODY {@link EquipmentSlot}.
+     * @return the BODY item stack.
+     */
     public ItemStack getBody() {
         return getItem(41);
     }
 
+    /**
+     * Puts the provided item stack in the BODY {@link EquipmentSlot}.
+     * @param body the item.
+     */
     public void setBody(@Nullable ItemStack body) {
         setItem(41, body);
     }

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

@@ -9,10 +9,13 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
+import com.google.gson.Strictness;
 import com.google.gson.TypeAdapterFactory;
 import com.google.gson.internal.bind.TreeTypeAdapter;
 import com.google.gson.reflect.TypeToken;
+import net.kyori.adventure.key.Key;
 import org.bukkit.Bukkit;
+import org.bukkit.Registry;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
 import org.bukkit.configuration.serialization.ConfigurationSerialization;
 import org.bukkit.inventory.ItemStack;
@@ -28,16 +31,25 @@ import java.util.Map;
     private static final TypeToken<Map<String, Object>> MAP_STR_OBJ_TYPE = new TypeToken<>() { };
 
     /** Gson instance with no custom type adapter */
-    private static final Gson vanillaGson = new GsonBuilder().setLenient().create();
+    private static final Gson vanillaGson = new GsonBuilder().setStrictness(Strictness.LENIENT).create();
 
     @Override
     public ItemStack deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
         if (!(json instanceof JsonObject jsonObj))
             throw new JsonParseException("Unable to deserialize a ConfigurationSerializable from the provided json structure.");
+
+        // if it contains both old and new data, delete the old one introduced for compatibility
+        if (jsonObj.has("DataVersion") || jsonObj.has("id")) {
+            jsonObj.remove("v");
+            jsonObj.remove("type");
+        }
+
+        // format used when using ConfigurationSerialization
         if (jsonObj.has(ConfigurationSerialization.SERIALIZED_TYPE_KEY))
             return context.deserialize(jsonObj, ConfigurationSerializable.class);
 
 
+
         if (jsonObj.has("meta")
                 && jsonObj.get("meta") instanceof JsonObject metaJson
                 && !metaJson.has(ConfigurationSerialization.SERIALIZED_TYPE_KEY)) {
@@ -47,6 +59,8 @@ import java.util.Map;
             Map<String, Object> map = context.deserialize(jsonObj, MAP_STR_OBJ_TYPE.getType());
             fixDeserializationVersion(map);
             map.remove("meta");
+
+
             ItemStack is = ItemStack.deserialize(map);
 
             Class<? extends ItemMeta> metaClass = is.getItemMeta().getClass();

pandalib-paper/src/main/java/fr/pandacube/lib/paper/players/PlayerDataWrapper.java

@@ -3,9 +3,14 @@ package fr.pandacube.lib.paper.players;
 import fr.pandacube.lib.paper.inventory.DummyPlayerInventory;
 import fr.pandacube.lib.paper.reflect.wrapper.craftbukkit.CraftItemStack;
 import fr.pandacube.lib.paper.reflect.wrapper.minecraft.nbt.CompoundTag;
-import fr.pandacube.lib.paper.reflect.wrapper.minecraft.nbt.ListTag;
+import fr.pandacube.lib.paper.reflect.wrapper.minecraft.util.ProblemReporter;
-import fr.pandacube.lib.paper.reflect.wrapper.minecraft.nbt.Tag;
+import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.ItemStackWithSlot;
+import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.TagValueInput;
+import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.TagValueOutput;
+import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.ValueInput;
+import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.ValueOutputTypedOutputList;
 import fr.pandacube.lib.paper.util.ExperienceUtil;
+import fr.pandacube.lib.reflect.wrapper.ReflectWrapper;
 import org.bukkit.Bukkit;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
@@ -14,6 +19,7 @@ import org.bukkit.inventory.PlayerInventory;
 
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Optional;
 import java.util.TreeMap;
 import java.util.UUID;
 import java.util.function.IntUnaryOperator;
@@ -118,17 +124,17 @@ public record PlayerDataWrapper(CompoundTag data) {
     }
 
     private Map<Integer, ItemStack> getRawInventoryContent(String key) {
-        if (!data.contains(key, Tag.TAG_LIST()))
+
-            return Map.of();
+        ValueInput vi = TagValueInput.createGlobal(ProblemReporter.DISCARDING(), data);
-        ListTag list = data.getList(key, Tag.TAG_COMPOUND());
+        Iterable<?> listNMSItemStackWithSlot = ReflectWrapper.unwrap(vi.listOrEmpty(key, ItemStackWithSlot.CODEC()));
-        if (list == null)
-            return Map.of();
 
         Map<Integer, ItemStack> stacks = new TreeMap<>();
-        for (int i = 0; i < list.size(); i++) {
+
-            CompoundTag itemTag = list.getCompound(i);
+        for (Object nmsISWS : listNMSItemStackWithSlot) {
-            int nbtSlot = itemTag.getByte("Slot") & 255;
+            ItemStackWithSlot isws = ReflectWrapper.wrap(nmsISWS, ItemStackWithSlot.class);
-            fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.ItemStack.parse(itemTag)
+
+            int nbtSlot = isws.slot() & 255;
+            Optional.of(isws.stack())
                     .map(nms -> filterStack(CraftItemStack.asCraftMirror(nms)))
                     .ifPresent(is -> stacks.put(nbtSlot, is));
         }
@@ -153,28 +159,27 @@ public record PlayerDataWrapper(CompoundTag data) {
     }
 
     private void setRawInventoryContent(String key, Map<Integer, ItemStack> stacks) {
-        ListTag list = new ListTag();
+
+        TagValueOutput vo = TagValueOutput.createWrappingGlobal(ProblemReporter.DISCARDING(), data);
+        ValueOutputTypedOutputList listNMSItemStackWithSlot = vo.list(key, ItemStackWithSlot.CODEC());
+
         for (Entry<Integer, ItemStack> is : stacks.entrySet()) {
             ItemStack stack = filterStack(is.getValue());
             if (stack == null)
                 continue;
-            CompoundTag itemTag = new CompoundTag();
+
-            itemTag.putByte("Slot", is.getKey().byteValue());
+            listNMSItemStackWithSlot.add(ReflectWrapper.unwrap(new ItemStackWithSlot(is.getKey(), CraftItemStack.asNMSCopy(is.getValue()))));
-            list.add(list.size(), CraftItemStack.asNMSCopy(is.getValue()).save(itemTag));
         }
-        data.put(key, list);
     }
 
 
     private ItemStack filterStack(ItemStack is) {
-        return is == null || is.getType().isEmpty() || is.getAmount() == 0 ? null : is;
+        return is == null || is.isEmpty() || is.getAmount() <= 0 ? null : is;
     }
 
 
     private int getHeldItemSlot() {
-        if (!data.contains("SelectedItemSlot"))
+        return data.getInt("SelectedItemSlot").orElse(0);
-            return 0;
-        return data.getInt("SelectedItemSlot");
     }
 
     private void setHeldItemSlot(int slot) {
@@ -187,9 +192,7 @@ public record PlayerDataWrapper(CompoundTag data) {
      * @return the value of Score.
      */
     public int getScore() {
-        if (!data.contains("Score"))
+        return data.getInt("Score").orElse(0);
-            return 0;
-        return data.getInt("Score");
 
     }
 
@@ -207,9 +210,7 @@ public record PlayerDataWrapper(CompoundTag data) {
      * @return the value of XpTotal.
      */
     public int getTotalExperience() {
-        if (!data.contains("XpTotal"))
+        return data.getInt("XpTotal").orElse(0);
-            return 0;
-        return data.getInt("XpTotal");
     }
 
     /**

pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/PandalibPaperReflect.java

@@ -59,11 +59,18 @@ import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.ChunkPos;
 import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.ChunkStorage;
 import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.Entity;
 import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.ItemStack;
+import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.ItemStackWithSlot;
 import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.Level;
 import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.MapItemSavedData;
 import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.PlayerDataStorage;
 import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.RegionFileStorage;
 import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.SavedData;
+import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.TagValueInput;
+import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.TagValueOutput;
+import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.ValueInput;
+import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.ValueInputTypedInputList;
+import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.ValueOutput;
+import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.ValueOutputTypedOutputList;
 import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.Vec3;
 import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.VoxelShape;
 import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.block.BambooStalkBlock;
@@ -189,11 +196,18 @@ public class PandalibPaperReflect {
         thAcc.catchThrowable(() -> initWrapper(ChunkStorage.class, ChunkStorage.REFLECT.get()));
         thAcc.catchThrowable(() -> initWrapper(Entity.class, Entity.REFLECT.get()));
         thAcc.catchThrowable(() -> initWrapper(ItemStack.class, ItemStack.REFLECT.get()));
+        thAcc.catchThrowable(() -> initWrapper(ItemStackWithSlot.class, ItemStackWithSlot.REFLECT.get()));
         thAcc.catchThrowable(() -> initWrapper(Level.class, Level.REFLECT.get()));
         thAcc.catchThrowable(() -> initWrapper(MapItemSavedData.class, MapItemSavedData.REFLECT.get()));
         thAcc.catchThrowable(() -> initWrapper(PlayerDataStorage.class, PlayerDataStorage.REFLECT.get()));
         thAcc.catchThrowable(() -> initWrapper(RegionFileStorage.class, RegionFileStorage.REFLECT.get()));
         thAcc.catchThrowable(() -> initWrapper(SavedData.class, SavedData.REFLECT.get()));
+        thAcc.catchThrowable(() -> initWrapper(TagValueInput.class, TagValueInput.REFLECT.get()));
+        thAcc.catchThrowable(() -> initWrapper(TagValueOutput.class, TagValueOutput.REFLECT.get()));
+        thAcc.catchThrowable(() -> initWrapper(ValueInput.class, ValueInput.REFLECT.get()));
+        thAcc.catchThrowable(() -> initWrapper(ValueInputTypedInputList.class, ValueInputTypedInputList.REFLECT.get()));
+        thAcc.catchThrowable(() -> initWrapper(ValueOutput.class, ValueOutput.REFLECT.get()));
+        thAcc.catchThrowable(() -> initWrapper(ValueOutputTypedOutputList.class, ValueOutputTypedOutputList.REFLECT.get()));
         thAcc.catchThrowable(() -> initWrapper(Vec3.class, Vec3.REFLECT.get()));
         thAcc.catchThrowable(() -> initWrapper(VoxelShape.class, VoxelShape.REFLECT.get()));
         // minecraft

pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/CompoundTag.java

@@ -6,10 +6,9 @@ import fr.pandacube.lib.reflect.ReflectConstructor;
 import fr.pandacube.lib.reflect.ReflectMethod;
 import fr.pandacube.lib.reflect.wrapper.ReflectWrapper;
 
-import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
-import java.util.UUID;
 
 import static fr.pandacube.lib.util.ThrowableUtil.wrapEx;
 import static fr.pandacube.lib.util.ThrowableUtil.wrapReflectEx;
@@ -20,21 +19,16 @@ public class CompoundTag extends ReflectWrapper implements Tag {
 	private static final ReflectMethod<?> putBoolean = wrapEx(() -> REFLECT.method("putBoolean", String.class, boolean.class));
 	private static final ReflectMethod<?> putByte = wrapEx(() -> REFLECT.method("putByte", String.class, byte.class));
 	private static final ReflectMethod<?> putByteArray = wrapEx(() -> REFLECT.method("putByteArray", String.class, byte[].class));
-	private static final ReflectMethod<?> putByteArray_List = wrapEx(() -> REFLECT.method("putByteArray", String.class, List.class));
 	private static final ReflectMethod<?> putDouble = wrapEx(() -> REFLECT.method("putDouble", String.class, double.class));
 	private static final ReflectMethod<?> putFloat = wrapEx(() -> REFLECT.method("putFloat", String.class, float.class));
 	private static final ReflectMethod<?> putInt = wrapEx(() -> REFLECT.method("putInt", String.class, int.class));
 	private static final ReflectMethod<?> putIntArray = wrapEx(() -> REFLECT.method("putIntArray", String.class, int[].class));
-	private static final ReflectMethod<?> putIntArray_List = wrapEx(() -> REFLECT.method("putIntArray", String.class, List.class));
 	private static final ReflectMethod<?> putString = wrapEx(() -> REFLECT.method("putString", String.class, String.class));
-	private static final ReflectMethod<?> putUUID = wrapEx(() -> REFLECT.method("putUUID", String.class, UUID.class));
 	private static final ReflectMethod<?> putLong = wrapEx(() -> REFLECT.method("putLong", String.class, long.class));
 	private static final ReflectMethod<?> putLongArray = wrapEx(() -> REFLECT.method("putLongArray", String.class, long[].class));
-	private static final ReflectMethod<?> putLongArray_List = wrapEx(() -> REFLECT.method("putLongArray", String.class, List.class));
 	private static final ReflectMethod<?> putShort = wrapEx(() -> REFLECT.method("putShort", String.class, short.class));
 	private static final ReflectMethod<?> put = wrapEx(() -> REFLECT.method("put", String.class, Tag.REFLECT.get()));
 
-	private static final ReflectMethod<?> getTagType = wrapEx(() -> REFLECT.method("getTagType", String.class));
 	private static final ReflectMethod<?> getByte = wrapEx(() -> REFLECT.method("getByte", String.class));
 	private static final ReflectMethod<?> getShort = wrapEx(() -> REFLECT.method("getShort", String.class));
 	private static final ReflectMethod<?> getInt = wrapEx(() -> REFLECT.method("getInt", String.class));
@@ -47,14 +41,13 @@ public class CompoundTag extends ReflectWrapper implements Tag {
 	private static final ReflectMethod<?> getLongArray = wrapEx(() -> REFLECT.method("getLongArray", String.class));
 	private static final ReflectMethod<?> getCompound = wrapEx(() -> REFLECT.method("getCompound", String.class));
 	private static final ReflectMethod<?> getBoolean = wrapEx(() -> REFLECT.method("getBoolean", String.class));
-	private static final ReflectMethod<?> getList = wrapEx(() -> REFLECT.method("getList", String.class, int.class));
+	private static final ReflectMethod<?> getList = wrapEx(() -> REFLECT.method("getList", String.class));
 
 	private static final ReflectMethod<?> get = wrapEx(() -> REFLECT.method("get", String.class));
-	private static final ReflectMethod<?> getAllKeys = wrapEx(() -> REFLECT.method("getAllKeys"));
+	private static final ReflectMethod<?> keySet = wrapEx(() -> REFLECT.method("keySet"));
 	private static final ReflectMethod<?> entrySet = wrapEx(() -> REFLECT.method("entrySet"));
 	private static final ReflectMethod<?> size = wrapEx(() -> REFLECT.method("size"));
 	private static final ReflectMethod<?> contains = wrapEx(() -> REFLECT.method("contains", String.class));
-	private static final ReflectMethod<?> containsStringInt = wrapEx(() -> REFLECT.method("contains", String.class, int.class));
 
 	public CompoundTag() {
 		this(wrapReflectEx(() -> CONSTRUCTOR.instantiate()));
@@ -73,9 +66,6 @@ public class CompoundTag extends ReflectWrapper implements Tag {
 	public void putByteArray(String key, byte[] value) {
 		wrapReflectEx(() -> putByteArray.invoke(__getRuntimeInstance(), key, value));
 	}
-	public void putByteArray(String key, List<Byte> value) {
-		wrapReflectEx(() -> putByteArray_List.invoke(__getRuntimeInstance(), key, value));
-	}
 	public void putDouble(String key, double value) {
 		wrapReflectEx(() -> putDouble.invoke(__getRuntimeInstance(), key, value));
 	}
@@ -88,78 +78,79 @@ public class CompoundTag extends ReflectWrapper implements Tag {
 	public void putIntArray(String key, int[] value) {
 		wrapReflectEx(() -> putIntArray.invoke(__getRuntimeInstance(), key, value));
 	}
-	public void putIntArray(String key, List<Integer> value) {
-		wrapReflectEx(() -> putIntArray_List.invoke(__getRuntimeInstance(), key, value));
-	}
 	public void putString(String key, String value) {
 		wrapReflectEx(() -> putString.invoke(__getRuntimeInstance(), key, value));
 	}
-	public void putUUID(String key, UUID value) {
-		wrapReflectEx(() -> putUUID.invoke(__getRuntimeInstance(), key, value));
-	}
 	public void putLong(String key, long value) {
 		wrapReflectEx(() -> putLong.invoke(__getRuntimeInstance(), key, value));
 	}
 	public void putLongArray(String key, long[] value) {
 		wrapReflectEx(() -> putLongArray.invoke(__getRuntimeInstance(), key, value));
 	}
-	public void putLongArray(String key, List<Long> value) {
-		wrapReflectEx(() -> putLongArray_List.invoke(__getRuntimeInstance(), key, value));
-	}
 	public void putShort(String key, short value) {
 		wrapReflectEx(() -> putShort.invoke(__getRuntimeInstance(), key, value));
 	}
 	public void put(String key, Tag value) {
 		wrapReflectEx(() -> put.invoke(__getRuntimeInstance(), key, unwrap(value)));
 	}
-	public byte getTagType(String key) {
+	@SuppressWarnings("unchecked")
-		return (byte) wrapReflectEx(() -> getTagType.invoke(__getRuntimeInstance(), key));
+	public Optional<Byte> getByte(String key) {
+		return (Optional<Byte>) wrapReflectEx(() -> getByte.invoke(__getRuntimeInstance(), key));
 	}
-	public byte getByte(String key) {
+	@SuppressWarnings("unchecked")
-		return (byte) wrapReflectEx(() -> getByte.invoke(__getRuntimeInstance(), key));
+	public Optional<Short> getShort(String key) {
+		return (Optional<Short>) wrapReflectEx(() -> getShort.invoke(__getRuntimeInstance(), key));
 	}
-	public short getShort(String key) {
+	@SuppressWarnings("unchecked")
-		return (short) wrapReflectEx(() -> getShort.invoke(__getRuntimeInstance(), key));
+	public Optional<Integer> getInt(String key) {
+		return (Optional<Integer>) wrapReflectEx(() -> getInt.invoke(__getRuntimeInstance(), key));
 	}
-	public int getInt(String key) {
+	@SuppressWarnings("unchecked")
-		return (int) wrapReflectEx(() -> getInt.invoke(__getRuntimeInstance(), key));
+	public Optional<Long> getLong(String key) {
+		return (Optional<Long>) wrapReflectEx(() -> getLong.invoke(__getRuntimeInstance(), key));
 	}
-	public long getLong(String key) {
+	@SuppressWarnings("unchecked")
-		return (long) wrapReflectEx(() -> getLong.invoke(__getRuntimeInstance(), key));
+	public Optional<Float> getFloat(String key) {
+		return (Optional<Float>) wrapReflectEx(() -> getFloat.invoke(__getRuntimeInstance(), key));
 	}
-	public float getFloat(String key) {
+	@SuppressWarnings("unchecked")
-		return (float) wrapReflectEx(() -> getFloat.invoke(__getRuntimeInstance(), key));
+	public Optional<Double> getDouble(String key) {
+		return (Optional<Double>) wrapReflectEx(() -> getDouble.invoke(__getRuntimeInstance(), key));
 	}
-	public double getDouble(String key) {
+	@SuppressWarnings("unchecked")
-		return (double) wrapReflectEx(() -> getDouble.invoke(__getRuntimeInstance(), key));
+	public Optional<String> getString(String key) {
+		return (Optional<String>) wrapReflectEx(() -> getString.invoke(__getRuntimeInstance(), key));
 	}
-	public String getString(String key) {
+	@SuppressWarnings("unchecked")
-		return (String) wrapReflectEx(() -> getString.invoke(__getRuntimeInstance(), key));
+	public Optional<byte[]> getByteArray(String key) {
+		return (Optional<byte[]>) wrapReflectEx(() -> getByteArray.invoke(__getRuntimeInstance(), key));
 	}
-	public byte[] getByteArray(String key) {
+	@SuppressWarnings("unchecked")
-		return (byte[]) wrapReflectEx(() -> getByteArray.invoke(__getRuntimeInstance(), key));
+	public Optional<int[]> getIntArray(String key) {
+		return (Optional<int[]>) wrapReflectEx(() -> getIntArray.invoke(__getRuntimeInstance(), key));
 	}
-	public int[] getIntArray(String key) {
+	@SuppressWarnings("unchecked")
-		return (int[]) wrapReflectEx(() -> getIntArray.invoke(__getRuntimeInstance(), key));
+	public Optional<long[]> getLongArray(String key) {
+		return (Optional<long[]>) wrapReflectEx(() -> getLongArray.invoke(__getRuntimeInstance(), key));
 	}
-	public long[] getLongArray(String key) {
+	public Optional<CompoundTag> getCompound(String key) {
-		return (long[]) wrapReflectEx(() -> getLongArray.invoke(__getRuntimeInstance(), key));
+		return ((Optional<?>) wrapReflectEx(() -> getCompound.invoke(__getRuntimeInstance(), key)))
+				.map(u -> wrap(u, CompoundTag.class));
 	}
-	public CompoundTag getCompound(String key) {
+	@SuppressWarnings("unchecked")
-		return wrap(wrapReflectEx(() -> getCompound.invoke(__getRuntimeInstance(), key)), CompoundTag.class);
+	public Optional<Boolean> getBoolean(String key) {
+		return (Optional<Boolean>) wrapReflectEx(() -> getBoolean.invoke(__getRuntimeInstance(), key));
 	}
-	public boolean getBoolean(String key) {
+	public Optional<ListTag> getList(String key) {
-		return (boolean) wrapReflectEx(() -> getBoolean.invoke(__getRuntimeInstance(), key));
+		return ((Optional<?>) wrapReflectEx(() -> getList.invoke(__getRuntimeInstance(), key)))
-	}
+				.map(u -> wrap(u, ListTag.class));
-	public ListTag getList(String key, int type) {
-		return wrap(wrapReflectEx(() -> getList.invoke(__getRuntimeInstance(), key, type)), ListTag.class);
 	}
 	public Tag get(String key) {
 		return wrap(wrapReflectEx(() -> get.invoke(__getRuntimeInstance(), key)), Tag.class);
 	}
 	@SuppressWarnings("unchecked")
-	public Set<String> getAllKeys() {
+	public Set<String> keySet() {
-		return (Set<String>) wrapReflectEx(() -> getAllKeys.invoke(__getRuntimeInstance()));
+		return (Set<String>) wrapReflectEx(() -> keySet.invoke(__getRuntimeInstance()));
 	}
 
 	/**
@@ -176,8 +167,5 @@ public class CompoundTag extends ReflectWrapper implements Tag {
 	public boolean contains(String key) {
 		return (boolean) wrapReflectEx(() -> contains.invoke(__getRuntimeInstance(), key));
 	}
-	public boolean contains(String key, int type) {
-		return (boolean) wrapReflectEx(() -> containsStringInt.invoke(__getRuntimeInstance(), key, type));
-	}
 
 }

pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ItemStack.java

@@ -1,63 +1,15 @@
 package fr.pandacube.lib.paper.reflect.wrapper.minecraft.world;
 
-import fr.pandacube.lib.paper.reflect.wrapper.craftbukkit.CraftServer;
-import fr.pandacube.lib.paper.reflect.wrapper.minecraft.core.HolderLookupProvider;
-import fr.pandacube.lib.paper.reflect.wrapper.minecraft.core.RegistryAccess;
-import fr.pandacube.lib.paper.reflect.wrapper.minecraft.nbt.Tag;
 import fr.pandacube.lib.reflect.Reflect;
 import fr.pandacube.lib.reflect.ReflectClass;
-import fr.pandacube.lib.reflect.ReflectMethod;
 import fr.pandacube.lib.reflect.wrapper.ReflectWrapper;
-import org.bukkit.Bukkit;
-
-import java.util.Optional;
 
 import static fr.pandacube.lib.util.ThrowableUtil.wrapEx;
-import static fr.pandacube.lib.util.ThrowableUtil.wrapReflectEx;
 
 public class ItemStack extends ReflectWrapper {
     public static final ReflectClass<?> REFLECT = wrapEx(() -> Reflect.ofClass("net.minecraft.world.item.ItemStack"));
-    private static final ReflectMethod<?> parse = wrapEx(() -> REFLECT.method("parse", HolderLookupProvider.REFLECT.get(), Tag.REFLECT.get()));
-    private static final ReflectMethod<?> saveWithPrefix = wrapEx(() -> REFLECT.method("save", HolderLookupProvider.REFLECT.get(), Tag.REFLECT.get()));
-    private static final ReflectMethod<?> save = wrapEx(() -> REFLECT.method("save", HolderLookupProvider.REFLECT.get()));
-
-    @SuppressWarnings("unchecked")
-    public static Optional<ItemStack> parse(HolderLookupProvider registries, Tag nbt) {
-        return ((Optional<Object>) wrapReflectEx(() -> parse.invokeStatic(unwrap(registries), unwrap(nbt))))
-                .map(o -> wrap(o, ItemStack.class));
-    }
-
-    
-    public static Optional<ItemStack> parse(Tag nbt) {
-        return parse(getRegistries(), nbt);
-    }
-
 
     protected ItemStack(Object obj) {
         super(obj);
     }
-
-
-    public Tag save(HolderLookupProvider registries, Tag prefix) {
-        return wrap(wrapReflectEx(() -> saveWithPrefix.invoke(__getRuntimeInstance(), unwrap(registries), unwrap(prefix))), Tag.class);
-    }
-
-
-    public Tag save(HolderLookupProvider registries) {
-        return wrap(wrapReflectEx(() -> save.invoke(__getRuntimeInstance(), unwrap(registries))), Tag.class);
-    }
-
-
-    public Tag save(Tag prefix) {
-        return save(getRegistries(), prefix);
-    }
-
-
-    public Tag save() {
-        return save(getRegistries());
-    }
-
-    private static RegistryAccess getRegistries() {
-        return wrap(Bukkit.getServer(), CraftServer.class).getServer().registryAccess();
-    }
 }

pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ItemStackWithSlot.java

@@ -0,0 +1,44 @@
+package fr.pandacube.lib.paper.reflect.wrapper.minecraft.world;
+
+import com.mojang.serialization.Codec;
+import fr.pandacube.lib.reflect.Reflect;
+import fr.pandacube.lib.reflect.ReflectClass;
+import fr.pandacube.lib.reflect.ReflectConstructor;
+import fr.pandacube.lib.reflect.ReflectField;
+import fr.pandacube.lib.reflect.ReflectMethod;
+import fr.pandacube.lib.reflect.wrapper.ReflectWrapper;
+
+import static fr.pandacube.lib.util.ThrowableUtil.wrapEx;
+import static fr.pandacube.lib.util.ThrowableUtil.wrapReflectEx;
+
+public class ItemStackWithSlot extends ReflectWrapper {
+    public static final ReflectClass<?> REFLECT = wrapEx(() -> Reflect.ofClass("net.minecraft.world.ItemStackWithSlot"));
+    private static final ReflectConstructor<?> CONSTRUCTOR = wrapEx(() -> REFLECT.constructor(int.class, ItemStack.REFLECT.get()));
+    private static final ReflectField<?> CODEC = wrapEx(() -> REFLECT.field("CODEC"));
+    private static final ReflectMethod<?> slot = wrapEx(() -> REFLECT.method("slot"));
+    private static final ReflectMethod<?> stack = wrapEx(() -> REFLECT.method("stack"));
+
+    public static Codec<?> CODEC() {
+        return (Codec<?>) wrapReflectEx(CODEC::getStaticValue);
+    }
+
+
+
+    protected ItemStackWithSlot(Object obj) {
+        super(obj);
+    }
+
+    public ItemStackWithSlot(int slot, ItemStack stack) {
+        super(wrapReflectEx(() -> CONSTRUCTOR.instantiate(slot, unwrap(stack))));
+    }
+
+
+    public int slot() {
+        return (int) wrapReflectEx(() -> slot.invoke(__getRuntimeInstance()));
+    }
+
+    public ItemStack stack() {
+        return wrap(wrapReflectEx(() -> stack.invoke(__getRuntimeInstance())), ItemStack.class);
+    }
+
+}

pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/TagValueInput.java

@@ -0,0 +1,25 @@
+package fr.pandacube.lib.paper.reflect.wrapper.minecraft.world;
+
+import fr.pandacube.lib.paper.reflect.wrapper.minecraft.nbt.CompoundTag;
+import fr.pandacube.lib.paper.reflect.wrapper.minecraft.util.ProblemReporter;
+import fr.pandacube.lib.reflect.Reflect;
+import fr.pandacube.lib.reflect.ReflectClass;
+import fr.pandacube.lib.reflect.ReflectMethod;
+import fr.pandacube.lib.reflect.wrapper.ReflectWrapper;
+
+import static fr.pandacube.lib.util.ThrowableUtil.wrapEx;
+import static fr.pandacube.lib.util.ThrowableUtil.wrapReflectEx;
+
+public class TagValueInput extends ReflectWrapper implements ValueInput {
+    public static final ReflectClass<?> REFLECT = wrapEx(() -> Reflect.ofClass("net.minecraft.world.level.storage.TagValueInput"));
+    private static final ReflectMethod<?> createGlobal = wrapEx(() -> REFLECT.method("createGlobal", ProblemReporter.REFLECT.get(), CompoundTag.REFLECT.get()));
+
+    public static ValueInput createGlobal(ProblemReporter problemReporter, CompoundTag nbt) {
+        return wrap(wrapReflectEx(() -> createGlobal.invokeStatic(unwrap(problemReporter), unwrap(nbt))), ValueInput.class);
+    }
+
+    protected TagValueInput(Object obj) {
+        super(obj);
+    }
+
+}

pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/TagValueOutput.java

@@ -0,0 +1,25 @@
+package fr.pandacube.lib.paper.reflect.wrapper.minecraft.world;
+
+import fr.pandacube.lib.paper.reflect.wrapper.minecraft.nbt.CompoundTag;
+import fr.pandacube.lib.paper.reflect.wrapper.minecraft.util.ProblemReporter;
+import fr.pandacube.lib.reflect.Reflect;
+import fr.pandacube.lib.reflect.ReflectClass;
+import fr.pandacube.lib.reflect.ReflectMethod;
+import fr.pandacube.lib.reflect.wrapper.ReflectWrapper;
+
+import static fr.pandacube.lib.util.ThrowableUtil.wrapEx;
+import static fr.pandacube.lib.util.ThrowableUtil.wrapReflectEx;
+
+public class TagValueOutput extends ReflectWrapper implements ValueOutput {
+    public static final ReflectClass<?> REFLECT = wrapEx(() -> Reflect.ofClass("net.minecraft.world.level.storage.TagValueOutput"));
+    private static final ReflectMethod<?> createWrappingGlobal = wrapEx(() -> REFLECT.method("createWrappingGlobal", ProblemReporter.REFLECT.get(), CompoundTag.REFLECT.get()));
+
+    public static TagValueOutput createWrappingGlobal(ProblemReporter problemReporter, CompoundTag nbt) {
+        return wrap(wrapReflectEx(() -> createWrappingGlobal.invokeStatic(unwrap(problemReporter), unwrap(nbt))), TagValueOutput.class);
+    }
+
+    protected TagValueOutput(Object obj) {
+        super(obj);
+    }
+
+}

pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ValueInput.java

@@ -0,0 +1,31 @@
+package fr.pandacube.lib.paper.reflect.wrapper.minecraft.world;
+
+import com.mojang.serialization.Codec;
+import fr.pandacube.lib.reflect.Reflect;
+import fr.pandacube.lib.reflect.ReflectClass;
+import fr.pandacube.lib.reflect.ReflectMethod;
+import fr.pandacube.lib.reflect.wrapper.ConcreteWrapper;
+import fr.pandacube.lib.reflect.wrapper.ReflectWrapper;
+import fr.pandacube.lib.reflect.wrapper.ReflectWrapperI;
+
+import static fr.pandacube.lib.reflect.wrapper.ReflectWrapper.wrap;
+import static fr.pandacube.lib.util.ThrowableUtil.wrapEx;
+import static fr.pandacube.lib.util.ThrowableUtil.wrapReflectEx;
+
+@ConcreteWrapper(ValueInput.__concrete.class)
+public interface ValueInput extends ReflectWrapperI {
+    ReflectClass<?> REFLECT = wrapEx(() -> Reflect.ofClass("net.minecraft.world.level.storage.ValueInput"));
+    ReflectMethod<?> listOrEmpty = wrapEx(() -> REFLECT.method("listOrEmpty", String.class, Codec.class));
+
+
+
+    default ValueInputTypedInputList listOrEmpty(String key, Codec<?> elementCodec) {
+        return wrap(wrapReflectEx(() -> listOrEmpty.invoke(__getRuntimeInstance(), key, elementCodec)), ValueInputTypedInputList.class);
+    }
+
+    class __concrete extends ReflectWrapper implements ValueInput {
+        private __concrete(Object obj) {
+            super(obj);
+        }
+    }
+}

pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ValueInputTypedInputList.java

@@ -0,0 +1,21 @@
+package fr.pandacube.lib.paper.reflect.wrapper.minecraft.world;
+
+import fr.pandacube.lib.reflect.Reflect;
+import fr.pandacube.lib.reflect.ReflectClass;
+import fr.pandacube.lib.reflect.wrapper.ConcreteWrapper;
+import fr.pandacube.lib.reflect.wrapper.ReflectWrapperTyped;
+import fr.pandacube.lib.reflect.wrapper.ReflectWrapperTypedI;
+
+import static fr.pandacube.lib.util.ThrowableUtil.wrapEx;
+
+@ConcreteWrapper(ValueInputTypedInputList.__concrete.class)
+public interface ValueInputTypedInputList extends ReflectWrapperTypedI<Iterable<?>> {
+    ReflectClass<?> REFLECT = wrapEx(() -> Reflect.ofClass("net.minecraft.world.level.storage.ValueInput$TypedInputList"));
+
+
+    class __concrete extends ReflectWrapperTyped<Iterable<?>> implements ValueInputTypedInputList {
+        private __concrete(Object obj) {
+            super(obj);
+        }
+    }
+}

pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ValueOutput.java

@@ -0,0 +1,31 @@
+package fr.pandacube.lib.paper.reflect.wrapper.minecraft.world;
+
+import com.mojang.serialization.Codec;
+import fr.pandacube.lib.reflect.Reflect;
+import fr.pandacube.lib.reflect.ReflectClass;
+import fr.pandacube.lib.reflect.ReflectMethod;
+import fr.pandacube.lib.reflect.wrapper.ConcreteWrapper;
+import fr.pandacube.lib.reflect.wrapper.ReflectWrapper;
+import fr.pandacube.lib.reflect.wrapper.ReflectWrapperI;
+
+import static fr.pandacube.lib.reflect.wrapper.ReflectWrapper.wrap;
+import static fr.pandacube.lib.util.ThrowableUtil.wrapEx;
+import static fr.pandacube.lib.util.ThrowableUtil.wrapReflectEx;
+
+@ConcreteWrapper(ValueOutput.__concrete.class)
+public interface ValueOutput extends ReflectWrapperI {
+    ReflectClass<?> REFLECT = wrapEx(() -> Reflect.ofClass("net.minecraft.world.level.storage.ValueOutput"));
+    ReflectMethod<?> list = wrapEx(() -> REFLECT.method("list", String.class, Codec.class));
+
+
+
+    default ValueOutputTypedOutputList list(String key, Codec<?> elementCodec) {
+        return wrap(wrapReflectEx(() -> list.invoke(__getRuntimeInstance(), key, elementCodec)), ValueOutputTypedOutputList.class);
+    }
+
+    class __concrete extends ReflectWrapper implements ValueOutput {
+        private __concrete(Object obj) {
+            super(obj);
+        }
+    }
+}

pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ValueOutputTypedOutputList.java

@@ -0,0 +1,28 @@
+package fr.pandacube.lib.paper.reflect.wrapper.minecraft.world;
+
+import fr.pandacube.lib.reflect.Reflect;
+import fr.pandacube.lib.reflect.ReflectClass;
+import fr.pandacube.lib.reflect.ReflectMethod;
+import fr.pandacube.lib.reflect.wrapper.ConcreteWrapper;
+import fr.pandacube.lib.reflect.wrapper.ReflectWrapper;
+import fr.pandacube.lib.reflect.wrapper.ReflectWrapperI;
+
+import static fr.pandacube.lib.util.ThrowableUtil.wrapEx;
+import static fr.pandacube.lib.util.ThrowableUtil.wrapReflectEx;
+
+@ConcreteWrapper(ValueOutputTypedOutputList.__concrete.class)
+public interface ValueOutputTypedOutputList extends ReflectWrapperI {
+    ReflectClass<?> REFLECT = wrapEx(() -> Reflect.ofClass("net.minecraft.world.level.storage.ValueOutput$TypedOutputList"));
+    ReflectMethod<?> add = wrapEx(() -> REFLECT.method("add", Object.class));
+
+    default void add(Object rawElement) {
+        wrapReflectEx(() -> add.invoke(__getRuntimeInstance(), rawElement));
+    }
+
+
+    class __concrete extends ReflectWrapper implements ValueOutputTypedOutputList {
+        private __concrete(Object obj) {
+            super(obj);
+        }
+    }
+}

pom.xml

@@ -56,10 +56,13 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
         <bungeecord.version>1.21-R0.4-SNAPSHOT</bungeecord.version>
-        <paper.version>1.21.7-R0.1</paper.version>
+        <paper.version>1.21.8-R0.1</paper.version>
-        <mc.version>1.21.7</mc.version>
+        <mc.version>1.21.8</mc.version>
 
         <guava.version>33.3.1-jre</guava.version> <!-- Match the version imported by Paper API/BungeeCord API if possible -->
+        <gson.version>2.11.0</gson.version> <!-- Match the version imported by Paper API/BungeeCord API if possible -->
+        <brigadier.version>1.3.10</brigadier.version> <!-- Match the version imported by Paper API if possible -->
+        <datafixerupper.version>8.0.16</datafixerupper.version> <!-- Match the version used internally in Paper Server -->
     </properties>
 	
     <modules>