Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: 0514fc4e2 Add missing effects 8f5d9effd Add getMainThreadExecutor to BukkitScheduler 313b5020b Allow adding items to BlockDropItemEvent (#5093) 9a556d9da [CI-SKIP] [Auto] Rebuild Patches 72b2768ad Inline shift fields in EnumDirection (#5082) ffff53fa7 added option to disable pathfinding updates on block changes (#5123) b67081fd7 add DragonEggFormEvent (fixes #5110) (#5112) 3eefafbaf Fix javadoc build 0081ed1c4 Add javadoc step to GH Actions 01082503e Add dropLeash variable to EntityUnleashEvent (#5130) 31f9f869a [CI-SKIP] Fix YourKit links in readme, fixes #5091 8ac27aa38 [Auto] Updated Upstream (CraftBukkit) c4d9cc831 [Auto] Updated Upstream (Bukkit/CraftBukkit) d0477d326 [Auto] Updated Upstream (CraftBukkit) d9f5f7018 EntityMoveEvent (#4614)
2026-02-19 09:27:43 +01:00 · 2021-01-30 20:41:46 -06:00
parent f3644e18a2
commit e581a731bf
186 changed files with 206 additions and 451 deletions
--- a/patches/api/0028-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
+++ b/patches/api/0028-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
@@ -0,0 +1,52 @@
+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 3d325cab6b106ce8617e321d7a733eca91ba93e5..4dedbdc1cc8b34b73a1a32b35d1985284da6fc08 100644
+--- a/src/main/java/org/bukkit/inventory/RecipeChoice.java
+++ b/src/main/java/org/bukkit/inventory/RecipeChoice.java
+@@ -10,6 +10,7 @@ import java.util.function.Predicate;
+ import org.bukkit.Material;
+ import org.bukkit.Tag;
+ import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable; // Purpur
+ 
+ /**
+  * Represents a potential item match within a recipe. All choices within a
+@@ -155,6 +156,7 @@ public interface RecipeChoice extends Predicate<ItemStack>, Cloneable {
+     public static class ExactChoice implements RecipeChoice {
+ 
+         private List<ItemStack> choices;
+        private Predicate<ItemStack> predicate; // Purpur
+ 
+         public ExactChoice(@NotNull ItemStack stack) {
+             this(Arrays.asList(stack));
+@@ -199,6 +201,7 @@ public interface RecipeChoice extends Predicate<ItemStack>, Cloneable {
+ 
+         @Override
+         public boolean test(@NotNull ItemStack t) {
+            if (predicate != null) return predicate.test(t); // Purpur
+             for (ItemStack match : choices) {
+                 if (t.isSimilar(match)) {
+                     return true;
+@@ -208,6 +211,17 @@ public interface RecipeChoice extends Predicate<ItemStack>, Cloneable {
+             return false;
+         }
+ 
+        // Purpur start
+        @Nullable
+        public Predicate<ItemStack> getPredicate() {
+            return predicate;
+        }
+
+        public void setPredicate(@Nullable Predicate<ItemStack> predicate) {
+            this.predicate = predicate;
+        }
+        // Purpur end
+
+         @Override
+         public int hashCode() {
+             int hash = 7;