Revert Thermal recipes to JSON

kubejs/assets/create/lang/en_us.json

@@ -20,5 +20,6 @@
 	"block.create.brass_bars": "Brass Bars",
 	"block.create.brass_scaffolding": "Brass Scaffolding",
 	"block.create.brass_door": "Brass Door",
-	"item.create.brass_hand": "Brass Hand"
+	"item.create.brass_hand": "Brass Hand",
+	"block.create.andesite_bars": "Andesite Bars"
 }

kubejs/assets/manyideas_core/lang/en_us.json

@@ -1,3 +1,3 @@
 {
-	"item.manyideas_core.plate_iron": "Heavy Plate"
+	"item.manyideas_core.plate_iron": "Iron Plate"
 }

kubejs/server_scripts/normal/recipes/thermal/centrifuge.js

@@ -1,30 +1 @@
-ServerEvents.recipes((event) => {
-    if (global.isNormalMode == false) {
-        return;
-    }
-    const id_prefix = 'enigmatica:normal/thermal/centrifuge/';
-
-    const recipes = [
-        {
-            input: Ingredient.of('#create:crushed_ores/netherite'),
-            outputs: [
-                Item.of(AlmostUnified.getPreferredItemForTag('forge:nuggets/netherite'), 6),
-                {
-                    item: AlmostUnified.getPreferredItemForTag('forge:nuggets/netherite').getId(),
-                    chance: 0.25,
-                    count: 3
-                },
-                { item: AlmostUnified.getPreferredItemForTag('forge:nuggets/gold').getId(), chance: 0.66, count: 6 }
-            ],
-            energy: 50000,
-            id: `${id_prefix}netherite_centrifuging`
-        }
-    ];
-
-    recipes.forEach((recipe) => {
-        recipe.type = 'thermal:centrifuge';
-        recipe.ingredient = recipe.input.toJson();
-        recipe.result = recipe.outputs;
-        event.custom(recipe).id(recipe.id);
-    });
-});
+// TODO: Remove next breaking update

kubejs/server_scripts/normal/recipes/thermal/crystallizer.js

@@ -6,44 +6,62 @@ ServerEvents.recipes((event) => {
 
     const recipes = [
         {
-            inputs: ['ae2:charged_certus_quartz_crystal', '#forge:dusts/amethyst'],
-            fluid: Fluid.of('minecraft:water', 2000),
-            outputs: [Item.of('ae2:fluix_crystal', 2)],
+            ingredients: [
+                { fluid: 'minecraft:water', amount: 2000 },
+                { item: 'ae2:charged_certus_quartz_crystal' },
+                { tag: 'forge:dusts/amethyst' }
+            ],
+            result: [{ item: 'ae2:fluix_crystal', count: 2 }],
             energy: 20000,
             id: `${id_prefix}fluix_crystal_from_amethyst_dust`
         },
         {
-            inputs: ['ae2:charged_certus_quartz_crystal', 'ae2:fluix_dust'],
-            fluid: Fluid.of('minecraft:water', 1000),
-            outputs: [Item.of('ae2:fluix_crystal')],
+            ingredients: [
+                { fluid: 'minecraft:water', amount: 1000 },
+                { item: 'ae2:charged_certus_quartz_crystal' },
+                { item: 'ae2:fluix_dust' }
+            ],
+            result: [{ item: 'ae2:fluix_crystal' }],
             energy: 10000,
             id: `${id_prefix}fluix_crystal_from_fluix_dust`
         },
         {
-            inputs: ['ae2:charged_certus_quartz_crystal', 'ae2:quartz_block'],
-            fluid: Fluid.of('minecraft:water', 500),
-            outputs: [Item.of('ae2:damaged_budding_quartz')],
+            ingredients: [
+                { fluid: 'minecraft:water', amount: 500 },
+                { item: 'ae2:charged_certus_quartz_crystal' },
+                { item: 'ae2:quartz_block' }
+            ],
+            result: [{ item: 'ae2:damaged_budding_quartz' }],
             energy: 5000,
             id: `${id_prefix}damaged_budding_quartz`
         },
         {
-            inputs: ['ae2:charged_certus_quartz_crystal', 'ae2:damaged_budding_quartz'],
-            fluid: Fluid.of('minecraft:water', 500),
-            outputs: [Item.of('ae2:chipped_budding_quartz')],
+            ingredients: [
+                { fluid: 'minecraft:water', amount: 500 },
+                { item: 'ae2:charged_certus_quartz_crystal' },
+                { item: 'ae2:damaged_budding_quartz' }
+            ],
+            result: [{ item: 'ae2:chipped_budding_quartz' }],
             energy: 5000,
             id: `${id_prefix}chipped_budding_quartz`
         },
         {
-            inputs: ['ae2:charged_certus_quartz_crystal', 'ae2:chipped_budding_quartz'],
-            fluid: Fluid.of('minecraft:water', 500),
-            outputs: [Item.of('ae2:flawed_budding_quartz')],
+            ingredients: [
+                { fluid: 'minecraft:water', amount: 500 },
+                { item: 'ae2:charged_certus_quartz_crystal' },
+                { item: 'ae2:chipped_budding_quartz' }
+            ],
+            result: [{ item: 'ae2:flawed_budding_quartz' }],
             energy: 5000,
             id: `${id_prefix}flawed_budding_quartz`
         },
         {
-            inputs: ['ae2:charged_certus_quartz_crystal', '#forge:dusts/certus_quartz'],
-            fluid: Fluid.of('minecraft:water', 2000),
-            outputs: [Item.of('ae2:certus_quartz_crystal', 2)],
+            ingredients: [
+                { fluid: 'minecraft:water', amount: 2000 },
+                { item: 'ae2:charged_certus_quartz_crystal' },
+                { tag: 'forge:dusts/certus_quartz' }
+            ],
+            result: [{ item: 'ae2:certus_quartz_crystal', count: 2 }],
             energy: 20000,
             id: `${id_prefix}certus_quartz_crystal`
         }
@@ -52,10 +70,6 @@ ServerEvents.recipes((event) => {
     recipes.forEach((recipe) => {
         recipe.type = 'thermal:crystallizer';
 
-        // "ingredients": [{ "tag": "forge:ingots/copper" }, { "item": "thermal:press_coin_die" }]
-        recipe.ingredients = recipe.inputs.map((input) => Ingredient.of(input).toJson());
-        recipe.ingredients.push(recipe.fluid.toJson());
-        recipe.result = recipe.outputs.map((output) => output.toJson());
         event.custom(recipe).id(recipe.id);
     });
 });

kubejs/server_scripts/normal/recipes/thermal/press.js

@@ -6,74 +6,77 @@ ServerEvents.recipes((event) => {
 
     const recipes = [
         {
-            inputs: ['powah:photoelectric_pane', 'powah:ender_core'],
-            outputs: [{ item: 'powah:lens_of_ender' }],
+            result: [{ item: 'powah:lens_of_ender' }],
+            ingredients: [{ item: 'powah:photoelectric_pane' }, { item: 'powah:ender_core' }],
             energy: 50000,
             id: `${id_prefix}lens_of_ender`
         },
         {
-            inputs: ['powah:aerial_pearl', 'powah:ender_core'],
-            outputs: [{ item: 'powah:player_aerial_pearl' }],
+            result: [{ item: 'powah:player_aerial_pearl' }],
+            ingredients: [{ item: 'powah:aerial_pearl' }, { item: 'powah:ender_core' }],
             energy: 100000,
             id: `${id_prefix}player_aerial_pearl`
         },
         {
-            inputs: ['powah:binding_card', 'powah:ender_core'],
-            outputs: [{ item: 'powah:binding_card_dim' }],
+            result: [{ item: 'powah:binding_card_dim' }],
+            ingredients: [{ item: 'powah:binding_card' }, { item: 'powah:ender_core' }],
             energy: 150000,
             id: `${id_prefix}binding_card_dim`
         },
         {
-            inputs: ['ae2:certus_quartz_crystal', 'ae2:calculation_processor_press'],
-            outputs: [{ item: 'ae2:printed_calculation_processor' }],
+            result: [{ item: 'ae2:printed_calculation_processor' }],
+            ingredients: [{ item: 'ae2:certus_quartz_crystal' }, { item: 'ae2:calculation_processor_press' }],
             energy: 12000,
             id: `${id_prefix}printed_calculation_processor`
         },
         {
-            inputs: ['#forge:gems/diamond', 'ae2:engineering_processor_press'],
-            outputs: [{ item: 'ae2:printed_engineering_processor' }],
+            result: [{ item: 'ae2:printed_engineering_processor' }],
+            ingredients: [{ tag: 'forge:gems/diamond' }, { item: 'ae2:engineering_processor_press' }],
             energy: 12000,
             id: `${id_prefix}printed_engineering_processor`
         },
         {
-            inputs: ['#forge:ingots/gold', 'ae2:logic_processor_press'],
-            outputs: [{ item: 'ae2:printed_logic_processor' }],
+            result: [{ item: 'ae2:printed_logic_processor' }],
+            ingredients: [{ tag: 'forge:ingots/gold' }, { item: 'ae2:logic_processor_press' }],
             energy: 12000,
             id: `${id_prefix}printed_logic_processor`
         },
         {
-            inputs: ['#forge:silicon', 'ae2:silicon_press'],
-            outputs: [{ item: 'ae2:printed_silicon' }],
+            result: [{ item: 'ae2:printed_silicon' }],
+            ingredients: [{ tag: 'forge:silicon' }, { item: 'ae2:silicon_press' }],
             energy: 4000,
             id: `${id_prefix}printed_silicon`
         },
         {
-            inputs: ['#forge:storage_blocks/iron', 'ae2:calculation_processor_press'],
-            outputs: [{ item: 'ae2:calculation_processor_press' }],
+            result: [{ item: 'ae2:calculation_processor_press' }],
+            ingredients: [{ tag: 'forge:storage_blocks/iron' }, { item: 'ae2:calculation_processor_press' }],
             energy: 12000,
             id: `${id_prefix}calculation_processor_press`
         },
         {
-            inputs: ['#forge:storage_blocks/iron', 'ae2:engineering_processor_press'],
-            outputs: [{ item: 'ae2:engineering_processor_press' }],
+            result: [{ item: 'ae2:engineering_processor_press' }],
+            ingredients: [{ tag: 'forge:storage_blocks/iron' }, { item: 'ae2:engineering_processor_press' }],
             energy: 12000,
             id: `${id_prefix}engineering_processor_press`
         },
         {
-            inputs: ['#forge:storage_blocks/iron', 'ae2:logic_processor_press'],
-            outputs: [{ item: 'ae2:logic_processor_press' }],
+            result: [{ item: 'ae2:logic_processor_press' }],
+            ingredients: [{ tag: 'forge:storage_blocks/iron' }, { item: 'ae2:logic_processor_press' }],
             energy: 12000,
             id: `${id_prefix}logic_processor_press`
         },
         {
-            inputs: ['#forge:storage_blocks/iron', 'ae2:silicon_press'],
-            outputs: [{ item: 'ae2:silicon_press' }],
+            result: [{ item: 'ae2:silicon_press' }],
+            ingredients: [{ tag: 'forge:storage_blocks/iron' }, { item: 'ae2:silicon_press' }],
             energy: 4000,
             id: `${id_prefix}silicon_press`
         },
         {
-            outputs: [{ item: `pneumaticcraft:compressed_iron_gear`, count: 1 }],
-            inputs: [`4x #forge:ingots/compressed_iron`, 'immersiveengineering:mold_gear'],
+            result: [{ item: `pneumaticcraft:compressed_iron_gear` }],
+            ingredients: [
+                { tag: `forge:ingots/compressed_iron`, count: 4 },
+                { item: 'immersiveengineering:mold_gear' }
+            ],
             energy: 2400,
             id: `${id_prefix}compressed_iron_gear`
         }
@@ -82,8 +85,8 @@ ServerEvents.recipes((event) => {
     Object.keys(gem_properties).forEach((gem) => {
         if (gem_properties[gem].gear) {
             recipes.push({
-                outputs: [{ item: `emendatusenigmatica:${gem}_gear`, count: 1 }],
-                inputs: [`4x #forge:gems/${gem}`, 'immersiveengineering:mold_gear'],
+                result: [{ item: `emendatusenigmatica:${gem}_gear`, count: 1 }],
+                ingredients: [{ tag: `forge:gems/${gem}`, count: 4 }, { item: 'immersiveengineering:mold_gear' }],
                 energy: 2400,
                 id: `${id_prefix}${gem}_gear`
             });
@@ -92,8 +95,6 @@ ServerEvents.recipes((event) => {
 
     recipes.forEach((recipe) => {
         recipe.type = 'thermal:press';
-        recipe.ingredients = recipe.inputs.map((input) => Ingredient.of(input).toJson());
-        recipe.result = recipe.outputs;
         event.custom(recipe).id(recipe.id);
     });
 });

kubejs/server_scripts/normal/recipes/thermal/pulverizer.js

@@ -6,47 +6,27 @@ ServerEvents.recipes((event) => {
 
     const recipes = [
         {
-            input: '#forge:gems/coal',
-            outputs: [{ item: 'emendatusenigmatica:coal_dust', count: 1 }],
+            ingredient: { tag: 'forge:gems/coal' },
+            result: [{ item: 'emendatusenigmatica:coal_dust', count: 1 }],
             energy: 4000,
             id: `${id_prefix}coal_dust`
         },
         {
-            input: '#forge:ingots/copper',
-            outputs: [{ item: 'emendatusenigmatica:copper_dust', count: 1 }],
-            energy: 4000,
-            id: `${id_prefix}copper_dust`
-        },
-        {
-            input: '#forge:ingots/gold',
-            outputs: [{ item: 'emendatusenigmatica:gold_dust', count: 1 }],
-            energy: 4000,
-            id: `${id_prefix}gold_dust`
-        },
-        {
-            input: '#forge:ingots/iron',
-            outputs: [{ item: 'emendatusenigmatica:iron_dust', count: 1 }],
-            energy: 4000,
-            id: `${id_prefix}iron_dust`
-        },
-        {
-            input: '#forge:gems/dimensional',
-            outputs: [{ item: 'emendatusenigmatica:dimensional_dust', count: 1 }],
+            ingredient: { tag: 'forge:gems/dimensional' },
+            result: [{ item: 'emendatusenigmatica:dimensional_dust', count: 1 }],
             energy: 4000,
             id: `${id_prefix}dimensional_dust`
         },
         {
-            input: '#forge:ores/netherite',
-            outputs: [{ item: 'mekanism:dirty_netherite_scrap', count: 1, chance: 1 }],
+            ingredient: { tag: 'forge:ores/netherite' },
+            result: [{ item: 'mekanism:dirty_netherite_scrap', count: 1, chance: 1 }],
             energy: 4000,
             id: `${id_prefix}netherite_scrap`
         }
     ];
 
     recipes.forEach((recipe) => {
         recipe.type = 'thermal:pulverizer';
-        recipe.ingredient = Ingredient.of(recipe.input).toJson();
-        recipe.result = recipe.outputs;
         event.custom(recipe).id(recipe.id);
     });
 });