From 5faed21218632f3673895e6024689d2b8a3c61a8 Mon Sep 17 00:00:00 2001 From: Rime <81419447+Emirlol@users.noreply.github.com> Date: Mon, 26 Oct 2026 01:21:23 +0300 Subject: [PATCH] Revert missing item count rendering changes from #1044 (#1091) Co-authored-by: Martin Robertz Co-authored-by: slprime <31038811+slprime@users.noreply.github.com> --- .../chain/RecipeChainTooltipLineHandler.java | 57 ++++--------------- src/main/resources/assets/nei/lang/en_US.lang | 1 + 2 files changed, 13 insertions(+), 45 deletions(-) diff --git a/src/main/java/codechicken/nei/recipe/chain/RecipeChainTooltipLineHandler.java b/src/main/java/codechicken/nei/recipe/chain/RecipeChainTooltipLineHandler.java index c09ea761..f56777c0 100644 --- a/src/main/java/codechicken/nei/recipe/chain/RecipeChainTooltipLineHandler.java +++ b/src/main/java/codechicken/nei/recipe/chain/RecipeChainTooltipLineHandler.java @@ -3,11 +3,9 @@ package codechicken.nei.recipe.chain; import java.util.ArrayList; import java.util.Comparator; import java.util.HashMap; -import java.util.HashSet; import java.util.IdentityHashMap; import java.util.List; import java.util.Map; -import java.util.Set; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; @@ -23,7 +21,6 @@ import codechicken.nei.ItemSorter; import codechicken.nei.ItemStackAmount; import codechicken.nei.ItemsTooltipLineHandler; import codechicken.nei.ItemsTooltipLineHandler.AmountRenderer; -import codechicken.nei.ItemsTooltipLineHandler.StacksAmountRenderer; import codechicken.nei.ItemsTooltipLineHandler.TotalAmountRenderer; import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIClientUtils; @@ -39,25 +36,6 @@ import codechicken.nei.recipe.StackInfo; public class RecipeChainTooltipLineHandler extends CompositeTooltipLineHandler { - protected static class MissingStacksAmountRenderer extends StacksAmountRenderer { - - protected static final int MISSING_COLOR = 0xFF5555; - - protected final Set missing; - private final Map cache = new IdentityHashMap<>(); - - public MissingStacksAmountRenderer(Set missing) { - this.missing = missing; - } - - @Override - protected int getColor(ItemStack stack) { - return this.cache.computeIfAbsent(stack, key -> this.missing.contains(StackInfo.itemStackToNBT(key, false))) - ? MISSING_COLOR - : super.getColor(stack); - } - } - protected static class HandlerIconRenderer extends TotalAmountRenderer { protected static final int ICON_SIZE = 16; @@ -285,35 +263,15 @@ public class RecipeChainTooltipLineHandler extends CompositeTooltipLineHandler { } } - final Set missing = new HashSet<>(); - - if (this.lastShiftKey) { - for (ItemStack stack : inputs) { - missing.add(StackInfo.itemStackToNBT(stack, false)); - } - } - - // items with a shortage are already in the inputs list, holding the missing amount instead of the required one - final List covered = new ArrayList<>(); - - for (ItemStack stack : available) { - if (!missing.contains(StackInfo.itemStackToNBT(stack, false))) { - covered.add(stack); - } - } - final Comparator comparator = Comparator .comparing((ItemStack stack) -> StackInfo.getFluid(stack) != null) .thenComparingInt(stack -> -1 * stack.stackSize).thenComparing(ItemSorter.instance); inputs.sort(comparator); - covered.sort(comparator); + available.sort(comparator); outputs.sort(comparator); remainder.sort(comparator); - // missing items stay on top of the list - inputs.addAll(covered); - if (this.lastShiftKey) { outputs.addAll(remainder); } @@ -332,12 +290,21 @@ public class RecipeChainTooltipLineHandler extends CompositeTooltipLineHandler { EnumChatFormatting.BLUE, new HandlerIconRenderer(craftingHandlers)); + if (this.lastShiftKey) { + addLine( + NEIClientUtils.translate("bookmark.crafting_chain.missing"), + inputs, + true, + EnumChatFormatting.RED, + new TotalAmountRenderer()); + } + addLine( NEIClientUtils.translate("bookmark.crafting_chain.input"), - inputs, + this.lastShiftKey ? available : inputs, this.lastShiftKey, EnumChatFormatting.YELLOW, - this.lastShiftKey ? new MissingStacksAmountRenderer(missing) : new TotalAmountRenderer()); + new TotalAmountRenderer()); } protected static void putHandlerInfo(Map handlers, ItemStack stack, diff --git a/src/main/resources/assets/nei/lang/en_US.lang b/src/main/resources/assets/nei/lang/en_US.lang index 71ad7f72..91533493 100644 --- a/src/main/resources/assets/nei/lang/en_US.lang +++ b/src/main/resources/assets/nei/lang/en_US.lang @@ -48,6 +48,7 @@ nei.bookmark.recipe.toggle_collapse=Toggle Collapse/Expand nei.bookmark.recipe.chat_link=Send Recipe to Chat nei.bookmark.crafting_chain=Crafting Chain nei.bookmark.crafting_chain.input=Ingredients +nei.bookmark.crafting_chain.missing=Missing Items nei.bookmark.crafting_chain.needed=Required Crafts nei.bookmark.tree.title=Crafting Tree nei.bookmark.tree.empty=No crafting chain to display