some work on combining abilities

Author: ghzdude

src/main/java/gregtech/api/DualHandler.java

@@ -1,33 +1,39 @@
 package gregtech.api;
 
+import gregtech.api.capability.IMultipleTankHandler;
 import gregtech.api.capability.INotifiableHandler;
+import gregtech.api.capability.impl.FluidTankList;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.util.IDirtyNotifiable;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidTankProperties;
 import net.minecraftforge.items.IItemHandlerModifiable;
 
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
-public final class DualHandler implements IItemHandlerModifiable, IFluidHandler, INotifiableHandler {
+public final class DualHandler implements IItemHandlerModifiable, IMultipleTankHandler, INotifiableHandler {
 
     @Nullable
     IItemHandlerModifiable itemDelegate;
     @Nullable
-    IFluidHandler fluidDelegate;
+    IMultipleTankHandler fluidDelegate;
     @Nullable
     IDirtyNotifiable dirtyNotifiable;
     private final boolean isExport;
+    private static final MultiFluidTankEntry EMPTY = new MultiFluidTankEntry(new FluidTankList(false, new FluidTank[0]), new FluidTank(0));
 
     private final List<MetaTileEntity> notifiables = new ArrayList<>();
 
-    public DualHandler(IItemHandlerModifiable itemDelegate, IFluidHandler fluidDelegate, IDirtyNotifiable notifiable,
+    public DualHandler(IItemHandlerModifiable itemDelegate, IMultipleTankHandler fluidDelegate, IDirtyNotifiable notifiable,
                        boolean isExport) {
         this.itemDelegate = itemDelegate;
         this.fluidDelegate = fluidDelegate;
@@ -121,18 +127,39 @@ public static Builder builder() {
         return new Builder();
     }
 
+    @Override
+    public @NotNull List<MultiFluidTankEntry> getFluidTanks() {
+        if (this.fluidDelegate == null) return Collections.emptyList();
+        return this.fluidDelegate.getFluidTanks();
+    }
+
+    @Override
+    public int getTanks() {
+        return this.fluidDelegate == null ? 0 : this.fluidDelegate.getTanks();
+    }
+
+    @Override
+    public @NotNull MultiFluidTankEntry getTankAt(int index) {
+        return this.fluidDelegate == null ? EMPTY : this.fluidDelegate.getTankAt(index);
+    }
+
+    @Override
+    public boolean allowSameFluidFill() {
+        return this.fluidDelegate != null && this.fluidDelegate.allowSameFluidFill();
+    }
+
     public static class Builder {
 
         IItemHandlerModifiable itemHandler;
-        IFluidHandler fluidHandler;
+        IMultipleTankHandler fluidHandler;
         IDirtyNotifiable notifiable;
 
         public Builder itemHandler(IItemHandlerModifiable itemHandler) {
             this.itemHandler = itemHandler;
             return this;
         }
 
-        public Builder fluidTank(IFluidHandler fluidTank) {
+        public Builder fluidTank(IMultipleTankHandler fluidTank) {
             this.fluidHandler = fluidTank;
             return this;
         }

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

@@ -22,6 +22,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -88,7 +89,10 @@ protected IItemHandlerModifiable getInputInventory() {
     // Used for distinct bus recipe checking
     protected List<IItemHandlerModifiable> getInputBuses() {
         RecipeMapMultiblockController controller = (RecipeMapMultiblockController) metaTileEntity;
-        return controller.getAbilities(MultiblockAbility.IMPORT_ITEMS);
+        List<IItemHandlerModifiable> l = new ArrayList<>();
+        l.addAll(controller.getAbilitiesModifiable(MultiblockAbility.IMPORT_ITEMS));
+        l.addAll(controller.getAbilitiesModifiable(MultiblockAbility.IMPORT_DUAL));
+        return Collections.unmodifiableList(l);
     }
 
     @Override

src/main/java/gregtech/api/metatileentity/MetaTileEntity.java

@@ -371,7 +371,7 @@ public final String getMetaFullName() {
         return getMetaName() + ".name";
     }
 
-    public <T> void addNotifiedInput(T input) {
+    public void addNotifiedInput(Object input) {
         if (input instanceof IItemHandlerModifiable) {
             if (!notifiedItemInputList.contains(input)) {
                 this.notifiedItemInputList.add((IItemHandlerModifiable) input);
@@ -383,7 +383,7 @@ public <T> void addNotifiedInput(T input) {
         }
     }
 
-    public <T> void addNotifiedOutput(T output) {
+    public void addNotifiedOutput(Object output) {
         if (output instanceof IItemHandlerModifiable) {
             if (!notifiedItemOutputList.contains(output)) {
                 this.notifiedItemOutputList.add((IItemHandlerModifiable) output);

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

@@ -380,10 +380,13 @@ public void onRemoval() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     public <T> List<T> getAbilities(MultiblockAbility<T> ability) {
-        List<T> rawList = (List<T>) multiblockAbilities.getOrDefault(ability, Collections.emptyList());
-        return Collections.unmodifiableList(rawList);
+        return Collections.unmodifiableList(getAbilitiesModifiable(ability));
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T> List<T> getAbilitiesModifiable(MultiblockAbility<T> ability) {
+        return (List<T>) multiblockAbilities.getOrDefault(ability, Collections.emptyList());
     }
 
     public List<IMultiblockPart> getMultiblockParts() {

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

@@ -547,6 +547,7 @@ protected void setVoidingMode(int mode) {
             this.getNotifiedFluidInputList().add((IFluidHandler) tank);
         }
         this.getNotifiedItemInputList().addAll(this.getAbilities(MultiblockAbility.IMPORT_ITEMS));
+        this.getNotifiedItemInputList().addAll(this.getAbilities(MultiblockAbility.IMPORT_DUAL));
 
         markDirty();
     }

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

@@ -1,5 +1,6 @@
 package gregtech.api.metatileentity.multiblock;
 
+import gregtech.api.DualHandler;
 import gregtech.api.GTValues;
 import gregtech.api.capability.IDistinctBusController;
 import gregtech.api.capability.IEnergyContainer;
@@ -251,6 +252,7 @@ public void setDistinct(boolean isDistinct) {
         if (this.isDistinct) {
             // todo use dual handlers
             this.notifiedItemInputList.addAll(this.getAbilities(MultiblockAbility.IMPORT_ITEMS));
+            this.notifiedItemInputList.addAll(this.getAbilities(MultiblockAbility.IMPORT_DUAL));
         } else {
             this.notifiedItemInputList.add(this.inputInventory);
         }

src/main/java/gregtech/api/recipes/Recipe.java

@@ -1,6 +1,8 @@
 package gregtech.api.recipes;
 
+import gregtech.api.DualHandler;
 import gregtech.api.capability.IMultipleTankHandler;
+import gregtech.api.capability.impl.FluidTankList;
 import gregtech.api.recipes.category.GTRecipeCategory;
 import gregtech.api.recipes.chance.boost.ChanceBoostFunction;
 import gregtech.api.recipes.chance.output.ChancedOutputList;
@@ -18,6 +20,8 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidTank;
+import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.items.IItemHandlerModifiable;
 import net.minecraftforge.items.ItemHandlerHelper;
 import net.minecraftforge.oredict.OreDictionary;
@@ -193,6 +197,9 @@ public final boolean matches(boolean consumeIfSuccessful, IItemHandlerModifiable
                                  IMultipleTankHandler fluidInputs) {
         Pair<Boolean, int[]> fluids = null;
         Pair<Boolean, int[]> items = null;
+        if (inputs instanceof IFluidTank tank) {
+            fluidInputs = new FluidTankList(false, tank);
+        }
 
         if (fluidInputs.getFluidTanks().size() > 0) {
             fluids = matchesFluid(GTUtility.fluidHandlerToList(fluidInputs));

src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityRockBreaker.java

@@ -75,7 +75,7 @@ private void checkAdjacentFluids() {
     }
 
     @Override
-    public <T> void addNotifiedInput(T input) {
+    public void addNotifiedInput(Object input) {
         super.addNotifiedInput(input);
         onNeighborChanged();
     }