From a65b3d2cebf8e7ba33814037f518488bb61ec47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salom=C3=A3o?= Date: Wed, 24 Feb 2021 13:24:04 -0300 Subject: [PATCH] fix interface terminal GUI --- .../implementations/GuiInterfaceTerminal.java | 26 ++++++++---------- .../ContainerInterfaceTerminal.java | 2 +- .../textures/guis/interfaceterminal.png | Bin 1928 -> 11018 bytes 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java index 8b9f22651..bfbdb0658 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java +++ b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java @@ -79,7 +79,7 @@ public class GuiInterfaceTerminal extends AEBaseGui final GuiScrollbar scrollbar = new GuiScrollbar(); this.setScrollBar( scrollbar ); this.xSize = 195; - this.ySize = 222; + this.ySize = 236; } @Override @@ -89,16 +89,17 @@ public class GuiInterfaceTerminal extends AEBaseGui this.getScrollBar().setLeft( 175 ); this.getScrollBar().setHeight( 106 ); - this.getScrollBar().setTop( 18 ); + this.getScrollBar().setTop( 32 ); - this.searchFieldInputs = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 104, this.offsetX ), this.guiTop + 4, 65, 12 ); + this.searchFieldInputs = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 16, this.offsetX ), this.guiTop + 18, 65, 12 ); this.searchFieldInputs.setEnableBackgroundDrawing( false ); this.searchFieldInputs.setMaxStringLength( 25 ); this.searchFieldInputs.setTextColor( 0xFFFFFF ); this.searchFieldInputs.setVisible( true ); this.searchFieldInputs.setFocused( false ); - this.searchFieldOutputs = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 104, this.offsetX ), this.guiTop + 18, 65, 12 ); +// this.searchFieldOutputs = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 104, this.offsetX ), this.guiTop + 4, 65, 12 ); + this.searchFieldOutputs = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 94, this.offsetX ), this.guiTop + 18, 65, 12 ); this.searchFieldOutputs.setEnableBackgroundDrawing( false ); this.searchFieldOutputs.setMaxStringLength( 25 ); this.searchFieldOutputs.setTextColor( 0xFFFFFF ); @@ -123,7 +124,7 @@ public class GuiInterfaceTerminal extends AEBaseGui } } - int offset = 17; + int offset = 32; for( int x = 0; x < LINES_ON_PAGE && ex + x < this.lines.size(); x++ ) { final Object lineObj = this.lines.get( ex + x ); @@ -183,7 +184,7 @@ public class GuiInterfaceTerminal extends AEBaseGui this.bindTexture( "guis/interfaceterminal.png" ); this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize ); - int offset = 17; + int offset = 32; final int ex = this.getScrollBar().getCurrentScroll(); for( int x = 0; x < LINES_ON_PAGE && ex + x < this.lines.size(); x++ ) @@ -195,7 +196,7 @@ public class GuiInterfaceTerminal extends AEBaseGui GlStateManager.color( 1, 1, 1, 1 ); final int width = inv.getInventory().getSlots() * 18; - this.drawTexturedModalRect( offsetX + 7, offsetY + offset, 7, 139, width, 18 ); + this.drawTexturedModalRect( offsetX + 7, offsetY + offset, 7, 153, width, 18 ); } offset += 18; } @@ -216,24 +217,21 @@ public class GuiInterfaceTerminal extends AEBaseGui { if( !this.checkHotbarKeys( key ) ) { - if( character == ' ' && this.searchFieldInputs.getText().isEmpty() ) + if( character == ' ' && this.searchFieldInputs.getText().isEmpty() && this.searchFieldInputs.isFocused() ) { return; } - if( character == ' ' && this.searchFieldOutputs.getText().isEmpty() ) + if( character == ' ' && this.searchFieldOutputs.getText().isEmpty() && this.searchFieldOutputs.isFocused()) { return; } - if( this.searchFieldInputs.textboxKeyTyped( character, key ) ) - { - this.refreshList(); - } - else if( this.searchFieldOutputs.textboxKeyTyped( character, key ) ) + if( this.searchFieldInputs.textboxKeyTyped( character, key ) || this.searchFieldOutputs.textboxKeyTyped( character, key )) { this.refreshList(); } + else { super.keyTyped( character, key ); diff --git a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java index ea970dd75..338fb898a 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java +++ b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java @@ -78,7 +78,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer this.grid = anchor.getActionableNode().getGrid(); } - this.bindPlayerInventory( ip, 0, 222 - /* height of player inventory */82 ); + this.bindPlayerInventory( ip, 0, 236 - /* height of player inventory */82 ); } @Override diff --git a/src/main/resources/assets/appliedenergistics2/textures/guis/interfaceterminal.png b/src/main/resources/assets/appliedenergistics2/textures/guis/interfaceterminal.png index 9f6e68f501d3614ce782febca6befa179b2f5047..aa2996581120bc1f902f8b0735ee416a0afff18f 100644 GIT binary patch literal 11018 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�O;vK5jn!+v5G))3whToi?8e*_!c;m5?+n@;D?@#f>+lYZjFvd2dhlQv#CS|q-C(?X&1 z0`4NAi~l*DOKtrumcBJA{jKFs?q=3p)x)K$0#!D&s02-!*kh%&;*isnvR)D4OsoFN zAMP^sT`@*GwGy60IPhwz9OwVXzJIf6_vPTc^H&ocby+vx<-`bqpYlRQ| z=ZVRbtzXM|rgqZ37a0?k6AGkv?0A>)Nv>cgbIbgalM`f4`m2g`ANVa<8!RWWi}ly_ zJ9ln9x2R>fHw_pajK-~Fuj%O@%nEl4`~k(+^me@%!KNrB%__*n4QfPDN}8=wMoCG5mA-y? zdAVM>v0i>ry1t>MrKP@sk-m|UZc$2_ZgFK^Nn(X=Ua>OB2#6Ujsl~}fnFS@8`FRQ; zGZT~YOG|8(l(-ZW6rhG@7L+8rR+PXk0P(@b7nh{ydlr-=n^fc$xK@Ti>#xWy@b!i3&MSt7Vsd`2ennz|zM-Cher_&`j^Yy6GK76tbrgqG7NqJ2r55Lx z7A2>;mZj#EC?i{1kW*TWY-ee4Do6LnWDMhzLUQ4@d?a1jxo$ndS0=d^JB|kYc#R|+!HBK~1OG-7?O-(T~)HO*pP1Ch7Ff!6L zw6L&9G)_rLOi8jtGRiZrxFj(zITd77MQ(v!W@d_&iMhE^ieZwGZlZyKxvq(+nSpLn zl3|LjX_8TzWs+%Xno)`Yk`ewzndzB%i8;uw0vVN(nPO#`lAMxgZeXcvk!F;pYm#J{ zqMK-9XsT;woMf3|oRpkmXkZ353KS1kjsc#wN=AAR!@(i}If*4{`9-<5O5vG#Df#8a z2*n|pxv9Y=iJ)LJG&3|YG&ZrcFfubVFfc^YAC_8FoSB~oGS$#P&&UX@Jtf)7Ex#x? zvBXv>GdD3kRlguF9V`Kg7%Tsx%+$P+L{RRqRWbyNSL7C0ITxiSmgE0w370~qEyH9)VvZ~ zCHKtS0&qMlXh74SCaU`Kj8stKGB7d(7lOtiM#feqmR2T4N|4xAu+ayVu)$E@+JMR+ zUtcTa@UQ`uQC6Oygcw{}P>_?ES_BChaJmUjErgh4qmM%!l74Wq%O|KESs6sPbACZ( zQD%BZiGO(>UhAJEI>6A zEip9p(b5V9g;7gL3g6M-8VxRzLVzU2qp52&xJU{Ck`#}oE~*6=7oy9ZnwMg$RIX%i zmw!KCDgy&ELx4|+E2vk_z+i4}9vT|j-Q9ic*s%u>9{m6RA0j?Vj)uVS4gn8w>m#65 zjwL~U!3+-1Zlr-YN#5=*3>~bp9t;c&oCO|{#S9F5yFi#xbidgp1_lQ95>H=O_NPn| zOom$3L1Ntu42;`7T^vIyZoR#Gkgr)mz`;>q&Hw+$a~}!j?chDJN10t%ee25GVL@J% zFE17RjM}y5=g;``I)(=^JAytL9NMRhtIvgR<^UuIS}gT$7;CF%=5lWEH3@C+3dB93>$16Zt^VH?)ck} zf${l%DTh3-*^En;gO-mnFfiPjyZm*I_CX}|o fQSqDvLYXV{%fBQ(zA{H*I!L>xtDnm{r-UW|-3-~L literal 1928 zcmeAS@N?(olHy`uVBq!ia0y~yU}OMc4rT@hhU_&FAq)%*Ea{HEjtmSN`?>!lvNA9* zGX(gAxH2#>n46o2hK6=`cON@;?7@Qv|NsAI7zLvtFfu|w`Nlt6P(~>U@(cbyvH?Tz zcXm|<1_sUokH}&M2EJV&%qY6w>=FY5gG7mIL`iUdT1k0gQ7S`0VrE{6US4X6f{C7i zo^j8!=>ZH3Oz%8h978JN-rfz&zHK1U7HIzR)Bpb)%{AXA-7@0XbVR3Qp0r`?iC=s- zy?i6L*WO>2XMb~Be*a2q?G3(m{~v!|;=uZ2&W_t}=QuE)2u$8R_szWGedhcJ{>J>@ z1#*^=S2QR|PFQ@5O`&;G>}^&@-({$a-ShnU z7v=v-S6+!RFfc%M2Kb*V){|~1@@8N#s^)dL$;iOq;Fie^GW6BS%5$mA0ePGZ4r%Kd zHLMvJ7*1&9f{IWFTg&r1a~MwPGBTWaW6F@q&cMJRxl|XVX@&Z8%jvuhJ5?DNX6|KM z@P>hbL1FP0R*=-!CpOPFF=}jQVNlq7oneYB0|P_Klx-lH1@q=Sk1=C-I*oxL<(pK) zCT0ePhMr3xS2A3g{CUo4wgq>D7#hyRF$a_}FfdFAyv4-8z|c@tG_Uw3!<1+yh6y*b z8BXzGdg^o|!}5CZTOUs8?vLI4<_psdGX{ohY&&$>KKyZg6Ccf~pj`j*&Y#PSIrgU% z*7~wfs4fS4yyzDTqXhee_-8dG=c~TVFLz^pqI!7s@v9)qLC$5^S-u@igNV9+H3zPi zu`xf{d-~#ma_h+cd$%NcC-~o5-6;QT8_16!MGo)ofP!7 zo8;^|Hh|Tc$-jgr4BzX+nK{2p*_g8U+_i_Df`|h8u z`f}}DMnlckO4ASAQMW+>08+2;{T(>yKRX`kbxnadCvd%mildPqb