Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed liquid path finder

Browse source 
Wasn't finding fillable block correctly and still really isn't due to
the fact it can ID air correctly.
This commit is contained in:
DarkGuardsman 2013-07-30 23:09:14 -04:00
parent 391c54f968
commit fdbb423145
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/minecraft/dark/fluid/common/pump/LiquidPathFinder.java
View file

@ -66,7 +66,7 @@ public class LiquidPathFinder
{ {
if (node == null) if (node == null)
{ {
return true; return false;
} }
try try
{ {
@ -118,7 +118,7 @@ public class LiquidPathFinder
{ {
Vector3 vec = origin.clone().modifyPositionFromSide(direction); Vector3 vec = origin.clone().modifyPositionFromSide(direction);
double distance = vec.toVector2().distanceTo(this.Start.toVector2()); double distance = vec.toVector2().distanceTo(this.Start.toVector2());
if (distance <= this.range && this.isValidNode(vec) & !this.nodes.contains(vec)) if (distance <= this.range && this.isValidNode(vec))
{ {
if (this.findNodes(vec)) if (this.findNodes(vec))
{ {
@ -131,7 +131,7 @@ public class LiquidPathFinder
/** Checks to see if this node is valid to path find threw */ /** Checks to see if this node is valid to path find threw */
public boolean isValidNode(Vector3 pos) public boolean isValidNode(Vector3 pos)
{ {
if (pos == null) if (pos == null || this.nodes.contains(pos))
{ {
return false; return false;
} }
@ -141,18 +141,19 @@ public class LiquidPathFinder
{ {
return false; return false;
} }
boolean flag = FluidHelper.drainBlock(world, pos, false) != null || FluidHelper.isFillableFluid(world, pos);
/* Fillable blocks need to be connected to fillable fluid blocks to be valid */ /* Fillable blocks need to be connected to fillable fluid blocks to be valid */
if (this.fill && FluidHelper.isFillableBlock(world, pos)) if (this.fill && flag)
{ {
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
{ {
if (FluidHelper.isFillableFluid(world, pos.clone().modifyPositionFromSide(dir)) || FluidHelper.drainBlock(world, pos, false) != null) if (FluidHelper.isFillableBlock(world, pos.clone().modifyPositionFromSide(dir)))
{ {
return true; return true;
} }
} }
} }
return FluidHelper.drainBlock(world, pos, false) != null || FluidHelper.isFillableFluid(world, pos); return flag;
} }
public boolean isValidResult(Vector3 node) public boolean isValidResult(Vector3 node)
@ -220,10 +221,15 @@ public class LiquidPathFinder
it = this.results.iterator(); it = this.results.iterator();
while (it.hasNext()) while (it.hasNext())
{ {
if (!this.isValidResult(it.next())) Vector3 vec = it.next();
if (!this.isValidResult(vec))
{ {
it.remove(); it.remove();
} }
if (this.isValidNode(vec))
{
this.nodes.add(vec);
}
} }
return this; return this;
} }