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

Makes naming of security station related classes/assets consistent with registry name.

Browse Source
This commit is contained in:
Sebastian Hartte
2016-08-26 01:34:46 +02:00
parent 0df62abebd
commit c0b0687fd3
18 changed files with 45 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java
+3 -3
View File
@@ -63,7 +63,7 @@ import appeng.helpers.WirelessTerminalGuiObject;
import appeng.integration.IntegrationRegistry;
import appeng.integration.IntegrationType;
import appeng.parts.reporting.AbstractPartTerminal;
import appeng.tile.misc.TileSecurity;
import appeng.tile.misc.TileStationSecurity;
import appeng.util.IConfigManagerHost;
import appeng.util.Platform;
@@ -126,7 +126,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
this.viewCell = te instanceof IViewCellStorage;
if( te instanceof TileSecurity )
if( te instanceof TileStationSecurity )
{
this.myName = GuiText.Security;
}
@@ -401,7 +401,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
final int x_width = 197;
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, x_width, 18 );
if( this.viewCell || ( this instanceof GuiSecurity ) )
if( this.viewCell || ( this instanceof GuiSecurityStation ) )
{
this.drawTexturedModalRect( offsetX + x_width, offsetY, x_width, 0, 46, 128 );
}
src/main/java/appeng/client/gui/implementations/GuiSecurity.java → src/main/java/appeng/client/gui/implementations/GuiSecurityStation.java
+7 -7
View File
@@ -27,14 +27,14 @@ import appeng.api.config.SecurityPermissions;
import appeng.api.config.SortOrder;
import appeng.api.storage.ITerminalHost;
import appeng.client.gui.widgets.GuiToggleButton;
import appeng.container.implementations.ContainerSecurity;
import appeng.container.implementations.ContainerSecurityStation;
import appeng.core.AELog;
import appeng.core.localization.GuiText;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketValueConfig;
public class GuiSecurity extends GuiMEMonitorable
public class GuiSecurityStation extends GuiMEMonitorable
{
private GuiToggleButton inject;
@@ -43,9 +43,9 @@ public class GuiSecurity extends GuiMEMonitorable
private GuiToggleButton build;
private GuiToggleButton security;
public GuiSecurity( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
public GuiSecurityStation( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
{
super( inventoryPlayer, te, new ContainerSecurity( inventoryPlayer, te ) );
super( inventoryPlayer, te, new ContainerSecurityStation( inventoryPlayer, te ) );
this.setCustomSortOrder( false );
this.setReservedSpace( 33 );
@@ -86,7 +86,7 @@ public class GuiSecurity extends GuiMEMonitorable
{
try
{
NetworkHandler.instance.sendToServer( new PacketValueConfig( "TileSecurity.ToggleOption", toggleSetting.name() ) );
NetworkHandler.instance.sendToServer( new PacketValueConfig( "TileStationSecurity.ToggleOption", toggleSetting.name() ) );
}
catch( final IOException e )
{
@@ -122,7 +122,7 @@ public class GuiSecurity extends GuiMEMonitorable
@Override
protected String getBackground()
{
final ContainerSecurity cs = (ContainerSecurity) this.inventorySlots;
final ContainerSecurityStation cs = (ContainerSecurityStation) this.inventorySlots;
this.inject.setState( ( cs.getPermissionMode() & ( 1 << SecurityPermissions.INJECT.ordinal() ) ) > 0 );
this.extract.setState( ( cs.getPermissionMode() & ( 1 << SecurityPermissions.EXTRACT.ordinal() ) ) > 0 );
@@ -130,7 +130,7 @@ public class GuiSecurity extends GuiMEMonitorable
this.build.setState( ( cs.getPermissionMode() & ( 1 << SecurityPermissions.BUILD.ordinal() ) ) > 0 );
this.security.setState( ( cs.getPermissionMode() & ( 1 << SecurityPermissions.SECURITY.ordinal() ) ) > 0 );
return "guis/security.png";
return "guis/security_station.png";
}
@Override