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

Some fixes to bucket and gutter, not finished

Browse source
This commit is contained in:
Calclavia 2014-03-11 22:55:46 +08:00
parent 7abcdef9fc
commit dd3e1cc8d4
1 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
archaic/src/main/java/resonantinduction/archaic/fluid/gutter/TileGutter.java
View file

@ -18,6 +18,7 @@ import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
@ -240,12 +241,39 @@ public class TileGutter extends TilePressureNode
{
if (!resource.getFluid().isGaseous())
{
return super.fill(from, resource, doFill);
int totalFill = 0;
int trials = 0;
FluidStack fillStack = resource.copy();
// Handle overflow.
do
{
int filled = super.fill(from, fillStack, doFill);
totalFill += filled;
int remain = fillStack.amount - filled;
fillStack.amount -= filled;
node.update(1 / 20f);
trials++;
}
while (fillStack.amount > totalFill && trials < 20);
return totalFill;
}
return 0;
}
@Override
public FluidTank getInternalTank()
{
if (tank == null)
{
tank = new FluidTank(2 * FluidContainerRegistry.BUCKET_VOLUME);
}
return tank;
}
@Override
public boolean canFill(ForgeDirection from, Fluid fluid)
{