From f78f491c46ecccab32f6b0ce1c41405f1cf34027 Mon Sep 17 00:00:00 2001 From: Victoria Fischer Date: Tue, 1 Jul 2025 17:53:38 +0200 Subject: [PATCH] this time, test the fixes before pushing :D --- index.toml | 6 +++--- kubejs/server_scripts/mods/create.js | 2 +- kubejs/server_scripts/ore-processing.js | 23 ++++++++++++++--------- pack.toml | 2 +- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/index.toml b/index.toml index e570de4..6cb1a33 100644 --- a/index.toml +++ b/index.toml @@ -627,7 +627,7 @@ hash = "4717847a6d54f56ed6919a1e2c3591fc73780973708e818a563753132bc7c15e" [[files]] file = "kubejs/server_scripts/mods/create.js" -hash = "b3704e9c562dc0cb1ea474d880ae985801c739681a3a43fbe81801bea5d7d486" +hash = "08a3e63e7cc12785d7d34716e1506a6993be6617fa43863d66e280743d563742" [[files]] file = "kubejs/server_scripts/mods/create_jetpack.js" @@ -707,7 +707,7 @@ hash = "2d9109e7f1e0beed5dd325fb7939a15f6afa2f2783e31f3830d1fb6f055f3f07" [[files]] file = "kubejs/server_scripts/mods/powah.js" -hash = "b4ec417cacfa80c7cd7115086b952583344c212109f1f62fa96c837e9f100af7" +hash = "f83c2a9f95e664a55b76eb3f67e0c4e64218fc4cba324da41829a79aea5b9cb1" [[files]] file = "kubejs/server_scripts/mods/powder_power.js" @@ -751,7 +751,7 @@ hash = "4003082f31011049402ff31504a6db0f4fdd6c7076167109c66fa412286be462" [[files]] file = "kubejs/server_scripts/ore-processing.js" -hash = "3f493c302b8374f805d0f983baec2cf020a9ade927c66478f8d533e916947375" +hash = "4b8bb32cc012765c5c1719b297a396ffef6bd563f4b0a1cee1a5b4b2b98a8af1" [[files]] file = "kubejs/server_scripts/progression/report.js" diff --git a/kubejs/server_scripts/mods/create.js b/kubejs/server_scripts/mods/create.js index d6fcb4c..32b4e35 100644 --- a/kubejs/server_scripts/mods/create.js +++ b/kubejs/server_scripts/mods/create.js @@ -110,7 +110,7 @@ ServerEvents.recipes(event => { '#kubejs:grist/build/improved' ); - ['red', 'orange', 'yellow', 'green', 'blue', 'purple', 'magenta', 'white', 'black', 'light_gray', 'gray', 'brown', 'cyan', 'pink'].forEach(color => { + ['red', 'orange', 'yellow', 'green', 'blue', 'purple', 'magenta', 'white', 'black', 'light_gray', 'gray', 'brown', 'cyan', 'pink', 'lime'].forEach(color => { // Create colored blocks from the mixer. // TODO: This is required due to disabling all automatic crafting recipes, maybe these can just be re-enabled somehow? event.recipes.create.mixing(`8x minecraft:${color}_concrete_powder`, [`minecraft:${color}_dye`, '4x #forge:sand', '4x minecraft:gravel']); diff --git a/kubejs/server_scripts/ore-processing.js b/kubejs/server_scripts/ore-processing.js index 680a2db..cadbeae 100755 --- a/kubejs/server_scripts/ore-processing.js +++ b/kubejs/server_scripts/ore-processing.js @@ -160,14 +160,14 @@ ServerEvents.recipes(event => { lumium: [4, 'silver', '3x tin', '2x minecraft:glowstone_dust'], redium: [4, '4x powder_power:powder_redstone', '2x #forge:dusts/obsidian', '2x #forge:dusts/iron', 'minecraft:blaze_powder'], lapium: [4, '4x powder_power:powder_lapis', '2x #forge:dusts/gold', '2x #forge:dusts/obsidian', 'powder_power:powder_nether_quartz'], - gemium: [4, '4x #forge:dusts/obsidian', '2x #forge:dusts/diamond', '2x #forge:dusts/emerald', 'powder_power:powder_prismarine'], - trilium: [4, '2x lapium', '2x gemium', '2x redium', 'powder_power:powder_end_pearl'] + gemium: [4, '4x #forge:dusts/obsidian', '2x #forge:dusts/diamond', '2x #forge:dusts/emerald', 'powder_power:powder_prismarine'] }, // Modern age: Alloys require improved grist modern: { gobber: [3, 'gobber2:gobber2_glob', 'platinum', 'osmium'], nether_gobber: [3, 'gobber2:gobber2_glob_nether', 'minecraft:netherite_scrap', '2x gobber2:gobber2_ingot'], - quadrilium: [3, '3x trilium', '4x minecraft:netherite_scrap', 'powder_power:powder_ghast_tear'] + quadrilium: [3, '3x trilium', '4x minecraft:netherite_scrap', 'powder_power:powder_ghast_tear'], + trilium: [4, '2x lapium', '2x gemium', '2x redium', 'powder_power:powder_end_pearl'] }, // Age of Legends: The end game legends: { @@ -244,7 +244,7 @@ ServerEvents.recipes(event => { if (ingotSource != null) { event.smelting(ingotType, ingotSource); } else { - console.error(`Unable to generate ${metal} ingot smelting from derivatives`); + console.warn(`Unable to generate ${metal} ingot smelting from derivatives`); } } @@ -309,12 +309,11 @@ 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, or in a regular heated mixer + // If we have 3 or fewer ingredients, we can create it in the 3-slot thermal smelter 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 + // Materials with 4 or more require superheating to be made in the mixer event.recipes.create.mixing(ingotType.withCount(ingredients[0]), real_ingredients).superheated().id(`kubejs:metals/superheated_mixing/${metal}`); } } @@ -443,7 +442,6 @@ ServerEvents.recipes(event => { for (const tier of ['primitive', 'vanilla', 'andesite', 'mechanical']) { for (const [metal, ingredients] of Object.entries(progression[tier])) { let crushedType = Item.of(`create:crushed_raw_${metal}`); - let dustType = metalForm(metal, 'dusts', 'dust'); let ingotType = metalForm(metal, 'ingots', 'ingot'); console.log(`Building mechanical processing for ${metal}...`); @@ -453,7 +451,7 @@ ServerEvents.recipes(event => { // This allows Nickel to be processed into a constantan gear, which unlocks the centrifuge event.smelting(ingotType, [crushedType]); } else { - console.error(`No ${metal} ore pulverizing available! Falling back to dust-based processing line`); + console.warn(`No ${metal} ore pulverizing available! Falling back to dust-based processing line`); } } } @@ -464,6 +462,7 @@ ServerEvents.recipes(event => { for (const [metal, ingredients] of Object.entries(progression[tier])) { let rawIngredients = rawForms(metal); let crushedType = Item.of(`create:crushed_raw_${metal}`); + let ingotType = metalForm(metal, 'ingots', 'ingot'); let dustType = metalForm(metal, 'dusts', 'dust'); let rawBlockType = metalForm(`raw_${metal}`, 'storage_blocks', 'block'); if (rawIngredients != null) { @@ -475,6 +474,12 @@ ServerEvents.recipes(event => { console.error(`No ${metal} ore centrifuing available!`); } } + + // Industrial and below can be mixed up in a regular heated mixer + 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}`); + } } } diff --git a/pack.toml b/pack.toml index 4ba7ba4..c568eae 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "57c103afe30954ef158d822e714058fd8a1115af90dca61467d2c8347c9c8b60" +hash = "413340d35f45549501c5fd214bf82bf629ed5dbb7304b98b57f2977adbe4ca91" [versions] forge = "47.4.0"