From 63d7aa24ae707c1eb46cd5bafb9947265c65e0b8 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sat, 9 May 2015 09:19:39 +0200 Subject: [PATCH] allow storing the current crafting recipe for the crafting helper --- resources/assets/enderio/lang/en_US.lang | 3 + .../enderio/textures/gui/inventorypanel.png | Bin 2906 -> 3306 bytes .../machine/invpanel/GuiInventoryPanel.java | 34 ++- .../invpanel/InventoryPanelContainer.java | 4 + .../invpanel/client/CraftingHelper.java | 221 ++++++++++++++++++ .../InventoryPanelNEIOverlayHandler.java | 214 +---------------- 6 files changed, 269 insertions(+), 207 deletions(-) create mode 100644 src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelper.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 0e91875c..f9da1c9d 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -509,6 +509,9 @@ enderio.gui.inventorypanel.tooltip.refill.line2=A normal click puts items enderio.gui.inventorypanel.tooltip.refill.line3=for one crafting opperations, enderio.gui.inventorypanel.tooltip.refill.line4=while a shift click tries to enderio.gui.inventorypanel.tooltip.refill.line5=fill the crafting grid. +enderio.gui.inventorypanel.tooltip.setrecipe.line1=Learn the current crafting recipe +enderio.gui.inventorypanel.tooltip.setrecipe.line2=Allows the refilling for the +enderio.gui.inventorypanel.tooltip.setrecipe.line3=current recipe from the network. enderio.gui.inventorypanel.tooltip.clear.line1=Clear crafting grid enderio.gui.inventorypanel.tooltip.clear.line2=Moves all items to the return area enderio.gui.inventorypanel.tooltip.fuelTank=Nutrient Tank diff --git a/resources/assets/enderio/textures/gui/inventorypanel.png b/resources/assets/enderio/textures/gui/inventorypanel.png index 9b49c80526e2c92f6355dc53eda9d811c74cc81e..baeec6e208087b2cc93912378cc07e61b3030082 100644 GIT binary patch literal 3306 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 AqW}N^ diff --git a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java index 1104a9b6..f34cdb68 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java @@ -25,6 +25,7 @@ import crazypants.enderio.gui.TextFieldEIO; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.gui.VScrollbarEIO; import crazypants.enderio.machine.gui.GuiMachineBase; +import crazypants.enderio.machine.invpanel.client.CraftingHelper; import crazypants.enderio.machine.invpanel.client.DatabaseView; import crazypants.enderio.machine.invpanel.client.ICraftingHelper; import crazypants.enderio.machine.invpanel.client.InventoryDatabaseClient; @@ -55,6 +56,7 @@ public class GuiInventoryPanel extends GuiMachineBase { private final TextFieldEIO tfFilter; private final IconButtonEIO btnSort; private final GuiToolTip ttRefill; + private final GuiToolTip ttSetReceipe; private final VScrollbarEIO scrollbar; private final MultiIconButtonEIO btnClear; @@ -130,6 +132,16 @@ public class GuiInventoryPanel extends GuiMachineBase { ttRefill.setVisible(false); addToolTip(ttRefill); + list.clear(); + TooltipAddera.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.setrecipe.line"); + ttSetReceipe = new GuiToolTip(btnRefill, list) { + @Override + public boolean shouldDraw() { + return super.shouldDraw() && getContainer().hasCraftingRecipe(); + } + }; + addToolTip(ttSetReceipe); + list.clear(); TooltipAddera.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.clear.line"); btnClear.setToolTip(list.toArray(new String[list.size()])); @@ -147,6 +159,7 @@ public class GuiInventoryPanel extends GuiMachineBase { public void setCraftingHelper(ICraftingHelper craftingHelper) { this.craftingHelper = craftingHelper; ttRefill.setVisible(craftingHelper != null); + ttSetReceipe.setVisible(craftingHelper == null); } @Override @@ -170,7 +183,7 @@ public class GuiInventoryPanel extends GuiMachineBase { if(getContainer().clearCraftingGrid()) { if(craftingHelper != null) { craftingHelper.remove(); - craftingHelper = null; + setCraftingHelper(null); } } } @@ -189,6 +202,10 @@ public class GuiInventoryPanel extends GuiMachineBase { boolean hover = btnRefill.contains(mouseX - sx, mouseY - sy); int iconX = hover ? (isShiftKeyDown() ? 48 : 24) : 0; drawTexturedModalRect(sx + btnRefill.x - 2, sy + btnRefill.y - 2, iconX, 232, 24, 24); + } else if(getContainer().hasCraftingRecipe()) { + boolean hover = btnRefill.contains(mouseX - sx, mouseY - sy); + int iconX = hover ? 96 : 72; + drawTexturedModalRect(sx + btnRefill.x - 2, sy + btnRefill.y - 2, iconX, 232, 24, 24); } int headerColor = 0x404040; @@ -328,12 +345,21 @@ public class GuiInventoryPanel extends GuiMachineBase { x -= guiLeft; y -= guiTop; - if(craftingHelper != null && btnRefill.contains(x, y)) { - mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); - craftingHelper.refill(this, isShiftKeyDown() ? 64 : 1); + if(btnRefill.contains(x, y)) { + if(craftingHelper != null) { + playClickSound(); + craftingHelper.refill(this, isShiftKeyDown() ? 64 : 1); + } else if(getContainer().hasCraftingRecipe()) { + playClickSound(); + setCraftingHelper(CraftingHelper.createFromSlots(getContainer().getCraftingGridSlots())); + } } } + private void playClickSound() { + mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); + } + @Override protected void mouseWheel(int x, int y, int delta) { super.mouseWheel(x, y, delta); diff --git a/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java b/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java index f7b73584..d69f680d 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/InventoryPanelContainer.java @@ -238,6 +238,10 @@ public class InventoryPanelContainer extends AbstractMachineContainer implements return cleared; } + public boolean hasCraftingRecipe() { + return getSlot(slotCraftResult).getHasStack(); + } + @Override protected List getTargetSlotsForTransfer(int slotIndex, Slot slot) { if((slotIndex == slotCraftResult) || (slotIndex >= firstSlotReturn && slotIndex < endSlotReturn)) { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelper.java b/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelper.java new file mode 100644 index 00000000..738c84da --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/CraftingHelper.java @@ -0,0 +1,221 @@ +package crazypants.enderio.machine.invpanel.client; + +import crazypants.enderio.machine.invpanel.GuiInventoryPanel; +import crazypants.enderio.machine.invpanel.InventoryPanelContainer; +import crazypants.enderio.machine.invpanel.PacketFetchItem; +import crazypants.enderio.network.PacketHandler; +import crazypants.util.ItemUtil; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class CraftingHelper implements ICraftingHelper { + final ItemStack[][] ingredients; + + public CraftingHelper(ItemStack[][] ingredients) { + this.ingredients = ingredients; + } + + public static ICraftingHelper createFromSlots(List slots) { + if (slots.size() != 9) { + return null; + } + ItemStack[][] ingredients = new ItemStack[9][]; + int count = 0; + for (int idx = 0; idx < 9; idx++) { + Slot slot = slots.get(idx); + ItemStack stack = slot.getStack(); + if(stack != null) { + stack = stack.copy(); + stack.stackSize = 1; + ingredients[idx] = new ItemStack[] { stack }; + count++; + } + } + if (count > 0) { + return new CraftingHelper(ingredients); + } + return null; + } + + @Override + public void remove() { + } + + @Override + public void refill(GuiInventoryPanel gui, int amount) { + InventoryPanelContainer container = gui.getContainer(); + InventoryDatabaseClient db = gui.getDatabase(); + List craftingGrid = container.getCraftingGridSlots(); + int slotsToProcess = (1 << 9) - 1; + boolean madeProgress; + int maxAmount = 64; + do { + Candidate[] candidates = new Candidate[9]; + for (int idx = 0; idx < 9; idx++) { + if ((slotsToProcess & (1 << idx)) != 0) { + ItemStack[] pstack = ingredients[idx]; + Slot slot = craftingGrid.get(idx); + ItemStack stack = slot.getStack(); + if (pstack == null) { + if (stack != null) { + return; + } + } else { + Candidate candidate; + if (stack != null) { + if (!isStackCompatible(pstack, stack)) { + return; + } + candidate = findCandidates(stack, gui, db, candidates); + } else { + candidate = findAllCandidates(pstack, gui, db, candidates); + } + if (candidate == null) { + return; + } + candidate.used++; + candidates[idx] = candidate; + } + } + } + int targetAmount = maxAmount; + int currentAmount = 0; + for (int idx = 0; idx < 9; idx++) { + Candidate candidate = candidates[idx]; + if (candidate != null) { + Slot slot = craftingGrid.get(idx); + int current = getSlotStackSize(slot); + int maxStackSize = candidate.stack.getMaxStackSize(); + currentAmount = Math.max(currentAmount, current); + if (candidate.stack.isStackable() && maxStackSize > 1) { + targetAmount = Math.min(targetAmount, current + Math.min(maxStackSize, candidate.getAvailable())); + } + } + } + targetAmount = Math.min(targetAmount, currentAmount + amount); + madeProgress = false; + for (int idx = 0; idx < 9; idx++) { + final int mask = 1 << idx; + Candidate candidate = candidates[idx]; + if (candidate != null) { + Slot slot = craftingGrid.get(idx); + for (Slot srcSlot : candidate.sourceSlots) { + int current = getSlotStackSize(slot); + if (current >= targetAmount) { + break; + } + if (container.moveItems(srcSlot.slotNumber, slot.slotNumber, slot.slotNumber + 1, targetAmount - current)) { + slotsToProcess &= ~mask; + madeProgress = true; + } + } + int current = getSlotStackSize(slot); + if (candidate.entry != null) { + if (current < targetAmount) { + int toMove = Math.min(candidate.entry.getCount(), targetAmount - current); + PacketHandler.INSTANCE.sendToServer(new PacketFetchItem(db.getGeneration(), candidate.entry, slot.slotNumber, toMove)); + slotsToProcess &= ~mask; + current += toMove; + } + } + if (current > 0) { + maxAmount = Math.min(maxAmount, current); + } + } + } + } while (madeProgress && slotsToProcess != 0); + } + + private static int getSlotStackSize(Slot slot) { + ItemStack stack = slot.getStack(); + return (stack != null) ? stack.stackSize : 0; + } + + private static boolean isStackCompatible(ItemStack[] pstack, ItemStack stack) { + for (ItemStack istack : pstack) { + if (ItemUtil.areStackMergable(stack, istack)) { + return true; + } + } + return false; + } + + private Candidate findAllCandidates(ItemStack[] pstack, GuiInventoryPanel gui, InventoryDatabaseClient db, Candidate[] candidates) { + Candidate bestInventory = null; + Candidate bestNetwork = null; + for (ItemStack istack : pstack) { + Candidate candidate = findCandidates(istack, gui, db, candidates); + if (candidate.available > 0) { + if (bestInventory == null || bestInventory.available < candidate.available) { + bestInventory = candidate; + } + } + if (candidate.entry != null) { + if (bestNetwork == null || bestNetwork.entry.getCount() < candidate.entry.getCount()) { + bestNetwork = candidate; + } + } + } + if (bestInventory != null) { + return bestInventory; + } else { + return bestNetwork; + } + } + + private Candidate findCandidates(ItemStack stack, GuiInventoryPanel gui, InventoryDatabaseClient db, Candidate[] candidates) { + for (Candidate candidate : candidates) { + if (candidate != null && ItemUtil.areStackMergable(candidate.stack, stack)) { + return candidate; + } + } + Candidate candidate = new Candidate(stack); + InventoryPanelContainer container = gui.getContainer(); + findCandidates(candidate, stack, container.getReturnAreaSlots()); + findCandidates(candidate, stack, container.getPlayerInventorySlots()); + findCandidates(candidate, stack, container.getPlayerHotbarSlots()); + if (candidate.available == 0 && db != null) { + candidate.entry = db.lookupItem(stack, null, false); + if (candidate.entry != null && candidate.entry.getCount() <= 0) { + candidate.entry = null; + } + } + return candidate; + } + + private void findCandidates(Candidate candidates, ItemStack stack, Collection slots) { + for (Slot slot : slots) { + ItemStack slotStack = slot.getStack(); + if (slotStack != null && ItemUtil.areStackMergable(slotStack, stack)) { + candidates.sourceSlots.add(slot); + candidates.available += slotStack.stackSize; + } + } + } + + static class Candidate { + final ItemStack stack; + final ArrayList sourceSlots = new ArrayList(); + ItemEntry entry; + int available; + int used; + + public Candidate(ItemStack stack) { + this.stack = stack; + } + + public int getAvailable() { + int avail = available; + if(entry != null) { + avail += entry.getCount(); + } + if(avail > 0 && used > 1) { + avail = Math.max(1, avail / used); + } + return avail; + } + } +} diff --git a/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryPanelNEIOverlayHandler.java b/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryPanelNEIOverlayHandler.java index 419a2e81..bca1add3 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryPanelNEIOverlayHandler.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/client/InventoryPanelNEIOverlayHandler.java @@ -1,6 +1,5 @@ package crazypants.enderio.machine.invpanel.client; -import codechicken.lib.inventory.InventoryUtils; import codechicken.nei.LayoutManager; import codechicken.nei.OffsetPositioner; import codechicken.nei.PositionedStack; @@ -10,10 +9,6 @@ import codechicken.nei.api.IStackPositioner; import codechicken.nei.recipe.IRecipeHandler; import crazypants.enderio.machine.invpanel.GuiInventoryPanel; import crazypants.enderio.machine.invpanel.InventoryPanelContainer; -import crazypants.enderio.machine.invpanel.PacketFetchItem; -import crazypants.enderio.network.PacketHandler; -import java.util.ArrayList; -import java.util.Collection; import java.util.List; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Slot; @@ -40,9 +35,15 @@ public class InventoryPanelNEIOverlayHandler implements IOverlayHandler { shift = guiInvPanel.getContainer().clearCraftingGrid(); } - PositionedStack[] slots = mapSlots(ingredients, guiInvPanel.getContainer()); + ItemStack[][] slots = mapSlots(ingredients, guiInvPanel.getContainer()); if(slots != null) { - CraftingHelper helper = new CraftingHelper(slots); + CraftingHelper helper = new CraftingHelper(slots) { + @Override + public void remove() { + super.remove(); + LayoutManager.overlayRenderer = null; + } + }; guiInvPanel.setCraftingHelper(helper); if(shift) { helper.refill(guiInvPanel, 64); @@ -52,15 +53,15 @@ public class InventoryPanelNEIOverlayHandler implements IOverlayHandler { } } - private PositionedStack[] mapSlots(List ingredients, InventoryPanelContainer c) { - PositionedStack[] slots = new PositionedStack[9]; + private ItemStack[][] mapSlots(List ingredients, InventoryPanelContainer c) { + ItemStack[][] slots = new ItemStack[9][]; List craftingGrid = c.getCraftingGridSlots(); int found = 0; for(PositionedStack pstack : ingredients) { for(int idx = 0; idx < 9 ; idx++) { Slot slot = craftingGrid.get(idx); if(slot.xDisplayPosition == pstack.relx + CRAFTING_GRID_OFFSET_X && slot.yDisplayPosition == pstack.rely + CRAFTING_GRID_OFFSET_Y) { - slots[idx] = pstack; + slots[idx] = pstack.items; found++; break; } @@ -71,197 +72,4 @@ public class InventoryPanelNEIOverlayHandler implements IOverlayHandler { } return slots; } - - static class CraftingHelper implements ICraftingHelper { - final PositionedStack[] ingredients; - - public CraftingHelper(PositionedStack[] ingredients) { - this.ingredients = ingredients; - } - - @Override - public void remove() { - LayoutManager.overlayRenderer = null; - } - - @Override - public void refill(GuiInventoryPanel gui, int amount) { - InventoryPanelContainer container = gui.getContainer(); - InventoryDatabaseClient db = gui.getDatabase(); - List craftingGrid = container.getCraftingGridSlots(); - int slotsToProcess = (1<<9)-1; - boolean madeProgress; - int maxAmount = 64; - do { - Candidate[] candidates = new Candidate[9]; - for(int idx = 0; idx < 9; idx++) { - if((slotsToProcess & (1 << idx)) != 0) { - PositionedStack pstack = ingredients[idx]; - Slot slot = craftingGrid.get(idx); - ItemStack stack = slot.getStack(); - if(pstack == null) { - if(stack != null) { - return; - } - } else { - Candidate candidate; - if(stack != null) { - if(!isStackCompatible(pstack, stack)) { - return; - } - candidate = findCandidates(stack, gui, db, candidates); - } else { - candidate = findAllCandidates(pstack, gui, db, candidates); - } - - if(candidate == null) { - return; - } - candidate.used++; - candidates[idx] = candidate; - } - } - } - - int targetAmount = maxAmount; - int currentAmount = 0; - for(int idx = 0; idx < 9; idx++) { - Candidate candidate = candidates[idx]; - if(candidate != null) { - Slot slot = craftingGrid.get(idx); - int current = getSlotStackSize(slot); - int maxStackSize = candidate.stack.getMaxStackSize(); - currentAmount = Math.max(currentAmount, current); - if(candidate.stack.isStackable() && maxStackSize > 1) { - targetAmount = Math.min(targetAmount, current + Math.min(maxStackSize, candidate.getAvailable())); - } - } - } - - targetAmount = Math.min(targetAmount, currentAmount + amount); - madeProgress = false; - for(int idx = 0; idx < 9; idx++) { - final int mask = 1 << idx; - Candidate candidate = candidates[idx]; - if(candidate != null) { - Slot slot = craftingGrid.get(idx); - for(Slot srcSlot : candidate.sourceSlots) { - int current = getSlotStackSize(slot); - if(current >= targetAmount) { - break; - } - if(container.moveItems(srcSlot.slotNumber, slot.slotNumber, slot.slotNumber+1, targetAmount - current)) { - slotsToProcess &= ~mask; - madeProgress = true; - } - } - - int current = getSlotStackSize(slot); - if(candidate.entry != null) { - if(current < targetAmount) { - int toMove = Math.min(candidate.entry.getCount(), targetAmount - current); - PacketHandler.INSTANCE.sendToServer(new PacketFetchItem(db.getGeneration(), candidate.entry, slot.slotNumber, toMove)); - slotsToProcess &= ~mask; - current += toMove; - } - } - - if(current > 0) { - maxAmount = Math.min(maxAmount, current); - } - } - } - }while(madeProgress && slotsToProcess != 0); - } - - private static int getSlotStackSize(Slot slot) { - ItemStack stack = slot.getStack(); - return (stack != null) ? stack.stackSize : 0; - } - - private static boolean isStackCompatible(PositionedStack pstack, ItemStack stack) { - for(ItemStack istack : pstack.items) { - if(InventoryUtils.canStack(stack, istack)) { - return true; - } - } - return false; - } - - private Candidate findAllCandidates(PositionedStack pstack, GuiInventoryPanel gui, InventoryDatabaseClient db, Candidate[] candidates) { - Candidate bestInventory = null; - Candidate bestNetwork = null; - for(ItemStack istack : pstack.items) { - Candidate candidate = findCandidates(istack, gui, db, candidates); - if(candidate.available > 0) { - if(bestInventory == null || bestInventory.available < candidate.available) { - bestInventory = candidate; - } - } - if(candidate.entry != null) { - if(bestNetwork == null || bestNetwork.entry.getCount() < candidate.entry.getCount()) { - bestNetwork = candidate; - } - } - } - if(bestInventory != null) { - return bestInventory; - } else { - return bestNetwork; - } - } - - private Candidate findCandidates(ItemStack stack, GuiInventoryPanel gui, InventoryDatabaseClient db, Candidate[] candidates) { - for(Candidate candidate : candidates) { - if(candidate != null && InventoryUtils.canStack(candidate.stack, stack)) { - return candidate; - } - } - Candidate candidate = new Candidate(stack); - InventoryPanelContainer container = gui.getContainer(); - findCandidates(candidate, stack, container.getReturnAreaSlots()); - findCandidates(candidate, stack, container.getPlayerInventorySlots()); - findCandidates(candidate, stack, container.getPlayerHotbarSlots()); - if(candidate.available == 0 && db != null) { - candidate.entry = db.lookupItem(stack, null, false); - if(candidate.entry != null && candidate.entry.getCount() <= 0) { - candidate.entry = null; - } - } - return candidate; - } - - private void findCandidates(Candidate candidates, ItemStack stack, Collection slots) { - for(Slot slot : slots) { - ItemStack slotStack = slot.getStack(); - if(slotStack != null && InventoryUtils.canStack(slotStack, stack)) { - candidates.sourceSlots.add(slot); - candidates.available += slotStack.stackSize; - } - } - } - } - - static class Candidate { - final ItemStack stack; - final ArrayList sourceSlots = new ArrayList(); - ItemEntry entry; - int available; - int used; - - public Candidate(ItemStack stack) { - this.stack = stack; - } - - public int getAvailable() { - int avail = available; - if(entry != null) { - avail += entry.getCount(); - } - if(avail > 0 && used > 1) { - avail = Math.max(1, avail / used); - } - return avail; - } - } }