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

Changed Grid Flags

Browse Source
This commit is contained in:
AlgorithmX2
2014-07-23 13:55:20 -05:00
parent 253221e494
commit d9a747d26b
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
me/GridNode.java
+1 -1
View File
@@ -141,7 +141,7 @@ public class GridNode implements IGridNode, IPathItem
public void updateState()
{
EnumSet<GridFlags> set = gridProxy.getFlags();
maxChannels = set.contains( GridFlags.CANNOT_CARRY ) ? 0 : (set.contains( GridFlags.TIER_2_CAPACITY ) ? 32 : 8);
maxChannels = set.contains( GridFlags.CANNOT_CARRY ) ? 0 : (set.contains( GridFlags.DENSE_CAPACITY ) ? 32 : 8);
myColor = gridProxy.getGridColor();
validDirections = gridProxy.getConnectableSides();
FindConnections();
me/cache/PathGridCache.java
Vendored
+3 -3
View File
@@ -170,7 +170,7 @@ public class PathGridCache implements IPathingGrid
IGridBlock gb = nodes.getGridBlock();
EnumSet<GridFlags> flags = gb.getFlags();
if ( flags.contains( GridFlags.DENSE_CHANNEL ) && !blockDense.isEmpty() )
if ( flags.contains( GridFlags.COMPRESSED_CHANNEL ) && !blockDense.isEmpty() )
return 9;
depth++;
@@ -212,7 +212,7 @@ public class PathGridCache implements IPathingGrid
if ( flags.contains( GridFlags.REQUIRE_CHANNEL ) )
requireChannels.remove( gridNode );
if ( flags.contains( GridFlags.CANNOT_CARRY_DENSE ) )
if ( flags.contains( GridFlags.CANNOT_CARRY_COMPRESSED ) )
blockDense.remove( gridNode );
repath();
@@ -232,7 +232,7 @@ public class PathGridCache implements IPathingGrid
if ( flags.contains( GridFlags.REQUIRE_CHANNEL ) )
requireChannels.add( gridNode );
if ( flags.contains( GridFlags.CANNOT_CARRY_DENSE ) )
if ( flags.contains( GridFlags.CANNOT_CARRY_COMPRESSED ) )
blockDense.add( gridNode );
repath();
me/pathfinding/PathSegment.java
+2 -2
View File
@@ -59,7 +59,7 @@ public class PathSegment
{
boolean worked = false;
if ( flags.contains( GridFlags.DENSE_CHANNEL ) )
if ( flags.contains( GridFlags.COMPRESSED_CHANNEL ) )
worked = useDenseChannel( pi );
else
worked = useChannel( pi );
@@ -118,7 +118,7 @@ public class PathSegment
IPathItem pi = start;
while (pi != null)
{
if ( !pi.canSupportMoreChannels() || pi.getFlags().contains( GridFlags.CANNOT_CARRY_DENSE ) )
if ( !pi.canSupportMoreChannels() || pi.getFlags().contains( GridFlags.CANNOT_CARRY_COMPRESSED ) )
return false;
pi = pi.getControllerRoute();