From c79d00e77ff637f2b49735be0c71060641488bab Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 18 Apr 2025 13:46:59 +0100 Subject: [PATCH] renamed locometal recipe file to be consistent --- .../gregtech/recipes.materials.js | 4 ++-- kubejs/server_scripts/railways/recipes.js | 2 +- ...tal_integration.js => recipes.locometal.js} | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) rename kubejs/server_scripts/railways/{gpedia_locometal_integration.js => recipes.locometal.js} (92%) diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index 7f72b3cc4..445ea350a 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -291,7 +291,7 @@ function registerGTCEUMetalRecipes(event) { const processNormalRawOre = (tagPrefix, material) => { const normalOreItem = ChemicalHelper.get(tagPrefix, material, 1) - const crushedOreItem = ChemicalHelper.get(TagPrefix.crushed, material, 1) + const crushedOreItem = ChemicalHelper.get(TagPrefix.crushed, material, material.getProperty(PropertyKey.ORE).getOreMultiplier()) if (normalOreItem != null && crushedOreItem != null) { event.recipes.tfc.quern(crushedOreItem, normalOreItem) @@ -301,7 +301,7 @@ function registerGTCEUMetalRecipes(event) { const processRichRawOre = (tagPrefix, material) => { const richOreItem = ChemicalHelper.get(tagPrefix, material, 1) - const crushedOreItem = ChemicalHelper.get(TagPrefix.crushed, material, 2) + const crushedOreItem = ChemicalHelper.get(TagPrefix.crushed, material, material.getProperty(PropertyKey.ORE).getOreMultiplier() * 2) if (richOreItem != null && crushedOreItem != null) { event.recipes.tfc.quern(crushedOreItem, richOreItem) diff --git a/kubejs/server_scripts/railways/recipes.js b/kubejs/server_scripts/railways/recipes.js index 55924e895..68326170b 100644 --- a/kubejs/server_scripts/railways/recipes.js +++ b/kubejs/server_scripts/railways/recipes.js @@ -5,7 +5,7 @@ const registerRailWaysRecipes = (event) => { // Удаление рецептов мода railways event.remove({ mod: 'railways' }); - railwaysLocometalIntegration(event) + registerRailwaysLocometalRecipes(event) // Семафор event.shaped('railways:semaphore', [ diff --git a/kubejs/server_scripts/railways/gpedia_locometal_integration.js b/kubejs/server_scripts/railways/recipes.locometal.js similarity index 92% rename from kubejs/server_scripts/railways/gpedia_locometal_integration.js rename to kubejs/server_scripts/railways/recipes.locometal.js index 6ccac5a9f..a9707b39e 100644 --- a/kubejs/server_scripts/railways/gpedia_locometal_integration.js +++ b/kubejs/server_scripts/railways/recipes.locometal.js @@ -18,13 +18,13 @@ const locometalBase = { flat_riveted_locometal: 'flat_riveted_locometal' } -const railwaysLocometalIntegration = (event) => { +const registerRailwaysLocometalRecipes = (event) => { for (var locometal in locometalBase) { event.recipes.create.cutting(`8x railways:${locometal}`, '#forge:storage_blocks/iron').processingTime(200); event.recipes.create.cutting(`16x railways:${locometal}`, '#forge:storage_blocks/wrought_iron').processingTime(200); event.recipes.create.cutting(`24x railways:${locometal}`, '#forge:storage_blocks/steel').processingTime(200); event.recipes.create.cutting(`railways:${locometal}`, `#railways:palettes/cycle_groups/base`).processingTime(20); - event.recipes.gtceu.chemical_bath(`gpedia:undying/locometal/${locometal}`) + event.recipes.gtceu.chemical_bath(`tfg:undying/locometal/${locometal}`) .itemInputs(Item.of(locometalDyeGroups[`${locometal}`], 1)) .inputFluids(Fluid.of(`gtceu:chlorine`, 18)) .itemOutputs(Item.of(`railways:${locometal}`)) @@ -37,21 +37,21 @@ const railwaysLocometalIntegration = (event) => { event.recipes.create.item_application(`railways:copper_wrapped_locometal`, [`#railways:palettes/cycle_groups/base`, '#forge:plates/copper']); event.recipes.create.item_application(`railways:brass_wrapped_locometal`, [`#railways:palettes/cycle_groups/base`, '#forge:plates/brass']) - event.recipes.gtceu.chemical_bath(`gpedia:undying/brass_wrapped_locometal`) + event.recipes.gtceu.chemical_bath(`tfg:undying/brass_wrapped_locometal`) .itemInputs('#railways:palettes/dye_groups/brass_wrapped_slashed') .inputFluids(Fluid.of(`gtceu:chlorine`, 18)) .itemOutputs(`railways:brass_wrapped_locometal`) .duration(20) .EUt(24) .category(GTRecipeCategories.CHEM_DYES); - event.recipes.gtceu.chemical_bath(`gpedia:undying/copper_wrapped_locometal`) + event.recipes.gtceu.chemical_bath(`tfg:undying/copper_wrapped_locometal`) .itemInputs('#railways:palettes/dye_groups/copper_wrapped_slashed') .inputFluids(Fluid.of(`gtceu:chlorine`, 18)) .itemOutputs(`railways:copper_wrapped_locometal`) .duration(20) .EUt(24) .category(GTRecipeCategories.CHEM_DYES); - event.recipes.gtceu.chemical_bath(`gpedia:undying/iron_wrapped_locometal`) + event.recipes.gtceu.chemical_bath(`tfg:undying/iron_wrapped_locometal`) .itemInputs('#railways:palettes/dye_groups/iron_wrapped_slashed') .inputFluids(Fluid.of(`gtceu:chlorine`, 18)) .itemOutputs(`railways:iron_wrapped_locometal`) @@ -89,7 +89,7 @@ const railwaysLocometalIntegration = (event) => { global.MINECRAFT_DYE_NAMES.forEach(dye => { for (var locometal in locometalBase) { - event.recipes.gtceu.chemical_bath(`gpedia:chemical_dying_locometal/${locometal}/${dye}`) + event.recipes.gtceu.chemical_bath(`tfg:chemical_dying_locometal/${locometal}/${dye}`) .itemInputs(Item.of(locometalDyeGroups[`${locometal}`], 1)) .inputFluids(Fluid.of(`tfc:${dye}_dye`, 18)) .itemOutputs(Item.of(`railways:${dye}_${locometal}`)) @@ -101,21 +101,21 @@ const railwaysLocometalIntegration = (event) => { event.recipes.create.item_application(`railways:${dye}_copper_wrapped_locometal`, [`#railways:palettes/cycle_groups/${dye}`, '#forge:plates/copper']); event.recipes.create.item_application(`railways:${dye}_brass_wrapped_locometal`, [`#railways:palettes/cycle_groups/${dye}`, '#forge:plates/brass']); - event.recipes.gtceu.chemical_bath(`gpedia:brass_locometal_bathing/${dye}`) + event.recipes.gtceu.chemical_bath(`tfg:brass_locometal_bathing/${dye}`) .itemInputs('#railways:palettes/dye_groups/brass_wrapped_slashed') .inputFluids(Fluid.of(`tfc:${dye}_dye`, 18)) .itemOutputs(`railways:${dye}_brass_wrapped_locometal`) .duration(20) .EUt(24) .category(GTRecipeCategories.CHEM_DYES); - event.recipes.gtceu.chemical_bath(`gpedia:copper_locometal_bathing/${dye}`) + event.recipes.gtceu.chemical_bath(`tfg:copper_locometal_bathing/${dye}`) .itemInputs('#railways:palettes/dye_groups/copper_wrapped_slashed') .inputFluids(Fluid.of(`tfc:${dye}_dye`, 18)) .itemOutputs(`railways:${dye}_copper_wrapped_locometal`) .duration(20) .EUt(24) .category(GTRecipeCategories.CHEM_DYES); - event.recipes.gtceu.chemical_bath(`gpedia:locometal_bathing/${dye}`) + event.recipes.gtceu.chemical_bath(`tfg:locometal_bathing/${dye}`) .itemInputs('#railways:palettes/dye_groups/iron_wrapped_slashed') .inputFluids(Fluid.of(`tfc:${dye}_dye`, 18)) .itemOutputs(`railways:${dye}_iron_wrapped_locometal`)