Merge branch 'dev/1.21.1' into release/1.21.1

Author: SirEndii

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -41,14 +41,16 @@ body:
       multiple: false
       options:
         - Own compiled build.
-        - 1.21.1-0.7.53b (Latest 1.21.1)
+        - 1.21.1-0.7.55b (Latest 1.21.1)
+        - 1.21.1-0.7.54b
+        - 1.21.1-0.7.53b 
         - 1.21.1-0.7.52b
         - 1.21.1-0.7.51b
         - 1.21.1-0.7.50b
         - 1.20.4-0.7.43a (Latest 1.20.4)
-        - 1.20.1-0.7.41r (Latest 1.20.1)
-        - 1.20.1-0.7.40r
-        - 1.20.1-0.7.39r 
+        - 1.20.1-0.7.45r (Latest 1.20.1)
+        - 1.20.1-0.7.44r
+        - 1.20.1-0.7.43r
         - 1.19.2-0.7.37r (Latest 1.19.2)
         - 1.19.2-0.7.36r
         - 1.19.2-0.7.35r

build.gradle

@@ -159,6 +159,10 @@ repositories {
             includeGroup("com.tterrag.registrate")
         }
     }
+    maven {
+        name = "TerraformersMC EMI"
+        url = "https://maven.terraformersmc.com/"
+    }
     maven {
         name = "SirEdvin's private repository"
         url = "https://repo.repsy.io/mvn/siredvin/default"
@@ -282,8 +286,8 @@ dependencies {
 
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_version}"
     // Testing stuff
-    // JEI
-    implementation "mezz.jei:jei-${jei_version}"
+    // EMI
+    runtimeOnly "dev.emi:emi-neoforge:${emi_version}"
 }
 
 

gradle.properties

@@ -28,9 +28,9 @@ ttoolkit_version=0.1.3
 cc_version=1.116.0
 
 ae2things_version=5637783
-appliedenergistics_version=19.2.10
+appliedenergistics_version=19.2.13
 appliedmekanistics_version=5978711
-refinedstorage_version=2.0.0-beta.2
+refinedstorage_version=2.0.0-beta.8
 refinedstorage_mekanism_version=1.0.0
 minecolonies_version=1.1.1020-1.21.1-snapshot
 patchouli_version=1.21-88
@@ -49,5 +49,5 @@ emiVersion=1.1.11+1.21
 cloth_config_version=15.0.127
 
 # Mod dependencies for testing stuff(Only used in the dev environment)
-jei_version=1.21.1-neoforge:19.19.6.235
+emi_version=1.1.22+1.21.1
 createadditions_version=5099752

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

@@ -115,9 +115,13 @@ public final MethodResult warpToPoint(String name) throws LuaException {
         if (pairData.leftPresent())
             return pairData.getLeft();
 
+        CompoundTag data = pairData.getRight();
+
+        if (!data.contains(name))
+            return MethodResult.of(null, "Cannot find point to teleport");
+
         TurtlePeripheralOwner owner = automataCore.getPeripheralOwner();
         Level level = owner.getLevel();
-        CompoundTag data = pairData.getRight();
         BlockPos newPosition = NBTUtil.blockPosFromNBT(data.getCompound(name));
         return automataCore.withOperation(WARP, automataCore.toDistance(newPosition), context -> {
             boolean result = owner.move(level, newPosition);

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

@@ -1,5 +1,6 @@
 package de.srendi.advancedperipherals.common.addons.refinedstorage;
 
+import com.refinedmods.refinedstorage.api.autocrafting.calculation.CancellationToken;
 import com.refinedmods.refinedstorage.api.autocrafting.preview.Preview;
 import com.refinedmods.refinedstorage.api.autocrafting.preview.PreviewType;
 import com.refinedmods.refinedstorage.api.autocrafting.status.TaskStatus;
@@ -210,7 +211,7 @@ protected void maybeCraft() {
 
         // 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
         // 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);
+        futureTask = autocraftingComponent.startTask(toCraft, amount, Actor.EMPTY, false, CancellationToken.NONE);
     }
 
     @Override
@@ -225,7 +226,7 @@ protected void startCalculation() {
             return;
         }
 
-        futureCalculationResult = autocraftingComponent.getPreview(toCraft, amount);
+        futureCalculationResult = autocraftingComponent.getPreview(toCraft, amount, CancellationToken.NONE);
         fireEvent(false, StatusConstants.CALCULATION_STARTED);
     }