tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Got fill part of the drain mostly working

Browse source 
It still needs more refinement, balancing, and bug fixes. Main issue
that was spotted but not confirmed yet was liquid being used even if not
filled.
This commit is contained in:
DarkGuardsman 2013-07-27 00:13:30 -04:00
parent f773af8ff7
commit d8c167f06a
3 changed files with 136 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,8 +2,8 @@ package dark.fluid.common.pump;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Random;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
@ -12,7 +12,9 @@ import universalelectricity.core.vector.Vector2;
import universalelectricity.core.vector.Vector3;
import dark.core.helpers.FluidHelper;
/** A simpler pathfinder based on Calclavia's PathFinder from UE api */
/** A simpler path Finder used to find drainable or fillable tiles
*
* @author DarkGuardsman */
public class LiquidPathFinder
{
/** Curent world this pathfinder will operate in */
@ -65,20 +67,9 @@ public class LiquidPathFinder
}
try
{
Vector3 vec = node.clone();
this.nodes.add(node);
Chunk chunk = this.world.getChunkFromBlockCoords(vec.intX(), vec.intZ());
if (chunk == null || !chunk.isChunkLoaded)
{
return true;
}
if (this.fill && FluidHelper.isFillable(world, node))
{
this.results.add(node);
}
else if (!this.fill && FluidHelper.drainBlock(world, node, false) != null)
if (this.isValidResult(node))
{
this.results.add(node);
}
@ -98,7 +89,7 @@ public class LiquidPathFinder
for (ForgeDirection direction : shuffledDirections)
{
if (find(direction, vec))
if (find(direction, node.clone()))
{
return true;
}
@ -137,7 +128,44 @@ public class LiquidPathFinder
/** Checks to see if this node is valid to path find threw */
public boolean isValidNode(Vector3 pos)
{
return FluidHelper.drainBlock(world, pos, false) != null || FluidHelper.isFillable(world, pos);
if (pos == null)
{
return false;
}
/* Check if the chunk is loaded to prevent action outside of the loaded area */
Chunk chunk = this.world.getChunkFromBlockCoords(pos.intX(), pos.intZ());
if (chunk == null || !chunk.isChunkLoaded)
{
return false;
}
/* Fillable blocks need to be connected to fillable fluid blocks to be valid */
if (FluidHelper.isFillableBlock(world, pos))
{
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
{
if (FluidHelper.isFillableFluid(world, pos.clone().modifyPositionFromSide(dir)))
{
return true;
}
}
}
return FluidHelper.drainBlock(world, pos, false) != null || FluidHelper.isFillableFluid(world, pos);
}
public boolean isValidResult(Vector3 node)
{
if (this.fill && (FluidHelper.isFillableBlock(world, node) || FluidHelper.isFillableFluid(world, node)))
{
return true;
}
else if (!this.fill && FluidHelper.drainBlock(world, node, false) != null)
{
return true;
}
else
{
return false;
}
}
/** Checks to see if we are done pathfinding */
@ -151,11 +179,18 @@ public class LiquidPathFinder
}
/** Called to execute the pathfinding operation. */
public LiquidPathFinder init(final Vector3 startNode, final boolean fill)
public LiquidPathFinder start(final Vector3 startNode, final boolean fill)
{
this.Start = startNode.toVector2();
this.fill = fill;
this.findNodes(startNode);
if (this.nodes.isEmpty())
{
this.findNodes(startNode);
}
else
{
this.find(ForgeDirection.UNKNOWN, startNode);
}
return this;
}
@ -165,4 +200,25 @@ public class LiquidPathFinder
this.results.clear();
return this;
}
public LiquidPathFinder refresh()
{
Iterator<Vector3> it = this.nodes.iterator();
while(it.hasNext())
{
if(!this.isValidNode(it.next()))
{
it.remove();
}
}
it = this.results.iterator();
while(it.hasNext())
{
if(!this.isValidResult(it.next()))
{
it.remove();
}
}
return this;
}
}

3
src/minecraft/dark/fluid/common/pump/TileEntityConstructionPump.java
View file

@ -28,8 +28,7 @@ public class TileEntityConstructionPump extends TileEntityMachine implements IFl
@Override
public void initiate()
{
// TODO if use wrench to change rotation have it call this
int meta = worldObj.getBlockMetadata(xCoord, yCoord, zCoord);
super.initiate();
}
public ForgeDirection getFacing(boolean input)

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

@ -16,7 +16,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import universalelectricity.core.vector.Vector2;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import dark.api.fluid.IDrain;
@ -34,7 +33,6 @@ public class TileEntityDrain extends TileEntityFluidDevice implements IFluidHand
/* LIST OF PUMPS AND THERE REQUESTS FOR THIS DRAIN */
private HashMap<TileEntity, Pair<FluidStack, Integer>> requestMap = new HashMap<TileEntity, Pair<FluidStack, Integer>>();
private List<Vector3> targetSources = new ArrayList<Vector3>();
private List<Vector3> updateQue = new ArrayList<Vector3>();
private LiquidPathFinder pathLiquid;
@ -84,7 +82,7 @@ public class TileEntityDrain extends TileEntityFluidDevice implements IFluidHand
{
super.updateEntity();
/* MAIN LOGIC PATH FOR DRAINING BODIES OF LIQUID */
if (!this.worldObj.isRemote && this.ticks % 30 == 0)
if (!this.worldObj.isRemote && this.ticks % 20 == 0)
{
this.currentWorldEdits = 0;
this.doCleanup();
@ -92,9 +90,9 @@ public class TileEntityDrain extends TileEntityFluidDevice implements IFluidHand
if (this.canDrainSources() && this.requestMap.size() > 0)
{
/* ONLY FIND NEW SOURCES IF OUR CURRENT LIST RUNS DRY */
if (this.targetSources.size() < TileEntityDrain.MAX_WORLD_EDITS_PER_PROCESS + 10)
if (this.getLiquidFinder().results.size() < TileEntityDrain.MAX_WORLD_EDITS_PER_PROCESS + 10)
{
this.getNextFluidBlock();
this.getLiquidFinder().start(new Vector3(this).modifyPositionFromSide(this.getFacing()), false);
}
for (Entry<TileEntity, Pair<FluidStack, Integer>> request : requestMap.entrySet())
{
@ -165,23 +163,15 @@ public class TileEntityDrain extends TileEntityFluidDevice implements IFluidHand
}
}
/** Finds more liquid blocks using a path finder to be drained */
public void getNextFluidBlock()
{
getLiquidFinder().reset();
getLiquidFinder().init(new Vector3(this.xCoord + this.getFacing().offsetX, this.yCoord + this.getFacing().offsetY, this.zCoord + this.getFacing().offsetZ), false);
// System.out.println("Nodes:" + pathFinder.nodes.size() + "Results:" +
// pathFinder.results.size());
for (Vector3 vec : getLiquidFinder().nodes)
{
this.addVectorToQue(vec);
}
}
@SuppressWarnings("unchecked")
/** Cleans up all the data lists to remove unneeded references
*
* UpdateQue run every 5 seconds
*
* RequestQue is cleaned every time this method is called */
public void doCleanup()
{
/* Call refresh on path finder to clear out invalid nodes/results */
this.getLiquidFinder().refresh();
/* CALL UPDATE ON EDITED BLOCKS */
if (this.ticks % 100 == 0 && updateQue.size() > 0)
{
@ -197,12 +187,12 @@ public class TileEntityDrain extends TileEntityFluidDevice implements IFluidHand
}
}
/* CLEANUP REQUEST MAP AND REMOVE INVALID TILES */
Iterator requests = this.requestMap.entrySet().iterator();
Iterator<Entry<TileEntity, Pair<FluidStack, Integer>>> requests = this.requestMap.entrySet().iterator();
TileEntity pipe = VectorHelper.getTileEntityFromSide(worldObj, new Vector3(this), this.getFacing().getOpposite());
while (requests.hasNext())
{
Entry<TileEntityConstructionPump, FluidStack> entry = (Entry<TileEntityConstructionPump, FluidStack>) requests.next();
Entry<TileEntity, Pair<FluidStack, Integer>> entry = (Entry<TileEntity, Pair<FluidStack, Integer>>) requests.next();
TileEntity entity = entry.getKey();
if (entity == null)
{
@ -223,7 +213,7 @@ public class TileEntityDrain extends TileEntityFluidDevice implements IFluidHand
@Override
public int fillArea(FluidStack resource, boolean doFill)
{
int drained = 0;
int fillVolume = 0;
if (!this.canDrainSources() && this.currentWorldEdits < MAX_WORLD_EDITS_PER_PROCESS)
{
@ -233,68 +223,94 @@ public class TileEntityDrain extends TileEntityFluidDevice implements IFluidHand
return 0;
}
int blockID = resource.getFluid().getBlockID();
int blocks = (resource.amount / FluidContainerRegistry.BUCKET_VOLUME);
fillVolume = resource.amount;
/* FIND ALL VALID BLOCKS ON LEVEL OR BELLOW */
final Vector3 faceVec = new Vector3(this.xCoord + this.getFacing().offsetX, this.yCoord + this.getFacing().offsetY, this.zCoord + this.getFacing().offsetZ);
getLiquidFinder().init(faceVec, true);
System.out.println("Drain:FillArea: Targets -> " + getLiquidFinder().results.size());
final Vector3 faceVec = new Vector3(this).modifyPositionFromSide(this.getFacing());
this.getLiquidFinder().start(faceVec, true);
//System.out.println("Drain>>FillArea>>Targets>> " + getLiquidFinder().results.size());
/* SORT RESULTS TO PUT THE LOWEST AND CLOSEST AT THE TOP */
if (getLiquidFinder().results.size() > 1)
{
this.sortBlockList(faceVec, getLiquidFinder().results, true, false);
}
for (Vector3 loc : getLiquidFinder().results)
List<Vector3> fluids = new ArrayList<Vector3>();
List<Vector3> blocks = new ArrayList<Vector3>();
List<Vector3> drained = new ArrayList<Vector3>();
/* Sort results out into two groups and clear the rest out of the result list */
Iterator<Vector3> it = this.getLiquidFinder().results.iterator();
while (it.hasNext())
{
if (blocks <= 0)
Vector3 vec = it.next();
if (FluidHelper.isFillableFluid(worldObj, vec) && !fluids.contains(vec) && !blocks.contains(vec))
{
fluids.add(vec);
}
else if (FluidHelper.isFillableBlock(worldObj, vec) && !blocks.contains(vec) && !fluids.contains(vec))
{
blocks.add(vec);
}
else
{
it.remove();
}
}
/* Fill non-full fluids first */
for (Vector3 loc : fluids)
{
if (fillVolume <= 0)
{
break;
}
Fluid stack = FluidHelper.getFluidFromBlockID(loc.getBlockID(worldObj));
if (stack != null && stack.getBlockID() == blockID && loc.getBlockMetadata(worldObj) != 0)
if (FluidHelper.isFillableFluid(worldObj, loc))
{
drained += FluidContainerRegistry.BUCKET_VOLUME;
blocks--;
fillVolume -= FluidHelper.fillBlock(worldObj, loc, FluidHelper.getStack(resource, fillVolume), doFill);
//System.out.println("Drain>>FillArea>>Filling>>" + (doFill ? "" : "Sim>>") + ">>Fluid>" + loc.toString());
if (doFill)
{
loc.setBlock(worldObj, blockID, 0);
drained.add(loc);
this.currentWorldEdits++;
if (!this.updateQue.contains(loc))
{
this.updateQue.add(loc);
}
}
}
}
for (Vector3 loc : getLiquidFinder().results)
/* Fill air or replaceable blocks after non-full fluids */
for (Vector3 loc : blocks)
{
if (blocks <= 0)
if (fillVolume <= 0)
{
break;
}
if (loc.getBlockID(worldObj) == 0)
if (FluidHelper.isFillableBlock(worldObj, loc))
{
drained += FluidContainerRegistry.BUCKET_VOLUME;
blocks--;
fillVolume -= FluidHelper.fillBlock(worldObj, loc, FluidHelper.getStack(resource, fillVolume), doFill);
//System.out.println("Drain>>FillArea>>Filling>>" + (doFill ? "" : "Sim>>") + ">>Block>" + loc.toString());
if (doFill)
{
loc.setBlock(worldObj, blockID, 0);
drained.add(loc);
this.currentWorldEdits++;
if (!this.updateQue.contains(loc))
{
this.updateQue.add(loc);
}
}
}
}
this.getLiquidFinder().results.removeAll(drained);
//System.out.println("Drain>>FillArea>>Filling>>Filled>>" + (doFill ? "" : "Sim>>") + (resource.amount - fillVolume) + "mb");
return Math.max(resource.amount - fillVolume, 0);
}
return drained;
return 0;
}
/** Used to sort a list of vector3 locations using the vector3's distance from one point and
@ -378,14 +394,6 @@ public class TileEntityDrain extends TileEntityFluidDevice implements IFluidHand
}
}
public void addVectorToQue(Vector3 vector)
{
if (!this.targetSources.contains(vector))
{
this.targetSources.add(vector);
}
}
@Override
public boolean canFill(ForgeDirection from, Fluid fluid)
{