From 7155ca3a4ff49ce8261a87d26d3955649fd91899 Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Fri, 20 Dec 2024 12:06:47 -0500 Subject: [PATCH 1/2] Fix creative tanks only outputting up to 1kL at a time --- .../storage/MetaTileEntityCreativeTank.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCreativeTank.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCreativeTank.java index fd2cb5e24e5..1fb83219326 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCreativeTank.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCreativeTank.java @@ -129,7 +129,7 @@ public void update() { if (fluidHandler == null || fluidHandler.getTankProperties().length == 0) return; - FluidStack stack = fluidTank.getFluid().copy(); + FluidStack stack = fluidTank.getFluid(); int canInsertAmount = fluidHandler.fill(stack, false); stack.amount = Math.min(mBPerCycle, canInsertAmount); @@ -231,5 +231,17 @@ public FluidStack drain(int maxDrain, boolean doDrain) { public int fill(FluidStack resource, boolean doFill) { return 0; } + + @Override + public FluidStack getFluid() { + FluidStack fluid = super.getFluid(); + + if (fluid != null) { + fluid = fluid.copy(); + fluid.amount = mBPerCycle; + } + + return fluid; + } } } From 91371446886587ad6807851f64cc91b1c8a39966 Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Sat, 18 Jan 2025 03:52:37 -0500 Subject: [PATCH 2/2] Simplify logic --- .../storage/MetaTileEntityCreativeTank.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCreativeTank.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCreativeTank.java index 1fb83219326..a40d0b54bf2 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCreativeTank.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCreativeTank.java @@ -129,11 +129,7 @@ public void update() { if (fluidHandler == null || fluidHandler.getTankProperties().length == 0) return; - FluidStack stack = fluidTank.getFluid(); - int canInsertAmount = fluidHandler.fill(stack, false); - stack.amount = Math.min(mBPerCycle, canInsertAmount); - - fluidHandler.fill(stack, true); + fluidHandler.fill(fluidTank.drain(mBPerCycle, false), true); } } @@ -231,17 +227,5 @@ public FluidStack drain(int maxDrain, boolean doDrain) { public int fill(FluidStack resource, boolean doFill) { return 0; } - - @Override - public FluidStack getFluid() { - FluidStack fluid = super.getFluid(); - - if (fluid != null) { - fluid = fluid.copy(); - fluid.amount = mBPerCycle; - } - - return fluid; - } } }