diff --git a/client/gui/implementations/GuiMEMonitorable.java b/client/gui/implementations/GuiMEMonitorable.java index b917842e8..673164344 100644 --- a/client/gui/implementations/GuiMEMonitorable.java +++ b/client/gui/implementations/GuiMEMonitorable.java @@ -129,7 +129,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi @Override 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); int NEI = 0; @@ -181,9 +181,12 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi .getSetting( Settings.SEARCH_MODE ) ) ); offset += 20; - buttonList.add( terminalStyleBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.TERMINAL_STYLE, AEConfig.instance.settings - .getSetting( Settings.TERMINAL_STYLE ) ) ); - + if ( !(this instanceof GuiMEPortableCell ) ) + { + 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.setEnableBackgroundDrawing( false ); searchField.setMaxStringLength( 25 ); @@ -296,7 +299,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi bindTexture( getBackground() ); 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 ); for (int x = 0; x < rows; x++) @@ -369,4 +372,9 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi return repo.hasPower(); } + int getMaxRows() + { + return AEConfig.instance.getConfigManager().getSetting( Settings.TERMINAL_STYLE ) == TerminalStyle.SMALL ? 6 : Integer.MAX_VALUE; + } + } diff --git a/client/gui/implementations/GuiMEPortableCell.java b/client/gui/implementations/GuiMEPortableCell.java index 8951de738..75531f3b6 100644 --- a/client/gui/implementations/GuiMEPortableCell.java +++ b/client/gui/implementations/GuiMEPortableCell.java @@ -9,7 +9,11 @@ public class GuiMEPortableCell extends GuiMEMonitorable public GuiMEPortableCell(InventoryPlayer inventoryPlayer, IPortableCell te) { super( inventoryPlayer, te, new ContainerMEPortableCell( inventoryPlayer, null ) ); - maxRows = 3; } + @Override + int getMaxRows() + { + return 3; + } } diff --git a/client/gui/implementations/GuiSecurity.java b/client/gui/implementations/GuiSecurity.java index 31f35d478..8ce92a727 100644 --- a/client/gui/implementations/GuiSecurity.java +++ b/client/gui/implementations/GuiSecurity.java @@ -20,7 +20,10 @@ public class GuiSecurity extends GuiMEMonitorable super( inventoryPlayer, te, new ContainerSecurity( inventoryPlayer, te ) ); customSortOrder = false; reservedSpace = 33; - xSize += 50; + + // increase size so that the slot is over the gui. + xSize += 56; + standardSize = xSize; } GuiToggleButton inject, extract, craft, build, security;