diff --git a/src/main/java/forestry/core/fluids/TankManager.java b/src/main/java/forestry/core/fluids/TankManager.java index a5ca2659a..64545f939 100644 --- a/src/main/java/forestry/core/fluids/TankManager.java +++ b/src/main/java/forestry/core/fluids/TankManager.java @@ -351,6 +351,13 @@ public class TankManager implements ITankManager { return drained; } + public FluidStack drain(Fluid resource, int amount, boolean doDrain) { + if (resource == null) { + return null; + } + return drain(new FluidStack(resource, amount), false, doDrain); + } + public FluidStack drain(FluidStack resource, boolean doDrain) { return drain(resource, false, doDrain); } diff --git a/src/main/java/forestry/factory/tiles/TileFabricator.java b/src/main/java/forestry/factory/tiles/TileFabricator.java index 081819f35..7aa50a719 100644 --- a/src/main/java/forestry/factory/tiles/TileFabricator.java +++ b/src/main/java/forestry/factory/tiles/TileFabricator.java @@ -153,7 +153,7 @@ public class TileFabricator extends TilePowered implements ICrafter, ILiquidTank if (!moltenTank.isEmpty()) { // Remove smelt if we have gone below melting point if (heat < (getMeltingPoint() - 100)) { - tankManager.drain(new FluidStack(moltenTank.getFluidType(), 5), true); + tankManager.drain(moltenTank.getFluidType(), 5, true); } } diff --git a/src/main/java/forestry/factory/tiles/TileFermenter.java b/src/main/java/forestry/factory/tiles/TileFermenter.java index 1c0e4b407..5f0ca1b1f 100644 --- a/src/main/java/forestry/factory/tiles/TileFermenter.java +++ b/src/main/java/forestry/factory/tiles/TileFermenter.java @@ -201,8 +201,7 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu } fuelBurnTime--; - FluidStack drainResource = new FluidStack(resourceTank.getFluidType(), fuelCurrentFerment); - tankManager.drain(drainResource, true); + tankManager.drain(resourceTank.getFluidType(), fuelCurrentFerment, true); fermentationTime -= this.fuelCurrentFerment; // Not done yet @@ -416,7 +415,7 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu @Override public FluidStack drain(ForgeDirection from, int quantityMax, boolean doEmpty) { - return tankManager.drain(new FluidStack(productTank.getFluidType(), quantityMax), doEmpty); + return tankManager.drain(productTank.getFluidType(), quantityMax, doEmpty); } @Override diff --git a/src/main/java/forestry/factory/tiles/TileMoistener.java b/src/main/java/forestry/factory/tiles/TileMoistener.java index c0810a92e..6d1192dc7 100644 --- a/src/main/java/forestry/factory/tiles/TileMoistener.java +++ b/src/main/java/forestry/factory/tiles/TileMoistener.java @@ -190,7 +190,7 @@ public class TileMoistener extends TileBase implements ISidedInventory, ILiquidT return; } - tankManager.drain(new FluidStack(resourceTank.getFluidType(), 1), true); + tankManager.drain(resourceTank.getFluidType(), 1, true); burnTime -= speed; productionTime -= speed;