Implement pattern filtering for the me bridge

Author: SirEndii

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AppEngApi.java

@@ -22,6 +22,7 @@
 import de.srendi.advancedperipherals.common.util.LuaConverter;
 import de.srendi.advancedperipherals.common.util.Pair;
 import de.srendi.advancedperipherals.common.util.inventory.FluidFilter;
+import de.srendi.advancedperipherals.common.util.inventory.GenericFilter;
 import de.srendi.advancedperipherals.common.util.inventory.ItemFilter;
 import de.srendi.advancedperipherals.common.util.inventory.ItemUtil;
 import io.github.projectet.ae2things.item.DISKDrive;
@@ -87,6 +88,45 @@ public static Pair<Long, AEFluidKey> findAEFluidFromFilter(MEStorage monitor, @N
         return null;
     }
 
+    public static Pair<IPatternDetails, String> findPatternFromFilters(ICraftingProvider provider, GenericFilter inputFilter, GenericFilter outputFilter) {
+        for (IPatternDetails pattern : provider.getAvailablePatterns()) {
+            if (pattern.getInputs().length == 0)
+                continue;
+            if (pattern.getOutputs().length == 0)
+                continue;
+
+            boolean inputMatch = false;
+            boolean outputMatch = false;
+
+            if(!inputFilter.isEmpty()) {
+                for (IPatternDetails.IInput input : pattern.getInputs()) {
+                    if (inputFilter.test(input.getPossibleInputs()[0])) {
+                        inputMatch = true;
+                        break;
+                    }
+                }
+            } else {
+                inputMatch = true;
+            }
+
+            if(!outputFilter.isEmpty()) {
+                for (GenericStack output : pattern.getOutputs()) {
+                    if (outputFilter.test(output)) {
+                        outputMatch = true;
+                        break;
+                    }
+                }
+            } else {
+                outputMatch = true;
+            }
+
+            if (inputMatch && outputMatch)
+                return Pair.of(pattern, null);
+        }
+
+        return Pair.of(null, "NO_PATTERN_FOUND");
+    }
+
     public static List<Object> listStacks(MEStorage monitor, ICraftingService service, int flag) {
         List<Object> items = new ArrayList<>();
         KeyCounter keyCounter = monitor.getAvailableStacks();

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/MeBridgePeripheral.java

@@ -1,5 +1,6 @@
 package de.srendi.advancedperipherals.common.addons.computercraft.peripheral;
 
+import appeng.api.crafting.IPatternDetails;
 import appeng.api.networking.IGridNode;
 import appeng.api.networking.IManagedGridNode;
 import appeng.api.networking.crafting.ICraftingCPU;
@@ -13,6 +14,7 @@
 import dan200.computercraft.api.lua.LuaFunction;
 import dan200.computercraft.api.lua.MethodResult;
 import dan200.computercraft.api.peripheral.IComputerAccess;
+import dan200.computercraft.core.apis.TableHelper;
 import dan200.computercraft.core.computer.ComputerSide;
 import de.srendi.advancedperipherals.common.addons.appliedenergistics.AppEngApi;
 import de.srendi.advancedperipherals.common.addons.appliedenergistics.CraftJob;
@@ -273,25 +275,50 @@ public MethodResult getFilteredPatterns(IArguments arguments) throws LuaExceptio
         if (!isAvailable())
             return notConnected();
 
+        // Expected input is a table with either an input table, an output table or both to filter for both
         Map<?, ?> filterTable;
         try {
             Optional<Map<?, ?>> optionalTable = arguments.optTable(0);
             if (optionalTable.isEmpty())
                 return MethodResult.of(null, "EMPTY_INPUT");
-            // Expected input is a table with either an input table, an output table or both to filter for both
             filterTable = optionalTable.get();
         } catch (LuaException e) {
             return MethodResult.of(null, "NO_TABLE");
         }
 
         boolean hasInputFilter = filterTable.containsKey("input");
         boolean hasOutputFilter = filterTable.containsKey("output");
+        boolean hasAnyFilter = hasInputFilter || hasOutputFilter;
 
+        // If the player tries to filter for nothing, return nothing.
+        if (!hasAnyFilter)
+            return MethodResult.of(null, "NO_FILTER");
 
-        if (hasInputFilter)
-            return null;
+        GenericFilter inputFilter = GenericFilter.empty();
+        GenericFilter outputFilter = GenericFilter.empty();
 
-        return null;
+        if (hasInputFilter) {
+            Map<?, ?> inputFilterTable = TableHelper.getTableField(filterTable, "input");
+
+            inputFilter = GenericFilter.parseGeneric(inputFilterTable).getLeft();
+        }
+        if (hasOutputFilter) {
+            Map<?, ?> outputFilterTable = TableHelper.getTableField(filterTable, "output");
+
+            outputFilter = GenericFilter.parseGeneric(outputFilterTable).getLeft();
+        }
+
+        ICraftingProvider provider = node.getService(ICraftingProvider.class);
+
+        if (provider == null)
+            return MethodResult.of(null, "NO_CRAFTING_PROVIDER");
+
+        Pair<IPatternDetails, String> pattern = AppEngApi.findPatternFromFilters(provider, inputFilter, outputFilter);
+
+        if (pattern.getRight() != null)
+            return MethodResult.of(null, pattern.getRight());
+
+        return MethodResult.of(AppEngApi.getObjectFromPattern(pattern.getLeft()));
     }
 
     @Override

src/main/java/de/srendi/advancedperipherals/common/setup/APBlocks.java

@@ -1,6 +1,5 @@
 package de.srendi.advancedperipherals.common.setup;
 
-import de.srendi.advancedperipherals.common.addons.APAddons;
 import de.srendi.advancedperipherals.common.blocks.PlayerDetectorBlock;
 import de.srendi.advancedperipherals.common.blocks.RedstoneIntegratorBlock;
 import de.srendi.advancedperipherals.common.blocks.base.APBlockEntityBlock;

src/main/java/de/srendi/advancedperipherals/common/util/inventory/FluidFilter.java

@@ -1,5 +1,7 @@
 package de.srendi.advancedperipherals.common.util.inventory;
 
+import appeng.api.stacks.AEFluidKey;
+import appeng.api.stacks.GenericStack;
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.core.apis.TableHelper;
 import de.srendi.advancedperipherals.AdvancedPeripherals;
@@ -97,6 +99,14 @@ public FluidFilter setCount(int count) {
         return this;
     }
 
+    @Override
+    public boolean test(GenericStack genericStack) {
+        if (genericStack.what() instanceof AEFluidKey aeFluidKey) {
+            return test(aeFluidKey.toStack(1));
+        }
+        return false;
+    }
+
     public boolean test(FluidStack stack) {
         if (!fingerprint.isEmpty()) {
             String testFingerprint = FluidUtil.getFingerprint(stack);

src/main/java/de/srendi/advancedperipherals/common/util/inventory/GenericFilter.java

@@ -1,16 +1,60 @@
 package de.srendi.advancedperipherals.common.util.inventory;
 
+import appeng.api.stacks.GenericStack;
 import de.srendi.advancedperipherals.common.util.Pair;
+import net.minecraftforge.registries.ForgeRegistries;
 
 import java.util.Map;
 
 public abstract class GenericFilter {
 
-    // TODO: Imagine we want to filter for an object which can either a item, a fluid or maybe a chemical from mekanism
-    // This function should first check if the `name` key can be found in any of the registries and then return the
-    // right filter according to the registry type which could be an item or a chemical
-    public static Pair<GenericFilter, String> parseGeneric(Map<?, ?> rawFilter) {
-        return Pair.of(null, null);
+    /**
+     * Try to parse a raw filter table to any existing filter type. Could be a fluid filter, an item filter, maybe something else
+     * in the future.
+     * <p>
+     * If the function can't find a valid type for the given name/resource location, it will return an empty filter with
+     * a proper error message.
+     *
+     * @param rawFilter The raw filter, which is a map of strings and objects
+     * @return A pair of the parsed filter and an error message, if there is one
+     */
+    public static Pair<? extends GenericFilter, String> parseGeneric(Map<?, ?> rawFilter) {
+        if (!rawFilter.containsKey("name")) {
+            // If the filter does not contain a name, which should never happen, but players are players, we will just
+            // give the ItemFilter the task to parse the filter
+            return ItemFilter.parse(rawFilter);
+        }
+        String name = rawFilter.get("name").toString();
+
+        // Let's check in which registry this thing is
+        if (ItemUtil.getRegistryEntry(name, ForgeRegistries.ITEMS) != null) {
+            return ItemFilter.parse(rawFilter);
+        } else if (ItemUtil.getRegistryEntry(name, ForgeRegistries.FLUIDS) != null) {
+            return FluidFilter.parse(rawFilter);
+            // TODO: Add chemical filter support
+        } else {
+            // If the name is in neither of the registries, we will just return an empty filter
+            return Pair.of(empty(), "NO_VALID_FILTER_TYPE");
+        }
+
+    }
+
+    public abstract boolean isEmpty();
+
+    public abstract boolean test(GenericStack genericStack);
+
+    public static GenericFilter empty() {
+        return new GenericFilter() {
+            @Override
+            public boolean isEmpty() {
+                return true;
+            }
+
+            @Override
+            public boolean test(GenericStack genericStack) {
+                return false;
+            }
+        };
     }
 
 }

src/main/java/de/srendi/advancedperipherals/common/util/inventory/ItemFilter.java

@@ -1,5 +1,7 @@
 package de.srendi.advancedperipherals.common.util.inventory;
 
+import appeng.api.stacks.AEItemKey;
+import appeng.api.stacks.GenericStack;
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.core.apis.TableHelper;
 import de.srendi.advancedperipherals.AdvancedPeripherals;
@@ -112,6 +114,14 @@ public ItemStack toItemStack() {
         return result;
     }
 
+    @Override
+    public boolean test(GenericStack genericStack) {
+        if (genericStack.what() instanceof AEItemKey aeItemKey) {
+            return test(aeItemKey.toStack());
+        }
+        return false;
+    }
+
     public boolean test(ItemStack stack) {
         if (!fingerprint.isEmpty()) {
             String testFingerprint = ItemUtil.getFingerprint(stack);