tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Fixed broken name of TileStationSecurity -> TileSecurityStation

Browse source
This commit is contained in:
Sebastian Hartte 2016-08-26 13:51:38 +02:00
parent f3e10b1851
commit 0316c1de58
8 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/appeng/block/misc/BlockSecurityStation.java
View file

@ -33,7 +33,7 @@ import net.minecraft.world.World;
import appeng.api.util.AEPartLocation; import appeng.api.util.AEPartLocation;
import appeng.block.AEBaseTileBlock; import appeng.block.AEBaseTileBlock;
import appeng.core.sync.GuiBridge; import appeng.core.sync.GuiBridge;
import appeng.tile.misc.TileStationSecurity; import appeng.tile.misc.TileSecurityStation;
import appeng.util.Platform; import appeng.util.Platform;
public class BlockSecurityStation extends AEBaseTileBlock public class BlockSecurityStation extends AEBaseTileBlock
@ -43,7 +43,7 @@ public class BlockSecurityStation extends AEBaseTileBlock
{ {
super( Material.IRON ); super( Material.IRON );
this.setTileEntity( TileStationSecurity.class ); this.setTileEntity( TileSecurityStation.class );
} }
@Override @Override
@ -60,7 +60,7 @@ public class BlockSecurityStation extends AEBaseTileBlock
return false; return false;
} }
final TileStationSecurity tg = this.getTileEntity( w, pos ); final TileSecurityStation tg = this.getTileEntity( w, pos );
if( tg != null ) if( tg != null )
{ {
if( Platform.isClient() ) if( Platform.isClient() )

4
src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java
View file

@ -63,7 +63,7 @@ import appeng.helpers.WirelessTerminalGuiObject;
import appeng.integration.IntegrationRegistry; import appeng.integration.IntegrationRegistry;
import appeng.integration.IntegrationType; import appeng.integration.IntegrationType;
import appeng.parts.reporting.AbstractPartTerminal; import appeng.parts.reporting.AbstractPartTerminal;
import appeng.tile.misc.TileStationSecurity; import appeng.tile.misc.TileSecurityStation;
import appeng.util.IConfigManagerHost; import appeng.util.IConfigManagerHost;
import appeng.util.Platform; import appeng.util.Platform;
@ -126,7 +126,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
this.viewCell = te instanceof IViewCellStorage; this.viewCell = te instanceof IViewCellStorage;
if( te instanceof TileStationSecurity ) if( te instanceof TileSecurityStation )
{ {
this.myName = GuiText.Security; this.myName = GuiText.Security;
} }

2
src/main/java/appeng/client/gui/implementations/GuiSecurityStation.java
View file

@ -86,7 +86,7 @@ public class GuiSecurityStation extends GuiMEMonitorable
{ {
try try
{ {
NetworkHandler.instance.sendToServer( new PacketValueConfig( "TileStationSecurity.ToggleOption", toggleSetting.name() ) ); NetworkHandler.instance.sendToServer( new PacketValueConfig( "TileSecurityStation.ToggleOption", toggleSetting.name() ) );
} }
catch( final IOException e ) catch( final IOException e )
{ {

6
src/main/java/appeng/container/implementations/ContainerSecurityStation.java
View file

@ -37,7 +37,7 @@ import appeng.container.slot.SlotRestrictedInput;
import appeng.tile.inventory.AppEngInternalInventory; import appeng.tile.inventory.AppEngInternalInventory;
import appeng.tile.inventory.IAEAppEngInventory; import appeng.tile.inventory.IAEAppEngInventory;
import appeng.tile.inventory.InvOperation; import appeng.tile.inventory.InvOperation;
import appeng.tile.misc.TileStationSecurity; import appeng.tile.misc.TileSecurityStation;
public class ContainerSecurityStation extends ContainerMEMonitorable implements IAEAppEngInventory public class ContainerSecurityStation extends ContainerMEMonitorable implements IAEAppEngInventory
@ -50,7 +50,7 @@ public class ContainerSecurityStation extends ContainerMEMonitorable implements
private final SlotRestrictedInput wirelessIn; private final SlotRestrictedInput wirelessIn;
private final SlotOutput wirelessOut; private final SlotOutput wirelessOut;
private final TileStationSecurity securityBox; private final TileSecurityStation securityBox;
@GuiSync( 0 ) @GuiSync( 0 )
public int permissionMode = 0; public int permissionMode = 0;
@ -58,7 +58,7 @@ public class ContainerSecurityStation extends ContainerMEMonitorable implements
{ {
super( ip, monitorable, false ); super( ip, monitorable, false );
this.securityBox = (TileStationSecurity) monitorable; this.securityBox = (TileSecurityStation) monitorable;
this.addSlotToContainer( this.configSlot = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.BIOMETRIC_CARD, this.securityBox.getConfigSlot(), 0, 37, -33, ip ) ); this.addSlotToContainer( this.configSlot = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.BIOMETRIC_CARD, this.securityBox.getConfigSlot(), 0, 37, -33, ip ) );

4
src/main/java/appeng/core/sync/GuiBridge.java
View file

@ -109,7 +109,7 @@ import appeng.tile.grindstone.TileGrinder;
import appeng.tile.misc.TileCellWorkbench; import appeng.tile.misc.TileCellWorkbench;
import appeng.tile.misc.TileCondenser; import appeng.tile.misc.TileCondenser;
import appeng.tile.misc.TileInscriber; import appeng.tile.misc.TileInscriber;
import appeng.tile.misc.TileStationSecurity; import appeng.tile.misc.TileSecurityStation;
import appeng.tile.misc.TileVibrationChamber; import appeng.tile.misc.TileVibrationChamber;
import appeng.tile.networking.TileWireless; import appeng.tile.networking.TileWireless;
import appeng.tile.qnb.TileQuantumBridge; import appeng.tile.qnb.TileQuantumBridge;
@ -167,7 +167,7 @@ public enum GuiBridge implements IGuiHandler
GUI_PRIORITY( ContainerPriority.class, IPriorityHost.class, GuiHostType.WORLD, SecurityPermissions.BUILD ), GUI_PRIORITY( ContainerPriority.class, IPriorityHost.class, GuiHostType.WORLD, SecurityPermissions.BUILD ),
GUI_SECURITY( ContainerSecurityStation.class, TileStationSecurity.class, GuiHostType.WORLD, SecurityPermissions.SECURITY ), GUI_SECURITY( ContainerSecurityStation.class, TileSecurityStation.class, GuiHostType.WORLD, SecurityPermissions.SECURITY ),
GUI_CRAFTING_TERMINAL( ContainerCraftingTerm.class, PartCraftingTerminal.class, GuiHostType.WORLD, SecurityPermissions.CRAFT ), GUI_CRAFTING_TERMINAL( ContainerCraftingTerm.class, PartCraftingTerminal.class, GuiHostType.WORLD, SecurityPermissions.CRAFT ),

2
src/main/java/appeng/core/sync/packets/PacketValueConfig.java
View file

@ -143,7 +143,7 @@ public class PacketValueConfig extends AppEngPacket
final ContainerQuartzKnife qk = (ContainerQuartzKnife) c; final ContainerQuartzKnife qk = (ContainerQuartzKnife) c;
qk.setName( this.Value ); qk.setName( this.Value );
} }
else if( this.Name.equals( "TileStationSecurity.ToggleOption" ) && c instanceof ContainerSecurityStation ) else if( this.Name.equals( "TileSecurityStation.ToggleOption" ) && c instanceof ContainerSecurityStation )
{ {
final ContainerSecurityStation sc = (ContainerSecurityStation) c; final ContainerSecurityStation sc = (ContainerSecurityStation) c;
sc.toggleSetting( this.Value, player ); sc.toggleSetting( this.Value, player );

6
src/main/java/appeng/me/storage/SecurityStationInventory.java
View file

@ -33,16 +33,16 @@ import appeng.api.storage.StorageChannel;
import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList; import appeng.api.storage.data.IItemList;
import appeng.me.GridAccessException; import appeng.me.GridAccessException;
import appeng.tile.misc.TileStationSecurity; import appeng.tile.misc.TileSecurityStation;
public class SecurityStationInventory implements IMEInventoryHandler<IAEItemStack> public class SecurityStationInventory implements IMEInventoryHandler<IAEItemStack>
{ {
private final IItemList<IAEItemStack> storedItems = AEApi.instance().storage().createItemList(); private final IItemList<IAEItemStack> storedItems = AEApi.instance().storage().createItemList();
private final TileStationSecurity securityTile; private final TileSecurityStation securityTile;
public SecurityStationInventory( final TileStationSecurity ts ) public SecurityStationInventory( final TileSecurityStation ts )
{ {
this.securityTile = ts; this.securityTile = ts;
} }

4
src/main/java/appeng/tile/misc/TileStationSecurity.java → src/main/java/appeng/tile/misc/TileSecurityStation.java
View file

@ -80,7 +80,7 @@ import appeng.util.Platform;
import appeng.util.item.AEItemStack; import appeng.util.item.AEItemStack;
public class TileStationSecurity extends AENetworkTile implements ITerminalHost, IAEAppEngInventory, ILocatable, IConfigManagerHost, ISecurityProvider, IColorableTile public class TileSecurityStation extends AENetworkTile implements ITerminalHost, IAEAppEngInventory, ILocatable, IConfigManagerHost, ISecurityProvider, IColorableTile
{ {
private static int difference = 0; private static int difference = 0;
@ -92,7 +92,7 @@ public class TileStationSecurity extends AENetworkTile implements ITerminalHost,
private AEColor paintedColor = AEColor.Transparent; private AEColor paintedColor = AEColor.Transparent;
private boolean isActive = false; private boolean isActive = false;
public TileStationSecurity() public TileSecurityStation()
{ {
this.getProxy().setFlags( GridFlags.REQUIRE_CHANNEL ); this.getProxy().setFlags( GridFlags.REQUIRE_CHANNEL );
this.getProxy().setIdlePowerUsage( 2.0 ); this.getProxy().setIdlePowerUsage( 2.0 );