From 91828ea9f59eadf0fad4fb97f5647a37d554a8e4 Mon Sep 17 00:00:00 2001 From: slprime Date: Tue, 4 Nov 2025 21:07:21 +0200 Subject: [PATCH 1/2] Properly clears inventory before filling a recipe --- .../java/codechicken/nei/BookmarkPanel.java | 10 +- .../nei/DefaultBookmarkContainerHandler.java | 29 +--- .../codechicken/nei/FastTransferManager.java | 23 +++ .../nei/api/IBookmarkContainerHandler.java | 2 +- .../nei/recipe/DefaultOverlayHandler.java | 136 ++++++++++-------- 5 files changed, 118 insertions(+), 82 deletions(-) diff --git a/src/main/java/codechicken/nei/BookmarkPanel.java b/src/main/java/codechicken/nei/BookmarkPanel.java index dedd3a65..3b796290 100644 --- a/src/main/java/codechicken/nei/BookmarkPanel.java +++ b/src/main/java/codechicken/nei/BookmarkPanel.java @@ -1182,7 +1182,15 @@ public class BookmarkPanel extends PanelWidget { } if (!items.isEmpty()) { - containerHandler.pullBookmarkItemsFromContainer(guiContainer, items); + final int helmStackIndex = FastTransferManager.dropHeldItem(guiContainer); + + if (guiContainer.mc.thePlayer.inventory.getItemStack() == null) { + containerHandler.pullBookmarkItemsFromContainer(guiContainer, items); + + if (helmStackIndex != -1) { + FastTransferManager.clickSlot(guiContainer, helmStackIndex, 0, 0); + } + } } return true; diff --git a/src/main/java/codechicken/nei/DefaultBookmarkContainerHandler.java b/src/main/java/codechicken/nei/DefaultBookmarkContainerHandler.java index 9f97f1e5..9c9cd21a 100644 --- a/src/main/java/codechicken/nei/DefaultBookmarkContainerHandler.java +++ b/src/main/java/codechicken/nei/DefaultBookmarkContainerHandler.java @@ -1,7 +1,7 @@ package codechicken.nei; import java.util.ArrayList; -import java.util.LinkedList; +import java.util.List; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; @@ -12,36 +12,19 @@ public class DefaultBookmarkContainerHandler implements IBookmarkContainerHandle @Override public void pullBookmarkItemsFromContainer(GuiContainer guiContainer, ArrayList bookmarkItems) { - FastTransferManager manager = new FastTransferManager(); - LinkedList containerStacks = manager.saveContainer(guiContainer.inventorySlots); + final FastTransferManager manager = new FastTransferManager(); + final List containerStacks = getStorageStacks(guiContainer); for (ItemStack bookmarkItem : bookmarkItems) { - - int bookmarkSizeBackup = bookmarkItem.stackSize; - - for (int i = 0; i < containerStacks.size() - 4 * 9; i++) { // Last 36 slots are player inventory - ItemStack containerItem = containerStacks.get(i); - - if (containerItem == null) { - continue; - } + for (int i = 0; i < containerStacks.size() && bookmarkItem.stackSize > 0; i++) { + final ItemStack containerItem = containerStacks.get(i); if (bookmarkItem.isItemEqual(containerItem)) { - if (bookmarkItem.stackSize <= 0) { - break; - } - - int transferAmount = Math.min(bookmarkItem.stackSize, containerItem.stackSize); - + final int transferAmount = Math.min(bookmarkItem.stackSize, containerItem.stackSize); manager.transferItems(guiContainer, i, transferAmount); bookmarkItem.stackSize -= transferAmount; - - if (bookmarkItem.stackSize == 0) { - break; - } } } - bookmarkItem.stackSize = bookmarkSizeBackup; } } } diff --git a/src/main/java/codechicken/nei/FastTransferManager.java b/src/main/java/codechicken/nei/FastTransferManager.java index 79d8cfa5..5efa6b11 100644 --- a/src/main/java/codechicken/nei/FastTransferManager.java +++ b/src/main/java/codechicken/nei/FastTransferManager.java @@ -9,7 +9,9 @@ import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; +import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -281,6 +283,27 @@ public class FastTransferManager { GuiContainerManager.getManager(window).handleSlotClick(slotIndex, button, modifier); } + public static int dropHeldItem(GuiContainer window) { + final EntityPlayerSP player = window.mc.thePlayer; + final ItemStack held = player.inventory.getItemStack(); + + if (held == null) return -1; + + for (int i = 0; held != null && i < window.inventorySlots.inventorySlots.size(); i++) { + final Slot slot = window.inventorySlots.inventorySlots.get(i); + + if (slot.inventory instanceof InventoryPlayer && !slot.getHasStack() && slot.isItemValid(held)) { + clickSlot(window, i, 0, 0); + + if (player.inventory.getItemStack() == null) { + return i; + } + } + } + + return -1; + } + private boolean fillZoneWithHeldItem(GuiContainer window, int zoneIndex) { for (int transferTo : slotZones.get(zoneIndex)) { ItemStack held = NEIClientUtils.getHeldItem(); diff --git a/src/main/java/codechicken/nei/api/IBookmarkContainerHandler.java b/src/main/java/codechicken/nei/api/IBookmarkContainerHandler.java index 60aa6dce..bdd4b3e6 100644 --- a/src/main/java/codechicken/nei/api/IBookmarkContainerHandler.java +++ b/src/main/java/codechicken/nei/api/IBookmarkContainerHandler.java @@ -15,7 +15,7 @@ public interface IBookmarkContainerHandler { for (int i = 0; i < slots.size() - 4 * 9; i++) { if (slots.get(i).getHasStack()) { - stacks.add(slots.get(i).getStack()); + stacks.add(slots.get(i).getStack().copy()); } } diff --git a/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java b/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java index 5d1041db..3c817a55 100644 --- a/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java +++ b/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java @@ -6,10 +6,10 @@ import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import java.util.Map; +import java.util.Set; -import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.inventory.SlotCrafting; @@ -50,17 +50,17 @@ public class DefaultOverlayHandler implements IOverlayHandler { public Slot[] slots; } - public DefaultOverlayHandler(int x, int y) { - offsetx = x; - offsety = y; - } + public int offsetx; + public int offsety; public DefaultOverlayHandler() { this(5, 11); } - public int offsetx; - public int offsety; + public DefaultOverlayHandler(int x, int y) { + this.offsetx = x; + this.offsety = y; + } @Override public void overlayRecipe(GuiContainer gui, IRecipeHandler handler, int recipeIndex, boolean maxTransfer) { @@ -72,7 +72,7 @@ public class DefaultOverlayHandler implements IOverlayHandler { final List ingredients = handler.getIngredientStacks(recipeIndex); final List ingredStacks = getPermutationIngredients(ingredients); - if (!clearIngredients(gui)) return 0; + if (!clearIngredients(gui, handler)) return 0; findInventoryQuantities(gui, ingredStacks); @@ -99,12 +99,17 @@ public class DefaultOverlayHandler implements IOverlayHandler { } @Override - public boolean craft(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex, int multiplier) { - final EntityClientPlayerMP thePlayer = NEIClientUtils.mc().thePlayer; - boolean craft = false; + public boolean craft(GuiContainer firstGui, IRecipeHandler handler, int recipeIndex, int multiplier) { + final Slot craftingSlot = firstGui.inventorySlots.inventorySlots.stream() + .filter(slot -> slot instanceof SlotCrafting).findFirst().orElse(null); + if (craftingSlot == null) { + return false; + } + + boolean craft = false; while (multiplier > 0) { - final int transfer = transferRecipe(firstGui, recipe, recipeIndex, multiplier); + final int transfer = transferRecipe(firstGui, handler, recipeIndex, multiplier); if (transfer <= 0) { break; @@ -112,43 +117,87 @@ public class DefaultOverlayHandler implements IOverlayHandler { multiplier -= transfer; - for (Slot slot : firstGui.inventorySlots.inventorySlots) { - if (slot.getHasStack() && slot instanceof SlotCrafting && slot.canTakeStack(thePlayer)) { - FastTransferManager.clickSlot(firstGui, slot.slotNumber, 0, 1); - craft = true; - break; - } + if (craftingSlot.getHasStack() && craftingSlot.canTakeStack(firstGui.mc.thePlayer)) { + FastTransferManager.clickSlot(firstGui, craftingSlot.slotNumber, 0, 1); + craft = true; } } - clearIngredients(firstGui); + clearIngredients(firstGui, handler); return craft; } - private boolean clearIngredients(GuiContainer gui) { - final EntityClientPlayerMP thePlayer = NEIClientUtils.mc().thePlayer; + protected boolean clearIngredients(GuiContainer gui, IRecipeHandler handler) { - for (Slot slot : gui.inventorySlots.inventorySlots) { - if (slot.getHasStack() && !canMoveFrom(slot, gui) - && !(slot instanceof SlotCrafting) - && slot.canTakeStack(thePlayer)) { + for (Slot slot : getCraftMatrixSlots(gui, handler)) { + if (slot.canTakeStack(gui.mc.thePlayer)) { FastTransferManager.clickSlot(gui, slot.slotNumber, 0, 1); if (slot.getHasStack()) return false; } } - return dropOffMouseStack(thePlayer, gui); + FastTransferManager.dropHeldItem(gui); + + return gui.mc.thePlayer.inventory.getItemStack() == null; + } + + /** + * Gets the slots in the crafting matrix for the given GUI and recipe handler. + * @param gui + * @param handler + * @return + */ + protected Set getCraftMatrixSlots(GuiContainer gui, IRecipeHandler handler) { + final PositionedStack firstIngr = handler.getIngredientStacks(0).get(0); + final Map grid = new HashMap<>(); + final Set ingredSlots = new HashSet<>(); + + for (Slot slot : gui.inventorySlots.inventorySlots) { + final int key = (slot.xDisplayPosition - this.offsetx) * 10_000 + (slot.yDisplayPosition - this.offsety); + grid.put(key, slot); + } + + int left = firstIngr.relx; + int top = firstIngr.rely; + int right = left; + int bottom = top; + + while (grid.containsKey((left - 18) * 10_000 + firstIngr.rely)) { + left -= 18; + } + + while (grid.containsKey((right + 18) * 10_000 + firstIngr.rely)) { + right += 18; + } + + while (grid.containsKey(firstIngr.relx * 10_000 + (top - 18))) { + top -= 18; + } + + while (grid.containsKey(firstIngr.relx * 10_000 + (bottom + 18))) { + bottom += 18; + } + + for (int x = left; x <= right; x += 18) { + for (int y = top; y <= bottom; y += 18) { + final Slot slot = grid.get(x * 10_000 + y); + if (slot != null && !(slot.inventory instanceof InventoryPlayer)) { + ingredSlots.add(slot); + } + } + } + + return ingredSlots; } private void moveIngredients(GuiContainer gui, List assignedIngredients, int multiplier) { - final EntityClientPlayerMP thePlayer = NEIClientUtils.mc().thePlayer; for (Slot slot : gui.inventorySlots.inventorySlots) { if (slot instanceof SlotCrafting || !slot.getHasStack() || !canMoveFrom(slot, gui) - || !slot.canTakeStack(thePlayer)) + || !slot.canTakeStack(gui.mc.thePlayer)) continue; ItemStack stack = slot.getStack(); int slotTransferCap = stack.getMaxStackSize(); @@ -186,7 +235,7 @@ public class DefaultOverlayHandler implements IOverlayHandler { } - if (thePlayer.inventory.getItemStack() != null) { + if (gui.mc.thePlayer.inventory.getItemStack() != null) { FastTransferManager.clickSlot(gui, slot.slotNumber); } } @@ -194,33 +243,6 @@ public class DefaultOverlayHandler implements IOverlayHandler { } } - protected boolean dropOffMouseStack(EntityPlayer entityPlayer, GuiContainer gui) { - - if (entityPlayer.inventory.getItemStack() == null) { - return true; - } - - for (int i = 0; i < gui.inventorySlots.inventorySlots.size(); i++) { - Slot slot = gui.inventorySlots.inventorySlots.get(i); - - if (slot.inventory == entityPlayer.inventory) { - ItemStack mouseItem = entityPlayer.inventory.getItemStack(); - ItemStack slotStack = slot.getStack(); - - if (slotStack == null || NEIClientUtils.areStacksSameType(mouseItem, slotStack)) { - FastTransferManager.clickSlot(gui, i, 0, 0); - } - - if (entityPlayer.inventory.getItemStack() == null) { - return true; - } - - } - } - - return entityPlayer.inventory.getItemStack() == null; - } - private int calculateRecipeQuantity(List assignedIngredients) { int quantity = Integer.MAX_VALUE; From 02c408076392be8efac4e45205fd43cff2a6df3c Mon Sep 17 00:00:00 2001 From: slprime Date: Tue, 4 Nov 2025 21:19:31 +0200 Subject: [PATCH 2/2] spotless --- src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java b/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java index 3c817a55..9b18d619 100644 --- a/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java +++ b/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java @@ -145,6 +145,7 @@ public class DefaultOverlayHandler implements IOverlayHandler { /** * Gets the slots in the crafting matrix for the given GUI and recipe handler. + * * @param gui * @param handler * @return