Name all the recipes

.github/actions/ci/kubejs-recipes.js

@@ -21,7 +21,8 @@ fsp.readFile('logs/kubejs/server.txt').then(data => {
     modified: {},
 
     duplicate: {},
-    nameless: {},
+    kjs: {},
+    md5: {},
   };
 
   lines.forEach(line => {
@@ -45,8 +46,12 @@ fsp.readFile('logs/kubejs/server.txt').then(data => {
       groups['duplicate'][id] = recipe;      
     }
 
-    if (group == "added" && id.includes(':kjs_')) {
-      groups['nameless'][id] = recipe;      
+    if (group == "added" && id.includes('kjs_')) {
+      groups['kjs'][id] = recipe;      
+    }
+
+    if (group == "added" && id.includes('md5_')) {
+      groups['md5'][id] = recipe;      
     }
 
     groups[group][id] = recipe;
@@ -57,5 +62,5 @@ fsp.readFile('logs/kubejs/server.txt').then(data => {
     fsp.writeFile(`kubejs/exported/recipes/${group}.json`, JSON.stringify(recipes, null, '\t'));
   }
 
-  console.log(`::notice::${Object.entries(groups['nameless']).length} KubeJS recipes with a randomized name, and ${Object.entries(groups['duplicate']).length} duplicates.`)
+  console.log(`::notice::${Object.entries(groups['kjs']).length} KubeJS recipes with kjs_, ${Object.entries(groups['md5']).length} recipes with md5_, and ${Object.entries(groups['duplicate']).length} duplicates.`)
 });

kubejs/server_scripts/enigmatica/kubejs/base/recipes/replace_input.js

@@ -1,4 +1,6 @@
 onEvent('recipes', (event) => {
+    const id_prefix = 'enigmatica:base/recipes/replace_input/';
+
     const recipes = [
         {
             replaceTarget: { id: 'entangled:block' },
@@ -206,19 +208,19 @@ onEvent('recipes', (event) => {
         event.remove({
             id: `minecraft:${color}_carpet_from_white_carpet`
         });
-        event.shaped(Item.of(`minecraft:${color}_carpet`, 3), ['WW'], {
+        fallback_id(event.shaped(Item.of(`minecraft:${color}_carpet`, 3), ['WW'], {
             W: `minecraft:${color}_wool`
-        });
+        }), id_prefix);
 
-        event.shaped(Item.of(`minecraft:${color}_stained_glass_pane`, 8), ['GGG', 'GDG', 'GGG'], {
+        fallback_id(event.shaped(Item.of(`minecraft:${color}_stained_glass_pane`, 8), ['GGG', 'GDG', 'GGG'], {
             G: 'minecraft:glass_pane',
             D: dyeTag
-        });
+        }), id_prefix);
 
-        event.shaped(Item.of(`minecraft:${color}_stained_glass`, 8), ['GGG', 'GDG', 'GGG'], {
+        fallback_id(event.shaped(Item.of(`minecraft:${color}_stained_glass`, 8), ['GGG', 'GDG', 'GGG'], {
             G: 'minecraft:glass',
             D: dyeTag
-        });
+        }), id_prefix);
 
         ['stained_glass', 'stained_glass_pane', 'terracotta', 'concrete_powder', 'wool', 'carpet'].forEach(
             (blockName) => {
@@ -231,11 +233,11 @@ onEvent('recipes', (event) => {
                     event.remove({ id: block });
                 }
 
-                event.shaped(Item.of(block, 8), ['SSS', 'SDS', 'SSS'], {
+                fallback_id(event.shaped(Item.of(block, 8), ['SSS', 'SDS', 'SSS'], {
                     S: itemTag,
                     D: dyeTag
-                });
-                event.shapeless(Item.of(block, 1), [dyeTag, itemTag]);
+                }), id_prefix);
+                fallback_id(event.shapeless(Item.of(block, 1), [dyeTag, itemTag]), id_prefix);
             }
         );
 
@@ -261,7 +263,7 @@ onEvent('recipes', (event) => {
             event.shapeless(Item.of(block, 1), [dyeTag, itemTag]).id(`kubejs:${blockName}_${color}`);
         });
 
-        event.shapeless(Item.of(`minecraft:${color}_concrete_powder`, 8), [
+        fallback_id(event.shapeless(Item.of(`minecraft:${color}_concrete_powder`, 8), [
             dyeTag,
             '#forge:sand',
             '#forge:sand',
@@ -271,7 +273,7 @@ onEvent('recipes', (event) => {
             '#forge:gravel',
             '#forge:gravel',
             '#forge:gravel'
-        ]);
+        ]), id_prefix);
     });
 
     const alt_material_tag_replacements = [

kubejs/server_scripts/enigmatica/kubejs/base/recipes/shapeless.js

@@ -1,5 +1,5 @@
 onEvent('recipes', (event) => {
-    const id_prefix = 'enigmatica:base/';
+    const id_prefix = 'enigmatica:base/shapeless/';
     const recipes = [
         { output: 'botania:enchanted_soil', inputs: ['minecraft:grass_block', 'botania:overgrowth_seed'] },
         { output: 'minecraft:sticky_piston', inputs: ['minecraft:piston', '#forge:slimeballs'] },
@@ -584,14 +584,14 @@ onEvent('recipes', (event) => {
     recipes.forEach((recipe) => {
         recipe.id
             ? event.shapeless(recipe.output, recipe.inputs).id(recipe.id)
-            : event.shapeless(recipe.output, recipe.inputs);
+            : fallback_id(event.shapeless(recipe.output, recipe.inputs), id_prefix);
     });
 
     powahTiers.forEach((tier) => {
         if (tier == 'starter') {
             return;
         }
-        event.shapeless(`powah:reactor_${tier}`, `powah:reactor_${tier}`);
+        fallback_id(event.shapeless(`powah:reactor_${tier}`, `powah:reactor_${tier}`), id_prefix);
     });
 
     colors.forEach(function (color) {
@@ -603,42 +603,45 @@ onEvent('recipes', (event) => {
         otherSimplePots.push('botanypots:botany_pot');
         otherHopperPots.push('botanypots:hopper_botany_pot');
 
-        event.shapeless(`botanypots:${color}_botany_pot`, [Ingredient.of(otherSimplePots), `#forge:dyes/${color}`]);
+        event.shapeless(`botanypots:${color}_botany_pot`, [
+            Ingredient.of(otherSimplePots),
+            `#forge:dyes/${color}`
+        ]).id(`${id_prefix}dye_botany_pot_${color}`);
 
         event.shapeless(`botanypots:hopper_${color}_botany_pot`, [
             Ingredient.of(otherHopperPots),
             `#forge:dyes/${color}`
-        ]);
+        ]).id(`${id_prefix}dye_hopper_botany_pot_${color}`);
 
         if (color != 'white') {
-            event.shapeless(Item.of(`2x atum:ceramic_slab_${color}`), [
+            fallback_id(event.shapeless(Item.of(`2x atum:ceramic_slab_${color}`), [
                 'atum:ceramic_slab_white',
                 'atum:ceramic_slab_white',
                 `#forge:dyes/${color}`
-            ]);
-            event.shapeless(Item.of(`6x atum:ceramic_tile_${color}`), [
+            ]), id_prefix);
+            fallback_id(event.shapeless(Item.of(`6x atum:ceramic_tile_${color}`), [
                 'atum:ceramic_tile_white',
                 'atum:ceramic_tile_white',
                 'atum:ceramic_tile_white',
                 'atum:ceramic_tile_white',
                 'atum:ceramic_tile_white',
                 'atum:ceramic_tile_white',
                 `#forge:dyes/${color}`
-            ]);
-            event.shapeless(Item.of(`3x atum:ceramic_stairs_${color}`), [
+            ]), id_prefix);
+            fallback_id(event.shapeless(Item.of(`3x atum:ceramic_stairs_${color}`), [
                 'atum:ceramic_stairs_white',
                 'atum:ceramic_stairs_white',
                 'atum:ceramic_stairs_white',
                 `#forge:dyes/${color}`
-            ]);
-            event.shapeless(`atum:ceramic_wall_${color}`, ['atum:ceramic_wall_white', `#forge:dyes/${color}`]);
+            ]), id_prefix);
+            fallback_id(event.shapeless(`atum:ceramic_wall_${color}`, ['atum:ceramic_wall_white', `#forge:dyes/${color}`]), id_prefix);
         }
     });
 
     materialsToUnify.forEach((material) => {
         var ore = Item.of(`emendatusenigmatica:${material}_ore`);
         if (ore.exists) {
-            event.shapeless(ore, `#forge:ores/${material}`);
+            fallback_id(event.shapeless(ore, `#forge:ores/${material}`), id_prefix);
         }
     });
 });

kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/architects_palette/warping.js

@@ -1,32 +1,35 @@
 onEvent('recipes', (event) => {
+    const id_prefix = 'enigmatica:base/architects_palette/warping/';
+
     const recipes = [
         {
             input: 'minecraft:cactus',
-            output: 'byg:warped_cactus'
+            output: 'byg:warped_cactus',
+            id: `${id_prefix}warped_cactus`
         },
         {
             input: '#forge:coral_blocks',
-            output: 'byg:warped_coral_block'
+            output: 'byg:warped_coral_block',
+            id: `${id_prefix}warped_coral_block`
         },
         {
             input: '#forge:corals',
-            output: 'byg:warped_coral'
+            output: 'byg:warped_coral',
+            id: `${id_prefix}warped_coral`
         },
         {
             input: '#forge:coral_fans',
-            output: 'byg:warped_coral_fan'
+            output: 'byg:warped_coral_fan',
+            id: `${id_prefix}warped_coral_fan`
         }
     ];
 
     recipes.forEach((recipe) => {
-        const re = event.custom({
+        event.custom({
             type: 'architects_palette:warping',
             ingredient: [Ingredient.of(recipe.input)],
             result: Item.of(recipe.output),
             dimension: 'minecraft:the_nether'
-        });
-        if (recipe.id) {
-            re.id(recipe.id);
-        }
+        }).id(recipe.id);
     });
 });

kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/astralsorcery/altar.js

@@ -1,4 +1,6 @@
 onEvent('recipes', (event) => {
+    const id_prefix = 'enigmatica:base/astralsorcery/altar/';
+
     const recipes = [
         {
             output: Item.of('resourcefulbees:bee_jar', {Entity: "resourcefulbees:starry_bee"}),
@@ -32,7 +34,8 @@ onEvent('recipes', (event) => {
                 'astralsorcery:built_in_effect_trait_focus_circle',
                 'astralsorcery:altar_default_sparkle',
                 'astralsorcery:built_in_effect_constellation_lines'
-            ]
+            ],
+            id: `${id_prefix}starry_bee_jar`
         }
     ];
 
@@ -58,9 +61,6 @@ onEvent('recipes', (event) => {
             constructed_recipe.recipe_class = recipe.recipe_class;
         }
 
-        const re = event.custom(constructed_recipe);
-        if (recipe.id) {
-            re.id(recipe.id);
-        }
+        event.custom(constructed_recipe).id(recipe.id);
     });
 });

kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/astralsorcery/block_transmutation.js

@@ -1,4 +1,6 @@
 onEvent('recipes', (event) => {
+    const id_prefix = 'enigmatica:base/astralsorcery/block_transmutation/';
+
     var data = {
         recipes: [
             { inputTag: '#forge:ores/diamond', output: 'emendatusenigmatica:emerald_ore', starlight: 1000 },
@@ -9,10 +11,11 @@ onEvent('recipes', (event) => {
             }
         ]
     };
+
     data.recipes.forEach((recipe) => {
         Ingredient.of(recipe.inputTag).stacks.forEach((input) => {
             if (!input.id.includes('chunk')) {
-                event.custom({
+                fallback_id(event.custom({
                     type: 'astralsorcery:block_transmutation',
                     input: {
                         block: input.id
@@ -21,7 +24,7 @@ onEvent('recipes', (event) => {
                         block: recipe.output
                     },
                     starlight: recipe.starlight
-                });
+                }), id_prefix);
             }
         });
     });

kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/astralsorcery/infuser.js

@@ -1,4 +1,6 @@
 onEvent('recipes', (event) => {
+    const id_prefix = 'enigmatica:base/astralsorcery/infuser/';
+
     data = {
         recipes: [
             {
@@ -75,7 +77,7 @@ onEvent('recipes', (event) => {
     };
 
     data.recipes.forEach((recipe) => {
-        event.custom({
+        fallback_id(event.custom({
             type: 'astralsorcery:infuser',
             fluidInput: recipe.fluid,
             input: recipe.input,
@@ -88,6 +90,6 @@ onEvent('recipes', (event) => {
             consumeMultipleFluids: false,
             acceptChaliceInput: true,
             copyNBTToOutputs: false
-        });
+        }), id_prefix);
     });
 });

kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/betterend/alloying.js

@@ -1,4 +1,6 @@
 onEvent('recipes', (event) => {
+    const id_prefix = 'enigmatica:base/betterend/alloying/';
+
     var data = {
         recipes: [
             {
@@ -28,12 +30,12 @@ onEvent('recipes', (event) => {
         ]
     };
     data.recipes.forEach((recipe) => {
-        event.custom({
+        fallback_id(event.custom({
             type: 'betterendforge:alloying',
             ingredients: recipe.ingredients,
             result: recipe.result,
             experience: recipe.experience,
             smelttime: recipe.smelttime
-        });
+        }), id_prefix);
     });
 });

kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/bloodmagic/altar.js

@@ -1,4 +1,6 @@
 onEvent('recipes', (event) => {
+    const id_prefix = 'enigmatica:base/bloodmagic/altar/';
+
     data = {
         recipes: [
             /*{
@@ -8,7 +10,7 @@ onEvent('recipes', (event) => {
                 altarLevel: 0,                      //Altar Level is zero idexed
                 consumptionRate: 5,                 //How much LP is infused per operation
                 drainRate: 5,                       //How much LP is lost per operation when the altar is empty
-                id: 'input item here'
+                id: 'output item here'
             }*/
 
             {
@@ -17,21 +19,20 @@ onEvent('recipes', (event) => {
                 syphon: 50000,
                 altarLevel: 3,
                 consumptionRate: 50,
-                drainRate: 50
+                drainRate: 50,
+                id: `${id_prefix}bloody_bee_jar`
             }
 
         ]
     };
 
     data.recipes.forEach((recipe) => {
-        const re = event.recipes.bloodmagic
+        event.recipes.bloodmagic
             .altar(recipe.output, recipe.input)
             .upgradeLevel(recipe.altarLevel)
             .altarSyphon(recipe.syphon)
             .consumptionRate(recipe.consumptionRate)
-            .drainRate(recipe.drainRate);
-        if (recipe.id) {
-            re.id(recipe.id);
-        }
+            .drainRate(recipe.drainRate)
+            .id(recipe.id);
     });
 });