fix: Fix crash when result ItemStackTemplate of a recipe is null #810

Author: BlayTheNinth

common/src/main/java/net/blay09/mods/cookingforblockheads/api/KitchenRecipeHandler.java

@@ -8,29 +8,34 @@
 import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.item.crafting.RecipeHolder;
 import net.minecraft.world.item.crafting.RecipeInput;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 import java.util.Optional;
 
 public interface KitchenRecipeHandler<C extends RecipeInput, T extends Recipe<C>> {
+    @SuppressWarnings("unchecked")
     default int mapToMatrixSlot(RecipeHolder<?> recipe, int ingredientIndex) {
         return mapToMatrixSlot((T) recipe.value(), ingredientIndex);
     }
 
     int mapToMatrixSlot(T recipe, int ingredientIndex);
 
+    @SuppressWarnings("unchecked")
     default List<Optional<Ingredient>> getIngredients(RecipeHolder<?> recipe) {
         return getIngredients((T) recipe.value());
     }
 
     List<Optional<Ingredient>> getIngredients(T recipe);
 
-    default ItemStackTemplate predictResultItem(RecipeHolder<?> recipe) {
+    @SuppressWarnings("unchecked")
+    default @Nullable ItemStackTemplate predictResultItem(RecipeHolder<?> recipe) {
         return predictResultItem((T) recipe.value());
     }
 
-    ItemStackTemplate predictResultItem(T recipe);
+    @Nullable ItemStackTemplate predictResultItem(T recipe);
 
+    @SuppressWarnings("unchecked")
     default ItemStack assemble(CraftingContext context, RecipeHolder<?> recipe, List<IngredientToken> ingredientTokens, RegistryAccess registryAccess) {
         return assemble(context, (T) recipe.value(), ingredientTokens, registryAccess);
     }

common/src/main/java/net/blay09/mods/cookingforblockheads/crafting/KitchenAbstractCookingRecipeHandler.java

@@ -9,6 +9,7 @@
 import net.minecraft.world.item.crafting.AbstractCookingRecipe;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.SingleRecipeInput;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 import java.util.Optional;
@@ -37,7 +38,7 @@ public ItemStack assemble(CraftingContext context, AbstractCookingRecipe recipe,
     }
 
     @Override
-    public ItemStackTemplate predictResultItem(AbstractCookingRecipe recipe) {
+    public @Nullable ItemStackTemplate predictResultItem(AbstractCookingRecipe recipe) {
         return ((SingleItemRecipeAccessor) recipe).getResult();
     }
 }

common/src/main/java/net/blay09/mods/cookingforblockheads/crafting/KitchenShapedRecipeHandler.java

@@ -4,6 +4,7 @@
 import net.minecraft.world.item.ItemStackTemplate;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.ShapedRecipe;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 import java.util.Optional;
@@ -27,7 +28,7 @@ public List<Optional<Ingredient>> getIngredients(ShapedRecipe recipe) {
     }
 
     @Override
-    public ItemStackTemplate predictResultItem(ShapedRecipe recipe) {
+    public @Nullable ItemStackTemplate predictResultItem(ShapedRecipe recipe) {
         return ((ShapedRecipeAccessor) recipe).getResult();
     }
 }

common/src/main/java/net/blay09/mods/cookingforblockheads/crafting/KitchenShapelessRecipeHandler.java

@@ -4,6 +4,7 @@
 import net.minecraft.world.item.ItemStackTemplate;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.ShapelessRecipe;
+import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 import java.util.Optional;
@@ -20,7 +21,7 @@ public List<Optional<Ingredient>> getIngredients(ShapelessRecipe recipe) {
     }
 
     @Override
-    public ItemStackTemplate predictResultItem(ShapelessRecipe recipe) {
+    public @Nullable ItemStackTemplate predictResultItem(ShapelessRecipe recipe) {
         return ((ShapelessRecipeAccessor) recipe).getResult();
     }
 }

common/src/main/java/net/blay09/mods/cookingforblockheads/menu/KitchenMenu.java

@@ -259,7 +259,8 @@ public List<CraftableWithStatus> buildAvailableCraftables() {
     private <C extends RecipeInput, T extends Recipe<C>> @Nullable CraftableWithStatus craftableWithStatusFromRecipe(RecipeHolder<?> recipeHolder) {
         final var recipe = recipeHolder.value();
         final var recipeHandler = CookingForBlockheadsAPI.getKitchenRecipeHandler(recipe);
-        final var resultItem = recipeHandler.predictResultItem(recipeHolder).create();
+        final var resultItemTemplate = recipeHandler.predictResultItem(recipeHolder);
+        final var resultItem = resultItemTemplate != null ? resultItemTemplate.create() : ItemStack.EMPTY;
         if (isGroupItem(resultItem)) {
             return null;
         }
@@ -373,7 +374,8 @@ private int getCraftableAmount(CraftingOperation operation, RecipeHolder<?> reci
         }
 
         final var recipeHandler = CookingForBlockheadsAPI.getKitchenRecipeHandler(recipe.value());
-        final var resultItem = recipeHandler.predictResultItem(recipe).create();
+        final var resultItemTemplate = recipeHandler.predictResultItem(recipe);
+        final var resultItem = resultItemTemplate != null ? resultItemTemplate.create() : ItemStack.EMPTY;
         final int resultCount = Math.max(1, resultItem.getCount());
         final int maxExecutions = Math.max(1, Mth.ceil(CraftingContext.COUNT_CUTOFF / (float) resultCount));
         final int craftableExecutions = operation.countCraftableRepeats(maxExecutions);
@@ -400,7 +402,8 @@ public void craft(RecipeDisplayId recipeDisplayId, NonNullList<ItemStack> locked
             final var recipe = serverDisplayInfo.parent();
             final var operation = state.craftingContext().createOperation(recipe).withLockedInputs(lockedInputs);
             final var recipeHandler = CookingForBlockheadsAPI.getKitchenRecipeHandler(recipe.value());
-            final var resultItem = recipeHandler.predictResultItem(recipe).create();
+            final var resultItemTemplate = recipeHandler.predictResultItem(recipe);
+            final var resultItem = resultItemTemplate != null ? resultItemTemplate.create() : ItemStack.EMPTY;
             final var repeats = craftFullStack ? resultItem.getMaxStackSize() / resultItem.getCount() : 1;
             for (int i = 0; i < repeats; i++) {
                 operation.prepare();

common/src/main/java/net/blay09/mods/cookingforblockheads/mixin/ShapedRecipeAccessor.java

@@ -2,11 +2,12 @@
 
 import net.minecraft.world.item.ItemStackTemplate;
 import net.minecraft.world.item.crafting.ShapedRecipe;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(ShapedRecipe.class)
 public interface ShapedRecipeAccessor {
     @Accessor
-    ItemStackTemplate getResult();
+    @Nullable ItemStackTemplate getResult();
 }

common/src/main/java/net/blay09/mods/cookingforblockheads/mixin/ShapelessRecipeAccessor.java

@@ -3,6 +3,7 @@
 import net.minecraft.world.item.ItemStackTemplate;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.ShapelessRecipe;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
@@ -14,5 +15,5 @@ public interface ShapelessRecipeAccessor {
     List<Ingredient> getIngredients();
 
     @Accessor
-    ItemStackTemplate getResult();
+    @Nullable ItemStackTemplate getResult();
 }

common/src/main/java/net/blay09/mods/cookingforblockheads/mixin/SingleItemRecipeAccessor.java

@@ -2,11 +2,12 @@
 
 import net.minecraft.world.item.ItemStackTemplate;
 import net.minecraft.world.item.crafting.SingleItemRecipe;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(SingleItemRecipe.class)
 public interface SingleItemRecipeAccessor {
     @Accessor
-    ItemStackTemplate getResult();
+    @Nullable ItemStackTemplate getResult();
 }

common/src/main/java/net/blay09/mods/cookingforblockheads/registry/CookingForBlockheadsRegistry.java

@@ -64,7 +64,8 @@ private static <C extends RecipeInput, T extends Recipe<C>> void loadRecipesByTy
                 continue;
             }
 
-            final var resultItem = recipeHandler.predictResultItem(recipe).create();
+            final var resultItemTemplate = recipeHandler.predictResultItem(recipe);
+            final var resultItem = resultItemTemplate != null ? resultItemTemplate.create() : ItemStack.EMPTY;
             if (isEligibleResultItem(resultItem)) {
                 if (recipe instanceof AbstractCookingRecipe cookingRecipe && isOvenDuplicate(cookingRecipe, (KitchenRecipeHandler<?, AbstractCookingRecipe>) recipeHandler, resultItem)) {
                     continue;
@@ -91,10 +92,13 @@ private static <T extends Recipe<?>> boolean isOvenDuplicate(T recipe, KitchenRe
         final var ingredients = recipeHandler.getIngredients(recipe);
         for (final var recipeHolder : existing) {
             final var otherRecipeHandler = getKitchenRecipeHandler(recipeHolder.value());
-            final var otherIngredients = otherRecipeHandler.getIngredients(recipeHolder);
-            final var otherResultItem = otherRecipeHandler.predictResultItem(recipeHolder).create();
-            if (ItemStack.isSameItemSameComponents(resultItem, otherResultItem) && ingredients.equals(otherIngredients)) {
-                return true;
+            if (otherRecipeHandler != null) {
+                final var otherIngredients = otherRecipeHandler.getIngredients(recipeHolder);
+                final var otherResultItemTemplate = otherRecipeHandler.predictResultItem(recipeHolder);
+                final var otherResultItem = otherResultItemTemplate != null ? otherResultItemTemplate.create() : ItemStack.EMPTY;
+                if (ItemStack.isSameItemSameComponents(resultItem, otherResultItem) && ingredients.equals(otherIngredients)) {
+                    return true;
+                }
             }
         }