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

Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Browse Source 
Conflicts:
	container/AEBaseContainer.java
	core/sync/AppEngPacketHandlerBase.java
This commit is contained in:
AlgorithmX2
2014-05-13 19:25:07 -05:00
parent d84ec9c0bf 62aa5c4175
commit 25a588f303
57 changed files with 1270 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
me/cache/SecurityCache.java
Vendored
+7 -7
View File
@@ -15,14 +15,14 @@ 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.api.networking.security.ISecurityProvider;
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 List<ISecurityProvider> securityProvider = new ArrayList();
private HashMap<Integer, EnumSet<SecurityPermissions>> playerPerms = new HashMap<Integer, EnumSet<SecurityPermissions>>();
public SecurityCache(IGrid g) {
@@ -84,7 +84,7 @@ public class SecurityCache implements IGridCache, ISecurityGrid
long lastCode = securityKey;
if ( securityProvider.size() == 1 )
securityKey = securityProvider.get( 0 ).securityKey;
securityKey = securityProvider.get( 0 ).getSecurityKey();
else
securityKey = -1;
@@ -99,9 +99,9 @@ public class SecurityCache implements IGridCache, ISecurityGrid
@Override
public void removeNode(IGridNode gridNode, IGridHost machine)
{
if ( machine instanceof TileSecurity )
if ( machine instanceof ISecurityProvider )
{
securityProvider.remove( (TileSecurity) machine );
securityProvider.remove( (ISecurityProvider) machine );
updateSecurityKey();
}
}
@@ -109,9 +109,9 @@ public class SecurityCache implements IGridCache, ISecurityGrid
@Override
public void addNode(IGridNode gridNode, IGridHost machine)
{
if ( machine instanceof TileSecurity )
if ( machine instanceof ISecurityProvider )
{
securityProvider.add( (TileSecurity) machine );
securityProvider.add( (ISecurityProvider) machine );
updateSecurityKey();
}
else
me/cache/TickManagerCache.java
Vendored
-5
View File
@@ -3,7 +3,6 @@ package appeng.me.cache;
import java.util.HashMap;
import java.util.PriorityQueue;
import net.minecraft.tileentity.TileEntity;
import appeng.api.networking.IGrid;
import appeng.api.networking.IGridHost;
import appeng.api.networking.IGridNode;
@@ -12,7 +11,6 @@ import appeng.api.networking.ticking.IGridTickable;
import appeng.api.networking.ticking.ITickManager;
import appeng.api.networking.ticking.TickRateModulation;
import appeng.api.networking.ticking.TickingRequest;
import appeng.core.AELog;
import appeng.me.cache.helpers.TickTracker;
public class TickManagerCache implements ITickManager
@@ -170,9 +168,6 @@ public class TickManagerCache implements ITickManager
TickingRequest tr = ((IGridTickable) machine).getTickingRequest( gridNode );
if ( tr != null )
{
if ( machine instanceof TileEntity && ((TileEntity) machine).canUpdate() )
AELog.warning( "Tile: " + machine.getClass().getName() + " - reports to use MC ticking, but also requests Network Based Ticking." );
TickTracker tt = new TickTracker( tr, gridNode, (IGridTickable) machine, currentTick, this );
if ( tr.canBeAlerted )