Improve and extend the functionality of the ME Bridge by implementing the handling of external fluid and item storage. This includes the capability to get the total, used, and available external storage for both fluid and item elements.

SirEndii · SirEndii · commit 1154d8aa3395 · 2023-12-21T01:51:42.000+01:00
diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AppEngApi.java b/src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AppEngApi.java
@@ -90,7 +90,18 @@ public static Pair<Long, AEFluidKey> findAEFluidFromFilter(MEStorage monitor, @N
         return null;
     }
 
-    public static Pair<IPatternDetails, String> findPatternFromFilters(IGrid grid, Level level, GenericFilter inputFilter, GenericFilter outputFilter) {
+    /**
+     * Finds a pattern from filters.
+     *
+     * @param grid         The grid to search patterns from.
+     * @param level        The level of the grid.
+     * @param inputFilter  The input filter to apply, can be null to ignore input filter.
+     * @param outputFilter The output filter to apply, can be null to ignore output filter.
+     * @return A Pair object containing the matched pattern and an error message if no pattern is found.
+     * The pattern can be null if no pattern is found.
+     * The error message is "NO_PATTERN_FOUND" if no pattern is found.
+     */
+    public static Pair<IPatternDetails, String> findPatternFromFilters(IGrid grid, Level level, @Nullable GenericFilter inputFilter, @Nullable GenericFilter outputFilter) {
         for (IPatternDetails pattern : getPatterns(grid, level)) {
             if (pattern.getInputs().length == 0)
                 continue;
@@ -101,10 +112,13 @@ public static Pair<IPatternDetails, String> findPatternFromFilters(IGrid grid, L
             boolean outputMatch = false;
 
             if (inputFilter != null) {
+                outerLoop:
                 for (IPatternDetails.IInput input : pattern.getInputs()) {
-                    if (inputFilter.test(input.getPossibleInputs()[0])) {
-                        inputMatch = true;
-                        break;
+                    for (GenericStack possibleInput : input.getPossibleInputs()) {
+                        if (inputFilter.test(possibleInput)) {
+                            inputMatch = true;
+                            break outerLoop;
+                        }
                     }
                 }
             } else {
@@ -263,8 +277,8 @@ private static Map<String, Object> getObjectFromGasStack(Pair<Long, MekanismKey>
     public static Map<String, Object> getObjectFromPattern(IPatternDetails pattern) {
         Map<String, Object> map = new HashMap<>();
 
-        map.put("inputs", Arrays.stream(pattern.getInputs()).map(AppEngApi::getObjectFromPatternInput));
-        map.put("outputs", Arrays.stream(pattern.getOutputs()).map(AppEngApi::getObjectFromGenericStack));
+        map.put("inputs", Arrays.stream(pattern.getInputs()).map(AppEngApi::getObjectFromPatternInput).collect(Collectors.toList()));
+        map.put("outputs", Arrays.stream(pattern.getOutputs()).map(AppEngApi::getObjectFromGenericStack).collect(Collectors.toList()));
         map.put("primaryOutput", getObjectFromGenericStack(pattern.getPrimaryOutput()));
         return map;
     }
@@ -393,13 +407,35 @@ public static boolean isFluidCrafting(MEStorage monitor, ICraftingService grid,
         return false;
     }
 
-    public static long getTotalItemStorage(IGridNode node) {
+    public static long getTotalExternalItemStorage(IGridNode node) {
         long total = 0;
 
-        Iterator<IGridNode> iterator = node.getGrid().getMachineNodes(DriveBlockEntity.class).iterator();
+        for (IGridNode iGridNode : node.getGrid().getMachineNodes(StorageBusPart.class)) {
+            StorageBusPart bus = (StorageBusPart) iGridNode.getService(IStorageProvider.class);
+            Level level = bus.getLevel();
+            BlockPos connectedInventoryPos = bus.getHost().getBlockEntity().getBlockPos().relative(bus.getSide());
+            BlockEntity connectedInventoryEntity = level.getBlockEntity(connectedInventoryPos);
 
-        while (iterator.hasNext()) {
-            DriveBlockEntity entity = (DriveBlockEntity) iterator.next().getService(IStorageProvider.class);
+            if (connectedInventoryEntity == null)
+                continue;
+
+            LazyOptional<IItemHandler> itemHandler = connectedInventoryEntity.getCapability(ForgeCapabilities.ITEM_HANDLER);
+            if (itemHandler.isPresent()) {
+                IItemHandler handler = itemHandler.orElse(null);
+                for (int i = 0; i < handler.getSlots(); i++) {
+                    total += handler.getSlotLimit(i);
+                }
+            }
+        }
+
+        return total;
+    }
+
+    public static long getTotalItemStorage(IGridNode node) {
+        long total = 0;
+
+        for (IGridNode iGridNode : node.getGrid().getMachineNodes(DriveBlockEntity.class)) {
+            DriveBlockEntity entity = (DriveBlockEntity) iGridNode.getService(IStorageProvider.class);
             if (entity == null)
                 continue;
 
@@ -420,24 +456,33 @@ public static long getTotalItemStorage(IGridNode node) {
                         total += disk.getBytes(null);
                     }
                 } else if (APAddons.aeAdditionsLoaded && (stack.getItem() instanceof SuperStorageCell superStorageCell)) {
-                    total += superStorageCell.getKiloBytes() * 1024;
+                    total += superStorageCell.getKiloBytes() * 1024L;
                 }
             }
         }
 
-        iterator = node.getGrid().getMachineNodes(StorageBusPart.class).iterator();
+        total += getTotalExternalItemStorage(node);
 
-        while (iterator.hasNext()) {
-            StorageBusPart bus = (StorageBusPart) iterator.next().getService(IStorageProvider.class);
-            net.minecraft.world.level.Level level = bus.getLevel();
+        return total;
+    }
+
+    public static long getTotalExternalFluidStorage(IGridNode node) {
+        long total = 0;
+
+        for (IGridNode iGridNode : node.getGrid().getMachineNodes(StorageBusPart.class)) {
+            StorageBusPart bus = (StorageBusPart) iGridNode.getService(IStorageProvider.class);
+            Level level = bus.getLevel();
             BlockPos connectedInventoryPos = bus.getHost().getBlockEntity().getBlockPos().relative(bus.getSide());
             BlockEntity connectedInventoryEntity = level.getBlockEntity(connectedInventoryPos);
 
-            LazyOptional<IItemHandler> itemHandler = connectedInventoryEntity.getCapability(ForgeCapabilities.ITEM_HANDLER);
-            if (itemHandler.isPresent()) {
-                IItemHandler handler = itemHandler.orElse(null);
-                for (int i = 0; i < handler.getSlots(); i++) {
-                    total += handler.getSlotLimit(i);
+            if (connectedInventoryEntity == null)
+                continue;
+
+            LazyOptional<IFluidHandler> fluidHandler = connectedInventoryEntity.getCapability(ForgeCapabilities.FLUID_HANDLER);
+            if (fluidHandler.isPresent()) {
+                IFluidHandler handler = fluidHandler.orElse(null);
+                for (int i = 0; i < handler.getTanks(); i++) {
+                    total += handler.getTankCapacity(i);
                 }
             }
         }
@@ -448,10 +493,8 @@ public static long getTotalItemStorage(IGridNode node) {
     public static long getTotalFluidStorage(IGridNode node) {
         long total = 0;
 
-        Iterator<IGridNode> iterator = node.getGrid().getMachineNodes(DriveBlockEntity.class).iterator();
-
-        while (iterator.hasNext()) {
-            DriveBlockEntity entity = (DriveBlockEntity) iterator.next().getService(IStorageProvider.class);
+        for (IGridNode iGridNode : node.getGrid().getMachineNodes(DriveBlockEntity.class)) {
+            DriveBlockEntity entity = (DriveBlockEntity) iGridNode.getService(IStorageProvider.class);
             if (entity == null)
                 continue;
 
@@ -468,38 +511,38 @@ public static long getTotalFluidStorage(IGridNode node) {
                         total += cell.getBytes(null);
                     }
                 } else if (APAddons.aeAdditionsLoaded && stack.getItem() instanceof SuperStorageCell superStorageCell) {
-                    total += superStorageCell.getKiloBytes() * 1024;
+                    total += superStorageCell.getKiloBytes() * 1024L;
                 }
             }
         }
 
-        iterator = node.getGrid().getMachineNodes(StorageBusPart.class).iterator();
+        total += getTotalExternalFluidStorage(node);
 
-        while (iterator.hasNext()) {
-            StorageBusPart bus = (StorageBusPart) iterator.next().getService(IStorageProvider.class);
-            net.minecraft.world.level.Level level = bus.getLevel();
-            BlockPos connectedInventoryPos = bus.getHost().getBlockEntity().getBlockPos().relative(bus.getSide());
-            BlockEntity connectedInventoryEntity = level.getBlockEntity(connectedInventoryPos);
+        return total;
+    }
 
-            LazyOptional<IFluidHandler> fluidHandler = connectedInventoryEntity.getCapability(ForgeCapabilities.FLUID_HANDLER);
-            if (fluidHandler.isPresent()) {
-                IFluidHandler handler = fluidHandler.orElse(null);
-                for (int i = 0; i < handler.getTanks(); i++) {
-                    total += handler.getTankCapacity(i);
+    public static long getUsedExternalItemStorage(IGridNode node) {
+        long used = 0;
+
+        for (IGridNode iGridNode : node.getGrid().getMachineNodes(StorageBusPart.class)) {
+            StorageBusPart bus = (StorageBusPart) iGridNode.getService(IStorageProvider.class);
+            KeyCounter keyCounter = bus.getInternalHandler().getAvailableStacks();
+
+            for (Object2LongMap.Entry<AEKey> aeKey : keyCounter) {
+                if (aeKey.getKey() instanceof AEItemKey) {
+                    used += aeKey.getLongValue();
                 }
             }
         }
 
-        return total;
+        return used;
     }
 
     public static long getUsedItemStorage(IGridNode node) {
         long used = 0;
 
-        Iterator<IGridNode> iterator = node.getGrid().getMachineNodes(DriveBlockEntity.class).iterator();
-
-        while (iterator.hasNext()) {
-            DriveBlockEntity entity = (DriveBlockEntity) iterator.next().getService(IStorageProvider.class);
+        for (IGridNode iGridNode : node.getGrid().getMachineNodes(DriveBlockEntity.class)) {
+            DriveBlockEntity entity = (DriveBlockEntity) iGridNode.getService(IStorageProvider.class);
             if (entity == null)
                 continue;
 
@@ -539,14 +582,20 @@ public static long getUsedItemStorage(IGridNode node) {
             }
         }
 
-        iterator = node.getGrid().getMachineNodes(StorageBusPart.class).iterator();
+        used += getUsedExternalItemStorage(node);
 
-        while (iterator.hasNext()) {
-            StorageBusPart bus = (StorageBusPart) iterator.next().getService(IStorageProvider.class);
+        return used;
+    }
+
+    public static long getUsedExternalFluidStorage(IGridNode node) {
+        long used = 0;
+
+        for (IGridNode iGridNode : node.getGrid().getMachineNodes(StorageBusPart.class)) {
+            StorageBusPart bus = (StorageBusPart) iGridNode.getService(IStorageProvider.class);
             KeyCounter keyCounter = bus.getInternalHandler().getAvailableStacks();
 
             for (Object2LongMap.Entry<AEKey> aeKey : keyCounter) {
-                if (aeKey.getKey() instanceof AEItemKey) {
+                if (aeKey.getKey() instanceof AEFluidKey) {
                     used += aeKey.getLongValue();
                 }
             }
@@ -558,10 +607,8 @@ public static long getUsedItemStorage(IGridNode node) {
     public static long getUsedFluidStorage(IGridNode node) {
         long used = 0;
 
-        Iterator<IGridNode> iterator = node.getGrid().getMachineNodes(DriveBlockEntity.class).iterator();
-
-        while (iterator.hasNext()) {
-            DriveBlockEntity entity = (DriveBlockEntity) iterator.next().getService(IStorageProvider.class);
+        for (IGridNode iGridNode : node.getGrid().getMachineNodes(DriveBlockEntity.class)) {
+            DriveBlockEntity entity = (DriveBlockEntity) iGridNode.getService(IStorageProvider.class);
             if (entity == null)
                 continue;
 
@@ -591,18 +638,7 @@ public static long getUsedFluidStorage(IGridNode node) {
             }
         }
 
-        iterator = node.getGrid().getMachineNodes(StorageBusPart.class).iterator();
-
-        while (iterator.hasNext()) {
-            StorageBusPart bus = (StorageBusPart) iterator.next().getService(IStorageProvider.class);
-            KeyCounter keyCounter = bus.getInternalHandler().getAvailableStacks();
-
-            for (Object2LongMap.Entry<AEKey> aeKey : keyCounter) {
-                if (aeKey.getKey() instanceof AEFluidKey) {
-                    used += aeKey.getLongValue();
-                }
-            }
-        }
+        used += getUsedExternalFluidStorage(node);
 
         return used;
     }
@@ -615,6 +651,14 @@ public static long getAvailableFluidStorage(IGridNode node) {
         return getTotalFluidStorage(node) - getUsedFluidStorage(node);
     }
 
+    public static long getAvailableExternalItemStorage(IGridNode node) {
+        return getTotalExternalItemStorage(node) - getUsedExternalItemStorage(node);
+    }
+
+    public static long getAvailableExternalFluidStorage(IGridNode node) {
+        return getTotalExternalFluidStorage(node) - getUsedExternalFluidStorage(node);
+    }
+
     public static List<Object> listCells(IGridNode node) {
         List<Object> items = new ArrayList<>();
 
diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/MeBridgePeripheral.java b/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/MeBridgePeripheral.java
@@ -376,13 +376,19 @@ public final MethodResult getAvgPowerInjection() {
     @Override
     @LuaFunction(mainThread = true)
     public MethodResult getTotalExternItemStorage() {
-        return null;
+        if (!isAvailable())
+            return notConnected();
+
+        return MethodResult.of(AppEngApi.getTotalExternalItemStorage(node));
     }
 
     @Override
     @LuaFunction(mainThread = true)
     public MethodResult getTotalExternFluidStorage() {
-        return null;
+        if (!isAvailable())
+            return notConnected();
+
+        return MethodResult.of(AppEngApi.getTotalExternalFluidStorage(node));
     }
 
 
@@ -407,13 +413,19 @@ public final MethodResult getTotalFluidStorage() {
     @Override
     @LuaFunction(mainThread = true)
     public MethodResult getUsedExternItemStorage() {
-        return null;
+        if (!isAvailable())
+            return notConnected();
+
+        return MethodResult.of(AppEngApi.getUsedExternalFluidStorage(node));
     }
 
     @Override
     @LuaFunction(mainThread = true)
     public MethodResult getUsedExternFluidStorage() {
-        return null;
+        if (!isAvailable())
+            return notConnected();
+
+        return MethodResult.of(AppEngApi.getUsedExternalFluidStorage(node));
     }
 
     @Override
@@ -437,13 +449,18 @@ public final MethodResult getUsedFluidStorage() {
     @Override
     @LuaFunction(mainThread = true)
     public MethodResult getAvailableExternItemStorage() {
-        return null;
-    }
+        if (!isAvailable())
+            return notConnected();
 
+        return MethodResult.of(AppEngApi.getAvailableExternalItemStorage(node));
+    }
     @Override
     @LuaFunction(mainThread = true)
     public MethodResult getAvailableExternFluidStorage() {
-        return null;
+        if (!isAvailable())
+            return notConnected();
+
+        return MethodResult.of(AppEngApi.getAvailableExternalFluidStorage(node));
     }
 
     @Override
