add overloaded method

fix distinct fluids

Author: ghzdude

src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java

@@ -1,6 +1,7 @@
 package gregtech.api.capability.impl;
 
 import gregtech.api.GTValues;
+import gregtech.api.capability.DualHandler;
 import gregtech.api.capability.IEnergyContainer;
 import gregtech.api.capability.IMultiblockController;
 import gregtech.api.capability.IMultipleRecipeMaps;
@@ -99,6 +100,21 @@ protected IMultipleTankHandler getInputTank() {
         return controller.getInputFluidInventory();
     }
 
+    /**
+     * Overload of {@link #getInputTank()} to gather extra fluid tanks
+     * that could exist in a distinct item handler (such as a {@link DualHandler})
+     * 
+     * @param items Handler to gather fluid tanks from
+     * @return a new FluidTankList with extra fluid tanks on top of the existing fluid tanks
+     */
+    protected IMultipleTankHandler getInputTank(IItemHandler items) {
+        var tanks = new ArrayList<>(getInputTank().getFluidTanks());
+        if (items instanceof IMultipleTankHandler tankHandler) {
+            tanks.addAll(tankHandler.getFluidTanks());
+        }
+        return new FluidTankList(getInputTank().allowSameFluidFill(), tanks);
+    }
+
     @Override
     protected IMultipleTankHandler getOutputTank() {
         RecipeMapMultiblockController controller = (RecipeMapMultiblockController) metaTileEntity;
@@ -222,7 +238,7 @@ protected void trySearchNewRecipeDistinct() {
                 continue;
             }
             // Look for a new recipe after a cache miss
-            currentRecipe = findRecipe(maxVoltage, bus, getInputTank());
+            currentRecipe = findRecipe(maxVoltage, bus, getInputTank(bus));
             // Cache the current recipe, if one is found
             if (currentRecipe != null && checkRecipe(currentRecipe)) {
                 this.previousRecipe = currentRecipe;
@@ -252,7 +268,7 @@ public void invalidateInputs() {
     }
 
     protected boolean checkPreviousRecipeDistinct(IItemHandlerModifiable previousBus) {
-        return previousRecipe != null && previousRecipe.matches(false, previousBus, getInputTank());
+        return previousRecipe != null && previousRecipe.matches(false, previousBus, getInputTank(previousBus));
     }
 
     protected boolean prepareRecipeDistinct(Recipe recipe) {
@@ -262,14 +278,15 @@ protected boolean prepareRecipeDistinct(Recipe recipe) {
         recipe = findParallelRecipe(
                 recipe,
                 currentDistinctInputBus,
-                getInputTank(),
+                getInputTank(currentDistinctInputBus),
                 getOutputInventory(),
                 getOutputTank(),
                 getMaxParallelVoltage(),
                 getParallelLimit());
 
         if (recipe != null) {
-            recipe = setupAndConsumeRecipeInputs(recipe, currentDistinctInputBus, getInputTank());
+            recipe = setupAndConsumeRecipeInputs(recipe, currentDistinctInputBus,
+                    getInputTank(currentDistinctInputBus));
             if (recipe != null) {
                 setupRecipe(recipe);
                 return true;

src/main/java/gregtech/api/metatileentity/multiblock/RecipeMapMultiblockController.java

@@ -48,6 +48,7 @@ public abstract class RecipeMapMultiblockController extends MultiblockWithDispla
     protected IItemHandlerModifiable outputInventory;
     protected IMultipleTankHandler inputFluidInventory;
     protected IMultipleTankHandler outputFluidInventory;
+    protected IMultipleTankHandler extendedFluidInputs;
     protected IEnergyContainer energyContainer;
 
     private boolean isDistinct = false;
@@ -74,7 +75,10 @@ public IItemHandlerModifiable getOutputInventory() {
     }
 
     public IMultipleTankHandler getInputFluidInventory() {
-        return inputFluidInventory;
+        // if distinct, return the normal input fluid inventory,
+        // as recipe logic handles gathering extra fluids
+        // if not distinct, return all the fluids instead
+        return isDistinct() ? inputFluidInventory : extendedFluidInputs;
     }
 
     public IMultipleTankHandler getOutputFluidInventory() {
@@ -120,9 +124,12 @@ public boolean isActive() {
 
     protected void initializeAbilities() {
         this.inputInventory = new ItemHandlerList(getAbilities(MultiblockAbility.IMPORT_ITEMS));
-        this.inputFluidInventory = createFluidList(MultiblockAbility.IMPORT_ITEMS, MultiblockAbility.IMPORT_FLUIDS);
+        this.inputFluidInventory = new FluidTankList(allowSameFluidFillForOutputs(),
+                getAbilities(MultiblockAbility.IMPORT_FLUIDS));
+        this.extendedFluidInputs = extendedImportFluidList(this.inputFluidInventory);
         this.outputInventory = new ItemHandlerList(getAbilities(MultiblockAbility.EXPORT_ITEMS));
-        this.outputFluidInventory = createFluidList(MultiblockAbility.EXPORT_ITEMS, MultiblockAbility.EXPORT_FLUIDS);
+        this.outputFluidInventory = new FluidTankList(allowSameFluidFillForOutputs(),
+                getAbilities(MultiblockAbility.EXPORT_FLUIDS));
 
         List<IEnergyContainer> inputEnergy = new ArrayList<>(getAbilities(MultiblockAbility.INPUT_ENERGY));
         inputEnergy.addAll(getAbilities(MultiblockAbility.SUBSTATION_INPUT_ENERGY));
@@ -138,19 +145,17 @@ private void resetTileAbilities() {
         this.energyContainer = new EnergyContainerList(Lists.newArrayList());
     }
 
-    protected IMultipleTankHandler createFluidList(MultiblockAbility<IItemHandlerModifiable> items,
-                                                   MultiblockAbility<IFluidTank> fluids) {
-        var tanks = new AbilityInstances(fluids);
-        tanks.addAll(getAbilities(fluids));
-        for (var handler : getAbilities(items)) {
+    protected IMultipleTankHandler extendedImportFluidList(IMultipleTankHandler fluids) {
+        List<IFluidTank> tanks = new ArrayList<>(fluids.getFluidTanks());
+        for (var handler : getAbilities(MultiblockAbility.IMPORT_ITEMS)) {
             if (handler instanceof IFluidTank tank) {
                 tanks.add(tank);
             } else if (handler instanceof IMultipleTankHandler multipleTankHandler) {
                 tanks.addAll(multipleTankHandler.getFluidTanks());
             }
         }
 
-        return new FluidTankList(allowSameFluidFillForOutputs(), tanks.cast());
+        return new FluidTankList(allowSameFluidFillForOutputs(), tanks);
     }
 
     protected boolean allowSameFluidFillForOutputs() {