From 0265428a615602929f36d4a8411a2713fb8660a5 Mon Sep 17 00:00:00 2001 From: くぁーりぃ <39122497+Quarri6343@users.noreply.github.com> Date: Fri, 2 Sep 2022 01:41:44 +0900 Subject: Super Tank Fluid Locking Fix (#1332) * fix bugs * spotless * add null check --- src/main/java/gregtech/api/gui/GT_Container.java | 1 + src/main/java/gregtech/api/gui/GT_Container_BasicTank.java | 7 +++++++ 2 files changed, 8 insertions(+) (limited to 'src/main/java/gregtech/api/gui') diff --git a/src/main/java/gregtech/api/gui/GT_Container.java b/src/main/java/gregtech/api/gui/GT_Container.java index 083634f030..5d9dde3535 100644 --- a/src/main/java/gregtech/api/gui/GT_Container.java +++ b/src/main/java/gregtech/api/gui/GT_Container.java @@ -670,6 +670,7 @@ public class GT_Container extends Container { } replaceCursorItemStack(aPlayer, tFilledContainer); } + aFluidAccess.verifyFluidStack(); return tFilledContainer; } diff --git a/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java b/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java index 6e4f5b8920..8d8d018cdc 100644 --- a/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java +++ b/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java @@ -119,6 +119,8 @@ public class GT_Container_BasicTank extends GT_ContainerMetaTile_Machine { public void set(FluidStack stack) { if (mIsFillableStack) mTank.setFillableStack(stack); else mTank.setDrainableStack(stack); + if (mTank instanceof GT_MetaTileEntity_DigitalTankBase) + ((GT_MetaTileEntity_DigitalTankBase) mTank).onEmptyingContainerWhenEmpty(); } @Override @@ -142,5 +144,10 @@ public class GT_Container_BasicTank extends GT_ContainerMetaTile_Machine { static BasicTankFluidAccess from(GT_MetaTileEntity_BasicTank aTank, boolean aIsFillableStack) { return new BasicTankFluidAccess(aTank, aIsFillableStack); } + + @Override + public void verifyFluidStack() { + if (!(mTank instanceof GT_MetaTileEntity_DigitalTankBase) && get() != null && get().amount <= 0) set(null); + } } } -- cgit