2.0.1 - 1.21.3 support

Author: mbax

README.md

@@ -6,8 +6,8 @@ A simple library for storing and retrieving ItemStacks in Bukkit-related environ
 Version support
 ------
 
-Currently, Cardboard Box supports 1.7 through 1.21.1.  
-Will it need an update for 1.21.2 (if it happens)? Maybe.  
+Currently, Cardboard Box supports 1.7 through 1.21.3.  
+Will it need an update for 1.21.4? Maybe.  
 Will it need an update for 1.22? Definitely.
 
 Support

combined/build.gradle.kts

@@ -15,6 +15,7 @@ dependencies {
     implementation(project(":api"))
     implementation(project(":v1.20.6"))
     implementation(project(":v1.21"))
+    implementation(project(":v1.21.3"))
 }
 
 java {
@@ -37,7 +38,7 @@ publishing {
             //artifact(tasks["shadowJar"])
             groupId = "dev.kitteh"
             artifactId = "cardboardbox"
-            version = "2.0.0"
+            version = "2.0.1"
             pom {
                 name = "CardboardBox"
                 description = "A Bukkit-related data storage handler"

combined/src/main/java/dev/kitteh/cardboardbox/CardboardBox.java

@@ -38,7 +38,9 @@ private static void init() {
                 JavaPlugin.getProvidingPlugin(CardboardBox.class).getLogger().warning("CardboardBox could not identify Minecraft version.");
                 ready = false;
             }
-            if (mcVersion >= 2100) {
+            if (mcVersion >= 2103) {
+                chosenBox = getBox("v1_21_3");
+            } else if (mcVersion >= 2100) {
                 chosenBox = getBox("v1_21");
             } else if (mcVersion == 2006) {
                 chosenBox = getBox("v1_20_6");

settings.gradle.kts

@@ -2,5 +2,5 @@ rootProject.name = "cardboardbox"
 include("api")
 include("v1.20.6")
 include("v1.21")
+include("v1.21.3")
 include("combined")
-

v1.20.6/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.7.1"
+    id("io.papermc.paperweight.userdev") version "1.7.4"
 }
 
 java {

v1.21.3/build.gradle.kts

@@ -0,0 +1,23 @@
+plugins {
+    id("java")
+    id("io.papermc.paperweight.userdev") version "1.7.4"
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    paperweight.paperDevBundle("1.21.3-R0.1-SNAPSHOT")
+    compileOnly(project(":api"))
+}
+
+tasks.assemble {
+    dependsOn(tasks.reobfJar)
+}

v1.21.3/src/main/java/dev/kitteh/cardboardbox/v1_21_3/Box.java

@@ -0,0 +1,53 @@
+package dev.kitteh.cardboardbox.v1_21_3;
+
+import com.google.common.base.Preconditions;
+import com.mojang.serialization.Dynamic;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.datafix.fixes.References;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.util.CraftMagicNumbers;
+import org.bukkit.inventory.ItemStack;
+
+import java.io.IOException;
+
+public class Box implements dev.kitteh.cardboardbox.api.Box {
+    public boolean check(ItemStack itemStack) {
+        return itemStack.equals(deserializeItem(serializeItem(itemStack)));
+    }
+
+    private static final int DATA_VERSION = CraftMagicNumbers.INSTANCE.getDataVersion();
+
+    @Override
+    public byte[] serializeItem(ItemStack item) {
+        CompoundTag compound = (net.minecraft.nbt.CompoundTag) CraftItemStack.asNMSCopy(item).save(MinecraftServer.getServer().registryAccess());
+        compound.putInt("DataVersion", DATA_VERSION);
+        java.io.ByteArrayOutputStream outputStream = new java.io.ByteArrayOutputStream();
+        try {
+            net.minecraft.nbt.NbtIo.writeCompressed(
+                    compound,
+                    outputStream
+            );
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
+        }
+        return outputStream.toByteArray();
+    }
+
+    @Override
+    public ItemStack deserializeItem(byte[] data) {
+        net.minecraft.nbt.CompoundTag compound;
+        try {
+            compound = net.minecraft.nbt.NbtIo.readCompressed(
+                    new java.io.ByteArrayInputStream(data), net.minecraft.nbt.NbtAccounter.unlimitedHeap()
+            );
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
+        }
+        final int dataVersion = compound.getInt("DataVersion");
+        Preconditions.checkArgument(dataVersion <= DATA_VERSION, "Newer version! Server downgrades are not supported!");
+        compound = (net.minecraft.nbt.CompoundTag) MinecraftServer.getServer().fixerUpper.update(References.ITEM_STACK, new Dynamic<>(NbtOps.INSTANCE, compound), dataVersion, dataVersion).getValue();
+        return CraftItemStack.asCraftMirror(net.minecraft.world.item.ItemStack.parse(MinecraftServer.getServer().registryAccess(), compound).orElseThrow());
+    }
+}

v1.21/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.7.1"
+    id("io.papermc.paperweight.userdev") version "1.7.4"
 }
 
 java {