From b48956ef94d9d9ba4c683b84049bdd6343aea2b9 Mon Sep 17 00:00:00 2001 From: slprime <31038811+slprime@users.noreply.github.com> Date: Wed, 29 Jul 2026 00:57:12 +0300 Subject: [PATCH 1/4] Bookmarks Chain: fix container item multiplier limit (#988) --- .../java/codechicken/nei/recipe/chain/RecipeChainMath.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/codechicken/nei/recipe/chain/RecipeChainMath.java b/src/main/java/codechicken/nei/recipe/chain/RecipeChainMath.java index a8b479ee..264d21fc 100644 --- a/src/main/java/codechicken/nei/recipe/chain/RecipeChainMath.java +++ b/src/main/java/codechicken/nei/recipe/chain/RecipeChainMath.java @@ -411,8 +411,9 @@ public class RecipeChainMath { final ContainerItemResult result = getToolsContainerItems(itemStack, steps); if (result.stack == null) { - multiplier = steps / (steps - result.leftSteps); - steps = steps % (steps - result.leftSteps); + final long stepsPerReplacement = steps - result.leftSteps; + multiplier = Math.min(steps / stepsPerReplacement, maxAmount - shiftAmount); + steps -= multiplier * stepsPerReplacement; } else { steps = result.leftSteps; } From 4cc72444d9a84af21f08be69963649c571f08e4d Mon Sep 17 00:00:00 2001 From: slprime <31038811+slprime@users.noreply.github.com> Date: Sat, 1 Aug 2026 20:00:17 +0300 Subject: [PATCH 2/4] Fix Tooltip with Component in first line (#989) --- src/main/java/codechicken/nei/guihook/GuiContainerManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java index a7b9234c..1a5fb953 100644 --- a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java +++ b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java @@ -625,7 +625,7 @@ public class GuiContainerManager { tooltip.set(0, tooltip.get(0) + GuiDraw.TOOLTIP_LINESPACE); } - } else if (!tooltip.isEmpty()) { + } else if (!tooltip.isEmpty() && !tooltip.get(0).startsWith(GuiDraw.TOOLTIP_HANDLER)) { tooltip.set(0, tooltip.get(0) + GuiDraw.TOOLTIP_LINESPACE); } From f47a8766a9eefc817d41f99d2906184a9676f886 Mon Sep 17 00:00:00 2001 From: slprime <31038811+slprime@users.noreply.github.com> Date: Sat, 1 Aug 2026 20:19:54 +0300 Subject: [PATCH 3/4] Create EmptyContainer (#990) --- src/main/java/codechicken/nei/NEIController.java | 4 ++-- src/main/java/codechicken/nei/recipe/GuiRecipe.java | 9 +++++---- .../ContainerRecipe.java => util/EmptyContainer.java} | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) rename src/main/java/codechicken/nei/{recipe/ContainerRecipe.java => util/EmptyContainer.java} (93%) diff --git a/src/main/java/codechicken/nei/NEIController.java b/src/main/java/codechicken/nei/NEIController.java index be90eae7..a360fcdb 100644 --- a/src/main/java/codechicken/nei/NEIController.java +++ b/src/main/java/codechicken/nei/NEIController.java @@ -27,7 +27,7 @@ import codechicken.nei.commands.CommandUntranslator; import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.guihook.IContainerInputHandler; import codechicken.nei.guihook.IContainerSlotClickHandler; -import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.util.EmptyContainer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -252,7 +252,7 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu // slot in GuiRecipe does not contain actual stack // and scroll should be handled by GuiRecipe, not here - if (gui instanceof GuiRecipe) return false; + if (gui.inventorySlots instanceof EmptyContainer) return false; Point mousePos = getMousePosition(); Slot mouseover = manager.window.getSlotAtPosition(mousePos.x, mousePos.y); diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipe.java b/src/main/java/codechicken/nei/recipe/GuiRecipe.java index 9aa907a1..8c9b6802 100644 --- a/src/main/java/codechicken/nei/recipe/GuiRecipe.java +++ b/src/main/java/codechicken/nei/recipe/GuiRecipe.java @@ -54,6 +54,7 @@ import codechicken.nei.scroll.ScrollBar; import codechicken.nei.scroll.ScrollBar.OverflowType; import codechicken.nei.scroll.ScrollBar.ScrollPlace; import codechicken.nei.scroll.ScrollContainer; +import codechicken.nei.util.EmptyContainer; import codechicken.nei.util.SlotInaccessible; public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOverlay, @@ -181,7 +182,7 @@ public abstract class GuiRecipe extends GuiContainer i private boolean isHeightHackApplied = false; protected GuiRecipe(GuiScreen prevgui) { - super(new ContainerRecipe()); + super(new EmptyContainer()); this.recipeTabs = new GuiRecipeTabs() { @Override @@ -191,7 +192,7 @@ public abstract class GuiRecipe extends GuiContainer i }; this.recipeCatalyst = new GuiRecipeCatalyst(); - this.slotcontainer = (ContainerRecipe) this.inventorySlots; + this.slotcontainer = (EmptyContainer) this.inventorySlots; this.prevGui = prevgui; this.firstGuiGeneral = prevgui; @@ -526,7 +527,7 @@ public abstract class GuiRecipe extends GuiContainer i @Override public Slot getSlotAtPosition(int mousex, int mousey) { final Widget activeWidget = this.container.getWidgetUnderMouse(mousex, mousey); - final ContainerRecipe slotcontainer = (ContainerRecipe) inventorySlots; + final EmptyContainer slotcontainer = (EmptyContainer) inventorySlots; slotcontainer.setActiveStack(null); if (activeWidget instanceof NEIRecipeWidget recipeWidget) { @@ -1033,7 +1034,7 @@ public abstract class GuiRecipe extends GuiContainer i private GuiOverlayButton[] overlayButtons = new GuiOverlayButton[0]; @Deprecated - public ContainerRecipe slotcontainer; + public EmptyContainer slotcontainer; @Deprecated public List getOverlayButtons() { diff --git a/src/main/java/codechicken/nei/recipe/ContainerRecipe.java b/src/main/java/codechicken/nei/util/EmptyContainer.java similarity index 93% rename from src/main/java/codechicken/nei/recipe/ContainerRecipe.java rename to src/main/java/codechicken/nei/util/EmptyContainer.java index 6a9f8b55..0d7fed5d 100644 --- a/src/main/java/codechicken/nei/recipe/ContainerRecipe.java +++ b/src/main/java/codechicken/nei/util/EmptyContainer.java @@ -1,4 +1,4 @@ -package codechicken.nei.recipe; +package codechicken.nei.util; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack; import codechicken.nei.PositionedStack; import codechicken.nei.api.ShortcutInputHandler; -public class ContainerRecipe extends Container { +public class EmptyContainer extends Container { private ItemStack activeStack = null; From 5fb5ab6698f4806f12f50ff7b7285a5632d449a3 Mon Sep 17 00:00:00 2001 From: slprime <31038811+slprime@users.noreply.github.com> Date: Sat, 1 Aug 2026 20:35:19 +0300 Subject: [PATCH 4/4] Added Bookmark Chain Visitor (#991) --- .../nei/recipe/chain/RecipeChainMath.java | 62 ++++++++++++++++--- 1 file changed, 52 insertions(+), 10 deletions(-) diff --git a/src/main/java/codechicken/nei/recipe/chain/RecipeChainMath.java b/src/main/java/codechicken/nei/recipe/chain/RecipeChainMath.java index 264d21fc..729453e7 100644 --- a/src/main/java/codechicken/nei/recipe/chain/RecipeChainMath.java +++ b/src/main/java/codechicken/nei/recipe/chain/RecipeChainMath.java @@ -25,6 +25,34 @@ import codechicken.nei.recipe.StackInfo; public class RecipeChainMath { + public interface ChainVisitor { + + void enterRecipe(RecipeId recipeId, long multiplier); + + void addIngredient(BookmarkItem ingrItem, long requestedAmount); + + void addIngredientFresh(BookmarkItem ingrItem, long freshAmount); + + void leaveRecipe(); + + } + + private static class EmptyChainVisitor implements ChainVisitor { + + @Override + public void enterRecipe(RecipeId recipeId, long multiplier) {} + + @Override + public void addIngredient(BookmarkItem ingrItem, long requestedAmount) {} + + @Override + public void addIngredientFresh(BookmarkItem ingrItem, long freshAmount) {} + + @Override + public void leaveRecipe() {} + + } + private static class ContainerItemResult { public ItemStack stack; @@ -38,6 +66,8 @@ public class RecipeChainMath { } } + private static final ChainVisitor EMPTY_CHAIN_VISITOR = new EmptyChainVisitor(); + private static final ItemStack ROOT_ITEM = new ItemStack(Blocks.fire); private static final RecipeId ROOT_RECIPE_ID = RecipeId .of(ROOT_ITEM, "recipe-autocrafting", Collections.emptyList()); @@ -298,6 +328,10 @@ public class RecipeChainMath { } public RecipeChainMath refresh() { + return refresh(EMPTY_CHAIN_VISITOR); + } + + public RecipeChainMath refresh(ChainVisitor visitor) { final boolean isPausedItemDamageSound = StackInfo.isPausedItemDamageSound(); StackInfo.pauseItemDamageSound(true); @@ -321,7 +355,7 @@ public class RecipeChainMath { } this.preferredItems.put(prefItem, prefItem); - calculateSuitableRecipe(prefItem, prefAmount, new ArrayList<>()); + calculateSuitableRecipe(prefItem, prefAmount, new ArrayList<>(), visitor); this.preferredItems.remove(prefItem); } } @@ -338,9 +372,12 @@ public class RecipeChainMath { return this; } - private void calculateSuitableRecipe(BookmarkItem ingrItem, long ingrAmount, List visited) { + private void calculateSuitableRecipe(BookmarkItem ingrItem, long ingrAmount, List visited, + ChainVisitor visitor) { final BookmarkItem prefItem = this.preferredItems.get(ingrItem); + visitor.addIngredient(prefItem != null ? prefItem : ingrItem, ingrAmount); + // calculate existing containers if (ingrAmount > 0) { for (ItemStack stack : ingrItem.permutations.values()) { @@ -358,7 +395,7 @@ public class RecipeChainMath { if (ingrAmount > 0) { for (BookmarkItem item : this.initialItems) { if (item.containsItems(ingrItem) - && (ingrAmount = addRequiredAmount(item, ingrAmount, item.getAmount())) == 0) { + && (ingrAmount = addRequiredAmount(item, ingrAmount, item.getAmount(), visitor)) == 0) { break; } } @@ -366,33 +403,37 @@ public class RecipeChainMath { // shift amount if (prefItem == null) { - addRequiredAmount(ingrItem, ingrAmount, Long.MAX_VALUE); + addRequiredAmount(ingrItem, ingrAmount, Long.MAX_VALUE, visitor); } else if (visited.contains(prefItem.recipeId)) { - addRequiredAmount(prefItem, ingrAmount, Long.MAX_VALUE); + addRequiredAmount(prefItem, ingrAmount, Long.MAX_VALUE, visitor); } else { - addRequiredAmount(prefItem, ingrAmount, Long.MAX_VALUE); + addRequiredAmount(prefItem, ingrAmount, Long.MAX_VALUE, visitor); final long multiplier = Math .max(0, prefItem.getMultiplierFromAmount(this.requiredAmount.get(prefItem)) - prefItem.multiplier); if (multiplier > 0) { addShift(prefItem.recipeId, multiplier); visited.add(prefItem.recipeId); - prepareIngredients(prefItem.recipeId, multiplier, visited); + prepareIngredients(prefItem.recipeId, multiplier, visited, visitor); visited.remove(prefItem.recipeId); } } } - private void prepareIngredients(RecipeId recipeId, long multiplier, List visited) { + private void prepareIngredients(RecipeId recipeId, long multiplier, List visited, ChainVisitor visitor) { + visitor.enterRecipe(recipeId, multiplier); + for (BookmarkItem item : this.recipeIngredients) { if (!item.emptyFactor() && recipeId.equals(item.recipeId)) { - calculateSuitableRecipe(item, item.getAmount(multiplier), visited); + calculateSuitableRecipe(item, item.getAmount(multiplier), visited, visitor); } } + + visitor.leaveRecipe(); } - private long addRequiredAmount(BookmarkItem prefItem, long ingrAmount, long maxAmount) { + private long addRequiredAmount(BookmarkItem prefItem, long ingrAmount, long maxAmount, ChainVisitor visitor) { long shiftAmount = this.requiredAmount.getOrDefault(prefItem, 0L); if (hasContainerItem(prefItem.itemStack)) { @@ -449,6 +490,7 @@ public class RecipeChainMath { ingrAmount -= initAmount; } + visitor.addIngredientFresh(prefItem, shiftAmount - this.requiredAmount.getOrDefault(prefItem, 0L)); this.requiredAmount.put(prefItem, shiftAmount); return ingrAmount;