From 6ce04b367d08fd94c8d69847373f8b99dea4d3f2 Mon Sep 17 00:00:00 2001 From: granny Date: Wed, 29 Apr 2026 14:16:24 -0700 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@174eab01 Update Improve exact choice recipe ingredients (#13788) --- gradle.properties | 2 +- .../net/minecraft/world/item/crafting/Ingredient.java.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 478e5cbf3..2b1ae31b0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ group = org.purpurmc.purpur mcVersion = 26.1.2 apiVersion = 26.1.2 channel=EXPERIMENTAL -paperCommit = 5d62ec0ed9d7fdc4c2c1dbcd6cb79aaed29f2186 +paperCommit = 174eab0192cf7a56287330d422650f13e361e59f org.gradle.configuration-cache = true org.gradle.caching = true diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/crafting/Ingredient.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/crafting/Ingredient.java.patch index ae8dbcf1d..0a3dce436 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/item/crafting/Ingredient.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/item/crafting/Ingredient.java.patch @@ -3,13 +3,13 @@ @@ -35,6 +_,7 @@ public final HolderSet values; // CraftBukkit start - private java.util.@org.jspecify.annotations.Nullable List itemStacks; + private java.util.@org.jspecify.annotations.Nullable Set itemStacks; // Paper - Improve exact choice recipe ingredients + public Predicate predicate; // Purpur - Add predicate to recipe's ExactChoice ingredient public boolean isExact() { return this.itemStacks != null; -@@ -88,6 +_,11 @@ - return false; +@@ -86,6 +_,11 @@ + return this.itemStacks.contains(input); // Paper - Improve exact choice recipe ingredients (hashing FTW!) } // CraftBukkit end + // Purpur start - Add predicate to recipe's ExactChoice ingredient