From 8248fc02d557f4305a6b567a8eea7d486af21655 Mon Sep 17 00:00:00 2001 From: hiroscho Date: Mon, 22 Dec 2025 12:55:06 +0100 Subject: [PATCH 1/4] fix --- .../glodblock/github/common/parts/PartFluidImportBus.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java b/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java index e59f6e63d..b007d8112 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java @@ -98,7 +98,6 @@ protected boolean importStuff(final Object myTarget, final IAEFluidStack whatToI if (tanksInfo == null) return true; int maxDrain = this.calculateAmountToSend(); - boolean doBreak = true; for (FluidTankInfo tankInfo : tanksInfo) { if (tankInfo.fluid == null) continue; @@ -112,18 +111,16 @@ protected boolean importStuff(final Object myTarget, final IAEFluidStack whatToI final IAEFluidStack notInserted = inv.injectItems(aeFluidStack, Actionable.MODULATE, this.mySrc); if (notInserted != null && notInserted.getStackSize() > 0) { + if (notInserted.getFluidStack().amount == aeFluidStack.getFluidStack().amount) continue; aeFluidStack.decStackSize(notInserted.getStackSize()); } fh.drain(this.getSide().getOpposite(), aeFluidStack.getFluidStack(), true); maxDrain -= aeFluidStack.getFluidStack().amount; - doBreak = false; + this.worked = true; } } - - return doBreak; } - return true; } From 774606e495a6d189ca48e4a8f92cf74e61c387cf Mon Sep 17 00:00:00 2001 From: hiroscho Date: Mon, 22 Dec 2025 16:00:43 +0100 Subject: [PATCH 2/4] fix adaptor flags --- .../glodblock/github/common/parts/PartFluidExportBus.java | 2 +- .../glodblock/github/common/parts/PartFluidImportBus.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java b/src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java index 2339d33c9..bb4de3cd3 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java @@ -33,7 +33,7 @@ public IIcon getFaceIcon() { @Override protected int getAdaptorFlags() { - return InventoryAdaptor.DEFAULT & ~InventoryAdaptor.ALLOW_ITEMS; + return InventoryAdaptor.ALLOW_FLUIDS | InventoryAdaptor.FOR_INSERTS; } @Override diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java b/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java index b007d8112..d1616cc14 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java @@ -1,5 +1,6 @@ package com.glodblock.github.common.parts; +import appeng.util.InventoryAdaptor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -170,4 +171,9 @@ public void readFromNBT(NBTTagCompound extra) { } } } + + @Override + protected int getAdaptorFlags() { + return InventoryAdaptor.ALLOW_FLUIDS | InventoryAdaptor.FOR_EXTRACTS; + } } From 2aafdf65c1902ae1b91dd1fb912abe5e17784ad7 Mon Sep 17 00:00:00 2001 From: hiroscho Date: Mon, 22 Dec 2025 16:01:08 +0100 Subject: [PATCH 3/4] use itemToSend --- .../glodblock/github/common/parts/PartFluidImportBus.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java b/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java index d1616cc14..2047a263f 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java @@ -98,12 +98,10 @@ protected boolean importStuff(final Object myTarget, final IAEFluidStack whatToI FluidTankInfo[] tanksInfo = fh.getTankInfo(this.getSide().getOpposite()); if (tanksInfo == null) return true; - int maxDrain = this.calculateAmountToSend(); - for (FluidTankInfo tankInfo : tanksInfo) { if (tankInfo.fluid == null) continue; - FluidStack fluidStack = new FluidStack(tankInfo.fluid, Math.min(tankInfo.fluid.amount, maxDrain)); + FluidStack fluidStack = new FluidStack(tankInfo.fluid, Math.min(tankInfo.fluid.amount, this.itemToSend)); fluidStack = fh.drain(this.getSide().getOpposite(), fluidStack, false); if (this.filterEnabled() && !this.isInFilter(fluidStack)) continue; @@ -117,7 +115,7 @@ protected boolean importStuff(final Object myTarget, final IAEFluidStack whatToI } fh.drain(this.getSide().getOpposite(), aeFluidStack.getFluidStack(), true); - maxDrain -= aeFluidStack.getFluidStack().amount; + this.itemToSend -= aeFluidStack.getFluidStack().amount; this.worked = true; } } From 125ff27a4136ab12f12bca8502c0508ca0aa7d32 Mon Sep 17 00:00:00 2001 From: hiroscho Date: Mon, 22 Dec 2025 16:08:35 +0100 Subject: [PATCH 4/4] apply spotless --- .../glodblock/github/common/parts/PartFluidImportBus.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java b/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java index 2047a263f..3a2a9850d 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java @@ -1,6 +1,5 @@ package com.glodblock.github.common.parts; -import appeng.util.InventoryAdaptor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -27,6 +26,7 @@ import appeng.me.GridAccessException; import appeng.parts.automation.PartBaseImportBus; import appeng.tile.inventory.IAEStackInventory; +import appeng.util.InventoryAdaptor; import appeng.util.item.AEFluidStack; public class PartFluidImportBus extends PartBaseImportBus { @@ -101,7 +101,9 @@ protected boolean importStuff(final Object myTarget, final IAEFluidStack whatToI for (FluidTankInfo tankInfo : tanksInfo) { if (tankInfo.fluid == null) continue; - FluidStack fluidStack = new FluidStack(tankInfo.fluid, Math.min(tankInfo.fluid.amount, this.itemToSend)); + FluidStack fluidStack = new FluidStack( + tankInfo.fluid, + Math.min(tankInfo.fluid.amount, this.itemToSend)); fluidStack = fh.drain(this.getSide().getOpposite(), fluidStack, false); if (this.filterEnabled() && !this.isInFilter(fluidStack)) continue;