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

Removed Terminal style from Portable Cell Gui.

Browse Source 
Portable Cell now only shows 3 rows now, like it should.
Security Gui now has the proper width.
Fixed bug introduced in #90 to show background behind security terminal slots.
This commit is contained in:
AlgorithmX2
2014-04-16 13:48:03 -05:00
parent 71b5fd4555
commit f5fc2ba18e
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/gui/implementations/GuiMEMonitorable.java
+13 -5
View File
@@ -129,7 +129,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
@Override @Override
public void initGui() public void initGui()
{ {
maxRows = AEConfig.instance.getConfigManager().getSetting( Settings.TERMINAL_STYLE ) == TerminalStyle.SMALL ? 6 : Integer.MAX_VALUE; maxRows = getMaxRows();
perRow = AEConfig.instance.getConfigManager().getSetting( Settings.TERMINAL_STYLE ) != TerminalStyle.FULL ? 9 : 9 + ((width - standardSize) / 18); perRow = AEConfig.instance.getConfigManager().getSetting( Settings.TERMINAL_STYLE ) != TerminalStyle.FULL ? 9 : 9 + ((width - standardSize) / 18);
int NEI = 0; int NEI = 0;
@@ -181,9 +181,12 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
.getSetting( Settings.SEARCH_MODE ) ) ); .getSetting( Settings.SEARCH_MODE ) ) );
offset += 20; offset += 20;
buttonList.add( terminalStyleBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.TERMINAL_STYLE, AEConfig.instance.settings if ( !(this instanceof GuiMEPortableCell ) )
.getSetting( Settings.TERMINAL_STYLE ) ) ); {
buttonList.add( terminalStyleBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.TERMINAL_STYLE, AEConfig.instance.settings
.getSetting( Settings.TERMINAL_STYLE ) ) );
}
searchField = new MEGuiTextField( fontRendererObj, this.guiLeft + Math.max( 82, xoffset ), this.guiTop + 6, 89, fontRendererObj.FONT_HEIGHT ); searchField = new MEGuiTextField( fontRendererObj, this.guiLeft + Math.max( 82, xoffset ), this.guiTop + 6, 89, fontRendererObj.FONT_HEIGHT );
searchField.setEnableBackgroundDrawing( false ); searchField.setEnableBackgroundDrawing( false );
searchField.setMaxStringLength( 25 ); searchField.setMaxStringLength( 25 );
@@ -296,7 +299,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
bindTexture( getBackground() ); bindTexture( getBackground() );
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, x_width, 18 ); this.drawTexturedModalRect( offsetX, offsetY, 0, 0, x_width, 18 );
if ( viewCell ) if ( viewCell || ( this instanceof GuiSecurity))
this.drawTexturedModalRect( offsetX + x_width, offsetY, x_width, 0, 46, 128 ); this.drawTexturedModalRect( offsetX + x_width, offsetY, x_width, 0, 46, 128 );
for (int x = 0; x < rows; x++) for (int x = 0; x < rows; x++)
@@ -369,4 +372,9 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
return repo.hasPower(); return repo.hasPower();
} }
int getMaxRows()
{
return AEConfig.instance.getConfigManager().getSetting( Settings.TERMINAL_STYLE ) == TerminalStyle.SMALL ? 6 : Integer.MAX_VALUE;
}
} }
client/gui/implementations/GuiMEPortableCell.java
+5 -1
View File
@@ -9,7 +9,11 @@ public class GuiMEPortableCell extends GuiMEMonitorable
public GuiMEPortableCell(InventoryPlayer inventoryPlayer, IPortableCell te) { public GuiMEPortableCell(InventoryPlayer inventoryPlayer, IPortableCell te) {
super( inventoryPlayer, te, new ContainerMEPortableCell( inventoryPlayer, null ) ); super( inventoryPlayer, te, new ContainerMEPortableCell( inventoryPlayer, null ) );
maxRows = 3;
} }
@Override
int getMaxRows()
{
return 3;
}
} }
client/gui/implementations/GuiSecurity.java
+4 -1
View File
@@ -20,7 +20,10 @@ public class GuiSecurity extends GuiMEMonitorable
super( inventoryPlayer, te, new ContainerSecurity( inventoryPlayer, te ) ); super( inventoryPlayer, te, new ContainerSecurity( inventoryPlayer, te ) );
customSortOrder = false; customSortOrder = false;
reservedSpace = 33; reservedSpace = 33;
xSize += 50;
// increase size so that the slot is over the gui.
xSize += 56;
standardSize = xSize;
} }
GuiToggleButton inject, extract, craft, build, security; GuiToggleButton inject, extract, craft, build, security;