From 5e330e2d1f8826833feb38fcc58c669cf9b62974 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 19 Dec 2025 23:55:29 +0000 Subject: [PATCH] some cleanup, fixed small gears not melting --- kubejs/server_scripts/tfc/recipes.js | 2 +- kubejs/server_scripts/tfc/recipes.materials.js | 12 +++++------- .../tfg/ores_and_materials/recipes.quartzes.js | 2 +- kubejs/server_scripts/tfg/primitive/recipes.clay.js | 7 +++---- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 090c48f99..4707863f8 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -13,7 +13,7 @@ const registerTFCRecipes = (event) => { registerTFCDyeRecipes(event) // Добавление рецептов - TFC_QUERN_POWDER_RECIPE_COMPONENTS = /** @type {const} */ ([ + const TFC_QUERN_POWDER_RECIPE_COMPONENTS = /** @type {const} */ ([ { input: "#forge:dusts/coke", output: "4x tfc:powder/coke", name: "coke_powder" }, { input: "#forge:dusts/amethyst", output: "4x tfc:powder/amethyst", name: "amethyst_powder" }, { input: "#forge:dusts/diamond", output: "4x tfc:powder/diamond", name: "diamond_powder" }, diff --git a/kubejs/server_scripts/tfc/recipes.materials.js b/kubejs/server_scripts/tfc/recipes.materials.js index 9c9a8d58d..2e90975a1 100644 --- a/kubejs/server_scripts/tfc/recipes.materials.js +++ b/kubejs/server_scripts/tfc/recipes.materials.js @@ -621,7 +621,7 @@ function registerTFCMaterialsRecipes(event) { let nuggetItem = ChemicalHelper.get(TagPrefix.nugget, material, 9) if (!nuggetItem.isEmpty()) { - event.recipes.tfc.heating(`#forge:nuggets/${material.getName()}`, tfcProperty.getMeltTemp()) + event.recipes.tfc.heating(nuggetItem, tfcProperty.getMeltTemp()) .resultFluid(Fluid.of(outputMaterial.getFluid(), 144/9)) .id(`tfc:heating/metal/${material.getName()}_nugget`) @@ -640,18 +640,16 @@ function registerTFCMaterialsRecipes(event) { let smallGearItem = ChemicalHelper.get(TagPrefix.gearSmall, material, 1) if (!smallGearItem.isEmpty()) { - if (tfcProperty.getMeltTemp() <= 1540) { - event.recipes.tfc.heating(`gtceu:small_${material.getName()}_gear`, tfcProperty.getMeltTemp()) - .resultFluid(Fluid.of(outputMaterial, 144)) + event.recipes.tfc.heating(smallGearItem, tfcProperty.getMeltTemp()) + .resultFluid(Fluid.of(outputMaterial.getFluid(), 144)) .id(`tfc:heating/small_${material.getName()}_gear`) - } - event.recipes.tfc.anvil(`gtceu:small_${material.getName()}_gear`, `#forge:ingots/${material.getName()}`, ['hit_last', 'shrink_second_last', 'draw_third_last']) + event.recipes.tfc.anvil(smallGearItem, `#forge:ingots/${material.getName()}`, ['hit_last', 'shrink_second_last', 'draw_third_last']) .tier(tfcProperty.getTier()) .id(`tfc:anvil/small_${material.getName()}_gear`) if (material.hasFlag(TFGMaterialFlags.CAN_BE_UNMOLDED)) { - event.recipes.tfc.casting(smallGearItem.withCount(1), 'tfg:small_gear_mold', Fluid.of(outputMaterial.getFluid(), 144), 0.05) + event.recipes.tfc.casting(smallGearItem, 'tfg:small_gear_mold', Fluid.of(outputMaterial.getFluid(), 144), 0.05) .id(`tfc:casting/small_${material.getName()}_gear`) } } diff --git a/kubejs/server_scripts/tfg/ores_and_materials/recipes.quartzes.js b/kubejs/server_scripts/tfg/ores_and_materials/recipes.quartzes.js index 7eee857e5..e5474b941 100644 --- a/kubejs/server_scripts/tfg/ores_and_materials/recipes.quartzes.js +++ b/kubejs/server_scripts/tfg/ores_and_materials/recipes.quartzes.js @@ -31,7 +31,7 @@ function registerTFGQuartzRecipes(event) { .duration(20) .EUt(30) - TFC_BATCH_TO_BOTTLE_ASSEMBLING_RECIPE_COMPONENTS = /** @type {const} */ ([ + const TFC_BATCH_TO_BOTTLE_ASSEMBLING_RECIPE_COMPONENTS = /** @type {const} */ ([ { input: "tfc:silica_glass_batch", output: "tfc:silica_glass_bottle", name: "silica_glass_bottle" }, { input: "tfc:hematitic_glass_batch", output: "tfc:hematitic_glass_bottle", name: "hematitic_glass_bottle" }, { input: "tfc:olivine_glass_batch", output: "tfc:olivine_glass_bottle", name: "olivine_glass_bottle" }, diff --git a/kubejs/server_scripts/tfg/primitive/recipes.clay.js b/kubejs/server_scripts/tfg/primitive/recipes.clay.js index 1a307908c..f61bf3c95 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.clay.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.clay.js @@ -14,7 +14,7 @@ function registerTFGClayRecipes(event) { event.shapeless('4x minecraft:clay_ball', ['minecraft:clay']) .id('tfg:shapeless/clay_block_to_balls') - TFC_FURNACE_MOLD_RECIPE_COMPONENTS = /** @type {const} */ ([ + const TFC_FURNACE_MOLD_RECIPE_COMPONENTS = /** @type {const} */ ([ { input: "tfc:ceramic/unfired_ingot_mold", output: "tfc:ceramic/ingot_mold", name: "ingot_mold" }, { input: "tfc:ceramic/unfired_pickaxe_head_mold", output: "tfc:ceramic/pickaxe_head_mold", name: "pickaxe_head_mold" }, { input: "tfc:ceramic/unfired_propick_head_mold", output: "tfc:ceramic/propick_head_mold", name: "propick_head_mold" }, @@ -49,7 +49,6 @@ function registerTFGClayRecipes(event) { { input: "firmalife:oven_chimney", output: "firmalife:cured_oven_chimney", name: "oven_chimney" }, { input: "firmalife:oven_bottom", output: "firmalife:cured_oven_bottom", name: "oven_bottom" }, { input: "firmalife:oven_hopper", output: "firmalife:cured_oven_hopper", name: "oven_hopper" }, - { input: "firmalife:oven_hopper", output: "firmalife:cured_oven_hopper", name: "oven_hopper" }, { input: "tfg:unfired_rod_mold", output: "tfg:rod_mold", name: "rod_mold" }, { input: "tfg:unfired_small_gear_mold", output: "tfg:small_gear_mold", name: "small_gear_mold" }, { input: "tfg:unfired_nugget_mold", output: "tfg:nugget_mold", name: "nugget_mold" } @@ -68,7 +67,7 @@ function registerTFGClayRecipes(event) { .id(`tfg:smelting/${dye}_large_vessel`) }) - TFC_CLAY_TO_UNFIRED_MOLD_RECIPE_COMPONENTS = /** @type {const} */ ([ + const TFC_CLAY_TO_UNFIRED_MOLD_RECIPE_COMPONENTS = /** @type {const} */ ([ { input: "5x minecraft:clay_ball", output: "2x tfc:ceramic/unfired_flower_pot", name: "flower_pot" }, { input: "5x minecraft:clay_ball", output: "4x tfc:ceramic/unfired_bowl", name: "bowl" }, { input: "5x minecraft:clay_ball", output: "10x rnr:unfired_roof_tile", name: "roof_tile" }, @@ -88,7 +87,7 @@ function registerTFGClayRecipes(event) { .EUt(2) } - TFC_FIRE_CLAY_TO_UNFIRED_MOLD_RECIPE_COMPONENTS = /** @type {const} */ ([ + const TFC_FIRE_CLAY_TO_UNFIRED_MOLD_RECIPE_COMPONENTS = /** @type {const} */ ([ { input: "5x tfc:fire_clay", output: "tfc:ceramic/unfired_crucible", name: "crucible" } ]);