Implement cancelCraftingTasks for the ME Bridge

IntelligenceModding · Apr 26, 2024 · b735bde · b735bde
1 parent ab0d58a
commit b735bde
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -24,7 +24,7 @@ ttoolkit_version=0.1.3
 cc_version=1.101.3
 curios_version=1.19.2-5.1.4.1
 minecolonies_version=1.19.2-1.1.473-BETA
-appliedenergistics_version=12.9.8
+appliedenergistics_version=12.9.9
 patchouli_version=1.19.2-77
 refinedstorage_version=1.11.7
 botania_version=1.19.2-440-FORGE

diff --git a/...srendi/advancedperipherals/common/addons/computercraft/peripheral/MeBridgePeripheral.java b/...srendi/advancedperipherals/common/addons/computercraft/peripheral/MeBridgePeripheral.java
@@ -8,6 +8,7 @@
 import appeng.api.stacks.AEFluidKey;
 import appeng.api.stacks.AEItemKey;
 import appeng.api.storage.MEStorage;
+import appeng.me.cluster.implementations.CraftingCPUCluster;
 import dan200.computercraft.api.lua.IArguments;
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.api.lua.LuaFunction;
@@ -598,6 +599,7 @@ public final MethodResult craftFluid(IComputerAccess computer, IArguments argume
     }
 
     @Override
+    @LuaFunction(mainThread = true)
     public MethodResult getCraftingTasks() {
         if (!isAvailable())
             return notConnected();
@@ -614,7 +616,8 @@ public MethodResult getCraftingTasks() {
     }
 
     @Override
-    public MethodResult cancelCraftingTasks(IArguments arguments) throws LuaException {
+    @LuaFunction(mainThread = true)
+    public MethodResult cancelCraftingTasks(IArguments arguments) {
         if (!isAvailable())
             return notConnected();
 
@@ -634,14 +637,16 @@ public MethodResult cancelCraftingTasks(IArguments arguments) throws LuaExceptio
         if (filter.getRight() != null)
             return MethodResult.of(null, filter.getRight());
 
-        //TODO: See https://github.com/AppliedEnergistics/Applied-Energistics-2/issues/7560
-        /*
+        int jobsCanceled = 0;
         for (ICraftingCPU cpu : craftingGrid.getCpus()) {
-            if (cpu.getJobStatus() != null) {
+            if (cpu.getJobStatus() != null && filter.getLeft().test(cpu.getJobStatus().crafting())) {
+                if (cpu instanceof CraftingCPUCluster cpuCluster) {
+                    cpuCluster.cancel();
+                    jobsCanceled++;
+                }
             }
         }
-         */
-        return null;
+        return MethodResult.of(jobsCanceled, "SUCCESSFUL");
     }
 
     @Override