From 4413e77fef034715966c84e503ed1c9444ccad81 Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Thu, 12 Jan 2023 14:33:19 +0800 Subject: [PATCH] fix fluid dupe --- .../container/FCBaseFluidMonitorContain.java | 24 +++++++++++-------- .../java/com/glodblock/github/util/Util.java | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/glodblock/github/client/gui/container/FCBaseFluidMonitorContain.java b/src/main/java/com/glodblock/github/client/gui/container/FCBaseFluidMonitorContain.java index 8a799587..77b4caa1 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/FCBaseFluidMonitorContain.java +++ b/src/main/java/com/glodblock/github/client/gui/container/FCBaseFluidMonitorContain.java @@ -376,7 +376,7 @@ public class FCBaseFluidMonitorContain extends AEBaseContainer ItemStack out = fluidContainer.copy(); out.stackSize = 1; if (Util.FluidUtil.isEmpty(fluidContainer) && fluid != null) { - // add fluid to tanks + // add fluid to tanks if (nfluid.getStackSize() <= 0) continue; final IAEFluidStack toExtract = nfluid.copy(); MutablePair fillStack = Util.FluidUtil.fillStack(out, toExtract.getFluidStack()); @@ -390,22 +390,26 @@ public class FCBaseFluidMonitorContain extends AEBaseContainer this.dropItem(fillStack.right); out.stackSize = fillStack.right.stackSize; if (fillStack.right.getItem() instanceof IFluidContainerItem) { - this.host.getFluidInventory().extractItems(toExtract, Actionable.MODULATE, this.getActionSource()); - if ((int) (tmp.getStackSize() % fillStack.left) > 0) { - ((IFluidContainerItem) fillStack.right.getItem()) + if (fillStack.right.stackSize == 0) { + if ((int) (tmp.getStackSize() % fillStack.left) > 0) { + ((IFluidContainerItem) fillStack.right.getItem()) .drain( - fillStack.right, - fillStack.left - (int) (tmp.getStackSize() % fillStack.left), - true); - this.dropItem(fillStack.right, 1); - out.stackSize++; + fillStack.right, + fillStack.left - (int) (tmp.getStackSize() % fillStack.left), + true); + this.dropItem(fillStack.right, 1); + out.stackSize++; + } + } else { + toExtract.setStackSize((long) fillStack.right.stackSize * fillStack.left); } + this.host.getFluidInventory().extractItems(toExtract, Actionable.MODULATE, this.getActionSource()); } else if (FluidContainerRegistry.isContainer(fillStack.right)) { toExtract.setStackSize((long) fillStack.right.stackSize * fillStack.left); this.host.getFluidInventory().extractItems(toExtract, Actionable.MODULATE, this.getActionSource()); } } else if (!Util.FluidUtil.isEmpty(fluidContainer)) { - // add fluid to ae network + // add fluid to ae network AEFluidStack fluidStack = Util.getAEFluidFromItem(fluidContainer); final IAEFluidStack aeFluidStack = fluidStack.copy(); // simulate result is incorrect. so I'm using other solution and ec2 both mod have same issues diff --git a/src/main/java/com/glodblock/github/util/Util.java b/src/main/java/com/glodblock/github/util/Util.java index 918feed6..57b70016 100644 --- a/src/main/java/com/glodblock/github/util/Util.java +++ b/src/main/java/com/glodblock/github/util/Util.java @@ -312,7 +312,7 @@ public final class Util { // get the filled fluidstack. FluidStack filled = FluidContainerRegistry.getFluidForFilledItem(filledContainer); // Return filled container and fill amount. - return new MutablePair(filled != null ? filled.amount : 0, filledContainer); + return new MutablePair<>(filled != null ? filled.amount : 0, filledContainer); } return null; }