Add item attributes for fan processing

Author: RaymondBlaze

CHANGELOG.md

@@ -1,18 +1,8 @@
-### Create: Dragons Plus 1.5.0
+### Create: Dragons Plus 1.5.1
 
 #### Features
-- Added Bulk Sanding (needs Quicksand), supports all Sand Parper Polishing recipes.
-- Added Sand Paper Polishing recipes for Polished Blocks.
-- Added Sand Paper Polishing recipes for Oxidized Blocks.
-- Added Sand Paper Polishing recipes for Waxed Blocks.
-- Added Bulk Ending (needs Dragon Head or Dragon's Breath (Fluid)).
-- Added block and bucket for Dragon's Breath (Fluid).
-- Added Automated Brewing recipes for Dragon's Breath (Fluid).
+- Added Item Attributes for Bulk Freezing, Bulk Sanding, Bulk Ending
 
-#### Update
-- Add French Translation by @fabien-gigante
-- Update Japanese Translation by @YukkuriOfuton
-
-#### Compatibility
-- Incompatible with Create: Central Kitchen < 2.1 due to breaking change,
-please update Create: Central Kitchen to 2.1+.
+#### Fix
+- Fix certain mods with blocks without items causing crash on Sand Paper Polishing due to 
+invalid generated recipes with empty ingredient.

gradle.properties

@@ -17,7 +17,7 @@ mod_id = create_dragons_plus
 mod_artifact_id = create-dragons-plus
 mod_name = Create: Dragons Plus
 mod_license = LGPL-3.0-or-later
-mod_version = 1.5.0
+mod_version = 1.5.1
 mod_group_id = plus.dragons.createdragonsplus
 mod_authors = DragonsPlus
 mod_description = Library mod for DragonsPlusMinecraft Create-addons.

src/main/java/plus/dragons/createdragonsplus/data/internal/CDPRuntimeRecipeProvider.java

@@ -29,6 +29,7 @@
 import net.minecraft.data.recipes.RecipeOutput;
 import net.minecraft.data.recipes.RecipeProvider;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.Items;
 import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.item.crafting.RecipeHolder;
 import net.neoforged.bus.api.SubscribeEvent;
@@ -61,34 +62,44 @@ private static void buildPolishedBlockRecipes(RecipeOutput output) {
                     var baseId = polishedId.withPath(name -> name.replace("polished_", ""));
                     if (!BuiltInRegistries.BLOCK.containsKey(baseId))
                         return;
-                    var polished = holder.value();
-                    var base = BuiltInRegistries.BLOCK.get(baseId);
+                    var polishedItem = holder.value().asItem();
+                    var baseItem = BuiltInRegistries.BLOCK.get(baseId).asItem();
+                    if (polishedItem == Items.AIR || baseItem == Items.AIR)
+                        return;
                     var recipeId = CDPCommon.asResource(baseId.toString().replace(':', '/'));
                     new ProcessingRecipeBuilder<>(SandPaperPolishingRecipe::new, recipeId)
-                            .require(base)
-                            .output(polished)
+                            .require(baseItem)
+                            .output(polishedItem)
                             .build(output);
                 });
     }
 
     private static void buildOxidizedBlockRecipes(RecipeOutput output) {
         DataMapHooks.INVERSE_OXIDIZABLES_DATAMAP.forEach((oxidized, polished) -> {
+            var oxidizedItem = oxidized.asItem();
+            var polishedItem = polished.asItem();
+            if (oxidizedItem == Items.AIR || polishedItem == Items.AIR)
+                return;
             var oxidizedId = BuiltInRegistries.BLOCK.getKey(oxidized);
             var recipeId = CDPCommon.asResource(oxidizedId.toString().replace(':', '/'));
             new ProcessingRecipeBuilder<>(SandPaperPolishingRecipe::new, recipeId)
-                    .require(oxidized)
-                    .output(polished)
+                    .require(oxidizedItem)
+                    .output(polishedItem)
                     .build(output);
         });
     }
 
     private static void buildWaxedBlockRecipes(RecipeOutput output) {
         DataMapHooks.INVERSE_WAXABLES_DATAMAP.forEach((waxed, polished) -> {
+            var waxedItem = waxed.asItem();
+            var polishedItem = polished.asItem();
+            if (waxedItem == Items.AIR || polishedItem == Items.AIR)
+                return;
             var waxedId = BuiltInRegistries.BLOCK.getKey(waxed);
             var recipeId = CDPCommon.asResource(waxedId.toString().replace(':', '/'));
             new ProcessingRecipeBuilder<>(SandPaperPolishingRecipe::new, recipeId)
-                    .require(waxed)
-                    .output(polished)
+                    .require(waxedItem)
+                    .output(polishedItem)
                     .build(output);
         });
     }