From 9dd1d45078e5aba4dc2d0edd3db242bedc4a915c Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Tue, 7 Apr 2015 22:54:06 +0200 Subject: [PATCH] GUI cleanup, mouse wheel and filter card support --- resources/assets/enderio/lang/en_US.lang | 3 + .../enderio/textures/gui/inventorypanel.png | Bin 2668 -> 2729 bytes .../enderio/conduit/item/FilterRegister.java | 9 +- .../item/filter/ExistingItemFilter.java | 6 +- .../conduit/item/filter/IItemFilter.java | 6 ++ .../machine/invpanel/GuiInventoryPanel.java | 82 +++++++++++++++--- .../invpanel/InventoryDatabaseClient.java | 12 ++- .../invpanel/InventoryPanelContainer.java | 27 +++++- .../enderio/machine/invpanel/ItemFilter.java | 23 +++-- .../machine/invpanel/TileInventoryPanel.java | 40 ++++++++- 10 files changed, 173 insertions(+), 35 deletions(-) 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 eff46cab66ddeabc9ac48c8a428559e7ce4d734a..323de29545c9c74ea480477f29cb924bcbc83b3a 100644 GIT binary patch literal 2729 zcmaJ@dpuNm8~>d#n8ie4S-DIat+X+rEbB5_%8ycGkbYI`(E1f&pDrS&hz}f-|zGNJ zjqUB|suU6%>q*tuK%77T9V-2$Rg%bs)!%tPw)ui za$sPO2c0-bgXE?jaVyt?gM!W^CYBpJDs!r+SX0*L>E{ziTdy*2gM>(lmZ2eHfsi*# zHe6ktbida)d%a1K7hb#H#H17_w~(Zb^_HswA2nk%CDNGD1{@R}G z48YDP)9*7C^WZoPvfdV4f70Hba=^qSe#d+IiX7ykedWrPK~D2*V`pAn5j}fG-6Ai~Fe00AI2>3f3;+rM*jGvO znA;UnJf)j;5PlI6x2JZS_ha+4pPNQ#yWH2hkG!rAs!6?k-5wiE37P@`&q!8Q*4xLY z2hOLLX>WP2!?YBG!V)6Yr#9Bt%)a~*1IVt?QBj5RT9!||nOMTR+od6T0@~ZbI-}ma zw6hS|(y;Xx?}~QSBKuo~IJu)0o;vGaHAK8bf&8=l4vCHm3WN$^m(6W(ng0=7|YlWs;*S6|CUE zMOP{|>M6sGLHp3?U7<&yil&eNR|sKt`wD~ez7oh($@t0V+rWCU@7}ecQ+wNf7EwJI z9%D3jbt{w`pUkxp3ouAO8AK1B>TRaT`ogs;nwF9AS?++T3 znOL7lbwS#^<|RJ=8-gKB!jkzs)V{}~!qcHOOSDi`Rn1E%rikz;J7M%L(H)N6=$lHaOf3kPc2vie6SVf_( z+G>~84H@$E#mPh2yAaSi-T;j3OMpOHw=9U$1a6V%AXxvr&yOEAz~__%SAMv{lf?sY z{yKkcb4n1B^J%~ru*nwVC3z=};SznD+I9{qXR9nD6hJd-22!e0!91*J#^-&vvSD(w z%cu#Aj*h}?El)_DSw4}(XpnKW?q}0hwNM$5S z9Xnj80_N130GTr(3C!gI<04mbE<{^_SG)P}=cPK(ltXpDYu1cWo~Z+{fhC9#4@Tc8 z{U;f&fkeuy-(fEy&Rnu)KG%CBg@J$^29|-0K`Gg~4yk$|VO-~J{)_)7=O7pJBO|+y z(NDD*WZqHn3k)opdfo4So)H~MU&!@L+`4P-I`f)`hzMqLx13lmRW_oOn#WWtMFh|+g1?)C;@4vN@K(-ut`W(` zj@%OqDg`QJ09JJyRyO;%J;vj8fGocUSboDwu}#K5u3ai-D7q z-HK3=YKD7OpL;}gn`v*|uUix;ht6rc1RIdqo~}yh^*4DAvk;<#n_!bQzeANTD=?IQVMwI z;H^Y0=JWZ}>f_tQvk(^JKVt#nkJmiL9V5u(z=8V8pDZ5VFzc-grQeTFFoJl2=0~&4 z9#$F&(NVBP;8Oo(<$p*2Pg12vm=sHf6aje zABWqVj#JJu>z!A1r%*2V>*2&hS^<#Hc5GTR>Mo6aQfO62;(t@}x<)ZMz zOJF{0U>840If!e7bN|hisvnrzriG4uj1azw+b2>`B?3EptHk&Dx+(7z>)jX=>uW0s z%hTD|$?l@V_Eeh}-Z}(r0WF+ge@np4bD-9n=K^r4SexLgG|6u`tEQ!OtciFd+R68R zQrBiW+q0*qr_4hy^uW!O(c>K*9r3`%wYcHztZ=fYw5)IHReyhXdwct>G-;fAP4wYQLF-fxG6a&``lCYq_Y`pPo8dmf$)2}{Dv7cXAG%~Th1 zVLn&lR0)^rQ}>lU4=wX#20P8cTXc5#{?vki8(KSH_(pK+T!m-P@^VeCd3@p0QcP3) z!kfX-+M1fh_w#|LBO>xlHJcSy!1Bt<(#(K~q;+~kuh-hbg9j`Y%bQ62Ir?oUA+LXU zxbFvP`Ni=L6|XRMeSJdE(R2;c?2rZFnNTRq9);vCyQ**{rkD3NZ(a-D{n2WP1X?>K VO!S6bG)Be$5Nw@nDi8Wy_!kTch>!pP literal 2668 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 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