diff options
author | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 19:32:44 -0800 |
---|---|---|
committer | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 19:32:44 -0800 |
commit | 55f64675b42ac8d3c557cc850f78664bee006f6f (patch) | |
tree | 2afd26dd3d5e6f763119bc192b57c66a1a075922 /src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java | |
parent | 0f5dfd01b877b6a1019e0671b88d07974aae68c0 (diff) | |
download | GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.gz GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.bz2 GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.zip |
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java')
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java index f7d29e1200..56a134716b 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java @@ -15,6 +15,7 @@ public class BTF_FluidTank extends FluidTank { /** * Let's replace the Default handling with GT's own handling code, because it's probably better, right? + * * @author Alkalus/GregoriusT */ public FluidStack getFluid() { @@ -38,13 +39,10 @@ public class BTF_FluidTank extends FluidTank { return this; } - /* public abstract boolean isLiquidInput(byte arg0); - - public abstract boolean isLiquidOutput(byte arg0); - - public abstract boolean doesFillContainers(); - - public abstract boolean doesEmptyContainers();*/ + /* + * public abstract boolean isLiquidInput(byte arg0); public abstract boolean isLiquidOutput(byte arg0); public + * abstract boolean doesFillContainers(); public abstract boolean doesEmptyContainers(); + */ public boolean canTankBeFilled() { return true; @@ -85,13 +83,11 @@ public class BTF_FluidTank extends FluidTank { } public int fill(FluidStack aFluid, boolean doFill) { - if (aFluid != null - && aFluid.getFluid().getID() > 0 + if (aFluid != null && aFluid.getFluid().getID() > 0 && aFluid.amount > 0 && this.canTankBeFilled() && this.isFluidInputAllowed(aFluid)) { - if (this.getFillableStack() != null - && this.getFillableStack().getFluid().getID() > 0) { + if (this.getFillableStack() != null && this.getFillableStack().getFluid().getID() > 0) { if (!this.getFillableStack().isFluidEqual(aFluid)) { return 0; } else { |