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

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

Browse source
This commit is contained in:
AlgorithmX2 2014-04-22 22:03:09 -05:00
commit a5c2c7244d
6 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
me/GridConnection.java
View file

@ -24,7 +24,7 @@ public class GridConnection implements IGridConnection, IPathItem
private ForgeDirection fromAtoB; private ForgeDirection fromAtoB;
private GridNode sideB; private GridNode sideB;
byte visitorIterationNumber = Byte.MIN_VALUE; Object visitorIterationNumber = null;
public int channelData = 0; public int channelData = 0;

29
me/GridNode.java
View file

@ -42,10 +42,7 @@ public class GridNode implements IGridNode, IPathItem
IGridBlock gridProxy; IGridBlock gridProxy;
Grid myGrid; Grid myGrid;
public static byte currentVisitorIterationNumber = Byte.MIN_VALUE; Object visitorIterationNumber = null;
public static byte currentChannelsIterationNumber = Byte.MIN_VALUE;
byte visitorIterationNumber = Byte.MIN_VALUE;
// connection criteria // connection criteria
AEColor myColor = AEColor.Transparent; AEColor myColor = AEColor.Transparent;
@ -152,12 +149,12 @@ public class GridNode implements IGridNode, IPathItem
@Override @Override
public void beginVisition(IGridVisitor g) public void beginVisition(IGridVisitor g)
{ {
currentVisitorIterationNumber++; Object tracker = new Object();
LinkedList<GridNode> nextRun = new LinkedList(); LinkedList<GridNode> nextRun = new LinkedList();
nextRun.add( this ); nextRun.add( this );
visitorIterationNumber = currentVisitorIterationNumber; visitorIterationNumber = tracker;
if ( g instanceof IGridConnecitonVisitor ) if ( g instanceof IGridConnecitonVisitor )
{ {
@ -173,7 +170,7 @@ public class GridNode implements IGridNode, IPathItem
nextRun = new LinkedList(); nextRun = new LinkedList();
for (GridNode n : thisRun) for (GridNode n : thisRun)
n.visitorConnection( g, nextRun, nextConn ); n.visitorConnection( tracker, g, nextRun, nextConn );
} }
} }
else else
@ -184,12 +181,12 @@ public class GridNode implements IGridNode, IPathItem
nextRun = new LinkedList(); nextRun = new LinkedList();
for (GridNode n : thisRun) for (GridNode n : thisRun)
n.visitorNode( g, nextRun ); n.visitorNode( tracker, g, nextRun );
} }
} }
} }
private void visitorConnection(IGridVisitor g, LinkedList<GridNode> nextRun, LinkedList<IGridConnection> nextConnections) private void visitorConnection(Object tracker, IGridVisitor g, LinkedList<GridNode> nextRun, LinkedList<IGridConnection> nextConnections)
{ {
if ( g.visitNode( this ) ) if ( g.visitNode( this ) )
{ {
@ -198,23 +195,23 @@ public class GridNode implements IGridNode, IPathItem
GridNode gn = (GridNode) gc.getOtherSide( this ); GridNode gn = (GridNode) gc.getOtherSide( this );
GridConnection gcc = (GridConnection) gc; GridConnection gcc = (GridConnection) gc;
if ( gcc.visitorIterationNumber != currentVisitorIterationNumber ) if ( gcc.visitorIterationNumber != tracker )
{ {
gcc.visitorIterationNumber = currentChannelsIterationNumber; gcc.visitorIterationNumber = tracker;
nextConnections.add( gc ); nextConnections.add( gc );
} }
if ( currentVisitorIterationNumber == gn.visitorIterationNumber ) if ( tracker == gn.visitorIterationNumber )
continue; continue;
gn.visitorIterationNumber = currentVisitorIterationNumber; gn.visitorIterationNumber = tracker;
nextRun.add( gn ); nextRun.add( gn );
} }
} }
} }
private void visitorNode(IGridVisitor g, LinkedList<GridNode> nextRun) private void visitorNode(Object tracker, IGridVisitor g, LinkedList<GridNode> nextRun)
{ {
if ( g.visitNode( this ) ) if ( g.visitNode( this ) )
{ {
@ -222,10 +219,10 @@ public class GridNode implements IGridNode, IPathItem
{ {
GridNode gn = (GridNode) gc.getOtherSide( this ); GridNode gn = (GridNode) gc.getOtherSide( this );
if ( currentVisitorIterationNumber == gn.visitorIterationNumber ) if ( tracker == gn.visitorIterationNumber )
continue; continue;
gn.visitorIterationNumber = currentVisitorIterationNumber; gn.visitorIterationNumber = tracker;
nextRun.add( gn ); nextRun.add( gn );
} }

2
me/cache/EnergyGridCache.java vendored
View file

@ -351,7 +351,7 @@ public class EnergyGridCache implements IEnergyGrid
// power information. // power information.
double drained = extractAEPower( getIdlePowerUsage(), Actionable.MODULATE, PowerMultiplier.CONFIG ); double drained = extractAEPower( getIdlePowerUsage(), Actionable.MODULATE, PowerMultiplier.CONFIG );
boolean currentlyHasPower = drained >= drainPerTick - 0.1; boolean currentlyHasPower = drained >= drainPerTick - 0.001;
// ticks since change.. // ticks since change..
if ( currentlyHasPower == hasPower ) if ( currentlyHasPower == hasPower )

4
me/cache/PathGridCache.java vendored
View file

@ -84,7 +84,7 @@ public class PathGridCache implements IPathingGrid
used = 0; used = 0;
int nodes = myGrid.getNodes().size(); int nodes = myGrid.getNodes().size();
ticksUntilReady = 20 + (nodes / 10); ticksUntilReady = 20 + Math.max( 0, nodes / 100 - 20 );
channelsByBlocks = nodes * used; channelsByBlocks = nodes * used;
channelPowerUsage = (double) channelsByBlocks / 128.0; channelPowerUsage = (double) channelsByBlocks / 128.0;
@ -98,7 +98,7 @@ public class PathGridCache implements IPathingGrid
else else
{ {
int nodes = myGrid.getNodes().size(); int nodes = myGrid.getNodes().size();
ticksUntilReady = 20 + (nodes / 10); ticksUntilReady = 20 + Math.max( 0, nodes / 100 - 20 );
closedList = new HashSet(); closedList = new HashSet();
semiOpen = new HashSet(); semiOpen = new HashSet();

9
parts/p2p/PartP2PLiquids.java
View file

@ -22,6 +22,9 @@ import cpw.mods.fml.relauncher.SideOnly;
public class PartP2PLiquids extends PartP2PTunnel<PartP2PLiquids> implements IFluidHandler public class PartP2PLiquids extends PartP2PTunnel<PartP2PLiquids> implements IFluidHandler
{ {
private final static FluidTankInfo[] activeTank = new FluidTankInfo[] { new FluidTankInfo( null, 10000 ) };
private final static FluidTankInfo[] inactiveTank = new FluidTankInfo[] { new FluidTankInfo( null, 0 ) };
public TunnelType getTunnelType() public TunnelType getTunnelType()
{ {
return TunnelType.FLUID; return TunnelType.FLUID;
@ -37,21 +40,21 @@ public class PartP2PLiquids extends PartP2PTunnel<PartP2PLiquids> implements IFl
{ {
PartP2PLiquids tun = getInput(); PartP2PLiquids tun = getInput();
if ( tun != null ) if ( tun != null )
return new FluidTankInfo[] { new FluidTankInfo( null, 10000 ) }; return activeTank;
} }
else else
{ {
try try
{ {
if ( !getOutputs().isEmpty() ) if ( !getOutputs().isEmpty() )
return new FluidTankInfo[] { new FluidTankInfo( null, 10000 ) }; return activeTank;
} }
catch (GridAccessException e) catch (GridAccessException e)
{ {
// :( // :(
} }
} }
return new FluidTankInfo[] { new FluidTankInfo( null, 0 ) }; return inactiveTank;
} }
IFluidHandler cachedTank; IFluidHandler cachedTank;

2
tile/networking/TileController.java
View file

@ -83,7 +83,7 @@ public class TileController extends AENetworkPowerTile implements IAEPowerStorag
} }
@MENetworkEventSubscribe @MENetworkEventSubscribe
public void onPowerChange(MENetworkControllerChange status) public void onControllerChange(MENetworkControllerChange status)
{ {
updateMeta(); updateMeta();
} }