Fix #1105: Fix extractions from configurable chest if the first fluid cannot be inserted (#1122)

Author: Technici4n

src/main/java/aztech/modern_industrialization/inventory/MIInventory.java

@@ -37,7 +37,6 @@
 import net.minecraft.world.level.Level;
 import net.neoforged.neoforge.capabilities.BlockCapabilityCache;
 import net.neoforged.neoforge.capabilities.Capabilities;
-import net.neoforged.neoforge.fluids.FluidUtil;
 import net.neoforged.neoforge.fluids.capability.IFluidHandler;
 import net.neoforged.neoforge.items.IItemHandler;
 import org.jetbrains.annotations.Nullable;
@@ -105,7 +104,7 @@ public void autoExtractFluids(Level world, BlockPos pos, Direction direction) {
         IFluidHandler target = world.getCapability(Capabilities.FluidHandler.BLOCK, pos.relative(direction), direction.getOpposite());
 
         if (target != null) {
-            FluidUtil.tryFluidTransfer(target, fluidStorage.fluidHandler, Integer.MAX_VALUE, true);
+            TransferHelper.tryFluidTransfer(target, fluidStorage.fluidHandler, Integer.MAX_VALUE, true);
         }
     }
 
@@ -121,7 +120,7 @@ public void autoInsertFluids(Level world, BlockPos pos, Direction direction) {
         IFluidHandler target = world.getCapability(Capabilities.FluidHandler.BLOCK, pos.relative(direction), direction.getOpposite());
 
         if (target != null) {
-            FluidUtil.tryFluidTransfer(fluidStorage.fluidHandler, target, Integer.MAX_VALUE, true);
+            TransferHelper.tryFluidTransfer(fluidStorage.fluidHandler, target, Integer.MAX_VALUE, true);
         }
     }
 

src/main/java/aztech/modern_industrialization/util/TransferHelper.java

@@ -28,6 +28,8 @@
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.item.ItemStack;
 import net.neoforged.neoforge.capabilities.Capabilities;
+import net.neoforged.neoforge.fluids.FluidStack;
+import net.neoforged.neoforge.fluids.capability.IFluidHandler;
 import net.neoforged.neoforge.items.IItemHandler;
 import net.neoforged.neoforge.items.ItemHandlerHelper;
 import net.neoforged.neoforge.items.wrapper.PlayerInvWrapper;
@@ -128,4 +130,45 @@ public static ItemStack extractMatching(IItemHandler src, Predicate<ItemStack> p
 
         return ret;
     }
+
+    /**
+     * Fixed version of NeoForge's FluidUtil method. This one correctly handles multi-tank to multi-tank transfer.
+     *
+     * <p>
+     * Fill a destination fluid handler from a source fluid handler with a max amount.
+     * To transfer as much as possible, use {@link Integer#MAX_VALUE} for maxAmount.
+     *
+     * @param fluidDestination The fluid handler to be filled.
+     * @param fluidSource      The fluid handler to be drained.
+     * @param maxAmount        The largest amount of fluid that should be transferred.
+     * @param doTransfer       True if the transfer should actually be done, false if it should be simulated.
+     * @return the fluidStack that was transferred from the source to the destination. null on failure.
+     */
+    public static FluidStack tryFluidTransfer(IFluidHandler fluidDestination, IFluidHandler fluidSource, int maxAmount, boolean doTransfer) {
+        int tanks = fluidSource.getTanks();
+        for (int i = 0; i < tanks; ++i) {
+            FluidStack toTry = fluidSource.getFluidInTank(i).copy();
+            if (toTry.getAmount() > maxAmount) {
+                toTry.setAmount(maxAmount);
+            }
+            FluidStack drainable = fluidSource.drain(toTry, IFluidHandler.FluidAction.SIMULATE);
+            if (drainable.isEmpty()) {
+                continue;
+            }
+            int fillableAmount = fluidDestination.fill(drainable, IFluidHandler.FluidAction.SIMULATE);
+            if (fillableAmount > 0) {
+                drainable.setAmount(fillableAmount);
+                if (doTransfer) {
+                    FluidStack drained = fluidSource.drain(drainable, IFluidHandler.FluidAction.EXECUTE);
+                    if (!drained.isEmpty()) {
+                        drained.setAmount(fluidDestination.fill(drained, IFluidHandler.FluidAction.EXECUTE));
+                        return drained;
+                    }
+                } else {
+                    return drainable;
+                }
+            }
+        }
+        return FluidStack.EMPTY;
+    }
 }