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

Security Term now displays a message when there is no power.

Browse source 
Removed "No Message" Sorting.
You can no longer insert a biometric card for the Admin.
This commit is contained in:
AlgorithmX2 2014-02-02 13:00:57 -06:00
parent 9aa8d416aa
commit 93ac258ee7
4 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
block/misc/BlockSecurity.java
View file

@ -10,6 +10,7 @@ import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.blocks.RendererSecurity;
import appeng.core.features.AEFeature;
import appeng.core.localization.PlayerMessages;
import appeng.core.sync.GuiBridge;
import appeng.tile.misc.TileSecurity;
import appeng.util.Platform;
@ -39,8 +40,16 @@ public class BlockSecurity extends AEBaseBlock
if ( tg != null )
{
if ( Platform.isServer() )
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_SECURITY );
{
if ( tg.isPowered() )
{
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_SECURITY );
}
else
p.sendChatToPlayer( PlayerMessages.MachineNotPowered.get() );
}
return true;
}
return false;
}

4
client/me/ItemRepo.java
View file

@ -132,8 +132,8 @@ public class ItemRepo
if ( SortBy == SortOrder.AMOUNT )
Collections.sort( view, ItemSorters.ConfigBased_SortBySize );
else if ( SortBy == SortOrder.MOD )
Collections.sort( view, ItemSorters.ConfigBased_SortByMod );
// else if ( SortBy == SortOrder.MOD )
// Collections.sort( view, ItemSorters.ConfigBased_SortByMod );
else
Collections.sort( view, ItemSorters.ConfigBased_SortByName );

4
me/storage/SecurityInventory.java
View file

@ -115,6 +115,10 @@ public class SecurityInventory implements IMEInventoryHandler<IAEItemStack>
IBiometricCard tbc = (IBiometricCard) input.getItem();
String newUser = tbc.getUsername( input.getItemStack() );
int PlayerID = AEApi.instance().registries().players().getID( newUser );
if ( securityTile.getOwner() == PlayerID )
return false;
for (IAEItemStack ais : storedItems)
{
if ( ais.isMeaninful() )

5
tile/misc/TileSecurity.java
View file

@ -270,4 +270,9 @@ public class TileSecurity extends AENetworkTile implements IStorageMonitorable,
return securityKey;
}
public boolean isPowered()
{
return gridProxy.isActive();
}
}