Fix ME fluid output voiding excess

- MultiFluidTank is one-to-one if copying ME fluid output

Author: jchung01

src/main/java/github/kasuminova/mmce/common/util/AEFluidInventoryUpgradeable.java

@@ -21,7 +21,7 @@
  * From: <a href="https://github.com/PrototypeTrousers/Applied-Energistics-2/blob/AE2-Omnifactory/src/main/java/appeng/fluids/util/AEFluidInventory.java">...</a>
  */
 @SuppressWarnings("unchecked")
-public class AEFluidInventoryUpgradeable implements IAEFluidTank, ReadWriteLockProvider {
+public class AEFluidInventoryUpgradeable implements IAEFluidTank, ReadWriteLockProvider, IOneToOneFluidHandler {
     private final ReadWriteLock rwLock = new ReentrantReadWriteLock();
 
     private final AtomicReference<IAEFluidStack>[] fluids;
@@ -54,6 +54,7 @@ public void setCapacity(int capacity) {
         }
     }
 
+    @Override
     public boolean isOneFluidOneSlot() {
         return oneFluidOneSlot;
     }

src/main/java/github/kasuminova/mmce/common/util/IOneToOneFluidHandler.java

@@ -0,0 +1,14 @@
+package github.kasuminova.mmce.common.util;
+
+/**
+ * Implement this interface for a multi-fluid tank that only allows one slot per type of fluid.
+ */
+public interface IOneToOneFluidHandler {
+
+    /**
+     * Returns whether distinct slots map to distinct types of fluids.
+     * @return true if the mapping is one-to-one
+     */
+    boolean isOneFluidOneSlot();
+
+}

src/main/java/github/kasuminova/mmce/common/util/MultiFluidTank.java

@@ -15,6 +15,8 @@ public class MultiFluidTank implements IFluidHandler {
     private final IFluidTankProperties[] props;
     private int capacity;
 
+    private boolean oneToOne;
+
     public MultiFluidTank(int capacity, int tankCount) {
         this.capacity = capacity;
         this.contents = new FluidStack[tankCount];
@@ -49,6 +51,10 @@ public MultiFluidTank(IFluidHandler from) {
                 contents[i] = stack.copy();
             }
         }
+
+        if (from instanceof IOneToOneFluidHandler oneToOneHandler) {
+            this.oneToOne = oneToOneHandler.isOneFluidOneSlot();
+        }
     }
 
     public int getCapacity() {
@@ -73,6 +79,22 @@ public synchronized int fill(final FluidStack fluid, final boolean doFill) {
 
         final FluidStack insert = fluid.copy();
 
+        if (oneToOne) {
+            // Find the distinct slot
+            int foundSlot = -1;
+            for (int i = 0; i < props.length; i++) {
+                FluidStack fluidInSlot = props[i].getContents();
+                if (fluidInSlot != null && fluidInSlot.getFluid() == fluid.getFluid()) {
+                    foundSlot = i;
+                    break;
+                }
+            }
+            if (foundSlot >= 0) {
+                return fill(foundSlot, insert, doFill);
+            }
+            // Didn't find existing fluid, resume normal logic.
+        }
+
         int totalFillAmount = 0;
         for (int i = 0; i < contents.length; i++) {
             int filled = fill(i, insert, doFill);
@@ -151,7 +173,7 @@ public synchronized FluidStack drain(final FluidStack resource, final boolean do
             int drained = drainedStack.amount;
             totalDrainAmount += drained;
 
-            if (drained >= res.amount) {
+            if (drained >= res.amount || oneToOne) {
                 break;
             }
             res.amount -= drained;