From 4561199569a14d2e50b70774f97075d5e847edb4 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Mon, 13 Apr 2015 23:23:21 +0200 Subject: [PATCH] refill button --- resources/assets/enderio/lang/en_US.lang | 5 ++++ .../enderio/textures/gui/inventorypanel.png | Bin 2729 -> 2791 bytes .../machine/invpanel/GuiInventoryPanel.java | 24 ++++++++++++++++-- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index aa7425a8..d02593aa 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -499,6 +499,11 @@ enderio.gui.inventorypanel.tooltip.sort.count_down.line1=Sort items by their qua enderio.gui.inventorypanel.tooltip.sort.count_down.line2=Starting with the highest quantity enderio.gui.inventorypanel.tooltip.sort.count_up.line1=Sort items by their quantity enderio.gui.inventorypanel.tooltip.sort.count_up.line2=Starting with the lonely ones +enderio.gui.inventorypanel.tooltip.refill.line1=Refills the crafting grid +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.machine.tooltip.configured=(Configured) diff --git a/resources/assets/enderio/textures/gui/inventorypanel.png b/resources/assets/enderio/textures/gui/inventorypanel.png index 323de29545c9c74ea480477f29cb924bcbc83b3a..b1cb2228307eb983049210ad52b683210d1a259e 100644 GIT binary patch literal 2791 zcmai0dpMM78-HfTph0FuMoE(7R1zy^V?#|@MwxNQGW%Jz)^6G~%}iomY~-+%$Yh;` zjEo3V7&B>O9aD~L+K_F?nVfPM``Y#GcXjQx*Z2POKJW89_kI8F-*Z2|`;8_#9h1ZC zzyJW`2*>SC0f2yq2p}y9zq~HqI|~4YL$I@TrT0zz#tT&KQK}zYeEq>QIth=LLnwu3 zIY5|&Q%{}NAqw6ed89B&!}SLVNd=EmRCUajyT|=|4HF~vJBwWGyT&{35%)k;{mHh) z&-b)kUskvOhIaYff>=!eQp)AuebLrzK^smpywbb{l5bhrZ8~f!Mi|70`u6$uUz|pT z{wfp(xUGuT0DWOxmtwDpgQo|cv^W(OgtR&@dzhj@FA50M0A!0xXjtx@x6sqmlK>CK zrI;SKbz|N{l#obyvC0M)F+jhlisM(DZ0O+U!PY;i;+v!yJzCYhyljqum%6%0dH!tE zcITcDY!E=!SR#IM z%hk3pX8=xKG@mw;vW7FZm3E8;xEmI<$&n`!QkI|8h>VT`*s zNy+E?YkBRN2{Z(>RmE4ap)}4A^OWeKs1xr?2t2!ZU56O%Sy_lSY z*TMt_m6>Vd}= zS5jAOCTwW#+Ec-1pTb2>S;h~!Q@`M5?g!95IY5{=#b?S~x0x?bJ^MzET2-=__v^^c9~~yngtZPeepPmZ zi{x^-TcGR`Wd0M)%nx1uWH2=24p(-nqZTF{507oJBh%BwdX}@=-Ejm!y+&!re8$M& zx=C!e&o0v!3h4%QZEf+IDrA6fNYuO;~L&FDD8?+l=dgm%R#64(&dE0Ml z4w+^_i?;%Ts17I>j^F3)CE0?ZP*?(^`{pm9U_`r(bCT%xI(4fX) z6WDVUe#bxv0?tF?(t`5kdy8mRS5jJS7eZ7RxQHH51g!TM$QuZTtiXTM2;I@%vw>)Y z*dcSlSa#NO>Y1cE0<`P_sos#fbW*;*5Z5UM^S>)c8BF7N0BV3ETFL`|hzCY?YfZ}* zIX(P6MY31sK}E%<)EN<{w$rS(tznXURdr)AzH{9hOigaJoU2wc3Oi>?O;r-mExVhV zVzh1%gfdtO1ng2i7|bDoTJC0qg1;ib5S=%ej)M{V!s{7QP-p+2SZ9I7OPPVR;NdjB zJP$~K_H0q#`r>Yj;YTnLPchI6>}(3rzG?fu1FBs>(rL7TJ^jV3EtXH&dwCP+uMe(Q zbn7-BhNUPLYia^6(`W@5S2`TqvfE~;Ea~!B+rr`(knRD=`S0os#Afqq;MUculBafA zZ!@IrJ}v|WIE9oA%p2$MVUuAeQle@Dn|%Vlkk5lW z0!WJ2GAtRN!5a56~<&W{+3G z)$Tz>a5gYF_)KE?!-pNJxqpk&pC<5u!mSYk|ML_-I^ifNE-o$%Fs9AqZKYas+dL*; zJAxJ*O)0-EXG}jhLbU*ZU;zHb!N=3>XL#vSf-kNWc0`#sbGS6Avl>|HGV$Ce+rmT) z8bu4~5@o)>^GglvKaqUw=_AM~R%RRLgE*G#)AunSFBoG=Qu&cmySLm$%(06m-5jnr`oi)&lW0po21c zfSOlugrCEmO@BAIE=N8{@e zJ|SzTNmd3SLrW%_)X;GI+wfm^<6EBMpoHv`}e*b^6_Jz`W{_gYT8oKF~(b!e-%}(v>3VsaTebH=V zk~f*n4)2$xS4$1FRXJbS&JS6N2nr)<=N@jJYo;+%{nre3uMLd$H8mCJV)H&l z)$|#La!@af$qeeZv(;=YJbYd>&%AP}KZ!&BIxR6apr%fsg35Z2U79gibUdI_`I}eN zTz}xyPdWEpcZ(C;aIEmLvZblo6*unuy4bnlBwSPgK$`E?uXpY6(T&mB_@xB|dnY^2 IXO!?i0D2Oowg3PC 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 diff --git a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java index 8ec1acbf..1b910b94 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java @@ -36,6 +36,8 @@ public class GuiInventoryPanel extends GuiMachineBase { 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 Rectangle btnRefill = new Rectangle(85, 32, 20, 20); + private static final int ID_SORT = 9876; private static final int GHOST_COLUMNS = 6; @@ -43,6 +45,7 @@ public class GuiInventoryPanel extends GuiMachineBase { private final TextFieldEIO tfFilter; private final IconButtonEIO btnSort; + private final GuiToolTip ttRefill; private boolean scrollUpPressed; private boolean scrollDownPressed; @@ -98,10 +101,17 @@ public class GuiInventoryPanel extends GuiMachineBase { return !getContainer().getSlotFilter().getHasStack() && super.shouldDraw(); } }); + + list = new ArrayList(); + TooltipAddera.addTooltipFromResources(list, "enderio.gui.inventorypanel.tooltip.refill.line"); + ttRefill = new GuiToolTip(btnRefill, list); + ttRefill.setVisible(false); + addToolTip(ttRefill); } public void setCraftingHelper(ICraftingHelper craftingHelper) { this.craftingHelper = craftingHelper; + ttRefill.setVisible(craftingHelper != null); } @Override @@ -120,7 +130,7 @@ public class GuiInventoryPanel extends GuiMachineBase { } @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + protected void drawGuiContainerBackgroundLayer(float par1, int mouseX, int mouseY) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); RenderUtil.bindTexture("enderio:textures/gui/inventorypanel.png"); int sx = guiLeft; @@ -128,6 +138,12 @@ public class GuiInventoryPanel extends GuiMachineBase { drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); + if(craftingHelper != null) { + 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); + } + long time = Minecraft.getSystemTime(); if((time - scrollLastTime) >= 100) { scrollLastTime = time; @@ -166,7 +182,7 @@ public class GuiInventoryPanel extends GuiMachineBase { fr.drawString(headerReturn, sx+7, sy+72, headerColor); fr.drawString(headerInventory, sx+38, sy+120, headerColor); - super.drawGuiContainerBackgroundLayer(par1, par2, par3); + super.drawGuiContainerBackgroundLayer(par1, mouseX, mouseY); if(getTileEntity().isActive()) { tfFilter.setEnabled(true); @@ -292,6 +308,10 @@ public class GuiInventoryPanel extends GuiMachineBase { x -= guiLeft; y -= guiTop; + if(craftingHelper != null && btnRefill.contains(x, y)) { + craftingHelper.refill(this, isShiftKeyDown() ? 64 : 1); + } + if(scrollMax > 0 && thumbArea.contains(x, y)) { int thumbPos = getThumbPosition(); scrollUpPressed = y < thumbPos;