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

possible improvement of overflow

Browse source
This commit is contained in:
Robert Seifert 2013-05-04 02:02:25 -04:00
parent 6620dac6bd
commit 07ba0d47aa
1 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/minecraft/fluidmech/common/pump/TileEntityDrain.java
View file

@ -37,7 +37,7 @@ public class TileEntityDrain extends TileEntityFluidDevice implements ITankConta
private List<Vector3> targetSources = new ArrayList<Vector3>(); private List<Vector3> targetSources = new ArrayList<Vector3>();
private List<Vector3> updateQue = new ArrayList<Vector3>(); private List<Vector3> updateQue = new ArrayList<Vector3>();
private LiquidPathFinder pathFinder = new LiquidPathFinder(this.worldObj, false, TileEntityDrain.MAX_WORLD_EDITS_PER_PROCESS * 2);
@Override @Override
public String getMeterReading(EntityPlayer user, ForgeDirection side) public String getMeterReading(EntityPlayer user, ForgeDirection side)
{ {
@ -72,7 +72,7 @@ public class TileEntityDrain extends TileEntityFluidDevice implements ITankConta
public void updateEntity() public void updateEntity()
{ {
/* MAIN LOGIC PATH FOR DRAINING BODIES OF LIQUID */ /* MAIN LOGIC PATH FOR DRAINING BODIES OF LIQUID */
if (!this.worldObj.isRemote && this.ticks % 20 == 0) if (!this.worldObj.isRemote && this.ticks % 30 == 0)
{ {
this.currentWorldEdits = 0; this.currentWorldEdits = 0;
this.doCleanup(); this.doCleanup();
@ -80,7 +80,7 @@ public class TileEntityDrain extends TileEntityFluidDevice implements ITankConta
if (this.canDrainSources() && this.requestMap.size() > 0) if (this.canDrainSources() && this.requestMap.size() > 0)
{ {
/* ONLY FIND NEW SOURCES IF OUR CURRENT LIST RUNS DRY */ /* ONLY FIND NEW SOURCES IF OUR CURRENT LIST RUNS DRY */
if (this.targetSources.size() < this.MAX_WORLD_EDITS_PER_PROCESS + 10) if (this.targetSources.size() < TileEntityDrain.MAX_WORLD_EDITS_PER_PROCESS + 10)
{ {
this.getNextFluidBlock(); this.getNextFluidBlock();
} }
@ -91,7 +91,7 @@ public class TileEntityDrain extends TileEntityFluidDevice implements ITankConta
break; break;
} }
Iterator it = this.targetSources.iterator(); Iterator<Vector3> it = this.targetSources.iterator();
while (it.hasNext()) while (it.hasNext())
{ {
Vector3 loc = (Vector3) it.next(); Vector3 loc = (Vector3) it.next();
@ -136,16 +136,6 @@ public class TileEntityDrain extends TileEntityFluidDevice implements ITankConta
} }
} }
} }
else if (FluidHelper.getLiquidFromBlockId(loc.getBlockID(this.worldObj)) != null && loc.getBlockMetadata(this.worldObj) != 0)
{
loc.setBlock(this.worldObj, 0, 0, 2);
/* ADD TO UPDATE QUE */
if (!this.updateQue.contains(loc))
{
this.updateQue.add(loc);
}
}
} }
} }
} }
@ -156,8 +146,8 @@ public class TileEntityDrain extends TileEntityFluidDevice implements ITankConta
* Finds more liquid blocks using a path finder to be drained * Finds more liquid blocks using a path finder to be drained
*/ */
public void getNextFluidBlock() public void getNextFluidBlock()
{ {
LiquidPathFinder pathFinder = new LiquidPathFinder(this.worldObj, false, this.MAX_WORLD_EDITS_PER_PROCESS * 2); pathFinder.reset();
pathFinder.init(new Vector3(this.xCoord + this.getFacing().offsetX, this.yCoord + this.getFacing().offsetY, this.zCoord + this.getFacing().offsetZ)); pathFinder.init(new Vector3(this.xCoord + this.getFacing().offsetX, this.yCoord + this.getFacing().offsetY, this.zCoord + this.getFacing().offsetZ));
// System.out.println("Nodes:" + pathFinder.nodes.size() + "Results:" + // System.out.println("Nodes:" + pathFinder.nodes.size() + "Results:" +
// pathFinder.results.size()); // pathFinder.results.size());
@ -172,9 +162,9 @@ public class TileEntityDrain extends TileEntityFluidDevice implements ITankConta
/* CALL UPDATE ON EDITED BLOCKS */ /* CALL UPDATE ON EDITED BLOCKS */
if (this.ticks % 100 == 0 && updateQue.size() > 0) if (this.ticks % 100 == 0 && updateQue.size() > 0)
{ {
Iterator pp = this.updateQue.iterator(); Iterator<Vector3> pp = this.updateQue.iterator();
int up = 0; int up = 0;
while (pp.hasNext() && up < this.MAX_WORLD_EDITS_PER_PROCESS) while (pp.hasNext() && up < TileEntityDrain.MAX_WORLD_EDITS_PER_PROCESS)
{ {
Vector3 vec = (Vector3) pp.next(); Vector3 vec = (Vector3) pp.next();
worldObj.notifyBlockChange(vec.intX(), vec.intY(), vec.intZ(), vec.getBlockID(this.worldObj)); worldObj.notifyBlockChange(vec.intX(), vec.intY(), vec.intZ(), vec.getBlockID(this.worldObj));