Make ME Interfaces insert items/fluids directly into storage if possible (#448)

src/main/java/appeng/fluids/helper/DualityFluidInterface.java

@@ -32,6 +32,7 @@ import appeng.api.networking.IGridNode;
 import appeng.api.networking.energy.IEnergySource;
 import appeng.api.networking.security.IActionHost;
 import appeng.api.networking.security.IActionSource;
+import appeng.api.networking.storage.IStorageGrid;
 import appeng.api.networking.ticking.IGridTickable;
 import appeng.api.networking.ticking.TickRateModulation;
 import appeng.api.networking.ticking.TickingRequest;
@@ -49,6 +50,7 @@ import appeng.capabilities.Capabilities;
 import appeng.core.settings.TickRates;
 import appeng.fluids.util.AEFluidInventory;
 import appeng.fluids.util.AEFluidStack;
+import appeng.fluids.util.AENetworkFluidInventory;
 import appeng.fluids.util.IAEFluidInventory;
 import appeng.fluids.util.IAEFluidTank;
 import appeng.helpers.ICustomNameObject;
@@ -90,6 +92,7 @@ import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.items.IItemHandler;
 
+import javax.annotation.Nullable;
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.HashSet;
@@ -109,7 +112,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
     private final UpgradeInventory upgrades;
     private boolean hasConfig = false;
     private final IStorageMonitorableAccessor accessor = this::getMonitorable;
-    private final AEFluidInventory tanks = new AEFluidInventory(this, NUMBER_OF_TANKS, TANK_CAPACITY);
+    private final AEFluidInventory tanks;
     private final AEFluidInventory config = new AEFluidInventory(this, NUMBER_OF_TANKS);
     private final IAEFluidStack[] requireWork;
     private int isWorking = -1;
@@ -131,6 +134,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 
         this.mySource = new MachineSource(this.iHost);
         this.interfaceRequestSource = new InterfaceRequestSource(this.iHost);
+        this.tanks = new AENetworkFluidInventory(this::getStorageGrid, this.mySource, this, NUMBER_OF_TANKS, TANK_CAPACITY);
 
         this.fluids.setChangeSource(this.mySource);
         this.items.setChangeSource(this.mySource);
@@ -141,6 +145,15 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
         }
     }
 
+    @Nullable
+    private IStorageGrid getStorageGrid() {
+        try {
+            return this.gridProxy.getStorage();
+        } catch (GridAccessException e) {
+            return null;
+        }
+    }
+
     public IUpgradeableHost getHost() {
         return this.iHost;
     }

src/main/java/appeng/fluids/util/AENetworkFluidInventory.java

@@ -0,0 +1,47 @@
+package appeng.fluids.util;
+
+import appeng.api.AEApi;
+import appeng.api.config.Actionable;
+import appeng.api.networking.security.IActionSource;
+import appeng.api.networking.storage.IStorageGrid;
+import appeng.api.storage.IMEInventory;
+import appeng.api.storage.channels.IFluidStorageChannel;
+import appeng.api.storage.data.IAEFluidStack;
+import net.minecraftforge.fluids.FluidStack;
+
+import java.util.function.Supplier;
+
+public class AENetworkFluidInventory extends AEFluidInventory {
+
+    private final Supplier<IStorageGrid> supplier;
+    private final IActionSource source;
+
+    public AENetworkFluidInventory(Supplier<IStorageGrid> networkSupplier, IActionSource source, IAEFluidInventory handler, int slots, int capcity) {
+        super(handler, slots, capcity);
+        this.supplier = networkSupplier;
+        this.source = source;
+    }
+
+    @Override
+    public int fill(final FluidStack fluid, final boolean doFill) {
+        if (fluid == null || fluid.amount <= 0) {
+            return 0;
+        }
+        IStorageGrid storage = supplier.get();
+        if (storage != null) {
+            int originAmt = fluid.amount;
+            IMEInventory<IAEFluidStack> dest = storage.getInventory(AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class));
+            IAEFluidStack overflow = dest.injectItems(AEFluidStack.fromFluidStack(fluid), doFill ? Actionable.MODULATE : Actionable.SIMULATE, this.source);
+            if (overflow != null && overflow.getStackSize() == originAmt) {
+                return super.fill(fluid, doFill);
+            } else if (overflow != null) {
+                return (int) (originAmt - overflow.getStackSize());
+            } else {
+                return originAmt;
+            }
+        } else {
+            return super.fill(fluid, doFill);
+        }
+    }
+
+}