Merge pull request #154 from jchung01/fix/me-fluid-output

Fix ME fluid output voiding

Author: KasumiNova

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

@@ -7,6 +7,7 @@
 import appeng.fluids.util.IAEFluidTank;
 import appeng.util.Platform;
 import github.kasuminova.mmce.common.util.concurrent.ReadWriteLockProvider;
+import hellfirepvp.modularmachinery.common.util.HybridFluidUtils;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.IFluidTankProperties;
@@ -21,7 +22,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 +55,7 @@ public void setCapacity(int capacity) {
         }
     }
 
+    @Override
     public boolean isOneFluidOneSlot() {
         return oneFluidOneSlot;
     }
@@ -203,18 +205,9 @@ public int fill(final FluidStack fluid, final boolean doFill) {
         try {
             (doFill ? rwLock.writeLock() : rwLock.readLock()).lock();
 
-            if (oneFluidOneSlot) {
-                int found = -1;
-                for (int i = 0; i < fluids.length; i++) {
-                    final IAEFluidStack fluidInSlot = getFluid(i);
-                    if (fluidInSlot != null && fluidInSlot.getFluid() == insert.getFluid()) {
-                        found = i;
-                        break;
-                    }
-                }
-                if (found != -1) {
-                    return this.fill(found, insert, doFill);
-                }
+            int found = HybridFluidUtils.findSlotWithFluid(this, getTankProperties(), insert);
+            if (found >= 0) {
+                return this.fill(found, insert, doFill);
             }
 
             int totalFillAmount = 0;

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

@@ -1,5 +1,6 @@
 package github.kasuminova.mmce.common.util;
 
+import hellfirepvp.modularmachinery.common.util.HybridFluidUtils;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.IFluidHandler;
@@ -10,11 +11,13 @@
 import java.util.Objects;
 
 @SuppressWarnings("unused")
-public class MultiFluidTank implements IFluidHandler {
+public class MultiFluidTank implements IFluidHandler, IOneToOneFluidHandler {
     private final FluidStack[] contents;
     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 +52,10 @@ public MultiFluidTank(IFluidHandler from) {
                 contents[i] = stack.copy();
             }
         }
+
+        if (from instanceof IOneToOneFluidHandler oneToOneHandler) {
+            this.oneToOne = oneToOneHandler.isOneFluidOneSlot();
+        }
     }
 
     public int getCapacity() {
@@ -60,6 +67,11 @@ public MultiFluidTank setCapacity(final int capacity) {
         return this;
     }
 
+    @Override
+    public boolean isOneFluidOneSlot() {
+        return oneToOne;
+    }
+
     @Override
     public IFluidTankProperties[] getTankProperties() {
         return props;
@@ -73,6 +85,11 @@ public synchronized int fill(final FluidStack fluid, final boolean doFill) {
 
         final FluidStack insert = fluid.copy();
 
+        int foundSlot = HybridFluidUtils.findSlotWithFluid(this, props, fluid);
+        if (foundSlot >= 0) {
+            return fill(foundSlot, insert, doFill);
+        }
+
         int totalFillAmount = 0;
         for (int i = 0; i < contents.length; i++) {
             int filled = fill(i, insert, doFill);
@@ -151,7 +168,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;

src/main/java/hellfirepvp/modularmachinery/common/util/HybridFluidUtils.java

@@ -3,6 +3,7 @@
 import com.google.common.collect.Lists;
 import github.kasuminova.mmce.common.concurrent.Sync;
 import github.kasuminova.mmce.common.util.IExtendedGasHandler;
+import github.kasuminova.mmce.common.util.IOneToOneFluidHandler;
 import github.kasuminova.mmce.common.util.MultiFluidTank;
 import github.kasuminova.mmce.common.util.MultiGasTank;
 import hellfirepvp.modularmachinery.common.crafting.helper.ProcessingComponent;
@@ -12,6 +13,7 @@
 import mekanism.api.gas.IGasHandler;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.IFluidHandler;
+import net.minecraftforge.fluids.capability.IFluidTankProperties;
 import net.minecraftforge.fml.common.Optional;
 
 import javax.annotation.Nonnull;
@@ -135,6 +137,20 @@ public static void doDrainOrFill(final GasStack drainOrFill, final long maxDrain
         }
     }
 
+    public static int findSlotWithFluid(final IOneToOneFluidHandler handler, final IFluidTankProperties[] props, final FluidStack fluid) {
+        int found = -1;
+        if (handler.isOneFluidOneSlot()) {
+            for (int i = 0; i < props.length; i++) {
+                FluidStack fluidInSlot = props[i].getContents();
+                if (fluidInSlot != null && fluidInSlot.getFluid() == fluid.getFluid()) {
+                    found = i;
+                    break;
+                }
+            }
+        }
+        return found;
+    }
+
     @Nonnull
     public static List<IFluidHandler> castFluidHandlerComponents(final List<ProcessingComponent<?>> components) {
         if (components.size() == 1) {