Store data version in serialized item stack compound

Author: NichtStudioCode

inventoryaccess/inventory-access-r19/src/main/java/xyz/xenondevs/inventoryaccess/r19/ItemUtilsImpl.java

@@ -33,6 +33,7 @@ public void serializeItemStack(org.bukkit.inventory.@NotNull ItemStack itemStack
         try {
             ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);
             CompoundTag nbt = (CompoundTag) nmsStack.save(CraftRegistry.getMinecraftRegistry(), new CompoundTag());
+            nbt.putInt("DataVersion", CraftMagicNumbers.INSTANCE.getDataVersion());
 
             if (compressed) {
                 NbtIo.writeCompressed(nbt, outputStream);
@@ -64,11 +65,15 @@ public org.bukkit.inventory.ItemStack deserializeItemStack(@NotNull InputStream
                 nbt = NbtIo.read(dataIn);
             }
 
+            int dataVersion = nbt.getInt("DataVersion");
+            if (dataVersion == 0)
+                dataVersion = 3700;
+            
             Dynamic<Tag> converted = DataFixers.getDataFixer()
                 .update(
                     References.ITEM_STACK,
                     new Dynamic<>(NbtOps.INSTANCE, nbt),
-                    3700, CraftMagicNumbers.INSTANCE.getDataVersion()
+                    dataVersion, CraftMagicNumbers.INSTANCE.getDataVersion()
                 );
 
             ItemStack itemStack = ItemStack.parse(

inventoryaccess/inventory-access-r20/src/main/java/xyz/xenondevs/inventoryaccess/r20/ItemUtilsImpl.java

@@ -33,6 +33,7 @@ public void serializeItemStack(org.bukkit.inventory.@NotNull ItemStack itemStack
         try {
             ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);
             CompoundTag nbt = (CompoundTag) nmsStack.save(CraftRegistry.getMinecraftRegistry(), new CompoundTag());
+            nbt.putInt("DataVersion", CraftMagicNumbers.INSTANCE.getDataVersion());
 
             if (compressed) {
                 NbtIo.writeCompressed(nbt, outputStream);
@@ -64,11 +65,15 @@ public org.bukkit.inventory.ItemStack deserializeItemStack(@NotNull InputStream
                 nbt = NbtIo.read(dataIn);
             }
 
+            int dataVersion = nbt.getInt("DataVersion");
+            if (dataVersion == 0)
+                dataVersion = 3700;
+            
             Dynamic<Tag> converted = DataFixers.getDataFixer()
                 .update(
                     References.ITEM_STACK,
                     new Dynamic<>(NbtOps.INSTANCE, nbt),
-                    3700, CraftMagicNumbers.INSTANCE.getDataVersion()
+                    dataVersion, CraftMagicNumbers.INSTANCE.getDataVersion()
                 );
 
             ItemStack itemStack = ItemStack.parse(

inventoryaccess/inventory-access-r21/src/main/java/xyz/xenondevs/inventoryaccess/r21/ItemUtilsImpl.java

@@ -33,6 +33,7 @@ public void serializeItemStack(org.bukkit.inventory.@NotNull ItemStack itemStack
         try {
             ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);
             CompoundTag nbt = (CompoundTag) nmsStack.save(CraftRegistry.getMinecraftRegistry(), new CompoundTag());
+            nbt.putInt("DataVersion", CraftMagicNumbers.INSTANCE.getDataVersion());
 
             if (compressed) {
                 NbtIo.writeCompressed(nbt, outputStream);
@@ -64,11 +65,15 @@ public org.bukkit.inventory.ItemStack deserializeItemStack(@NotNull InputStream
                 nbt = NbtIo.read(dataIn);
             }
 
+            int dataVersion = nbt.getInt("DataVersion");
+            if (dataVersion == 0)
+                dataVersion = 3700;
+            
             Dynamic<Tag> converted = DataFixers.getDataFixer()
                 .update(
                     References.ITEM_STACK,
                     new Dynamic<>(NbtOps.INSTANCE, nbt),
-                    3700, CraftMagicNumbers.INSTANCE.getDataVersion()
+                    dataVersion, CraftMagicNumbers.INSTANCE.getDataVersion()
                 );
 
             ItemStack itemStack = ItemStack.parse(

inventoryaccess/inventory-access-r22/src/main/java/xyz/xenondevs/inventoryaccess/r22/ItemUtilsImpl.java

@@ -33,6 +33,7 @@ public void serializeItemStack(org.bukkit.inventory.@NotNull ItemStack itemStack
         try {
             ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);
             CompoundTag nbt = (CompoundTag) nmsStack.save(CraftRegistry.getMinecraftRegistry(), new CompoundTag());
+            nbt.putInt("DataVersion", CraftMagicNumbers.INSTANCE.getDataVersion());
 
             if (compressed) {
                 NbtIo.writeCompressed(nbt, outputStream);
@@ -64,11 +65,15 @@ public org.bukkit.inventory.ItemStack deserializeItemStack(@NotNull InputStream
                 nbt = NbtIo.read(dataIn);
             }
 
+            int dataVersion = nbt.getInt("DataVersion");
+            if (dataVersion == 0)
+                dataVersion = 3700;
+            
             Dynamic<Tag> converted = DataFixers.getDataFixer()
                 .update(
                     References.ITEM_STACK,
                     new Dynamic<>(NbtOps.INSTANCE, nbt),
-                    3700, CraftMagicNumbers.INSTANCE.getDataVersion()
+                    dataVersion, CraftMagicNumbers.INSTANCE.getDataVersion()
                 );
 
             ItemStack itemStack = ItemStack.parse(