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

Implemented maxFlow rate in pipe network fill methods

Browse source
This commit is contained in:
DarkGuardsman 2014-01-21 16:57:12 -05:00
parent a2a8f8c5e1
commit 7da8ac4289
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/resonantinduction/mechanical/fluid/network/PipeNetwork.java
View file

@ -40,16 +40,8 @@ public class PipeNetwork extends FluidNetwork
{
int volPer = (stack.amount / count);
int volPerSide = (volPer / sideCount);
int maxFill = 1000;
TileEntity tile = new Vector3((TileEntity) entry.getKey()).modifyPositionFromSide(dir).getTileEntity(((TileEntity) entry.getKey()).worldObj);
if (tile instanceof IFluidPipe)
{
maxFill = ((IFluidPipe) tile).getMaxFlowRate();
}
stack.amount -= entry.getKey().fill(dir, FluidUtility.getStack(stack, Math.min(volPerSide, maxFill)), true);
stack.amount -= entry.getKey().fill(dir, FluidUtility.getStack(stack, Math.min(volPerSide, this.maxFlowRate)), true);
if (sideCount > 1)
--sideCount;
@ -89,6 +81,7 @@ public class PipeNetwork extends FluidNetwork
{
this.connectionMap.clear();
this.maxFlowRate = Integer.MAX_VALUE;
this.maxPressure = Integer.MAX_VALUE;
super.reconstruct();
}