diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index ac739ff7..3da6973e 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -476,6 +476,9 @@ enderio.gui.inventorypanel.info.filter= enderio.gui.inventorypanel.tooltip.return.line1=Item return area enderio.gui.inventorypanel.tooltip.return.line2=Items placed here can be extracted enderio.gui.inventorypanel.tooltip.return.line3=by an item conduit +enderio.gui.inventorypanel.tooltip.filterslot.line1=Filter card slot +enderio.gui.inventorypanel.tooltip.filterslot.line2=Place configured item filters in +enderio.gui.inventorypanel.tooltip.filterslot.line3=here to select which items to show. enderio.machine.tooltip.configured=(Configured) diff --git a/resources/assets/enderio/textures/gui/inventorypanel.png b/resources/assets/enderio/textures/gui/inventorypanel.png index eff46cab..323de295 100644 Binary files a/resources/assets/enderio/textures/gui/inventorypanel.png and b/resources/assets/enderio/textures/gui/inventorypanel.png differ diff --git a/src/main/java/crazypants/enderio/conduit/item/FilterRegister.java b/src/main/java/crazypants/enderio/conduit/item/FilterRegister.java index 73284dd6..b218307f 100644 --- a/src/main/java/crazypants/enderio/conduit/item/FilterRegister.java +++ b/src/main/java/crazypants/enderio/conduit/item/FilterRegister.java @@ -10,11 +10,12 @@ import crazypants.enderio.conduit.item.filter.IItemFilterUpgrade; public class FilterRegister { + public static boolean isItemFilter(ItemStack stack) { + return stack != null && (stack.getItem() instanceof IItemFilterUpgrade); + } + public static IItemFilter getFilterForUpgrade(ItemStack stack) { - if(stack == null) { - return null; - } - if(!(stack.getItem() instanceof IItemFilterUpgrade)) { + if(!isItemFilter(stack)) { return null; } IItemFilterUpgrade upgrade = (IItemFilterUpgrade)stack.getItem(); diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java index c84a346d..d0585164 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java @@ -30,7 +30,9 @@ public class ExistingItemFilter implements IItemFilter { if(item == null) { return false; } - if(snapshot == null) { + if(snapshot != null) { + return isStackInSnapshot(item); + } else if(ni != null) { int[] slots = ni.getInventory().getAccessibleSlotsFromSide(ni.getInventorySide()); for (int i = 0; i < slots.length; i++) { ItemStack stack = ni.getInventory().getStackInSlot(i); @@ -38,8 +40,6 @@ public class ExistingItemFilter implements IItemFilter { return true; } } - } else { - return isStackInSnapshot(item); } return false; } diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java index b096d78a..3580d410 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java @@ -19,6 +19,12 @@ public interface IItemFilter { void readFromByteBuf(ByteBuf buf); + /** + * Checks if the given item passes the filter or not. + * @param inv the attached inventory - or null when used without an inventory (eg for a GUI) + * @param item the item to check + * @return true if the item is allowed to pass + */ boolean doesItemPassFilter(NetworkedInventory inv, ItemStack item); boolean doesFilterCaptureStack(NetworkedInventory inv, ItemStack item); diff --git a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java index a3004ec2..5ae0d236 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java @@ -11,6 +11,7 @@ import crazypants.enderio.network.PacketHandler; import crazypants.gui.GhostSlot; import crazypants.gui.GuiToolTip; import crazypants.render.RenderUtil; +import crazypants.util.ItemUtil; import crazypants.util.Lang; import java.awt.Rectangle; import java.util.ArrayList; @@ -21,14 +22,18 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; +import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class GuiInventoryPanel extends GuiMachineBase { - private static final Rectangle btnScrollUp = new Rectangle(216, 27, 16, 8); - private static final Rectangle btnScrollDown = new Rectangle(216, 109, 16, 8); - private static final Rectangle thumbArea = new Rectangle(216, 35, 16, 74); + private static final Rectangle btnScrollUp = new Rectangle(215, 27, 11, 8); + private static final Rectangle btnScrollDown = new Rectangle(215, 109, 11, 8); + private static final Rectangle thumbArea = new Rectangle(215, 35, 11, 74); + + private static final Rectangle scrollbarArea = new Rectangle(215, 27, 11, 90); + private static final Rectangle inventoryArea = new Rectangle(107, 27, 108, 90); private static final int ID_SORT = 9876; @@ -49,8 +54,6 @@ public class GuiInventoryPanel extends GuiMachineBase { private final String headerInventory; private final String infoTextFilter; - private final GuiToolTip tooltipReturn; - public GuiInventoryPanel(TileInventoryPanel te, Container container) { super(te, container); redstoneButton.visible = false; @@ -59,15 +62,15 @@ public class GuiInventoryPanel extends GuiMachineBase { for(int y = 0; y < GHOST_ROWS; y++) { for(int x = 0; x < GHOST_COLUMNS; x++) { - ghostSlots.add(new InvSlot(109 + x*18, 28 + y*18)); + ghostSlots.add(new InvSlot(108 + x*18, 28 + y*18)); } } FontRenderer fr = Minecraft.getMinecraft().fontRenderer; - tfFilter = new TextFieldEIO(fr, 109, 10, 106, 10); + tfFilter = new TextFieldEIO(fr, 108, 11, 106, 10); tfFilter.setEnableBackgroundDrawing(false); - btnSort = new IconButtonEIO(this, ID_SORT, 216, 7, getSortOrderIcon()); + btnSort = new IconButtonEIO(this, ID_SORT, 233, 27, getSortOrderIcon()); textFields.add(tfFilter); @@ -78,14 +81,22 @@ public class GuiInventoryPanel extends GuiMachineBase { ArrayList list = new ArrayList(); TooltipAddera.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.return.line"); - tooltipReturn = new GuiToolTip(new Rectangle(6, 72, 5*18, 8), list); + addToolTip(new GuiToolTip(new Rectangle(6, 72, 5*18, 8), list)); + + list = new ArrayList(); + TooltipAddera.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.filterslot.line"); + addToolTip(new GuiToolTip(new Rectangle(InventoryPanelContainer.FILTER_SLOT_X, InventoryPanelContainer.FILTER_SLOT_Y, 16, 16), list) { + @Override + public boolean shouldDraw() { + return !((InventoryPanelContainer) inventorySlots).getSlotFilter().getHasStack() && super.shouldDraw(); + } + }); } @Override public void initGui() { super.initGui(); btnSort.onGuiInit(); - addToolTip(tooltipReturn); } @Override @@ -124,12 +135,13 @@ public class GuiInventoryPanel extends GuiMachineBase { if(scrollMax > 0) { icon = IconEIO.VSCROLL_THUMB; - icon.renderIcon(sx+thumbArea.x, sy+thumbArea.y + (thumbArea.height - icon.height) * scrollPos / scrollMax); + icon.renderIcon(sx+thumbArea.x, sy+getThumbPosition()); } tes.draw(); InventoryDatabaseClient db = getDatabase(); + db.setItemFilter(getTileEntity().getItemFilter()); db.updateFilter(tfFilter.getText()); if(db.sortItems()) { @@ -149,6 +161,10 @@ public class GuiInventoryPanel extends GuiMachineBase { } } + private int getThumbPosition() { + return thumbArea.y + (int)(thumbArea.height - IconEIO.VSCROLL_THUMB.height) * scrollPos / scrollMax; + } + @Override protected void drawFakeItemStack(int x, int y, ItemStack stack) { FontRenderer font = stack.getItem().getFontRenderer(stack); @@ -228,7 +244,7 @@ public class GuiInventoryPanel extends GuiMachineBase { @Override public int getXSize() { - return 238; + return 256; } @Override @@ -243,8 +259,14 @@ public class GuiInventoryPanel extends GuiMachineBase { x -= guiLeft; y -= guiTop; - scrollUpPressed = btnScrollUp.contains(x, y); - scrollDownPressed = btnScrollDown.contains(x, y); + if(scrollMax > 0 && thumbArea.contains(x, y)) { + int thumbPos = getThumbPosition(); + scrollUpPressed = y < thumbPos; + scrollDownPressed = y >= thumbPos + (int)IconEIO.VSCROLL_THUMB.height; + } else { + scrollUpPressed = btnScrollUp.contains(x, y); + scrollDownPressed = btnScrollDown.contains(x, y); + } if(scrollUpPressed || scrollDownPressed) { scrollLastTime = Minecraft.getSystemTime(); @@ -259,6 +281,38 @@ public class GuiInventoryPanel extends GuiMachineBase { scrollDownPressed = false; } + @Override + public void handleMouseInput() { + super.handleMouseInput(); + + int wheel = Mouse.getEventDWheel(); + if(wheel != 0) { + int x = Mouse.getEventX() * this.width / this.mc.displayWidth; + int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1; + boolean shift = isShiftKeyDown(); + + x -= guiLeft; + y -= guiTop; + + if(scrollbarArea.contains(x, y) || (shift && inventoryArea.contains(x, y))) { + scrollUpPressed = wheel > 0; + scrollDownPressed = wheel < 0; + doScroll(); + scrollUpPressed = false; + scrollDownPressed = false; + + } else if(!shift && wheel > 0 & (hoverGhostSlot instanceof InvSlot)) { + InvSlot invSlot = (InvSlot) hoverGhostSlot; + if(invSlot.stack != null && invSlot.entry != null) { + ItemStack itemStack = mc.thePlayer.inventory.getItemStack(); + if(itemStack == null || ItemUtil.areStackMergable(itemStack, hoverGhostSlot.stack)) { + PacketHandler.INSTANCE.sendToServer(new PacketFetchItem(invSlot.entry, -1, 1)); + } + } + } + } + } + @Override protected void mouseClickMove(int x, int y, int button, long time) { super.mouseClickMove(x, y, button, time); diff --git a/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabaseClient.java b/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabaseClient.java index 0f9693f2..5d5933e0 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabaseClient.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/InventoryDatabaseClient.java @@ -1,6 +1,7 @@ package crazypants.enderio.machine.invpanel; import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.conduit.item.filter.IItemFilter; import crazypants.enderio.network.CompressedDataInput; import crazypants.enderio.network.PacketHandler; import java.io.IOException; @@ -29,6 +30,7 @@ public class InventoryDatabaseClient extends InventoryDatabase