Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-06-21 17:57:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@174eab01 Update Improve exact choice recipe ingredients (#13788)
This commit is contained in:
granny
2026-04-29 14:16:24 -07:00
parent eaace37adc
commit 6ce04b367d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -3,7 +3,7 @@ group = org.purpurmc.purpur
mcVersion = 26.1.2 mcVersion = 26.1.2
apiVersion = 26.1.2 apiVersion = 26.1.2
channel=EXPERIMENTAL channel=EXPERIMENTAL
paperCommit = 5d62ec0ed9d7fdc4c2c1dbcd6cb79aaed29f2186 paperCommit = 174eab0192cf7a56287330d422650f13e361e59f
org.gradle.configuration-cache = true org.gradle.configuration-cache = true
org.gradle.caching = true org.gradle.caching = true

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

@@ -3,13 +3,13 @@
@@ -35,6 +_,7 @@ @@ -35,6 +_,7 @@
public final HolderSet<Item> values; public final HolderSet<Item> values;
// CraftBukkit start // CraftBukkit start
private java.util.@org.jspecify.annotations.Nullable List<ItemStack> itemStacks; private java.util.@org.jspecify.annotations.Nullable 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 Predicate<org.bukkit.inventory.ItemStack> predicate; // Purpur - Add predicate to recipe's ExactChoice ingredient
public boolean isExact() { public boolean isExact() {
return this.itemStacks != null; return this.itemStacks != null;
@@ -88,6 +_,11 @@ @@ -86,6 +_,11 @@
return false; return this.itemStacks.contains(input); // Paper - Improve exact choice recipe ingredients (hashing FTW!)
} }
// CraftBukkit end // CraftBukkit end
+ // Purpur start - Add predicate to recipe's ExactChoice ingredient + // Purpur start - Add predicate to recipe's ExactChoice ingredient