diff --git a/kubejs/server_scripts/mods/powah.js b/kubejs/server_scripts/mods/powah.js index 1f242db..edb7d0d 100755 --- a/kubejs/server_scripts/mods/powah.js +++ b/kubejs/server_scripts/mods/powah.js @@ -72,7 +72,7 @@ ServerEvents.recipes(event => { // Energized steel (aka hardened tier) require basic grist event.remove({output: 'powah:steel_energized'}); - event.recipes.powah.energizing(['minecraft:iron', 'minecraft:gold', '3x #kubejs:grist/energetic/basic'], '2x powah:steel_energized', 10000); + event.recipes.powah.energizing(['minecraft:iron_ingot', 'minecraft:gold_ingot', '3x #kubejs:grist/energetic/basic'], '2x powah:steel_energized', 10000); // Dielectric paste can be crafted with basic grist, and scaled up through machines event.shapeless('6x powah:dielectric_paste', [ diff --git a/kubejs/server_scripts/ore-processing.js b/kubejs/server_scripts/ore-processing.js index 4aec714..680a2db 100755 --- a/kubejs/server_scripts/ore-processing.js +++ b/kubejs/server_scripts/ore-processing.js @@ -309,9 +309,10 @@ ServerEvents.recipes(event => { if (real_ingredients.length == 0) { console.error(`Unable to create ingots from ${form} for ${metal}!`); } else { - // If we have 3 or fewer ingredients, we can create it in the 3-slot thermal smelter + // If we have 3 or fewer ingredients, we can create it in the 3-slot thermal smelter, or in a regular heated mixer if (real_ingredients.length <= 3) { event.recipes.thermal.smelter(ingotType.withCount(ingredients[0]), real_ingredients).id(`kubejs:metals/smelting/${metal}`); + event.recipes.create.mixing(ingotType.withCount(ingredients[0]), real_ingredients).heated().id(`kubejs:metals/hot_mixing/${metal}`); } else { // Materials with 4 or more require superheating, and can only be made in the mixer event.recipes.create.mixing(ingotType.withCount(ingredients[0]), real_ingredients).superheated().id(`kubejs:metals/superheated_mixing/${metal}`); @@ -454,12 +455,6 @@ ServerEvents.recipes(event => { } else { console.error(`No ${metal} ore pulverizing available! Falling back to dust-based processing line`); } - - // Mechanical alloys can produce whole ingots from heated mixing - let real_ingredients = alloyIngredients(['ingots', 'dusts'], ingredients); - if (real_ingredients.length > 0) { - event.recipes.create.mixing(ingotType.withCount(ingredients[0]), real_ingredients).heated().id(`kubejs:metals/hot_mixing/${metal}`); - } } } // Constantan gear is the progression item to get to the industrial tier, as it unlocks the press (and therefore other gears)