From 29fd49cc017e44e53bd909853e0611517331632b Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 30 May 2015 03:34:28 -0400 Subject: [PATCH] Add button to sync inventory panel search field with NEI --- resources/assets/enderio/lang/en_US.lang | 1 + .../enderio/textures/gui/inventorypanel.png | Bin 3716 -> 262950 bytes .../crazypants/enderio/gui/IconButtonEIO.java | 14 +++++- .../enderio/gui/ToggleButtonEIO.java | 16 ++++--- .../machine/invpanel/GuiInventoryPanel.java | 41 +++++++++++++++--- .../machine/invpanel/PacketGuiSettings.java | 8 ++-- .../machine/invpanel/TileInventoryPanel.java | 12 ++++- .../java/crazypants/gui/GuiContainerBase.java | 18 ++++++-- 8 files changed, 91 insertions(+), 19 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index bbf039ca..210866d6 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -534,6 +534,7 @@ enderio.gui.inventorypanel.tooltip.addrecipe.line4=items for one crafting operat enderio.gui.inventorypanel.tooltip.addrecipe.line5=Shift left clicking tries to fill the crafting enderio.gui.inventorypanel.tooltip.addrecipe.line6=grid to the maximum. enderio.gui.inventorypanel.tooltip.addrecipe.line7=Right click a stored recipe to delete it. +enderio.gui.inventorypanel.tooltip.sync=NEI Sync enderio.machine.tooltip.configured=(Configured) diff --git a/resources/assets/enderio/textures/gui/inventorypanel.png b/resources/assets/enderio/textures/gui/inventorypanel.png index 207b2231387bdbe7a7fc4438b957875c350d1063..6c58861104fc5e6cffd3646a5f5a3cc55114417f 100644 GIT binary patch literal 262950 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�G%M?o|1q3D z#V$Xzhd?R<7=TpxxETVPz-LzP{r6aN0VbMy&Vbtii{N(opdADz;Z$1wBZxZM$Xvc6P-%& z&$3)lj53smDQHS$j9b@Tf}C|YIu2aq!*W3##nitDc_7jRmcxmr2cPbI;;d~KEyeA# ziMs$nZ^E<{)ony*2Z2rkUp@TR*J8~D=)Be0n8e0_itlV$q8J1c6X1(LVr1L^f$|W* z0FgC=US)KzYiNoIoHkfy9G=;ul~7Q-lo(wh$;Lfy4%YN?*)^ zMr#NJ5ughYM1?pAgb;Y!FP@w$+gt#XRg8fl!4?7)B!B^^V4;&`2p9qw07HT;1S&`% z(SV>#3AW+7TS3lb83IlcNMr!SWwPvEQ%;r=Ncj% z41oJ(goY5vi~t58GqebXfcpfT9S|HJA5TqB2D^gRIZP@TInl(*%qNePgQIENJ?pFi zkZj6>l_sz zF2F?dSkZZ55sF@d=nsJu1TX+8;BhMiicSCnQ1lW+e+Z-?fB{GWk6R&7bOIQFqL(20 zLm&kK3_uEa+zNrB6Tkozy#&!80x1Y!08+r?)>0Dq?^j=I#-9sNA_N$N5)~#{fk09M z7=Wb2xE=x}B7gxXQDKr52qYzd0Z2-W>mg7g0?sZLAPWW9__Y$`L_e+YiRM%Gvn(H6 z_7Wz4g(JX{!G$X_6ox=C2`~mw%yL6(`ve}@x-eVGxc~+w#=wwZ3jqfRn65y-RFMI} znhwqB>1oyP#QT*=(t!X3f(e)wKyCN#-N9E73jql9oj^Z+KTI;^|A8_+Ihp_g2sl8% zUpF042^Am!0SG_<0uX=z1Rwwb2tWV=g(mRK$@?Cu^jv^KmmbPP00Izz00bZa0SG_< z0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*zK3HCTIW*HTPt=@UJ~(CuxC{bO1e!WToo}DhE9SKKbKZ%qb6Pzm z&lrHT6uIA30_}=4Gc)6=j()w`I{Qy#b&LVXiY#)SAW)#n-@&UNx?=!3uoF>c0%l!2 zSs=4ZXupm7Q4zIX>-r%5NK^7}77Xmdg3}OyKp6?p0w`mtlBW&=Yj6JN&+K}tb1p!F zR>3;CCr+GLcihXt&Ye5e_U+qa-|KOt^Y46+Gd3@@dZBcjLa#MSs9SFoFfB}e0%5z;%3&J0F*=3ihE3dq= zb=T{!zn-Yo;g=;s{Bb|~OTVmk9(bP`7#L8ezWr>+d5^kP-;LWPNIW=P2Cx`_9!k;Q zJ(4%Q_YE({rt%x{NxB|>`SPaszTxHg+I=^wrG*t$udTF_NFv|pRDo^V(WhHp9a<-# zo2pjNm)-#Q-<($IX-hQ`R9y=g z+Bl^C?OV^TGY)a(R^YmJ_frb8~a5IapVxsr+4wk;)&9D3$@p`YoEZd_j;!8uDiMR(fx< zKW*g~ou%3T_|!MlJFdS;4e6fj4*lj|Szc82!2xyV`R91^3#5eM$?yEDlFt6`@Bh_= zcb4<=t_HxoMYGC&*78Mf+i3(D6MyA@^UXJVHadR!-`9C~`)}T;7FSkOW8v6NPBt=>?}E6b(LU($?u4M5z{(zt1?8&&<_pHDWMdc=BUsIHb*o2s^| zRDGzX_iJit_JZ2DX_H!B~m{SeCU0zyN^+rPvmMOKM<7xx-);0PnwX!&`Qy5Si z8pCRCc2=q3VV(Ypl859g5B%{u`QA+XyA!6uiV-kxeu)da&MPZuKj^+Q`obN*@g8+b zSAJ<3NaYW@E=XQ=<0hLw819@4@HhW-MlHSd6FrDBtcGgK>I>hVR-5%#o8NxdwbezX zbM7?;^6=X>2yM7ueQ3P)dlQq*#l;m}=Z4j?u7>mH&#T7ps2Us@QVYvVN?QvxvT3iWPZ|dtBs!^}683MJc8jTTMp%>KR(qdb#**QLOZ|#nUA8XDn>k)EoRO*c(Z4efe z7>LD%MJ;<(4G#^e=1@be&c3Dl(|W57LtR(=1#J|>5UkA4t5t1q2Gx=g8+&WI25AQW zq7qx{8m#{^5OqE0))N?5TF_7XpneJI?eIqZTrI0P{d^=1;;%oZ{rvkGvP{!!03=UA zMj-U9m=wa7CdO+Ydf>Cod0p9cQK(w2uHWh(wI=_GkAI|gWa6{URo#+USy@%9x+U?{ zr$1&*ez*K)RryW2-p_(2j%_>ww_pFx)`d?z|2;LJUm(A;ueb34S>Y$?A|LTI48JPN zG=tU&$h5*d_250Vq56={ZBwmC+uw3HK56zp0pZLpWO}7M&KXhLv@^8EUFPei|^6`i5$~TThy=J`I;AGbFd)2#u z_qFB(#Qh|w9g6(VVPEGITui_3Y5KbW-f|Wo#t3-ht?Ym0*xj`cf9kI@lmEA$ys!4* zhd*asezyvo7Eadk)9P2D`}IV@T2mGl$;#FE>8GD=;q(}(zNZ;w07N;zRkT|EPyX2- zWh?*V_Qn^iW*lLCAs`hiW#w(T8sBouEq&4VVj_8@+0Xou76kf6Kw5xt|Du$NDLWRl_jhRxU#WpHiW6Dx?<)Cac@+Hh#k)q06YDKf_O$w@)YBu0!smo{w72T^1_? zd)ZcAdTQ;)q&MqkZmLN|y zA)6;^`Gz8RpGw=p`oYJo>o_D z2JzkXmti$m>XD>6_|P@Ble6=elhhkB8+Tvy@u4YV780WMB(O+gxm`@g?z74twZE7B zjNONWCon*e1K8i5y6obFiaQn;_rU-wdbZf-QD6-}zp1_AM6pfIs3M>~#?!T!3!X{# z_Rwi*<1yYx4KSZv`pGx)@s- z+Q4orkI@*;rHq=)5C>hdjd|1oj*hGawBORz)zwOdWIsqMYiz_nGA*dxkH};(m`px1 z$E^7M`;*Ro_ljr{4MWL>v4SzHEmz0C?IqcN{%iH3Szh8$^wOYcF{Vy%3|lkMBM{WT z(4R($%))2NBmt}W-Me=Ql8etmCRWs#Oy&|s{-s^`%;yj9-X(c^drN`5(ye8~{$KK9 zF`e3gbUB{kk%HE=CTC|)iO+74kCTsq1L{R7e|H6wHii};k?+f^c#S9ktlS}jlLYp< zTW#<`$kWl=BNxo~K)-kH+I2|{fmui$-J?FD4+p_Y#bCo_;mY@XznwdGUi9#YGxeZW z3YF0?QmT`alM-93r>E!lSNPepx7q-}S1U7by&oue4$Jos1+r_w)YOy(_r)LFaa@sU zBuC0|aV&$>hQx}Fqmy(vQm+Cn)B#9(H#+)&LKI!yrKhJWbxri+taJL?rD$sha#6(B ztP3oEqhCN?V0Cr%;*Wu#_JsrABN{|~B~@(|CnlJ=x!;yrPk}sai_#JM?H)0p< zFtB|oy2@o2#GAjwZC45zQTLJq)LCVyd`_ip7n;HA21~p4aWE~B>w9~9x4+d#0O{U~ z`#ejayL(y|F}Y;2vge&&Uk6KrBo8v@D&%2HrYP4WnJ@E?I9b+%GL1X^0aCBuM#AO? zh-fBGrB(W6@Mt*9d>?T8wC;vgVE!BMCK7gli7W2TT7Hi~AhG6zc>6-tSkksm8DNrx z2aI!zaFD!)510!-I7oFsQZ9krE#Ii#TEf6K&qs>KOol$l1W)%H^a8Na22s5Pzd|{aI6%sR zIm(*NIzCQz{DKE}QLC3WTfjXI61)Eb>?J`fcdjS(8xq{N)B_{>5irn-z&;uYfk8^7 zc1%mT_DsN&d^7G>^uStZ{!HYEB2Ze8B|!?l7y@W@!UsrDjIv$tPaSqcGG%DlwC&oj z;p#Auv=z+b!SGVgJt)ck#ye$?uAR}R?PoIw8 zO~LeJnDYBRPWim%|Gb&nHY_vpxjXi;=;`^e5t>a-lw_xG)jl-3B&=?bi=2(lh2XCL zO=uO}{-?vB0gwtHc`E-UPbcW7$NL%8-{DSv;rACZ@;8#8F1S0)Z{mme?P4N%Z$8k}rVG@s)lCcm&`GSqm5P?XJ!PHl+ya_S?SsP5S${LS& zqxOrDpsY(Ey0*9OCXzoXYF5M66aW*)<|1hTc_cC@v=jLsZ~ixX0fpX&}hM3r|q3I4Gp?u<_MD5RJSEZ zq^}u5{Z#AS z+dmKobKDM;rU69D?LI6?#&$!I%_cT$FrOk{Us18AI*bq|@c@dPIL}SIWUiX28cVgv z*@`-CQvzFUwR%Y`RMxYyt1}k@#sWay4wWFB5G)%;`Y(g>zQUk|c2GvaI{@?%JJy9g z%3nQ5)eLT*V2Yx>OvWlukg}VNrlD!{0K(6Kui~o!*|0qGTIv7z1B_K7)&)nZff^(t z842RHKn?Tv+36O$;9ci`fwmn#e!PmC3^zdnhAbhipB8WGMa6|DKuw38Yk8)z7SikY z({dYa&NlTrIIdVWRI^-HA6CX$qc0oQP}orx%5K!}&<0Rj{l_>+pZedq`k(OKUm=(T zQ+bawggnpw4NCtyfbncnTq}{5WYA)i{l2`(gmn2GfF3p5xRQ43$DF|DDdf%|w4HQ( z4fww=teUD7)y%cIT)(u`O<|TFYl;#@y&OPTT{F1HrzC6dib>|?01|G#giC(!P4ixR>((vr_06wK8Kjq)Fa}LSyv`eL=GGJw{f+B&?%ctU zkdVSFC*i>41wpxGe!jxU*!cJySpwX@qc)imF;3To<{k8|@rDPhgANLs-&vIM$gzg^g!AV=Dk{9x<}=8azn z>&b7GwY6^wW-JX5J4SbycC4Tx&nA<<%fp7?t+p`D$*MDW4pG3{*tlqM)lC{e-v!0A$A0H-BcLr_(V4Qenu+HM7m|im2X@%iMKCk|f8v)TlnG@%`=YPB2Y9VBz8kvh? zQnUM?=>#}IipLgxth~U9k-1%KrvcTwUt$Mqpv^umD-;p8H-{ofw+rq&U<=D_dSN^_h}&dM3=@sjZ;F$^e&~DCdPy#ZMK3>-IlV=|Z4!%8EiNpH`B@KBM7_9U6(>H- z`2^JS&_XUVXo`JrKp?4>Hm6bO+_t&g3M8!*-BgX6NfCwhxG=jNzv*(Evnb;UmOf1C zz;pVTmaWd@=ZtcPJ{iT8*oP;a$?WBF?JCo=*BgsXZuUqWissK}gtNrce-fWk<~$GB zYTmf}D&WY$hflNHQnv9d6UVBPCfcu14s7zWw#qu7dP~{2#>JsvtH<6=n67ZVV6-v6 zd|34glueUq3n-Mj<)@|iXYX@J39~_BVe<1P!F5F=MY1DZSVqGY z+fJck#xB7L1EgKk9W6x9V-<-X?7ZsBG^oXw?Ru?mz3~k=eW~Zob!#D;1q-+ix% zx{9=`!g5DnlfU`WlGx2jC|<6klbH>Iwl`CKUmi(Gnwcnj_*Z`1`J{09w((Fuy1!LK zUUOD*=VHd3D^Ym;{1lOcl>FnRWtkeu+0E_gMm@ZW-|UGI!`KLlq{=9h%9a&q_4ykG fSmPB)$3>`}D7Bv2jM&cAiD-Sq=5XmD!nJ<_bxXe| diff --git a/src/main/java/crazypants/enderio/gui/IconButtonEIO.java b/src/main/java/crazypants/enderio/gui/IconButtonEIO.java index e92d2a5a..747c6172 100644 --- a/src/main/java/crazypants/enderio/gui/IconButtonEIO.java +++ b/src/main/java/crazypants/enderio/gui/IconButtonEIO.java @@ -24,6 +24,7 @@ public class IconButtonEIO extends GuiButton { private int yOrigin; protected IGuiScreen gui; + protected String[] toolTipText; private GuiToolTip toolTip; private int marginY = 0; @@ -46,8 +47,19 @@ public class IconButtonEIO extends GuiButton { } else { toolTip.setToolTipText(tooltipText); } + this.toolTipText = tooltipText; } - + + protected void setToolTip(GuiToolTip newToolTip) { + if (toolTip != null) { + gui.removeToolTip(toolTip); + } + toolTip = newToolTip; + if (toolTip != null) { + gui.addToolTip(toolTip); + } + } + public final Rectangle getBounds() { return new Rectangle(xOrigin, yOrigin, getWidth(), getHeight()); } diff --git a/src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java b/src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java index 9b37fca7..979f8226 100644 --- a/src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java +++ b/src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java @@ -1,6 +1,11 @@ package crazypants.enderio.gui; +import org.apache.commons.lang3.ArrayUtils; + +import com.google.common.collect.Lists; + import net.minecraft.client.Minecraft; +import crazypants.gui.GuiToolTip; import crazypants.gui.IGuiScreen; public class ToggleButtonEIO extends IconButtonEIO { @@ -8,9 +13,8 @@ public class ToggleButtonEIO extends IconButtonEIO { private boolean selected; private final IconEIO unselectedIcon; private final IconEIO selectedIcon; - - private String[] selectedTooltip; - private String[] unselectedTooltip; + + private GuiToolTip selectedTooltip, unselectedTooltip; private boolean paintSelectionBorder; public ToggleButtonEIO(IGuiScreen gui, int id, int x, int y, IconEIO unselectedIcon, IconEIO selectedIcon) { @@ -64,12 +68,14 @@ public class ToggleButtonEIO extends IconButtonEIO { } public void setSelectedToolTip(String... tt) { - this.selectedTooltip = tt; + String[] combinedTooltip = ArrayUtils.addAll(toolTipText, tt); + selectedTooltip = new GuiToolTip(getBounds(), Lists.newArrayList(combinedTooltip)); setSelected(selected); } public void setUnselectedToolTip(String... tt) { - this.unselectedTooltip = tt; + String[] combinedTooltip = ArrayUtils.addAll(toolTipText, tt); + unselectedTooltip = new GuiToolTip(getBounds(), Lists.newArrayList(combinedTooltip)); setSelected(selected); } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java index a51958cc..da2041e6 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java @@ -17,6 +17,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import codechicken.nei.LayoutManager; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.fluid.Fluids; @@ -24,6 +26,7 @@ import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.MultiIconButtonEIO; import crazypants.enderio.gui.TextFieldEIO; +import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.gui.VScrollbarEIO; import crazypants.enderio.machine.gui.GuiMachineBase; @@ -51,6 +54,7 @@ public class GuiInventoryPanel extends GuiMachineBase { private static final int ID_SORT = 9876; private static final int ID_CLEAR = 9877; + private static final int ID_SYNC = 9878; private static final int GHOST_COLUMNS = 6; private static final int GHOST_ROWS = 5; @@ -58,6 +62,7 @@ public class GuiInventoryPanel extends GuiMachineBase { private final DatabaseView view; private final TextFieldEIO tfFilter; private final IconButtonEIO btnSort; + private final ToggleButtonEIO btnSync; private final GuiToolTip ttRefill; private final GuiToolTip ttSetReceipe; private final VScrollbarEIO scrollbar; @@ -103,9 +108,18 @@ public class GuiInventoryPanel extends GuiMachineBase { FontRenderer fr = Minecraft.getMinecraft().fontRenderer; + btnSync = new ToggleButtonEIO(this, ID_SYNC, 24 + 233, 46, IconEIO.CROSS, IconEIO.TICK); + btnSync.setToolTip(Lang.localize("gui.inventorypanel.tooltip.sync")); + btnSync.setSelectedToolTip(Lang.localize("gui.enabled")); + btnSync.setUnselectedToolTip(Lang.localize("gui.disabled")); + btnSync.setSelected(getTileEntity().getGuiSync()); + if (!Loader.isModLoaded("NotEnoughItems")) { + btnSync.enabled = false; + } + tfFilter = new TextFieldEIO(fr, 24+108, 11, 106, 10); tfFilter.setEnableBackgroundDrawing(false); - tfFilter.setText(te.getGuiFilterString()); + setText(tfFilter, te.getGuiFilterString()); btnSort = new IconButtonEIO(this, ID_SORT, 24+233, 27, getSortOrderIcon()) { @Override public boolean mousePressed(Minecraft mc, int x, int y) { @@ -121,6 +135,7 @@ public class GuiInventoryPanel extends GuiMachineBase { return false; } }; + scrollbar = new VScrollbarEIO(this, 24+215, 27, 90); btnClear = new MultiIconButtonEIO(this, ID_CLEAR, 24+65, 60, IconEIO.X_BUT, IconEIO.X_BUT_PRESSED, IconEIO.X_BUT_HOVER); @@ -200,7 +215,7 @@ public class GuiInventoryPanel extends GuiMachineBase { if(view.isSortOrderInverted()) { sortMode |= 1; } - getTileEntity().setGuiParameter(sortMode, tfFilter.getText()); + getTileEntity().setGuiParameter(sortMode, tfFilter.getText(), btnSync.isSelected()); super.onGuiClosed(); } @@ -234,16 +249,21 @@ public class GuiInventoryPanel extends GuiMachineBase { updateSortButton(); btnSort.onGuiInit(); btnClear.onGuiInit(); + btnSync.onGuiInit(); addScrollbar(scrollbar); } @Override public void actionPerformed(GuiButton b) { super.actionPerformed(b); - if(b.id == ID_CLEAR) { - if(getContainer().clearCraftingGrid()) { + if (b.id == ID_CLEAR) { + if (getContainer().clearCraftingGrid()) { setCraftingHelper(null); } + } else if (b.id == ID_SYNC) { + if (Loader.isModLoaded("NotEnoughItems")) { + updateNEI(((ToggleButtonEIO) b).isSelected() ? tfFilter.getText() : ""); + } } } @@ -325,11 +345,22 @@ public class GuiInventoryPanel extends GuiMachineBase { } } else { tfFilter.setEnabled(false); - tfFilter.setText(""); + setText(tfFilter, ""); fr.drawString(infoTextOffline, tfFilter.xPosition, tfFilter.yPosition, 0x707070); } } + @Override + protected void onTextFieldChanged(TextFieldEIO tf, String old) { + if (tf == tfFilter && btnSync.enabled && tfFilter.isFocused() && Loader.isModLoaded("NotEnoughItems")) { + updateNEI(tfFilter.getText()); + } + } + + private void updateNEI(String text) { + LayoutManager.searchField.setText(text); + } + @Override protected void drawFakeItemStack(int x, int y, ItemStack stack) { FontRenderer font = stack.getItem().getFontRenderer(stack); diff --git a/src/main/java/crazypants/enderio/machine/invpanel/PacketGuiSettings.java b/src/main/java/crazypants/enderio/machine/invpanel/PacketGuiSettings.java index 4a36f2fe..0493a968 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/PacketGuiSettings.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/PacketGuiSettings.java @@ -13,15 +13,17 @@ public class PacketGuiSettings extends MessageTileEntity imp private int sortMode; private String filterString; - + private boolean sync; + public PacketGuiSettings() { filterString = ""; } - public PacketGuiSettings(TileInventoryPanel tile, int sortMode, String filterString) { + public PacketGuiSettings(TileInventoryPanel tile, int sortMode, String filterString, boolean sync) { super(tile); this.sortMode = sortMode; this.filterString = filterString; + this.sync = sync; } @Override @@ -64,7 +66,7 @@ public class PacketGuiSettings extends MessageTileEntity imp TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); if(te instanceof TileInventoryPanel) { TileInventoryPanel teInvPanel = (TileInventoryPanel) te; - teInvPanel.setGuiParameter(message.sortMode, message.filterString); + teInvPanel.setGuiParameter(message.sortMode, message.filterString, message.sync); } return null; } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java index 1ce06d53..ae38a5da 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java @@ -54,6 +54,7 @@ public class TileInventoryPanel extends AbstractMachineEntity implements IFluidH private int guiSortMode; private String guiFilterString = ""; + private boolean guiSync; private final ArrayList storedCraftingRecipes; @@ -224,12 +225,17 @@ public class TileInventoryPanel extends AbstractMachineEntity implements IFluidH public String getGuiFilterString() { return guiFilterString; } + + public boolean getGuiSync() { + return guiSync; + } - public void setGuiParameter(int sortMode, String filterString) { + public void setGuiParameter(int sortMode, String filterString, boolean sync) { this.guiSortMode = sortMode; this.guiFilterString = filterString; + this.guiSync = sync; if(worldObj != null && worldObj.isRemote) { - PacketHandler.INSTANCE.sendToServer(new PacketGuiSettings(this, sortMode, filterString)); + PacketHandler.INSTANCE.sendToServer(new PacketGuiSettings(this, sortMode, filterString, sync)); } else { markDirty(); } @@ -295,6 +301,7 @@ public class TileInventoryPanel extends AbstractMachineEntity implements IFluidH fuelTank.writeCommon("fuelTank", nbtRoot); nbtRoot.setInteger("guiSortMode", guiSortMode); nbtRoot.setString("guiFilterString", guiFilterString); + nbtRoot.setBoolean("guiSync", guiSync); nbtRoot.setBoolean("extractionDisabled", extractionDisabled); if(!storedCraftingRecipes.isEmpty()) { @@ -314,6 +321,7 @@ public class TileInventoryPanel extends AbstractMachineEntity implements IFluidH fuelTank.readCommon("fuelTank", nbtRoot); guiSortMode = nbtRoot.getInteger("guiSortMode"); guiFilterString = nbtRoot.getString("guiFilterString"); + guiSync = nbtRoot.getBoolean("guiSync"); extractionDisabled = nbtRoot.getBoolean("extractionDisabled"); faceModes = null; diff --git a/src/main/java/crazypants/gui/GuiContainerBase.java b/src/main/java/crazypants/gui/GuiContainerBase.java index 5dafb00a..bb4e07f3 100644 --- a/src/main/java/crazypants/gui/GuiContainerBase.java +++ b/src/main/java/crazypants/gui/GuiContainerBase.java @@ -64,8 +64,8 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe @Override protected void keyTyped(char c, int key) { - GuiTextField focused = null; - for (GuiTextField f : textFields) { + TextFieldEIO focused = null; + for (TextFieldEIO f : textFields) { if (f.isFocused()) { focused = f; } @@ -98,7 +98,9 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe // If there is a focused text field, attempt to type into it if(focused != null) { + String old = focused.getText(); if(focused.textboxKeyTyped(c, key)) { + onTextFieldChanged(focused, old); return; } } @@ -120,6 +122,16 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe // If the key was not captured, let NEI do its thing super.keyTyped(c, key); } + + protected final void setText(TextFieldEIO tf, String newText) { + String old = tf.getText(); + tf.setText(newText); + onTextFieldChanged(tf, old); + } + + protected void onTextFieldChanged(TextFieldEIO tf, String old) { + + } public boolean hideOverlays() { for (IGuiOverlay overlay : overlays) { @@ -212,7 +224,7 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe if(button == 1) { for (TextFieldEIO tf : textFields) { if(tf.contains(x, y)) { - tf.setText(""); + setText(tf, ""); } } }