diff options
Diffstat (limited to 'src/main/java/gregtech/common')
3 files changed, 9 insertions, 35 deletions
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java index ce11a397f4..7d2afb838d 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java @@ -108,14 +108,8 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid } if (tTank1 != null && tTank2 != null) { allowFluid = true; - FluidStack tLiquid = tTank1.drain(directionFrom, Math.abs(aCoverVariable.speed), false); - if (tLiquid != null && this.canTransferFluid(tLiquid)) { - tLiquid = tLiquid.copy(); - tLiquid.amount = tTank2.fill(directionTo, tLiquid, false); - if (tLiquid.amount > 0) { - tTank2.fill(directionTo, tTank1.drain(directionFrom, tLiquid.amount, true), true); - } - } + GT_Utility + .moveFluid(tTank1, tTank2, directionFrom, Math.abs(aCoverVariable.speed), this::canTransferFluid); allowFluid = false; } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java index f36f6ce215..e1bbf950ce 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java @@ -50,32 +50,16 @@ public class GT_Cover_Pump extends GT_CoverBehavior { final IFluidHandler toAccess = aTileEntity.getITankContainerAtSide(side); if (toAccess == null) return aCoverVariable; - transferFluid(current, toAccess, side, aCoverVariable % 2); + transferFluid(current, toAccess, side, aCoverVariable % 2 == 0); } return aCoverVariable; } - protected void transferFluid(IFluidHandler current, IFluidHandler toAccess, ForgeDirection side, - int exportOrImport) { - if (exportOrImport == 0) { - FluidStack liquid = current.drain(side, this.mTransferRate, false); - if (liquid != null) { - liquid = liquid.copy(); - liquid.amount = toAccess.fill(side.getOpposite(), liquid, false); - if (liquid.amount > 0 && canTransferFluid(liquid)) { - toAccess.fill(side.getOpposite(), current.drain(side, liquid.amount, true), true); - } - } - return; - } - FluidStack liquid = toAccess.drain(side.getOpposite(), this.mTransferRate, false); - if (liquid != null) { - liquid = liquid.copy(); - liquid.amount = current.fill(side, liquid, false); - if (liquid.amount > 0 && canTransferFluid(liquid)) { - current.fill(side, toAccess.drain(side.getOpposite(), liquid.amount, true), true); - } - } + protected void transferFluid(IFluidHandler current, IFluidHandler toAccess, ForgeDirection side, boolean export) { + IFluidHandler source = export ? current : toAccess; + IFluidHandler dest = export ? toAccess : current; + ForgeDirection drainSide = export ? side : side.getOpposite(); + GT_Utility.moveFluid(source, dest, drainSide, mTransferRate, this::canTransferFluid); } protected boolean canTransferFluid(FluidStack fluid) { diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java index 5142a06766..6b245a9da1 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java @@ -320,11 +320,7 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa if (mSteam == null || mSteam.amount == 0) return; final IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(side); if (tTileEntity == null) return; - final FluidStack tDrained = aBaseMetaTileEntity.drain(side, Math.max(1, this.mSteam.amount / 2), false); - if (tDrained == null) return; - final int tFilledAmount = tTileEntity.fill(side.getOpposite(), tDrained, false); - if (tFilledAmount <= 0) return; - tTileEntity.fill(side.getOpposite(), aBaseMetaTileEntity.drain(side, tFilledAmount, true), true); + GT_Utility.moveFluid(aBaseMetaTileEntity, tTileEntity, side, Math.max(1, this.mSteam.amount / 2), null); } /** |