Update to Minecraft 1.21.6

Spigot is no longer supported.

Author: rutgerkok

build.gradle.kts

@@ -3,7 +3,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 plugins {
     `java-library`
     `maven-publish`
-    id("io.papermc.paperweight.userdev") version "2.0.0-beta.16"
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.17"
 }
 
 
@@ -37,7 +37,7 @@ repositories {
 
 dependencies {
     testImplementation("junit:junit:4.13.1")
-    paperweight.paperDevBundle("1.21.5-no-moonrise-SNAPSHOT")
+    paperweight.paperDevBundle("1.21.6-R0.1-SNAPSHOT")
     compileOnly("com.bergerkiller.bukkit:MyWorlds:1.12-v2") {
         exclude(group="org.spigotmc") // Don't let Spigot API overwrite Paper
     }
@@ -51,16 +51,10 @@ dependencies {
 }
 
 group = "nl.rutgerkok.betterenderchest"
-version = "2.7"
+version = "2.7.1"
 description = "BetterEnderChest"
 java.sourceCompatibility = JavaVersion.VERSION_21
 
-// For supporting Spigot
-paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.REOBF_PRODUCTION
-tasks.assemble {
-    dependsOn(tasks.reobfJar)
-}
-
 publishing {
     publications.create<MavenPublication>("maven") {
         from(components["java"])

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -1,2 +1,5 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
+}
 
 rootProject.name = "BetterEnderChest"

src/main/java/nl/rutgerkok/betterenderchest/BetterEnderInventoryHolder.java

@@ -7,7 +7,7 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;

src/main/java/nl/rutgerkok/betterenderchest/ChestOpener.java

@@ -1,6 +1,6 @@
 package nl.rutgerkok.betterenderchest;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;

src/main/java/nl/rutgerkok/betterenderchest/chestowner/NamedChestOwner.java

@@ -1,6 +1,6 @@
 package nl.rutgerkok.betterenderchest.chestowner;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;

src/main/java/nl/rutgerkok/betterenderchest/chestowner/UUIDChestOwner.java

@@ -4,7 +4,7 @@
 
 import nl.rutgerkok.betterenderchest.Translations;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;

src/main/java/nl/rutgerkok/betterenderchest/exception/InvalidOwnerException.java

@@ -1,6 +1,6 @@
 package nl.rutgerkok.betterenderchest.exception;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 /**
  * Thrown when the owner of a chest is not found.

src/main/java/nl/rutgerkok/betterenderchest/exception/NoPermissionException.java

@@ -2,7 +2,7 @@
 
 import nl.rutgerkok.betterenderchest.Translations;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 /**
  * Indicates that a chest could not be opened, because the player had no

src/main/java/nl/rutgerkok/betterenderchest/nms/SimpleNMSHandler.java

@@ -9,6 +9,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import net.minecraft.resources.RegistryOps;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -304,11 +305,12 @@ private Inventory loadNBTInventoryFromTag(CompoundTag baseTag, ChestOwner chestO
 
         // Add all the items
         List<ItemStack> overflowingItems = new ArrayList<>();
+        RegistryOps<Tag> context = CraftRegistry.getMinecraftRegistry().createSerializationContext(NbtOps.INSTANCE);
         for (int i = 0; i < inventoryTag.size(); i++) {
             CompoundTag item = inventoryTag.getCompoundOrEmpty(i);
             int slot = item.getByteOr("Slot", (byte) 0) & 255;
             item = updateToLatestMinecraft(item, dataVersion);
-            ItemStack bukkitItem = CraftItemStack.asCraftMirror(net.minecraft.world.item.ItemStack.parse(CraftRegistry.getMinecraftRegistry(), item).orElseThrow());
+            ItemStack bukkitItem = CraftItemStack.asCraftMirror(net.minecraft.world.item.ItemStack.CODEC.parse(context, item).getOrThrow());
 
             if (slot < inventory.getSize()) {
                 inventory.setItem(slot, bukkitItem);
@@ -376,12 +378,13 @@ private CompoundTag saveInventoryToTag(SaveEntry inventory) {
         baseTag.putInt("DataVersion", dataVersion);
 
         // Add all items to the inventory tag
+        RegistryOps<Tag> context = CraftRegistry.getMinecraftRegistry().createSerializationContext(NbtOps.INSTANCE);
         for (int i = 0; i < inventory.getSize(); i++) {
             ItemStack stack = inventory.getItem(i);
             if (stack != null && stack.getType() != Material.AIR) {
-                CompoundTag item = new CompoundTag();
+                CompoundTag item = (CompoundTag)net.minecraft.world.item.ItemStack.CODEC.encodeStart(context, CraftItemStack.asNMSCopy(stack)).getOrThrow();
                 item.putByte("Slot", (byte) i);
-                inventoryTag.add(CraftItemStack.asNMSCopy(stack).save(CraftRegistry.getMinecraftRegistry(), item));
+                inventoryTag.add(item);
             }
         }