fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix interface terminal GUI

Browse Source
This commit is contained in:
Salomão
2021-02-24 13:24:04 -03:00
parent c826a3e24f
commit a65b3d2ceb
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
+12 -14
View File
@@ -79,7 +79,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
final GuiScrollbar scrollbar = new GuiScrollbar(); final GuiScrollbar scrollbar = new GuiScrollbar();
this.setScrollBar( scrollbar ); this.setScrollBar( scrollbar );
this.xSize = 195; this.xSize = 195;
this.ySize = 222; this.ySize = 236;
} }
@Override @Override
@@ -89,16 +89,17 @@ public class GuiInterfaceTerminal extends AEBaseGui
this.getScrollBar().setLeft( 175 ); this.getScrollBar().setLeft( 175 );
this.getScrollBar().setHeight( 106 ); 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.setEnableBackgroundDrawing( false );
this.searchFieldInputs.setMaxStringLength( 25 ); this.searchFieldInputs.setMaxStringLength( 25 );
this.searchFieldInputs.setTextColor( 0xFFFFFF ); this.searchFieldInputs.setTextColor( 0xFFFFFF );
this.searchFieldInputs.setVisible( true ); this.searchFieldInputs.setVisible( true );
this.searchFieldInputs.setFocused( false ); 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.setEnableBackgroundDrawing( false );
this.searchFieldOutputs.setMaxStringLength( 25 ); this.searchFieldOutputs.setMaxStringLength( 25 );
this.searchFieldOutputs.setTextColor( 0xFFFFFF ); 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++ ) for( int x = 0; x < LINES_ON_PAGE && ex + x < this.lines.size(); x++ )
{ {
final Object lineObj = this.lines.get( ex + x ); final Object lineObj = this.lines.get( ex + x );
@@ -183,7 +184,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
this.bindTexture( "guis/interfaceterminal.png" ); this.bindTexture( "guis/interfaceterminal.png" );
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize ); this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );
int offset = 17; int offset = 32;
final int ex = this.getScrollBar().getCurrentScroll(); final int ex = this.getScrollBar().getCurrentScroll();
for( int x = 0; x < LINES_ON_PAGE && ex + x < this.lines.size(); x++ ) 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 ); GlStateManager.color( 1, 1, 1, 1 );
final int width = inv.getInventory().getSlots() * 18; 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; offset += 18;
} }
@@ -216,24 +217,21 @@ public class GuiInterfaceTerminal extends AEBaseGui
{ {
if( !this.checkHotbarKeys( key ) ) if( !this.checkHotbarKeys( key ) )
{ {
if( character == ' ' && this.searchFieldInputs.getText().isEmpty() ) if( character == ' ' && this.searchFieldInputs.getText().isEmpty() && this.searchFieldInputs.isFocused() )
{ {
return; return;
} }
if( character == ' ' && this.searchFieldOutputs.getText().isEmpty() ) if( character == ' ' && this.searchFieldOutputs.getText().isEmpty() && this.searchFieldOutputs.isFocused())
{ {
return; return;
} }
if( this.searchFieldInputs.textboxKeyTyped( character, key ) ) if( this.searchFieldInputs.textboxKeyTyped( character, key ) || this.searchFieldOutputs.textboxKeyTyped( character, key ))
{
this.refreshList();
}
else if( this.searchFieldOutputs.textboxKeyTyped( character, key ) )
{ {
this.refreshList(); this.refreshList();
} }
else else
{ {
super.keyTyped( character, key ); super.keyTyped( character, key );
src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java
+1 -1
View File
@@ -78,7 +78,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
this.grid = anchor.getActionableNode().getGrid(); 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 @Override
src/main/resources/assets/appliedenergistics2/textures/guis/interfaceterminal.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 11 KiB