Fixed issues with the cached status being null causing missing information when a job is done/canceled. Added a getCraftingJob function with the job id

Author: SirEndii

src/main/java/de/srendi/advancedperipherals/common/addons/ae2/AECraftJob.java

@@ -290,7 +290,9 @@ private void prepareCPUAndStatus(ICraftingService service) {
                     cpuCluster.craftingLogic.addListener((key) -> {
                         // The last time the listeners are called from the cpu logic is when the job is finished
                         // These listeners are not intended by ae2 to be used like this, but it works, and we don't modify the key
-                        this.cachedStatus = cpuCluster.getJobStatus();
+                        if (cpuCluster.getJobStatus() != null) {
+                            this.cachedStatus = cpuCluster.getJobStatus();
+                        }
                     });
                     this.targetCpu = cpu;
                     return;
@@ -301,9 +303,10 @@ private void prepareCPUAndStatus(ICraftingService service) {
     }
 
     private CraftingJobStatus getJobStatus() {
-        if (jobStatus == null || jobStatus.get() == null || cachedStatus != null) {
+        if (jobStatus == null || jobStatus.get() == null && cachedStatus != null) {
             return cachedStatus;
         }
+        cachedStatus = jobStatus.get();
         return jobStatus.get();
     }
 }

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

@@ -651,6 +651,22 @@ public MethodResult getCraftingJobs() {
         return MethodResult.of(jobs);
     }
 
+    @Override
+    @LuaFunction(mainThread = true)
+    public MethodResult getCraftingJob(int id) {
+        if (!isAvailable())
+            return notConnected();
+
+        AECraftJob foundJob = null;
+
+        for (AECraftJob job : bridge.getJobs()) {
+            if (job.getId() == id) {
+                foundJob = job;
+            }
+        }
+        return MethodResult.of(foundJob);
+    }
+
     @Override
     @LuaFunction(mainThread = true)
     public MethodResult cancelCraftingJobs(IArguments arguments) {

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

@@ -11,6 +11,7 @@
 import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.core.apis.TableHelper;
 import dan200.computercraft.core.computer.ComputerSide;
+import de.srendi.advancedperipherals.common.addons.ae2.AECraftJob;
 import de.srendi.advancedperipherals.common.addons.computercraft.owner.BlockEntityPeripheralOwner;
 import de.srendi.advancedperipherals.common.addons.refinedstorage.RSCraftJob;
 import de.srendi.advancedperipherals.common.addons.refinedstorage.RsApi;
@@ -629,6 +630,22 @@ public MethodResult getCraftingJobs() {
         return MethodResult.of(RsApi.getCraftingTasks(getNetwork(), bridge));
     }
 
+    @Override
+    @LuaFunction(mainThread = true)
+    public MethodResult getCraftingJob(int id) {
+        if (!isAvailable())
+            return notConnected();
+
+        RSCraftJob foundJob = null;
+
+        for (RSCraftJob job : bridge.getJobs()) {
+            if (job.getId() == id) {
+                foundJob = job;
+            }
+        }
+        return MethodResult.of(foundJob);
+    }
+
     @Override
     @LuaFunction(mainThread = true)
     public MethodResult cancelCraftingJobs(IArguments arguments) throws LuaException {

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

@@ -112,6 +112,9 @@ public interface IStorageSystemPeripheral {
 
     MethodResult getCraftingJobs();
 
+    // A function to get our BasicCraftJob object with the id
+    MethodResult getCraftingJob(int id);
+
     MethodResult cancelCraftingJobs(IArguments arguments) throws LuaException;
 
     MethodResult craftFluid(IComputerAccess computer, IArguments arguments) throws LuaException;