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

Worked on pathfinder

Browse source
This commit is contained in:
DarkGuardsman 2013-07-26 20:52:11 -04:00
parent 309f9a620a
commit f773af8ff7
2 changed files with 36 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,19 +15,24 @@ import dark.core.helpers.FluidHelper;
/** A simpler pathfinder based on Calclavia's PathFinder from UE api */ /** A simpler pathfinder based on Calclavia's PathFinder from UE api */
public class LiquidPathFinder public class LiquidPathFinder
{ {
private World world; /* MC WORLD */ /** Curent world this pathfinder will operate in */
public List<Vector3> nodes = new ArrayList<Vector3>(); /* private World world;
* LOCATIONs THE PATH FINDER HAS GONE /** List of all nodes traveled by the path finder */
* OVER public List<Vector3> nodes = new ArrayList<Vector3>();
*/ /** List of all nodes that match the search parms */
public List<Vector3> results = new ArrayList<Vector3>();/* LOCATIONS THAT ARE VALID RESULTS */ public List<Vector3> results = new ArrayList<Vector3>();
private boolean fill = false; /* ARE WE FILLING THE PATH OR DRAINING THE PATH */ /** Are we looking for liquid fillable blocks */
private ForgeDirection priority; /* BASED ON fill -- WHICH DIRECTION WILL THE PATH GO FIRST */ private boolean fill = false;
/** priority search direction either up or down only */
private ForgeDirection priority;
/** Limit on the searched nodes per run */
private int resultLimit = 2000; private int resultLimit = 2000;
/** Start location of the pathfinder used for range calculations */
private Vector2 Start; private Vector2 Start;
/** Range to limit the search to */
private double range; private double range;
private Random random = new Random(); /** List of forgeDirection to use that are shuffled to prevent strait lines */
List<ForgeDirection> bn = new ArrayList<ForgeDirection>(); List<ForgeDirection> shuffledDirections = new ArrayList<ForgeDirection>();
public LiquidPathFinder(final World world, final int resultLimit, final double range) public LiquidPathFinder(final World world, final int resultLimit, final double range)
{ {
@ -43,13 +48,15 @@ public class LiquidPathFinder
} }
this.resultLimit = resultLimit; this.resultLimit = resultLimit;
this.reset(); this.reset();
bn.add(ForgeDirection.EAST); shuffledDirections.add(ForgeDirection.EAST);
bn.add(ForgeDirection.WEST); shuffledDirections.add(ForgeDirection.WEST);
bn.add(ForgeDirection.NORTH); shuffledDirections.add(ForgeDirection.NORTH);
bn.add(ForgeDirection.SOUTH); shuffledDirections.add(ForgeDirection.SOUTH);
} }
/** @return True on success finding, false on failure. */ /** Searches for nodes attached to the given node
*
* @return True on success finding, false on failure. */
public boolean findNodes(Vector3 node) public boolean findNodes(Vector3 node)
{ {
if (node == null) if (node == null)
@ -67,8 +74,7 @@ public class LiquidPathFinder
return true; return true;
} }
int id = node.getBlockID(world); if (this.fill && FluidHelper.isFillable(world, node))
if (this.fill && (id == 0 || (FluidHelper.isFillable(world, node))))
{ {
this.results.add(node); this.results.add(node);
} }
@ -77,7 +83,7 @@ public class LiquidPathFinder
this.results.add(node); this.results.add(node);
} }
if (this.isDone(node)) if (this.isDone(node.clone()))
{ {
return false; return false;
} }
@ -87,10 +93,10 @@ public class LiquidPathFinder
return true; return true;
} }
Collections.shuffle(bn); Collections.shuffle(shuffledDirections);
Collections.shuffle(bn); Collections.shuffle(shuffledDirections);
for (ForgeDirection direction : bn) for (ForgeDirection direction : shuffledDirections)
{ {
if (find(direction, vec)) if (find(direction, vec))
{ {
@ -111,9 +117,12 @@ public class LiquidPathFinder
return false; return false;
} }
public boolean find(ForgeDirection direction, Vector3 vec) /** Find all node attached to the origin mode in the given direction
*
* Note: Calls findNode if the next code is valid */
public boolean find(ForgeDirection direction, Vector3 origin)
{ {
vec = vec.clone().modifyPositionFromSide(direction); Vector3 vec = origin.clone().modifyPositionFromSide(direction);
double distance = vec.toVector2().distanceTo(this.Start); double distance = vec.toVector2().distanceTo(this.Start);
if (distance <= this.range && this.isValidNode(vec) & !this.nodes.contains(vec)) if (distance <= this.range && this.isValidNode(vec) & !this.nodes.contains(vec))
{ {
@ -125,11 +134,13 @@ public class LiquidPathFinder
return false; return false;
} }
/** Checks to see if this node is valid to path find threw */
public boolean isValidNode(Vector3 pos) public boolean isValidNode(Vector3 pos)
{ {
return FluidHelper.drainBlock(world, pos, false) != null; return FluidHelper.drainBlock(world, pos, false) != null || FluidHelper.isFillable(world, pos);
} }
/** Checks to see if we are done pathfinding */
public boolean isDone(Vector3 vec) public boolean isDone(Vector3 vec)
{ {
if (this.results.size() >= this.resultLimit || this.nodes.size() >= 4000) if (this.results.size() >= this.resultLimit || this.nodes.size() >= 4000)

8
src/minecraft/dark/fluid/common/pump/TileEntityDrain.java
View file

@ -74,11 +74,7 @@ public class TileEntityDrain extends TileEntityFluidDevice implements IFluidHand
int meta = 0; int meta = 0;
if (worldObj != null) if (worldObj != null)
{ {
meta = worldObj.getBlockMetadata(xCoord, yCoord, zCoord); meta = worldObj.getBlockMetadata(xCoord, yCoord, zCoord) % 6;
if (meta > 5)
{
meta -= 6;
}
} }
return ForgeDirection.getOrientation(meta); return ForgeDirection.getOrientation(meta);
} }
@ -224,8 +220,6 @@ public class TileEntityDrain extends TileEntityFluidDevice implements IFluidHand
} }
@Override @Override
public int fillArea(FluidStack resource, boolean doFill) public int fillArea(FluidStack resource, boolean doFill)
{ {