Add RS 2.0.0-beta.13 support

Author: SirEndii

gradle.properties

@@ -10,7 +10,7 @@ mod_id=advancedperipherals
 mod_version=0.7.55b
 minecraft_version=1.21.1
 mod_artifact_suffix=
-neo_version=21.1.186
+neo_version=21.1.194
 parchment_minecraft_version=1.21.1
 parchment_mappings_version=2024.11.17
 loader_version=4
@@ -30,11 +30,11 @@ cc_version=1.116.0
 ae2things_version=5637783
 appliedenergistics_version=19.2.13
 appliedmekanistics_version=5978711
-refinedstorage_version=2.0.0-beta.8
+refinedstorage_version=2.0.0-beta.13
 refinedstorage_mekanism_version=1.0.0
 minecolonies_version=1.1.1020-1.21.1-snapshot
 patchouli_version=1.21-88
-mekanism_version=1.21.1-10.7.9.72
+mekanism_version=1.21.1-10.7.15.81
 powah_version=6143661
 
 # Mod dependencies which are needed for other mods

src/main/java/de/srendi/advancedperipherals/common/addons/refinedstorage/RSCraftJob.java

@@ -6,6 +6,7 @@
 import com.refinedmods.refinedstorage.api.autocrafting.status.TaskStatus;
 import com.refinedmods.refinedstorage.api.autocrafting.task.TaskId;
 import com.refinedmods.refinedstorage.api.network.autocrafting.AutocraftingNetworkComponent;
+import com.refinedmods.refinedstorage.api.network.impl.autocrafting.TimeoutableCancellationToken;
 import com.refinedmods.refinedstorage.api.resource.ResourceKey;
 import com.refinedmods.refinedstorage.api.storage.Actor;
 import dan200.computercraft.api.peripheral.IComputerAccess;
@@ -28,7 +29,7 @@ public class RSCraftJob extends BasicCraftJob {
     private TaskStatus craftingTask;
     private Preview preview;
     private Future<Optional<Preview>> futureCalculationResult;
-    private Future<Optional<TaskId>> futureTask;
+    private Optional<TaskId> futureTask = Optional.empty();
 
     public RSCraftJob(IComputerAccess computer, Level world, long amount, ResourceKey toCraft, AutocraftingNetworkComponent calculationResult) {
         super(computer, "rs", world, amount);
@@ -139,26 +140,11 @@ public void tick() {
             }
         }
         // The following is to get the TaskStatus from the issued task
-        if (futureTask == null || !futureTask.isDone() || craftingTask != null) {
+        if (futureTask.isEmpty() || craftingTask != null) {
             return;
         }
-        Optional<TaskId> optionalId;
 
-        try {
-            optionalId = futureTask.get();
-        } catch (InterruptedException | ExecutionException ex) {
-            AdvancedPeripherals.debug("Tried to get the task but the task was not done. Should be done", ex);
-            fireEvent(true, StatusConstants.UNKNOWN_ERROR);
-            return;
-        }
-
-        if (optionalId.isEmpty()) {
-            // This indicates that the second calculation was not successful. Well I guess. There is no java doc and I currently
-            // don't get an answer from the maintainer. So maybe we want to fire the crafting event
-            return;
-        }
-
-        TaskId id = optionalId.get();
+        TaskId id = futureTask.get();
         for (TaskStatus status : autocraftingComponent.getStatuses()) {
             if (status.info().id().equals(id)) {
                 this.craftingTask = status;
@@ -171,7 +157,7 @@ public void tick() {
 
     @Override
     protected void maybeCraft() {
-        if (startedCrafting || futureTask != null || futureCalculationResult == null || !futureCalculationResult.isDone()) {
+        if (startedCrafting || futureTask.isPresent() || futureCalculationResult == null || !futureCalculationResult.isDone()) {
             return;
         }
 
@@ -209,9 +195,9 @@ protected void maybeCraft() {
             return;
         }
 
-        // How RS2 handles crafting is a bit cursed. We first create a preview which calculates the recipes, and then we check if the preview was successful
+        // We first create a preview which calculates the recipes, and then we check if the preview was successful
         // If it was, we again start a task which again calculates the recipes, and then we hope nothing changed from the first calculation
-        futureTask = autocraftingComponent.startTask(toCraft, amount, Actor.EMPTY, false, CancellationToken.NONE);
+        futureTask = autocraftingComponent.startTask(toCraft, amount, Actor.EMPTY, false, new TimeoutableCancellationToken());
     }
 
     @Override
@@ -226,7 +212,7 @@ protected void startCalculation() {
             return;
         }
 
-        futureCalculationResult = autocraftingComponent.getPreview(toCraft, amount, CancellationToken.NONE);
+        futureCalculationResult = autocraftingComponent.getPreview(toCraft, amount, new TimeoutableCancellationToken());
         fireEvent(false, StatusConstants.CALCULATION_STARTED);
     }