Update to Paper 26.1.1

Author: NichtStudioCode

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 kotlin = "2.3.10"
-paper = "1.21.11-R0.1-SNAPSHOT"
+paper = "26.1.1.+"
 testpaper = "1.21.11-R0.1-SNAPSHOT"
 
 [libraries]
@@ -14,7 +14,7 @@ kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "
 kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
 mockbukkit = { module = "org.mockbukkit.mockbukkit:mockbukkit-v1.21", version = "4.106.1" }
 logback-classic = { module = "ch.qos.logback:logback-classic", version = "1.5.21" }
-paperweight-userdev-plugin = { module = "io.papermc.paperweight:paperweight-userdev", version = "2.0.0-beta.19" }
+paperweight-userdev-plugin = { module = "io.papermc.paperweight:paperweight-userdev", version = "2.0.0-beta.21" }
 test-paper-api = { module = "io.papermc.paper:paper-api", version.ref = "testpaper" }
 
 [plugins]

invui/src/main/java/xyz/xenondevs/invui/internal/menu/CustomContainerMenu.java

@@ -27,6 +27,7 @@
 import net.minecraft.util.HashOps;
 import net.minecraft.world.SimpleContainer;
 import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.inventory.ContainerInput;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.inventory.RemoteSlot;
 import net.minecraft.world.item.ItemStack;
@@ -497,7 +498,7 @@ protected UpdateType handleClick(ServerboundContainerClickPacket packet) {
         }
         remoteCarried.force(DIRTY_MARKER);
 
-        if (packet.clickType() == net.minecraft.world.inventory.ClickType.QUICK_CRAFT) {
+        if (packet.containerInput() == ContainerInput.QUICK_CRAFT) {
             if (!handleDragClick(packet))
                 return requiresFullUpdate ? UpdateType.FULL : UpdateType.DIRTY;
         } else {
@@ -514,7 +515,7 @@ protected UpdateType handleClick(ServerboundContainerClickPacket packet) {
      */
     private void handleNormalClick(ServerboundContainerClickPacket packet) {
         int hotbarBtn = -1;
-        ClickType clickType = switch (packet.clickType()) {
+        ClickType clickType = switch (packet.containerInput()) {
             case PICKUP -> switch (packet.buttonNum()) {
                 case 0 -> ClickType.LEFT;
                 case 1 -> ClickType.RIGHT;

invui/src/main/java/xyz/xenondevs/invui/internal/menu/CustomMerchantMenu.java

@@ -167,7 +167,7 @@ private ItemStack toItemStack(@Nullable Item item) {
 
     private ItemCost toItemCost(ItemStack itemStack) {
         return new ItemCost(
-            itemStack.getItemHolder(),
+            itemStack.typeHolder(),
             itemStack.getCount(),
             DataComponentExactPredicate.allOf(itemStack.getComponents()),
             itemStack

invui/src/main/java/xyz/xenondevs/invui/internal/menu/CustomStonecutterMenu.java

@@ -11,11 +11,9 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.ItemStackTemplate;
 import net.minecraft.world.item.Items;
-import net.minecraft.world.item.crafting.Ingredient;
-import net.minecraft.world.item.crafting.RecipeHolder;
-import net.minecraft.world.item.crafting.SelectableRecipe;
-import net.minecraft.world.item.crafting.StonecutterRecipe;
+import net.minecraft.world.item.crafting.*;
 import net.minecraft.world.item.crafting.display.SlotDisplay;
 import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.jspecify.annotations.Nullable;
@@ -134,7 +132,9 @@ private void setNmsButtons(List<? extends ItemStack> buttons) {
      * @return The stonecutter recipes.
      */
     private List<SelectableRecipe.SingleInputEntry<StonecutterRecipe>> createRecipes(List<? extends ItemStack> buttons) {
-        return buttons.stream().map(button -> new SelectableRecipe.SingleInputEntry<>(
+        return buttons.stream()
+            .map(ItemStackTemplate::fromNonEmptyStack)
+            .map(button -> new SelectableRecipe.SingleInputEntry<>(
             INGREDIENT,
             new SelectableRecipe<>(
                 new SlotDisplay.ItemStackSlotDisplay(button),
@@ -143,7 +143,7 @@ private List<SelectableRecipe.SingleInputEntry<StonecutterRecipe>> createRecipes
                         Registries.RECIPE,
                         Identifier.fromNamespaceAndPath("invui", "fake_stonecutter_" + MathUtils.RANDOM.nextInt())
                     ),
-                    new StonecutterRecipe("", INGREDIENT, button.copy())
+                    new StonecutterRecipe(new Recipe.CommonInfo(false), INGREDIENT, button)
                 ))
             )
         )).toList();

invui/src/main/java/xyz/xenondevs/invui/internal/util/ItemUtils2.java

@@ -14,7 +14,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 import static io.papermc.paper.datacomponent.item.BundleContents.bundleContents;
 
@@ -198,12 +197,11 @@ public static int removeFromBundle(ItemStack bundle, ItemStack target) {
         var nmsBundle = CraftItemStack.unwrap(bundle);
         var bundleContents = nmsBundle.get(DataComponents.BUNDLE_CONTENTS);
         if (bundleContents != null && !bundleContents.isEmpty()) {
-            var items = bundleContents.itemCopyStream()
-                .collect(Collectors.toCollection(ArrayList::new));
-            int i = Math.min(Math.max(0, bundleContents.getSelectedItem()), bundleContents.size());
+            var items = new ArrayList<>(bundleContents.items());
+            int i = Math.clamp(bundleContents.getSelectedItemIndex(), 0, bundleContents.size());
             var taken = items.remove(i);
             nmsBundle.set(DataComponents.BUNDLE_CONTENTS, new BundleContents(items));
-            return CraftItemStack.asCraftMirror(taken);
+            return CraftItemStack.asCraftMirror(taken.create());
         }
 
         return null;