Add 26.1-compatible ItemInput handling for Bukkit ItemStack parsing (#143)

* Initial plan

* fix: support 26.1 item stack signature

Co-authored-by: jpenilla <11360596+jpenilla@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jpenilla <11360596+jpenilla@users.noreply.github.com>

Author: Copilot

cloud-bukkit/src/main/java/org/incendo/cloud/bukkit/data/ProtoItemStack.java

@@ -53,12 +53,10 @@ public interface ProtoItemStack {
     /**
      * Create a new {@link ItemStack} from the state of this {@link ProtoItemStack}.
      *
-     * @param stackSize               stack size
-     * @param respectMaximumStackSize whether to respect the maximum stack size for the material
+     * @param stackSize stack size
      * @return the created {@link ItemStack}
      * @throws IllegalArgumentException if the {@link ItemStack} could not be created, due to max stack size or other reasons
      * @since 1.5.0
      */
-    @NonNull ItemStack createItemStack(int stackSize, boolean respectMaximumStackSize)
-            throws IllegalArgumentException;
+    @NonNull ItemStack createItemStack(int stackSize) throws IllegalArgumentException;
 }

cloud-bukkit/src/main/java/org/incendo/cloud/bukkit/parser/ItemStackParser.java

@@ -158,7 +158,8 @@ private static final class ModernParser<C> implements ArgumentParser.FutureArgum
         private static final Method CREATE_ITEM_STACK_METHOD = CraftBukkitReflection.firstNonNullOrThrow(
                 () -> "Couldn't find createItemStack method on ItemInput",
                 CraftBukkitReflection.findMethod(ITEM_INPUT_CLASS, "a", int.class, boolean.class),
-                CraftBukkitReflection.findMethod(ITEM_INPUT_CLASS, "createItemStack", int.class, boolean.class)
+                CraftBukkitReflection.findMethod(ITEM_INPUT_CLASS, "createItemStack", int.class, boolean.class),
+                CraftBukkitReflection.findMethod(ITEM_INPUT_CLASS, "createItemStack", int.class)
         );
         private static final Method AS_BUKKIT_COPY_METHOD = CraftBukkitReflection
                 .needMethod(CRAFT_ITEM_STACK_CLASS, "asBukkitCopy", NMS_ITEM_STACK_CLASS);
@@ -272,11 +273,14 @@ public boolean hasExtraData() {
             }
 
             @Override
-            public @NonNull ItemStack createItemStack(final int stackSize, final boolean respectMaximumStackSize) {
+            public @NonNull ItemStack createItemStack(final int stackSize) {
                 try {
+                    final Object nmsItemStack = CREATE_ITEM_STACK_METHOD.getParameterCount() == 1
+                            ? CREATE_ITEM_STACK_METHOD.invoke(this.itemInput, stackSize)
+                            : CREATE_ITEM_STACK_METHOD.invoke(this.itemInput, stackSize, true);
                     return (ItemStack) AS_BUKKIT_COPY_METHOD.invoke(
                             null,
-                            CREATE_ITEM_STACK_METHOD.invoke(this.itemInput, stackSize, respectMaximumStackSize)
+                            nmsItemStack
                     );
                 } catch (final InvocationTargetException ex) {
                     final Throwable cause = ex.getCause();
@@ -333,9 +337,8 @@ public boolean hasExtraData() {
             }
 
             @Override
-            public @NonNull ItemStack createItemStack(final int stackSize, final boolean respectMaximumStackSize)
-                    throws IllegalArgumentException {
-                if (respectMaximumStackSize && stackSize > this.material.getMaxStackSize()) {
+            public @NonNull ItemStack createItemStack(final int stackSize) throws IllegalArgumentException {
+                if (stackSize > this.material.getMaxStackSize()) {
                     throw new IllegalArgumentException(String.format(
                             "The maximum stack size for %s is %d",
                             this.material,

examples/example-bukkit/src/main/java/org/incendo/cloud/examples/bukkit/builder/feature/minecraft/ItemStackExample.java

@@ -58,7 +58,7 @@ public void registerFeature(
                                 "amount", integerParser(),
                                 (sender, proto, amount) -> {
                                     try {
-                                        return ArgumentParseResult.successFuture(proto.createItemStack(amount, true));
+                                        return ArgumentParseResult.successFuture(proto.createItemStack(amount));
                                     } catch (final IllegalArgumentException ex) {
                                         return ArgumentParseResult.failureFuture(ex);
                                     }

examples/example-bukkit/src/main/java/org/incendo/cloud/examples/bukkit/builder/feature/minecraft/ItemStackPredicateExample.java

@@ -59,6 +59,6 @@ private void executeTestItem(final @NonNull CommandContext<CommandSender> ctx) {
         final ProtoItemStack protoItemStack = ctx.get("item");
         final ItemStackPredicate predicate = ctx.get("predicate");
         ctx.sender().sendMessage("result: " + predicate.test(
-                protoItemStack.createItemStack(1, true)));
+                protoItemStack.createItemStack(1)));
     }
 }