From 4b519277838a21d3a3dee6e621a6416380b210c5 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Tue, 17 Dec 2024 12:32:56 +0100 Subject: [PATCH] Update Improve-exact-choice-recipe-ingredients patch --- ...rove-exact-choice-recipe-ingredients.patch | 291 +++++++++--------- 1 file changed, 146 insertions(+), 145 deletions(-) diff --git a/feature-patches/1075-Improve-exact-choice-recipe-ingredients.patch b/feature-patches/1075-Improve-exact-choice-recipe-ingredients.patch index be741b29e9..91119626f1 100644 --- a/feature-patches/1075-Improve-exact-choice-recipe-ingredients.patch +++ b/feature-patches/1075-Improve-exact-choice-recipe-ingredients.patch @@ -6,15 +6,12 @@ Subject: [PATCH] Improve exact choice recipe ingredients Fixes exact choices not working with recipe book clicks and shapeless recipes. -== AT == -public net.minecraft.world.item.ItemStackLinkedSet TYPE_AND_TAG - -diff --git a/src/main/java/io/papermc/paper/inventory/recipe/ItemOrExact.java b/src/main/java/io/papermc/paper/inventory/recipe/ItemOrExact.java +diff --git a/io/papermc/paper/inventory/recipe/ItemOrExact.java b/io/papermc/paper/inventory/recipe/ItemOrExact.java new file mode 100644 -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 +index 0000000000000000000000000000000000000000..ce745e49cd54fe3ae187785563a1bd311d14b5b2 --- /dev/null -+++ b/src/main/java/io/papermc/paper/inventory/recipe/ItemOrExact.java -@@ -0,0 +0,0 @@ ++++ b/io/papermc/paper/inventory/recipe/ItemOrExact.java +@@ -0,0 +1,63 @@ +package io.papermc.paper.inventory.recipe; + +import net.minecraft.core.Holder; @@ -78,12 +75,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + } +} -diff --git a/src/main/java/io/papermc/paper/inventory/recipe/StackedContentsExtrasMap.java b/src/main/java/io/papermc/paper/inventory/recipe/StackedContentsExtrasMap.java +diff --git a/io/papermc/paper/inventory/recipe/StackedContentsExtrasMap.java b/io/papermc/paper/inventory/recipe/StackedContentsExtrasMap.java new file mode 100644 -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 +index 0000000000000000000000000000000000000000..f47c12e9dd6cfa857ca07a764edc22de372e25b6 --- /dev/null -+++ b/src/main/java/io/papermc/paper/inventory/recipe/StackedContentsExtrasMap.java -@@ -0,0 +0,0 @@ ++++ b/io/papermc/paper/inventory/recipe/StackedContentsExtrasMap.java +@@ -0,0 +1,68 @@ +package io.papermc.paper.inventory.recipe; + +import it.unimi.dsi.fastutil.objects.Object2IntMap; @@ -152,92 +149,94 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + return false; + } +} -diff --git a/src/main/java/net/minecraft/recipebook/ServerPlaceRecipe.java b/src/main/java/net/minecraft/recipebook/ServerPlaceRecipe.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/recipebook/ServerPlaceRecipe.java -+++ b/src/main/java/net/minecraft/recipebook/ServerPlaceRecipe.java -@@ -0,0 +0,0 @@ public class ServerPlaceRecipe> { +diff --git a/net/minecraft/recipebook/ServerPlaceRecipe.java b/net/minecraft/recipebook/ServerPlaceRecipe.java +index 6475509689439636275b06b9eac33f0922d8fcfd..6c398c91909f42e352e80d0781549df9d834a060 100644 +--- a/net/minecraft/recipebook/ServerPlaceRecipe.java ++++ b/net/minecraft/recipebook/ServerPlaceRecipe.java +@@ -40,6 +40,7 @@ public class ServerPlaceRecipe> { return RecipeBookMenu.PostPlaceAction.NOTHING; } else { StackedItemContents stackedItemContents = new StackedItemContents(); + stackedItemContents.initializeExtras(recipe.value(), null); // Paper - Improve exact choice recipe ingredients inventory.fillStackedContents(stackedItemContents); - handler.fillCraftSlotsStackedContents(stackedItemContents); + menu.fillCraftSlotsStackedContents(stackedItemContents); return serverPlaceRecipe.tryPlaceRecipe(recipe, stackedItemContents); -@@ -0,0 +0,0 @@ public class ServerPlaceRecipe> { +@@ -99,7 +100,7 @@ public class ServerPlaceRecipe> { } - int j = this.calculateAmountToCraft(i, bl); + int i = this.calculateAmountToCraft(biggestCraftableStack, flag); - List> list = new ArrayList<>(); + List list = new ArrayList<>(); // Paper - Improve exact choice recipe ingredients - if (finder.canCraft(recipe.value(), j, list::add)) { - int k = clampToMaxStackSize(j, list); - if (k != j) { -@@ -0,0 +0,0 @@ public class ServerPlaceRecipe> { - this.gridWidth, this.gridHeight, recipe.value(), recipe.value().placementInfo().slotsToIngredientIndex(), (slotx, index, x, y) -> { - if (slotx != -1) { - Slot slot2 = this.inputGridSlots.get(index); -- Holder holder = list.get(slotx); -+ io.papermc.paper.inventory.recipe.ItemOrExact holder = list.get(slotx); // Paper - Improve exact choice recipe ingredients - int jx = k; + if (stackedItemContents.canCraft(recipe.value(), i, list::add)) { + int i1 = clampToMaxStackSize(i, list); + if (i1 != i) { +@@ -114,7 +115,7 @@ public class ServerPlaceRecipe> { + this.gridWidth, this.gridHeight, recipe.value(), recipe.value().placementInfo().slotsToIngredientIndex(), (item1, slot1, x, y) -> { + if (item1 != -1) { + Slot slot2 = this.inputGridSlots.get(slot1); +- Holder holder = list.get(item1); ++ io.papermc.paper.inventory.recipe.ItemOrExact holder = list.get(item1); // Paper - Improve exact choice recipe ingredients + int i2 = i1; - while (jx > 0) { -@@ -0,0 +0,0 @@ public class ServerPlaceRecipe> { + while (i2 > 0) { +@@ -129,9 +130,11 @@ public class ServerPlaceRecipe> { } } -- private static int clampToMaxStackSize(int count, List> entries) { -- for (Holder holder : entries) { -- count = Math.min(count, holder.value().getDefaultMaxStackSize()); +- private static int clampToMaxStackSize(int amount, List> items) { +- for (Holder holder : items) { +- amount = Math.min(amount, holder.value().getDefaultMaxStackSize()); + // Paper start - Improve exact choice recipe ingredients -+ private static int clampToMaxStackSize(int count, List entries) { -+ for (io.papermc.paper.inventory.recipe.ItemOrExact holder : entries) { -+ count = Math.min(count, holder.getMaxStackSize()); ++ private static int clampToMaxStackSize(int amount, List items) { ++ for (io.papermc.paper.inventory.recipe.ItemOrExact holder : items) { ++ amount = Math.min(amount, holder.getMaxStackSize()); + // Paper end - Improve exact choice recipe ingredients } - return count; -@@ -0,0 +0,0 @@ public class ServerPlaceRecipe> { + return amount; +@@ -160,7 +163,7 @@ public class ServerPlaceRecipe> { } } - private int moveItemToGrid(Slot slot, Holder item, int count) { + private int moveItemToGrid(Slot slot, io.papermc.paper.inventory.recipe.ItemOrExact item, int count) { // Paper - Improve exact choice recipe ingredients - ItemStack itemStack = slot.getItem(); - int i = this.inventory.findSlotMatchingCraftingIngredient(item, itemStack); + ItemStack item1 = slot.getItem(); + int i = this.inventory.findSlotMatchingCraftingIngredient(item, item1); if (i == -1) { -diff --git a/src/main/java/net/minecraft/world/entity/player/Inventory.java b/src/main/java/net/minecraft/world/entity/player/Inventory.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/world/entity/player/Inventory.java -+++ b/src/main/java/net/minecraft/world/entity/player/Inventory.java -@@ -0,0 +0,0 @@ public class Inventory implements Container, Nameable { +diff --git a/net/minecraft/world/entity/player/Inventory.java b/net/minecraft/world/entity/player/Inventory.java +index e8522f5ccd69ff5513782a31a3b53219bc17b0e5..9a72651c5efefc6290ae14aa50ca79572d274562 100644 +--- a/net/minecraft/world/entity/player/Inventory.java ++++ b/net/minecraft/world/entity/player/Inventory.java +@@ -178,12 +178,12 @@ public class Inventory implements Container, Nameable { return !stack.isDamaged() && !stack.isEnchanted() && !stack.has(DataComponents.CUSTOM_NAME); } - public int findSlotMatchingCraftingIngredient(Holder item, ItemStack stack) { + public int findSlotMatchingCraftingIngredient(io.papermc.paper.inventory.recipe.ItemOrExact item, ItemStack stack) { // Paper - Improve exact choice recipe ingredients - for (int i = 0; i < this.items.size(); ++i) { - ItemStack itemstack1 = (ItemStack) this.items.get(i); - -- if (!itemstack1.isEmpty() && itemstack1.is(item) && Inventory.isUsableForCrafting(itemstack1) && (stack.isEmpty() || ItemStack.isSameItemSameComponents(stack, itemstack1))) { -+ if (!itemstack1.isEmpty() && item.matches(itemstack1) && (!(item instanceof io.papermc.paper.inventory.recipe.ItemOrExact.Item) || Inventory.isUsableForCrafting(itemstack1)) && (stack.isEmpty() || ItemStack.isSameItemSameComponents(stack, itemstack1))) { // Paper - Improve exact choice recipe ingredients + for (int i = 0; i < this.items.size(); i++) { + ItemStack itemStack = this.items.get(i); + if (!itemStack.isEmpty() +- && itemStack.is(item) +- && isUsableForCrafting(itemStack) ++ && item.matches(itemStack) // Paper - Improve exact choice recipe ingredients ++ && (!(item instanceof io.papermc.paper.inventory.recipe.ItemOrExact.Item) || Inventory.isUsableForCrafting(itemStack)) // Paper - Improve exact choice recipe ingredients + && (stack.isEmpty() || ItemStack.isSameItemSameComponents(stack, itemStack))) { return i; } - } -diff --git a/src/main/java/net/minecraft/world/entity/player/StackedContents.java b/src/main/java/net/minecraft/world/entity/player/StackedContents.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/world/entity/player/StackedContents.java -+++ b/src/main/java/net/minecraft/world/entity/player/StackedContents.java -@@ -0,0 +0,0 @@ import java.util.List; +diff --git a/net/minecraft/world/entity/player/StackedContents.java b/net/minecraft/world/entity/player/StackedContents.java +index a4b528574ab371af94b0e07819e471cec94da244..a3fea6c8397046596afe3c8b5589f2ed37fcdfc3 100644 +--- a/net/minecraft/world/entity/player/StackedContents.java ++++ b/net/minecraft/world/entity/player/StackedContents.java +@@ -13,7 +13,7 @@ import java.util.List; import javax.annotation.Nullable; public class StackedContents { - public final Reference2IntOpenHashMap amounts = new Reference2IntOpenHashMap<>(); + public final it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap amounts = new it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap<>(); // Paper - Improve exact choice recipe ingredients (don't use "reference" map) - boolean hasAtLeast(T input, int minimum) { - return this.amounts.getInt(input) >= minimum; -@@ -0,0 +0,0 @@ public class StackedContents { + boolean hasAtLeast(T item, int amount) { + return this.amounts.getInt(item) >= amount; +@@ -49,7 +49,7 @@ public class StackedContents { List getUniqueAvailableIngredientItems(Iterable> ingredients) { List list = new ArrayList<>(); @@ -246,7 +245,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (entry.getIntValue() > 0 && anyIngredientMatches(ingredients, entry.getKey())) { list.add(entry.getKey()); } -@@ -0,0 +0,0 @@ public class StackedContents { +@@ -71,13 +71,13 @@ public class StackedContents { @VisibleForTesting public int getResultUpperBound(List> ingredients) { int i = Integer.MAX_VALUE; @@ -255,18 +254,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 label31: for (StackedContents.IngredientInfo ingredientInfo : ingredients) { - int j = 0; + int i1 = 0; - for (Entry entry : objectIterable) { + for (it.unimi.dsi.fastutil.objects.Object2IntMap.Entry entry : objectIterable) { // Paper - Improve exact choice recipe ingredients (don't use "reference" map) - int k = entry.getIntValue(); - if (k > j) { + int intValue = entry.getIntValue(); + if (intValue > i1) { if (ingredientInfo.acceptsItem(entry.getKey())) { -diff --git a/src/main/java/net/minecraft/world/entity/player/StackedItemContents.java b/src/main/java/net/minecraft/world/entity/player/StackedItemContents.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/world/entity/player/StackedItemContents.java -+++ b/src/main/java/net/minecraft/world/entity/player/StackedItemContents.java -@@ -0,0 +0,0 @@ import net.minecraft.world.item.crafting.PlacementInfo; +diff --git a/net/minecraft/world/entity/player/StackedItemContents.java b/net/minecraft/world/entity/player/StackedItemContents.java +index 6bbe2e51ef71d193e0a5d3cace2b0ad1760ce759..83ccde54c625d40dc595e000c533f60aa929bd5a 100644 +--- a/net/minecraft/world/entity/player/StackedItemContents.java ++++ b/net/minecraft/world/entity/player/StackedItemContents.java +@@ -9,9 +9,14 @@ import net.minecraft.world.item.crafting.PlacementInfo; import net.minecraft.world.item.crafting.Recipe; public class StackedItemContents { @@ -274,25 +273,30 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper start - Improve exact choice recipe ingredients + private final StackedContents raw = new StackedContents<>(); + @Nullable -+ private io.papermc.paper.inventory.recipe.StackedContentsExtrasMap extrasMap = null; ++ private io.papermc.paper.inventory.recipe.StackedContentsExtrasMap extrasMap; + // Paper start - Improve exact choice recipe ingredients - public void accountSimpleStack(ItemStack item) { -+ if (this.extrasMap != null && this.extrasMap.accountStack(item, Math.min(64, item.getCount()))) return; // Paper - Improve exact choice recipe ingredients; max of 64 due to accountStack method below - if (Inventory.isUsableForCrafting(item)) { - this.accountStack(item); + public void accountSimpleStack(ItemStack stack) { ++ if (this.extrasMap != null && this.extrasMap.accountStack(stack, Math.min(64, stack.getCount()))) return; // Paper - Improve exact choice recipe ingredients; max of 64 due to accountStack method below + if (Inventory.isUsableForCrafting(stack)) { + this.accountStack(stack); } -@@ -0,0 +0,0 @@ public class StackedItemContents { - public void accountStack(ItemStack item, int maxCount) { - if (!item.isEmpty()) { - int i = Math.min(maxCount, item.getCount()); -- this.raw.account(item.getItemHolder(), i); -+ if (this.extrasMap != null && !item.getComponentsPatch().isEmpty() && this.extrasMap.accountStack(item, i)) return; // Paper - Improve exact choice recipe ingredients; if an exact ingredient, don't include it -+ this.raw.account(new io.papermc.paper.inventory.recipe.ItemOrExact.Item(item.getItemHolder()), i); +@@ -24,34 +29,51 @@ public class StackedItemContents { + public void accountStack(ItemStack stack, int maxStackSize) { + if (!stack.isEmpty()) { + int min = Math.min(maxStackSize, stack.getCount()); +- this.raw.account(stack.getItemHolder(), min); ++ if (this.extrasMap != null && !stack.getComponentsPatch().isEmpty() && this.extrasMap.accountStack(stack, min)) return; // Paper - Improve exact choice recipe ingredients; if an exact ingredient, don't include it ++ this.raw.account(new io.papermc.paper.inventory.recipe.ItemOrExact.Item(stack.getItemHolder()), min); } } -- public boolean canCraft(Recipe recipe, @Nullable StackedContents.Output> itemCallback) { +- public boolean canCraft(Recipe recipe, @Nullable StackedContents.Output> output) { ++ public boolean canCraft(Recipe recipe, @Nullable StackedContents.Output output) { // Paper - Improve exact choice recipe ingredients + return this.canCraft(recipe, 1, output); + } + +- public boolean canCraft(Recipe recipe, int maxCount, @Nullable StackedContents.Output> output) { + // Paper start - Improve exact choice recipe ingredients + public void initializeExtras(final Recipe recipe, @Nullable final net.minecraft.world.item.crafting.CraftingInput input) { + if (this.extrasMap == null) { @@ -309,70 +313,64 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + // Paper end - Improve exact choice recipe ingredients + -+ public boolean canCraft(Recipe recipe, @Nullable StackedContents.Output itemCallback) { // Paper - Improve exact choice recipe ingredients - return this.canCraft(recipe, 1, itemCallback); - } - -- public boolean canCraft(Recipe recipe, int quantity, @Nullable StackedContents.Output> itemCallback) { -+ public boolean canCraft(Recipe recipe, int quantity, @Nullable StackedContents.Output itemCallback) { // Paper - Improve exact choice recipe ingredients ++ public boolean canCraft(Recipe recipe, int maxCount, @Nullable StackedContents.Output output) { // Paper - Improve exact choice recipe ingredients PlacementInfo placementInfo = recipe.placementInfo(); - return !placementInfo.isImpossibleToPlace() && this.canCraft(placementInfo.ingredients(), quantity, itemCallback); + return !placementInfo.isImpossibleToPlace() && this.canCraft(placementInfo.ingredients(), maxCount, output); } - public boolean canCraft( -- List>> rawIngredients, @Nullable StackedContents.Output> itemCallback -+ List> rawIngredients, @Nullable StackedContents.Output itemCallback // Paper - Improve exact choice recipe ingredients - ) { - return this.canCraft(rawIngredients, 1, itemCallback); +- public boolean canCraft(List>> ingredients, @Nullable StackedContents.Output> output) { ++ public boolean canCraft(List> ingredients, @Nullable StackedContents.Output output) { // Paper - Improve exact choice recipe ingredients + return this.canCraft(ingredients, 1, output); } private boolean canCraft( -- List>> rawIngredients, int quantity, @Nullable StackedContents.Output> itemCallback -+ List> rawIngredients, int quantity, @Nullable StackedContents.Output itemCallback // Paper - Improve exact choice recipe ingredients +- List>> ingredients, int maxCount, @Nullable StackedContents.Output> output ++ List> ingredients, int maxCount, @Nullable StackedContents.Output output // Paper - Improve exact choice recipe ingredients ) { - return this.raw.tryPick(rawIngredients, quantity, itemCallback); + return this.raw.tryPick(ingredients, maxCount, output); } -- public int getBiggestCraftableStack(Recipe recipe, @Nullable StackedContents.Output> itemCallback) { -+ public int getBiggestCraftableStack(Recipe recipe, @Nullable StackedContents.Output itemCallback) { // Paper - Improve exact choice recipe ingredients - return this.getBiggestCraftableStack(recipe, Integer.MAX_VALUE, itemCallback); +- public int getBiggestCraftableStack(Recipe recipe, @Nullable StackedContents.Output> output) { ++ public int getBiggestCraftableStack(Recipe recipe, @Nullable StackedContents.Output output) { // Paper - Improve exact choice recipe ingredients + return this.getBiggestCraftableStack(recipe, Integer.MAX_VALUE, output); } -- public int getBiggestCraftableStack(Recipe recipe, int max, @Nullable StackedContents.Output> itemCallback) { -+ public int getBiggestCraftableStack(Recipe recipe, int max, @Nullable StackedContents.Output itemCallback) { // Paper - Improve exact choice recipe ingredients - return this.raw.tryPickAll(recipe.placementInfo().ingredients(), max, itemCallback); +- public int getBiggestCraftableStack(Recipe recipe, int maxCount, @Nullable StackedContents.Output> output) { ++ public int getBiggestCraftableStack(Recipe recipe, int maxCount, @Nullable StackedContents.Output output) { // Paper - Improve exact choice recipe ingredients + return this.raw.tryPickAll(recipe.placementInfo().ingredients(), maxCount, output); } -diff --git a/src/main/java/net/minecraft/world/item/crafting/Ingredient.java b/src/main/java/net/minecraft/world/item/crafting/Ingredient.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/world/item/crafting/Ingredient.java -+++ b/src/main/java/net/minecraft/world/item/crafting/Ingredient.java -@@ -0,0 +0,0 @@ import java.util.List; - import javax.annotation.Nullable; - // CraftBukkit end +diff --git a/net/minecraft/world/item/crafting/Ingredient.java b/net/minecraft/world/item/crafting/Ingredient.java +index e43641650d66a62b5b7b58c43833ce504970ab1e..879c8fe1f20decc793cfa39e686b61d521bd76ba 100644 +--- a/net/minecraft/world/item/crafting/Ingredient.java ++++ b/net/minecraft/world/item/crafting/Ingredient.java +@@ -21,7 +21,7 @@ import net.minecraft.world.item.Items; + import net.minecraft.world.item.crafting.display.SlotDisplay; + import net.minecraft.world.level.ItemLike; -public final class Ingredient implements StackedContents.IngredientInfo>, Predicate { +public final class Ingredient implements StackedContents.IngredientInfo, Predicate { // Paper - Improve exact choice recipe ingredients - - public static final StreamCodec CONTENTS_STREAM_CODEC = ByteBufCodecs.holderSet(Registries.ITEM).map(Ingredient::new, (recipeitemstack) -> { - return recipeitemstack.values; -@@ -0,0 +0,0 @@ public final class Ingredient implements StackedContents.IngredientInfo CONTENTS_STREAM_CODEC = ByteBufCodecs.holderSet(Registries.ITEM) + .map(Ingredient::new, ingredient -> ingredient.values); + public static final StreamCodec> OPTIONAL_CONTENTS_STREAM_CODEC = ByteBufCodecs.holderSet(Registries.ITEM) +@@ -35,20 +35,24 @@ public final class Ingredient implements StackedContents.IngredientInfo values; // CraftBukkit start - @Nullable -- private List itemStacks; + @javax.annotation.Nullable +- private java.util.List itemStacks; + private java.util.Set itemStacks; // Paper - Improve exact choice recipe ingredients public boolean isExact() { return this.itemStacks != null; } -- public List itemStacks() { + @javax.annotation.Nullable +- public java.util.List itemStacks() { + public java.util.Set itemStacks() { // Paper - Improve exact choice recipe ingredients return this.itemStacks; } - public static Ingredient ofStacks(List stacks) { + public static Ingredient ofStacks(java.util.List stacks) { Ingredient recipe = Ingredient.of(stacks.stream().map(ItemStack::getItem)); - recipe.itemStacks = stacks; + // Paper start - Improve exact choice recipe ingredients @@ -383,29 +381,29 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 return recipe; } // CraftBukkit end -@@ -0,0 +0,0 @@ public final class Ingredient implements StackedContents.IngredientInfo holder) { -- return this.values.contains(holder); + // Paper start - Improve exact choice recipe ingredients -+ @Override -+ public boolean acceptsItem(final io.papermc.paper.inventory.recipe.ItemOrExact holder) { -+ return switch (holder) { + @Override +- public boolean acceptsItem(Holder item) { +- return this.values.contains(item); ++ public boolean acceptsItem(final io.papermc.paper.inventory.recipe.ItemOrExact itemOrExact) { ++ return switch (itemOrExact) { + case io.papermc.paper.inventory.recipe.ItemOrExact.Item(final Holder item) -> + !this.isExact() && this.values.contains(item); + case io.papermc.paper.inventory.recipe.ItemOrExact.Exact(final ItemStack exact) -> @@ -414,8 +412,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper end - Improve exact choice recipe ingredients } - public boolean equals(Object object) { -@@ -0,0 +0,0 @@ public final class Ingredient implements StackedContents.IngredientInfomap(SlotDisplay.ItemStackSlotDisplay::new).toList()); + } + // Paper end - show exact ingredients in recipe book - return (SlotDisplay) this.values.unwrap().map(SlotDisplay.TagSlotDisplay::new, (list) -> { - return new SlotDisplay.Composite(list.stream().map(Ingredient::displayForSingleItem).toList()); - }); -diff --git a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java -+++ b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java -@@ -0,0 +0,0 @@ public class ShapelessRecipe implements CraftingRecipe { - } + return (SlotDisplay)this.values + .unwrap() + .map(SlotDisplay.TagSlotDisplay::new, list -> new SlotDisplay.Composite(list.stream().map(Ingredient::displayForSingleItem).toList())); +diff --git a/net/minecraft/world/item/crafting/ShapelessRecipe.java b/net/minecraft/world/item/crafting/ShapelessRecipe.java +index fb317eafeed39adff793bffa8f6b21c37a32086c..d601b54b1de2f2ae44fe2b20c8116c71a6340e45 100644 +--- a/net/minecraft/world/item/crafting/ShapelessRecipe.java ++++ b/net/minecraft/world/item/crafting/ShapelessRecipe.java +@@ -72,13 +72,18 @@ public class ShapelessRecipe implements CraftingRecipe { - public boolean matches(CraftingInput input, Level world) { -- return input.ingredientCount() != this.ingredients.size() ? false : (input.size() == 1 && this.ingredients.size() == 1 ? ((Ingredient) this.ingredients.getFirst()).test(input.getItem(0)) : input.stackedContents().canCraft((Recipe) this, (StackedContents.Output) null)); + @Override + public boolean matches(CraftingInput input, Level level) { + // Paper start - Improve exact choice recipe ingredients & unwrap ternary -+ if (input.ingredientCount() != this.ingredients.size()) { -+ return false; -+ } + if (input.ingredientCount() != this.ingredients.size()) { + return false; +- } else { +- return input.size() == 1 && this.ingredients.size() == 1 +- ? this.ingredients.getFirst().test(input.getItem(0)) +- : input.stackedContents().canCraft(this, null); + } + if (input.size() == 1 && this.ingredients.size() == 1) { + return this.ingredients.getFirst().test(input.getItem(0)); + } @@ -450,4 +451,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper end - Improve exact choice recipe ingredients & unwrap ternary } - public ItemStack assemble(CraftingInput input, HolderLookup.Provider registries) { + @Override