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

change fill area to be limited

Browse source 
both drain and fill area will share a max edit limit per second. Current
its 30 blocks a second but a config later will allow this to be changed.
This commit is contained in:
Rseifert 2013-04-07 22:15:29 -04:00
parent f491e6f599
commit 8bc375b0ee
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,8 +34,8 @@ import universalelectricity.core.vector.VectorHelper;
public class TileEntityDrain extends TileEntityFluidDevice implements ITankContainer, IDrain public class TileEntityDrain extends TileEntityFluidDevice implements ITankContainer, IDrain
{ {
/* MAX BLOCKS DRAINED PER 1/2 SECOND */ /* MAX BLOCKS DRAINED PER 1/2 SECOND */
public static int MAX_DRAIN_PER_PROCESS = 30; public static int MAX_WORLD_EDITS_PER_PROCESS = 30;
private int currentDrains = 0; private int currentWorldEdits = 0;
public int yFillStart = 0; public int yFillStart = 0;
/* LIST OF PUMPS AND THERE REQUESTS FOR THIS DRAIN */ /* LIST OF PUMPS AND THERE REQUESTS FOR THIS DRAIN */
private HashMap<TileEntityConstructionPump, LiquidStack> requestMap = new HashMap<TileEntityConstructionPump, LiquidStack>(); private HashMap<TileEntityConstructionPump, LiquidStack> requestMap = new HashMap<TileEntityConstructionPump, LiquidStack>();
@ -79,10 +79,10 @@ public class TileEntityDrain extends TileEntityFluidDevice implements ITankConta
/* MAIN LOGIC PATH FOR DRAINING BODIES OF LIQUID */ /* MAIN LOGIC PATH FOR DRAINING BODIES OF LIQUID */
if (!this.worldObj.isRemote && this.canDrainSources() && this.ticks % 20 == 0 && this.requestMap.size() > 0) if (!this.worldObj.isRemote && this.canDrainSources() && this.ticks % 20 == 0 && this.requestMap.size() > 0)
{ {
this.currentDrains = 0; this.currentWorldEdits = 0;
this.doCleanup(); this.doCleanup();
/* 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_DRAIN_PER_PROCESS + 10) if (this.targetSources.size() < this.MAX_WORLD_EDITS_PER_PROCESS + 10)
{ {
this.getNextFluidBlock(); this.getNextFluidBlock();
} }
@ -93,7 +93,7 @@ public class TileEntityDrain extends TileEntityFluidDevice implements ITankConta
{ {
for (Entry<TileEntityConstructionPump, LiquidStack> request : requestMap.entrySet()) for (Entry<TileEntityConstructionPump, LiquidStack> request : requestMap.entrySet())
{ {
if (this.currentDrains >= MAX_DRAIN_PER_PROCESS) if (this.currentWorldEdits >= MAX_WORLD_EDITS_PER_PROCESS)
{ {
break; break;
} }
@ -103,7 +103,7 @@ public class TileEntityDrain extends TileEntityFluidDevice implements ITankConta
while (it.hasNext()) while (it.hasNext())
{ {
Vector3 loc = (Vector3) it.next(); Vector3 loc = (Vector3) it.next();
if (this.currentDrains >= MAX_DRAIN_PER_PROCESS) if (this.currentWorldEdits >= MAX_WORLD_EDITS_PER_PROCESS)
{ {
break; break;
} }
@ -138,7 +138,7 @@ public class TileEntityDrain extends TileEntityFluidDevice implements ITankConta
/* REMOVE BLOCK */ /* REMOVE BLOCK */
loc.setBlock(this.worldObj, 0, 0, 2); loc.setBlock(this.worldObj, 0, 0, 2);
this.currentDrains++; this.currentWorldEdits++;
it.remove(); it.remove();
} }
@ -210,7 +210,7 @@ public class TileEntityDrain extends TileEntityFluidDevice implements ITankConta
yFillStart = this.yCoord + this.getFacing().offsetY; yFillStart = this.yCoord + this.getFacing().offsetY;
} }
if (!this.canDrainSources()) if (!this.canDrainSources() && this.currentWorldEdits >= MAX_WORLD_EDITS_PER_PROCESS)
{ {
/* ID LIQUID BLOCK AND SET VARS FOR BLOCK PLACEMENT */ /* ID LIQUID BLOCK AND SET VARS FOR BLOCK PLACEMENT */
if (resource == null || resource.amount < LiquidContainerRegistry.BUCKET_VOLUME) if (resource == null || resource.amount < LiquidContainerRegistry.BUCKET_VOLUME)
@ -264,6 +264,7 @@ public class TileEntityDrain extends TileEntityFluidDevice implements ITankConta
if (doFill) if (doFill)
{ {
loc.setBlock(worldObj, blockID, meta); loc.setBlock(worldObj, blockID, meta);
this.currentWorldEdits++;
if (!this.updateQue.contains(loc)) if (!this.updateQue.contains(loc))
{ {
this.updateQue.add(loc); this.updateQue.add(loc);
@ -287,6 +288,7 @@ public class TileEntityDrain extends TileEntityFluidDevice implements ITankConta
if (doFill) if (doFill)
{ {
loc.setBlock(worldObj, blockID, meta); loc.setBlock(worldObj, blockID, meta);
this.currentWorldEdits++;
if (!this.updateQue.contains(loc)) if (!this.updateQue.contains(loc))
{ {
this.updateQue.add(loc); this.updateQue.add(loc);