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

2024-06-09 12:53:20 +08:00
parent 724f3baf4c
commit 6632344f87
4 changed files with 122 additions and 2 deletions
@@ -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);
+        }
+    }
+
+}