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

Cleaned up a bit of the unimplemented full-width terminal mode.

Browse Source 
And promptly disabled it by correctly filtering against the settings.
This commit is contained in:
Sebastian Hartte
2020-06-14 19:02:13 +02:00
parent cbbb9d1ade
commit 42651ed087
3 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java
+19 -19
View File
@@ -169,7 +169,16 @@ public class GuiMEMonitorable<T extends ContainerMEMonitorable> extends AEBaseME
this.maxRows = this.getMaxRows();
TerminalStyle terminalStyle = (TerminalStyle) AEConfig.instance().getConfigManager().getSetting(Settings.TERMINAL_STYLE);
this.perRow = terminalStyle != TerminalStyle.FULL ? 9 : 9 + ( ( this.width - this.standardSize ) / 18 );
if( terminalStyle != TerminalStyle.FULL )
{
this.perRow = 9;
}
else
{
this.perRow = 9 + ( ( this.width - this.standardSize ) / 18 );
}
this.xSize = this.standardSize + ( ( this.perRow - 9 ) * 18 );
final int magicNumber = 114 + 1;
final int extraSpace = this.height - magicNumber - this.reservedSpace;
@@ -185,6 +194,9 @@ public class GuiMEMonitorable<T extends ContainerMEMonitorable> extends AEBaseME
this.rows = 3;
}
// Size the container according to the number of rows we decided to have
this.ySize = magicNumber + this.rows * 18 + this.reservedSpace;
this.getMeSlots().clear();
for( int y = 0; y < this.rows; y++ )
{
@@ -194,25 +206,12 @@ public class GuiMEMonitorable<T extends ContainerMEMonitorable> extends AEBaseME
}
}
if( terminalStyle != TerminalStyle.FULL )
{
this.xSize = this.standardSize + ( ( this.perRow - 9 ) * 18 );
}
else
{
this.xSize = this.standardSize;
}
super.init();
// full size : 204
// extra slots : 72
// slot 18
this.ySize = magicNumber + this.rows * 18 + this.reservedSpace;
// this.guiTop = top;
final int unusedSpace = this.height - this.ySize;
this.guiTop = (int) Math.floor( unusedSpace / ( unusedSpace < 0 ? 3.8f : 2.0f ) );
int offset = this.guiTop + 8;
if( this.customSortOrder )
@@ -342,20 +341,20 @@ public class GuiMEMonitorable<T extends ContainerMEMonitorable> extends AEBaseME
this.bindTexture( this.getBackground() );
final int x_width = 197;
GuiUtils.drawTexturedModalRect( offsetX, offsetY, 0, 0, x_width, 18, getBlitOffset() );
blit( offsetX, offsetY, 0, 0, x_width, 18 );
if( this.viewCell || ( this instanceof GuiSecurityStation ) )
{
GuiUtils.drawTexturedModalRect( offsetX + x_width, offsetY, x_width, 0, 46, 128, getBlitOffset() );
blit( offsetX + x_width, offsetY, x_width, 0, 46, 128 );
}
for( int x = 0; x < this.rows; x++ )
{
GuiUtils.drawTexturedModalRect( offsetX, offsetY + 18 + x * 18, 0, 18, x_width, 18, getBlitOffset() );
blit( offsetX, offsetY + 18 + x * 18, 0, 18, x_width, 18 );
}
GuiUtils.drawTexturedModalRect( offsetX, offsetY + 16 + this.rows * 18 + this.lowerTextureOffset, 0, 106 - 18 - 18, x_width,
99 + this.reservedSpace - this.lowerTextureOffset, getBlitOffset() );
blit( offsetX, offsetY + 16 + this.rows * 18 + this.lowerTextureOffset, 0, 106 - 18 - 18, x_width,
99 + this.reservedSpace - this.lowerTextureOffset );
if( this.viewCell )
{
@@ -558,6 +557,7 @@ public class GuiMEMonitorable<T extends ContainerMEMonitorable> extends AEBaseME
private void reinitalize()
{
this.children.removeAll(this.buttons);
this.buttons.clear();
this.init();
}