Add predicate to recipe's ExactChoice ingredient

patches/server/0089-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch

@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 3 Oct 2020 17:40:52 -0500
-Subject: [PATCH] Add predicate to recipe's ExactChoice ingredient
-
-
-diff --git a/net/minecraft/world/item/crafting/Ingredient.java b/net/minecraft/world/item/crafting/Ingredient.java
-index 0b0054b3d5d56ba24e1aee0e3ab56ea5b01a82a8..2e3a834643d56543418e9b9beb9d3448bf059d22 100644
---- a/net/minecraft/world/item/crafting/Ingredient.java
-+++ b/net/minecraft/world/item/crafting/Ingredient.java
-@@ -45,6 +45,7 @@ public final class Ingredient implements StackedContents.IngredientInfo<io.paper
-     // CraftBukkit start
-     @Nullable
-     private java.util.Set<ItemStack> itemStacks; // Paper - Improve exact choice recipe ingredients
-+    public Predicate<org.bukkit.inventory.ItemStack> predicate; // Purpur
- 
-     public boolean isExact() {
-         return this.itemStacks != null;
-@@ -100,6 +101,11 @@ public final class Ingredient implements StackedContents.IngredientInfo<io.paper
-         if (this.isExact()) {
-             return this.itemStacks.contains(itemstack); // Paper - Improve exact choice recipe ingredients (hashing FTW!)
-         }
-+        // Purpur start
-+        if (predicate != null) {
-+            return predicate.test(itemstack.asBukkitCopy());
-+        }
-+        // Purpur end
-         // CraftBukkit end
-         return itemstack.is(this.values);
-     }
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
-index 4864e2016cb1d377425297fd1c52b383632cb59e..fc0e93a936dadb0dca758207297f92a22f3955d4 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
-@@ -36,6 +36,7 @@ public interface CraftRecipe extends Recipe {
-             stack = Ingredient.of(((RecipeChoice.MaterialChoice) bukkit).getChoices().stream().map((mat) -> CraftItemType.bukkitToMinecraft(mat)));
-         } else if (bukkit instanceof RecipeChoice.ExactChoice) {
-             stack = Ingredient.ofStacks(((RecipeChoice.ExactChoice) bukkit).getChoices().stream().map((mat) -> CraftItemStack.asNMSCopy(mat)).toList());
-+            stack.predicate = ((RecipeChoice.ExactChoice) bukkit).getPredicate(); // Purpur
-             // Paper start - support "empty" choices - legacy method that spigot might incorrectly call
-             // Their impl of Ingredient.of() will error, ingredients need at least one entry.
-             // Callers running into this exception may have passed an incorrect empty() recipe choice to a non-empty slot or

purpur-api/paper-patches/files/src/main/java/org/bukkit/inventory/RecipeChoice.java.patch

@@ -1,34 +1,27 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 2 Oct 2020 17:43:24 -0500
-Subject: [PATCH] Add predicate to recipe's ExactChoice ingredient
-
-
-diff --git a/src/main/java/org/bukkit/inventory/RecipeChoice.java b/src/main/java/org/bukkit/inventory/RecipeChoice.java
-index 922bb69b5f218e489a6dd5e0f207743c1f1d3d35..9b3e292be334d21eb978373f434bf3811ec4af2b 100644
 --- a/src/main/java/org/bukkit/inventory/RecipeChoice.java
 +++ b/src/main/java/org/bukkit/inventory/RecipeChoice.java
-@@ -191,6 +191,7 @@ public interface RecipeChoice extends Predicate<ItemStack>, Cloneable {
+@@ -191,6 +_,7 @@
      public static class ExactChoice implements RecipeChoice {
  
          private List<ItemStack> choices;
-+        private Predicate<ItemStack> predicate; // Purpur
++        private Predicate<ItemStack> predicate; // Purpur - Add predicate to recipe's ExactChoice ingredient
  
          public ExactChoice(@NotNull ItemStack stack) {
              this(Arrays.asList(stack));
-@@ -241,6 +242,7 @@ public interface RecipeChoice extends Predicate<ItemStack>, Cloneable {
+@@ -241,6 +_,7 @@
  
          @Override
          public boolean test(@NotNull ItemStack t) {
-+            if (predicate != null) return predicate.test(t); // Purpur
++            if (predicate != null) return predicate.test(t); // Purpur - Add predicate to recipe's ExactChoice ingredient
              for (ItemStack match : choices) {
                  if (t.isSimilar(match)) {
                      return true;
-@@ -250,6 +252,17 @@ public interface RecipeChoice extends Predicate<ItemStack>, Cloneable {
+@@ -249,6 +_,17 @@
+ 
              return false;
          }
- 
++
-+        // Purpur start
++        // Purpur start - Add predicate to recipe's ExactChoice ingredient
 +        @org.jetbrains.annotations.Nullable
 +        public Predicate<ItemStack> getPredicate() {
 +            return predicate;
@@ -37,8 +30,7 @@ index 922bb69b5f218e489a6dd5e0f207743c1f1d3d35..9b3e292be334d21eb978373f434bf381
 +        public void setPredicate(@org.jetbrains.annotations.Nullable Predicate<ItemStack> predicate) {
 +            this.predicate = predicate;
 +        }
-+        // Purpur end
++        // Purpur end - Add predicate to recipe's ExactChoice ingredient
-+
+ 
          @Override
          public int hashCode() {
-             int hash = 7;

purpur-server/minecraft-patches/sources/net/minecraft/world/item/crafting/Ingredient.java.patch

@@ -0,0 +1,22 @@
+--- a/net/minecraft/world/item/crafting/Ingredient.java
++++ b/net/minecraft/world/item/crafting/Ingredient.java
+@@ -36,6 +_,7 @@
+     // CraftBukkit start
+     @javax.annotation.Nullable
+     private java.util.Set<ItemStack> itemStacks; // Paper - Improve exact choice recipe ingredients
++    public Predicate<org.bukkit.inventory.ItemStack> predicate; // Purpur - Add predicate to recipe's ExactChoice ingredient
+ 
+     public boolean isExact() {
+         return this.itemStacks != null;
+@@ -87,6 +_,11 @@
+         if (this.isExact()) {
+             return this.itemStacks.contains(stack); // Paper - Improve exact choice recipe ingredients (hashing FTW!)
+         }
++        // Purpur start - Add predicate to recipe's ExactChoice ingredient
++        if (predicate != null) {
++            return predicate.test(stack.asBukkitCopy());
++        }
++        // Purpur end - Add predicate to recipe's ExactChoice ingredient
+         // CraftBukkit end
+         return stack.is(this.values);
+     }

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java.patch

@@ -0,0 +1,10 @@
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
+@@ -36,6 +_,7 @@
+             stack = Ingredient.of(((RecipeChoice.MaterialChoice) bukkit).getChoices().stream().map((mat) -> CraftItemType.bukkitToMinecraft(mat)));
+         } else if (bukkit instanceof RecipeChoice.ExactChoice) {
+             stack = Ingredient.ofStacks(((RecipeChoice.ExactChoice) bukkit).getChoices().stream().map((mat) -> CraftItemStack.asNMSCopy(mat)).toList());
++            stack.predicate = ((RecipeChoice.ExactChoice) bukkit).getPredicate(); // Purpur - Add predicate to recipe's ExactChoice ingredient
+             // Paper start - support "empty" choices - legacy method that spigot might incorrectly call
+             // Their impl of Ingredient.of() will error, ingredients need at least one entry.
+             // Callers running into this exception may have passed an incorrect empty() recipe choice to a non-empty slot or