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

Pretty much all of security minus the gui.

Browse Source 
and all the stuff I did that i forgot to comment.
This commit is contained in:
AlgorithmX2
2014-01-26 22:00:36 -06:00
parent bea039c7b5
commit 0f75db5e80
61 changed files with 2058 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
me/cache/GridStorageCache.java
Vendored
+9 -6
View File
@@ -10,6 +10,7 @@ import appeng.api.networking.IGridStorage;
import appeng.api.networking.events.MENetworkCellArrayUpdate;
import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.security.BaseActionSource;
import appeng.api.networking.security.ISecurityGrid;
import appeng.api.networking.security.MachineSource;
import appeng.api.networking.storage.IStackWatcher;
import appeng.api.networking.storage.IStackWatcherHost;
@@ -68,12 +69,12 @@ public class GridStorageCache implements IStorageGrid
for (IMEInventoryHandler<IAEItemStack> h : cc.getCellArray( StorageChannel.ITEMS ))
{
postChanges( StorageChannel.ITEMS, -1, h.getAvailableItems( new ItemList<IAEItemStack>() ), new MachineSource( machine ) );
postChanges( StorageChannel.ITEMS, -1, h.getAvailableItems( new ItemList<IAEItemStack>() ), new MachineSource( cc ) );
}
for (IMEInventoryHandler<IAEFluidStack> h : cc.getCellArray( StorageChannel.FLUIDS ))
{
postChanges( StorageChannel.ITEMS, -1, h.getAvailableItems( new ItemList<IAEFluidStack>() ), new MachineSource( machine ) );
postChanges( StorageChannel.ITEMS, -1, h.getAvailableItems( new ItemList<IAEFluidStack>() ), new MachineSource( cc ) );
}
}
@@ -100,12 +101,12 @@ public class GridStorageCache implements IStorageGrid
for (IMEInventoryHandler<IAEItemStack> h : cc.getCellArray( StorageChannel.ITEMS ))
{
postChanges( StorageChannel.ITEMS, 1, h.getAvailableItems( new ItemList<IAEItemStack>() ), new MachineSource( machine ) );
postChanges( StorageChannel.ITEMS, 1, h.getAvailableItems( new ItemList<IAEItemStack>() ), new MachineSource( cc ) );
}
for (IMEInventoryHandler<IAEFluidStack> h : cc.getCellArray( StorageChannel.FLUIDS ))
{
postChanges( StorageChannel.ITEMS, 1, h.getAvailableItems( new ItemList<IAEFluidStack>() ), new MachineSource( machine ) );
postChanges( StorageChannel.ITEMS, 1, h.getAvailableItems( new ItemList<IAEFluidStack>() ), new MachineSource( cc ) );
}
}
@@ -120,10 +121,12 @@ public class GridStorageCache implements IStorageGrid
private void buildNetworkStorage(StorageChannel chan)
{
SecurityCache security = myGrid.getCache( ISecurityGrid.class );
switch (chan)
{
case FLUIDS:
myFluidNetwork = new NetworkInventoryHandler<IAEFluidStack>( StorageChannel.FLUIDS );
myFluidNetwork = new NetworkInventoryHandler<IAEFluidStack>( StorageChannel.FLUIDS, security );
for (ICellContainer cc : cellContainers)
{
for (IMEInventoryHandler<IAEFluidStack> h : cc.getCellArray( chan ))
@@ -131,7 +134,7 @@ public class GridStorageCache implements IStorageGrid
}
break;
case ITEMS:
myItemNetwork = new NetworkInventoryHandler<IAEItemStack>( StorageChannel.ITEMS );
myItemNetwork = new NetworkInventoryHandler<IAEItemStack>( StorageChannel.ITEMS, security );
for (ICellContainer cc : cellContainers)
{
for (IMEInventoryHandler<IAEItemStack> h : cc.getCellArray( chan ))
me/cache/SecurityCache.java
Vendored
+153
View File
@@ -0,0 +1,153 @@
package appeng.me.cache;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import appeng.api.config.SecurityPermissions;
import appeng.api.networking.IGrid;
import appeng.api.networking.IGridCache;
import appeng.api.networking.IGridHost;
import appeng.api.networking.IGridNode;
import appeng.api.networking.IGridStorage;
import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.events.MENetworkSecurityChange;
import appeng.api.networking.security.ISecurityGrid;
import appeng.core.WorldSettings;
import appeng.me.GridNode;
import appeng.tile.misc.TileSecurity;
public class SecurityCache implements IGridCache, ISecurityGrid
{
private List<TileSecurity> securityProvider = new ArrayList();
private HashMap<Integer, EnumSet<SecurityPermissions>> playerPerms = new HashMap<Integer, EnumSet<SecurityPermissions>>();
public SecurityCache(IGrid g) {
myGrid = g;
}
private long securityKey = -1;
public final IGrid myGrid;
@MENetworkEventSubscribe
public void updatePermissions(MENetworkSecurityChange ev)
{
playerPerms.clear();
if ( securityProvider.isEmpty() )
return;
securityProvider.get( 0 ).readPermissions( playerPerms );
}
public long getSecurityKey()
{
return securityKey;
}
@Override
public boolean isAvailable()
{
return securityProvider.size() == 1 && securityProvider.get( 0 ).isSecurityEnabled();
}
@Override
public boolean hasPermission(EntityPlayer player, SecurityPermissions perm)
{
return hasPermission( WorldSettings.getInstance().getPlayerID( player.username ), perm );
}
@Override
public boolean hasPermission(int playerID, SecurityPermissions perm)
{
if ( isAvailable() )
{
EnumSet<SecurityPermissions> perms = playerPerms.get( playerID );
if ( perms == null )
{
if ( playerID == -1 ) // no default?
return false;
else
return hasPermission( -1, perm );
}
return perms.contains( perm );
}
return true;
}
private void updateSecurityKey()
{
long lastCode = securityKey;
if ( securityProvider.size() == 1 )
securityKey = securityProvider.get( 0 ).securityKey;
else
securityKey = -1;
if ( lastCode != securityKey )
{
myGrid.postEvent( new MENetworkSecurityChange() );
for (IGridNode n : myGrid.getNodes())
((GridNode) n).lastSecurityKey = securityKey;
}
}
@Override
public void removeNode(IGrid grid, IGridNode gridNode, IGridHost machine)
{
if ( machine instanceof TileSecurity )
{
securityProvider.remove( (TileSecurity) machine );
updateSecurityKey();
}
}
@Override
public void addNode(IGrid grid, IGridNode gridNode, IGridHost machine)
{
if ( machine instanceof TileSecurity )
{
securityProvider.add( (TileSecurity) machine );
updateSecurityKey();
}
else
((GridNode) gridNode).lastSecurityKey = securityKey;
}
@Override
public void onUpdateTick(IGrid grid)
{
}
@Override
public void onSplit(IGridStorage destinationStorage)
{
}
@Override
public void onJoin(IGridStorage sourceStorage)
{
}
@Override
public void populateGridStorage(IGridStorage destinationStorage)
{
}
@Override
public int getOwner()
{
if ( isAvailable() )
return securityProvider.get( 0 ).getOwner();
return -1;
}
}