Updated REI, fixed json recipe crash

KubeJS-Mods · Apr 9, 2024 · e213582 · e213582
1 parent a836cfe
commit e213582
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -12,7 +12,7 @@ minecraft_version=1.20.4
 rhino_version=2004.2.3-build.4
 min_rhino_version=2004.2.3-build.4
 architectury_version=11.1.17
-rei_version=14.0.688
+rei_version=14.0.692
 #rei_comp_version=9.0.16
 neoforge_version=20.4.223
 #forge_bookshelf_version=11.0.3

diff --git a/src/main/java/dev/latvian/mods/kubejs/recipe/JsonRecipeJS.java b/src/main/java/dev/latvian/mods/kubejs/recipe/JsonRecipeJS.java
@@ -4,7 +4,6 @@
 import dev.latvian.mods.kubejs.util.UtilsJS;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
-import net.minecraft.world.item.crafting.Recipe;
 
 public class JsonRecipeJS extends RecipeJS {
 	@Override
@@ -18,8 +17,15 @@ public void serialize() {
 	@Override
 	public boolean hasInput(ReplacementMatch match) {
 		if (CommonProperties.get().matchJsonRecipes && match instanceof ItemMatch m && getOriginalRecipe() != null) {
-			for (var ingredient : getOriginalRecipe().getIngredients()) {
-				if (ingredient != Ingredient.EMPTY && ingredient.kjs$canBeUsedForMatching() && m.contains(ingredient)) {
+			var arr = getOriginalRecipe().getIngredients();
+
+			//noinspection ConstantValue
+			if (arr == null || arr.isEmpty()) {
+				return false;
+			}
+
+			for (var ingredient : arr) {
+				if (ingredient != null && ingredient != Ingredient.EMPTY && ingredient.kjs$canBeUsedForMatching() && m.contains(ingredient)) {
 					return true;
 				}
 			}
@@ -34,10 +40,10 @@ public boolean replaceInput(ReplacementMatch match, InputReplacement with) {
 	}
 
 	@Override
-	@SuppressWarnings("ConstantValue")
 	public boolean hasOutput(ReplacementMatch match) {
 		if (CommonProperties.get().matchJsonRecipes && match instanceof ItemMatch m && getOriginalRecipe() != null) {
-			var result = ((Recipe<?>) this).getResultItem(UtilsJS.staticRegistryAccess);
+			var result = getOriginalRecipe().getResultItem(UtilsJS.staticRegistryAccess);
+			//noinspection ConstantValue
 			return result != null && result != ItemStack.EMPTY && !result.isEmpty() && m.contains(result);
 		}
 

diff --git a/src/main/java/dev/latvian/mods/kubejs/recipe/RecipesEventJS.java b/src/main/java/dev/latvian/mods/kubejs/recipe/RecipesEventJS.java
@@ -716,7 +716,11 @@ public void stage(RecipeFilter filter, String stage) {
 	}
 
 	public static void runInParallel(final Runnable runnable) {
-		PARALLEL_THREAD_POOL.invoke(ForkJoinTask.adapt(runnable));
+		try {
+			PARALLEL_THREAD_POOL.invoke(ForkJoinTask.adapt(runnable));
+		} catch (Throwable ex) {
+			ConsoleJS.SERVER.error("Error running a recipe task", ex, SKIP_ERROR);
+		}
 	}
 
 	public static <T> T runInParallel(final Callable<T> callable) {