Makes naming of security station related classes/assets consistent with registry name.
|
@ -33,17 +33,17 @@ import net.minecraft.world.World;
|
|||
import appeng.api.util.AEPartLocation;
|
||||
import appeng.block.AEBaseTileBlock;
|
||||
import appeng.core.sync.GuiBridge;
|
||||
import appeng.tile.misc.TileSecurity;
|
||||
import appeng.tile.misc.TileStationSecurity;
|
||||
import appeng.util.Platform;
|
||||
|
||||
public class BlockSecurity extends AEBaseTileBlock
|
||||
public class BlockSecurityStation extends AEBaseTileBlock
|
||||
{
|
||||
|
||||
public BlockSecurity()
|
||||
public BlockSecurityStation()
|
||||
{
|
||||
super( Material.IRON );
|
||||
|
||||
this.setTileEntity( TileSecurity.class );
|
||||
this.setTileEntity( TileStationSecurity.class );
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -60,7 +60,7 @@ public class BlockSecurity extends AEBaseTileBlock
|
|||
return false;
|
||||
}
|
||||
|
||||
final TileSecurity tg = this.getTileEntity( w, pos );
|
||||
final TileStationSecurity tg = this.getTileEntity( w, pos );
|
||||
if( tg != null )
|
||||
{
|
||||
if( Platform.isClient() )
|
|
@ -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 );
|
||||
}
|
||||
|
|
|
@ -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
|
|
@ -37,10 +37,10 @@ import appeng.container.slot.SlotRestrictedInput;
|
|||
import appeng.tile.inventory.AppEngInternalInventory;
|
||||
import appeng.tile.inventory.IAEAppEngInventory;
|
||||
import appeng.tile.inventory.InvOperation;
|
||||
import appeng.tile.misc.TileSecurity;
|
||||
import appeng.tile.misc.TileStationSecurity;
|
||||
|
||||
|
||||
public class ContainerSecurity extends ContainerMEMonitorable implements IAEAppEngInventory
|
||||
public class ContainerSecurityStation extends ContainerMEMonitorable implements IAEAppEngInventory
|
||||
{
|
||||
|
||||
private final SlotRestrictedInput configSlot;
|
||||
|
@ -50,15 +50,15 @@ public class ContainerSecurity extends ContainerMEMonitorable implements IAEAppE
|
|||
private final SlotRestrictedInput wirelessIn;
|
||||
private final SlotOutput wirelessOut;
|
||||
|
||||
private final TileSecurity securityBox;
|
||||
private final TileStationSecurity securityBox;
|
||||
@GuiSync( 0 )
|
||||
public int permissionMode = 0;
|
||||
|
||||
public ContainerSecurity( final InventoryPlayer ip, final ITerminalHost monitorable )
|
||||
public ContainerSecurityStation( final InventoryPlayer ip, final ITerminalHost monitorable )
|
||||
{
|
||||
super( ip, monitorable, false );
|
||||
|
||||
this.securityBox = (TileSecurity) monitorable;
|
||||
this.securityBox = (TileStationSecurity) monitorable;
|
||||
|
||||
this.addSlotToContainer( this.configSlot = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.BIOMETRIC_CARD, this.securityBox.getConfigSlot(), 0, 37, -33, ip ) );
|
||||
|
|
@ -47,7 +47,7 @@ import appeng.block.misc.BlockLightDetector;
|
|||
import appeng.block.misc.BlockPaint;
|
||||
import appeng.block.misc.BlockQuartzGrowthAccelerator;
|
||||
import appeng.block.misc.BlockQuartzTorch;
|
||||
import appeng.block.misc.BlockSecurity;
|
||||
import appeng.block.misc.BlockSecurityStation;
|
||||
import appeng.block.misc.BlockSkyCompass;
|
||||
import appeng.block.misc.BlockTinyTNT;
|
||||
import appeng.block.misc.BlockVibrationChamber;
|
||||
|
@ -238,7 +238,7 @@ public final class ApiBlocks implements IBlocks
|
|||
BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject( item, new DispenserBehaviorTinyTNT() );
|
||||
} )
|
||||
.build();
|
||||
this.securityStation = registry.block( "security_station", BlockSecurity::new ).features( AEFeature.Security ).build();
|
||||
this.securityStation = registry.block( "security_station", BlockSecurityStation::new ).features( AEFeature.Security ).build();
|
||||
this.quantumRing = registry.block( "quantum_ring", BlockQuantumRing::new ).features( AEFeature.QuantumNetworkBridge ).build();
|
||||
this.quantumLink = registry.block( "quantum_link", BlockQuantumLinkChamber::new ).features( AEFeature.QuantumNetworkBridge ).build();
|
||||
this.spatialPylon = registry.block( "spatial_pylon", BlockSpatialPylon::new ).features( AEFeature.SpatialIO ).build();
|
||||
|
|
|
@ -84,7 +84,7 @@ import appeng.container.implementations.ContainerPatternTerm;
|
|||
import appeng.container.implementations.ContainerPriority;
|
||||
import appeng.container.implementations.ContainerQNB;
|
||||
import appeng.container.implementations.ContainerQuartzKnife;
|
||||
import appeng.container.implementations.ContainerSecurity;
|
||||
import appeng.container.implementations.ContainerSecurityStation;
|
||||
import appeng.container.implementations.ContainerSkyChest;
|
||||
import appeng.container.implementations.ContainerSpatialIOPort;
|
||||
import appeng.container.implementations.ContainerStorageBus;
|
||||
|
@ -109,7 +109,7 @@ import appeng.tile.grindstone.TileGrinder;
|
|||
import appeng.tile.misc.TileCellWorkbench;
|
||||
import appeng.tile.misc.TileCondenser;
|
||||
import appeng.tile.misc.TileInscriber;
|
||||
import appeng.tile.misc.TileSecurity;
|
||||
import appeng.tile.misc.TileStationSecurity;
|
||||
import appeng.tile.misc.TileVibrationChamber;
|
||||
import appeng.tile.networking.TileWireless;
|
||||
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_SECURITY( ContainerSecurity.class, TileSecurity.class, GuiHostType.WORLD, SecurityPermissions.SECURITY ),
|
||||
GUI_SECURITY( ContainerSecurityStation.class, TileStationSecurity.class, GuiHostType.WORLD, SecurityPermissions.SECURITY ),
|
||||
|
||||
GUI_CRAFTING_TERMINAL( ContainerCraftingTerm.class, PartCraftingTerminal.class, GuiHostType.WORLD, SecurityPermissions.CRAFT ),
|
||||
|
||||
|
|
|
@ -50,7 +50,7 @@ import appeng.container.implementations.ContainerNetworkTool;
|
|||
import appeng.container.implementations.ContainerPatternTerm;
|
||||
import appeng.container.implementations.ContainerPriority;
|
||||
import appeng.container.implementations.ContainerQuartzKnife;
|
||||
import appeng.container.implementations.ContainerSecurity;
|
||||
import appeng.container.implementations.ContainerSecurityStation;
|
||||
import appeng.container.implementations.ContainerStorageBus;
|
||||
import appeng.core.sync.AppEngPacket;
|
||||
import appeng.core.sync.network.INetworkInfo;
|
||||
|
@ -143,9 +143,9 @@ public class PacketValueConfig extends AppEngPacket
|
|||
final ContainerQuartzKnife qk = (ContainerQuartzKnife) c;
|
||||
qk.setName( this.Value );
|
||||
}
|
||||
else if( this.Name.equals( "TileSecurity.ToggleOption" ) && c instanceof ContainerSecurity )
|
||||
else if( this.Name.equals( "TileStationSecurity.ToggleOption" ) && c instanceof ContainerSecurityStation )
|
||||
{
|
||||
final ContainerSecurity sc = (ContainerSecurity) c;
|
||||
final ContainerSecurityStation sc = (ContainerSecurityStation) c;
|
||||
sc.toggleSetting( this.Value, player );
|
||||
}
|
||||
else if( this.Name.equals( "PriorityHost.Priority" ) && c instanceof ContainerPriority )
|
||||
|
|
|
@ -33,16 +33,16 @@ import appeng.api.storage.StorageChannel;
|
|||
import appeng.api.storage.data.IAEItemStack;
|
||||
import appeng.api.storage.data.IItemList;
|
||||
import appeng.me.GridAccessException;
|
||||
import appeng.tile.misc.TileSecurity;
|
||||
import appeng.tile.misc.TileStationSecurity;
|
||||
|
||||
|
||||
public class SecurityInventory implements IMEInventoryHandler<IAEItemStack>
|
||||
public class SecurityStationInventory implements IMEInventoryHandler<IAEItemStack>
|
||||
{
|
||||
|
||||
private final IItemList<IAEItemStack> storedItems = AEApi.instance().storage().createItemList();
|
||||
private final TileSecurity securityTile;
|
||||
private final TileStationSecurity securityTile;
|
||||
|
||||
public SecurityInventory( final TileSecurity ts )
|
||||
public SecurityStationInventory( final TileStationSecurity ts )
|
||||
{
|
||||
this.securityTile = ts;
|
||||
}
|
|
@ -67,7 +67,7 @@ import appeng.api.util.DimensionalCoord;
|
|||
import appeng.api.util.IConfigManager;
|
||||
import appeng.helpers.PlayerSecurityWrapper;
|
||||
import appeng.me.GridAccessException;
|
||||
import appeng.me.storage.SecurityInventory;
|
||||
import appeng.me.storage.SecurityStationInventory;
|
||||
import appeng.tile.TileEvent;
|
||||
import appeng.tile.events.TileEventType;
|
||||
import appeng.tile.grid.AENetworkTile;
|
||||
|
@ -80,19 +80,19 @@ import appeng.util.Platform;
|
|||
import appeng.util.item.AEItemStack;
|
||||
|
||||
|
||||
public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEAppEngInventory, ILocatable, IConfigManagerHost, ISecurityProvider, IColorableTile
|
||||
public class TileStationSecurity extends AENetworkTile implements ITerminalHost, IAEAppEngInventory, ILocatable, IConfigManagerHost, ISecurityProvider, IColorableTile
|
||||
{
|
||||
|
||||
private static int difference = 0;
|
||||
private final AppEngInternalInventory configSlot = new AppEngInternalInventory( this, 1 );
|
||||
private final IConfigManager cm = new ConfigManager( this );
|
||||
private final SecurityInventory inventory = new SecurityInventory( this );
|
||||
private final SecurityStationInventory inventory = new SecurityStationInventory( this );
|
||||
private final MEMonitorHandler<IAEItemStack> securityMonitor = new MEMonitorHandler<IAEItemStack>( this.inventory );
|
||||
private long securityKey;
|
||||
private AEColor paintedColor = AEColor.Transparent;
|
||||
private boolean isActive = false;
|
||||
|
||||
public TileSecurity()
|
||||
public TileStationSecurity()
|
||||
{
|
||||
this.getProxy().setFlags( GridFlags.REQUIRE_CHANNEL );
|
||||
this.getProxy().setIdlePowerUsage( 2.0 );
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"variants": {
|
||||
"normal": {
|
||||
"model": "appliedenergistics2:security"
|
||||
"model": "appliedenergistics2:security_station"
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,8 +0,0 @@
|
|||
{
|
||||
"parent": "block/cube_bottom_top",
|
||||
"textures": {
|
||||
"bottom": "appliedenergistics2:blocks/security_bottom",
|
||||
"side": "appliedenergistics2:blocks/security_side",
|
||||
"top": "appliedenergistics2:blocks/security"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"parent": "block/cube_bottom_top",
|
||||
"textures": {
|
||||
"bottom": "appliedenergistics2:blocks/security_station_bottom",
|
||||
"side": "appliedenergistics2:blocks/security_station_side",
|
||||
"top": "appliedenergistics2:blocks/security_station"
|
||||
}
|
||||
}
|
|
@ -1,3 +0,0 @@
|
|||
{
|
||||
"parent": "appliedenergistics2:block/security"
|
||||
}
|
Before Width: | Height: | Size: 263 B After Width: | Height: | Size: 263 B |
Before Width: | Height: | Size: 398 B After Width: | Height: | Size: 398 B |
Before Width: | Height: | Size: 363 B After Width: | Height: | Size: 363 B |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |