mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
3b02c0439a
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@ab7bc3f Remove javadoc that doesn't apply to Paper (#9206) PaperMC/Paper@57fdc66 Undeprecate Server#getMap (#9185) PaperMC/Paper@f8603a4 Avoid Lazy Initialization for Enum Fields (#9210) PaperMC/Paper@5b66d33 Call EntityChangeBlockEvent for frogs egg (#9213) PaperMC/Paper@4ba5aac More accurate isInOpenWater impl (#9194) PaperMC/Paper@a61b484 Fix MC-224454 (#9195) PaperMC/Paper@b681760 Fix note block sound property on player heads (#9158) PaperMC/Paper@bcd8dc2 Use the spigot config for mangrove propagule / torchflower growth (#8597)
53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
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 523818cbb0d6c90481ec97123e7fe0e2ff4eea14..bfeb8171a723d84b94bfaacd8aaf7d4d48ecd051 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
|
|
@@ -150,6 +151,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));
|
|
@@ -194,6 +196,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;
|
|
@@ -203,6 +206,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;
|