diff options
| author | Martin Robertz <dream-master@gmx.net> | 2024-01-14 18:20:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-14 18:20:41 +0100 |
| commit | 82026627c6fafbc0def10244f8c02ebd8c514f9a (patch) | |
| tree | 5a25d3e90f3060095e30bdb2406ef16703b5e1f1 /src/main/java/gregtech/api/metatileentity | |
| parent | fee9926380647755f5882b8869462281123e0a46 (diff) | |
| download | GT5-Unofficial-82026627c6fafbc0def10244f8c02ebd8c514f9a.tar.gz GT5-Unofficial-82026627c6fafbc0def10244f8c02ebd8c514f9a.tar.bz2 GT5-Unofficial-82026627c6fafbc0def10244f8c02ebd8c514f9a.zip | |
Feature/movefluid (#2459)
* merge similar code into new utility function moveFluid
* Spotless apply for branch feature/movefluid for #2455 (#2456)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
* fix boolean logic
* Spotless apply for branch feature/movefluid for #2459 (#2460)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
* fix
(cherry picked from commit dce33cb4bbc0b1405bcbee25b5f1f1e6384f0147)
---------
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java index 6c46600f94..fd83f6899b 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java @@ -131,17 +131,12 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch IFluidHandler tTileEntity = aBaseMetaTileEntity .getITankContainerAtSide(aBaseMetaTileEntity.getFrontFacing()); if (tTileEntity != null) { - FluidStack tDrained = aBaseMetaTileEntity - .drain(aBaseMetaTileEntity.getFrontFacing(), Math.max(1, mFluid.amount), false); - if (tDrained != null) { - int tFilledAmount = tTileEntity.fill(aBaseMetaTileEntity.getBackFacing(), tDrained, false); - if (tFilledAmount > 0) { - tTileEntity.fill( - aBaseMetaTileEntity.getBackFacing(), - aBaseMetaTileEntity.drain(aBaseMetaTileEntity.getFrontFacing(), tFilledAmount, true), - true); - } - } + GT_Utility.moveFluid( + aBaseMetaTileEntity, + tTileEntity, + aBaseMetaTileEntity.getFrontFacing(), + Math.max(1, mFluid.amount), + null); } } } |