From 53c97d0f9144a7997391f27326fc9be809f89099 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 12 Jan 2024 18:29:45 +0700 Subject: [PATCH] some work --- kubejs/client_scripts/mods/tfc.js | 10 ++ kubejs/server_scripts/firmaciv/recipes.js | 5 +- kubejs/server_scripts/tfc/recipes.js | 41 ++++--- kubejs/server_scripts/tfc/tags.js | 106 ++++++++++++------ kubejs/server_scripts/water_flasks/recipes.js | 6 +- 5 files changed, 112 insertions(+), 56 deletions(-) diff --git a/kubejs/client_scripts/mods/tfc.js b/kubejs/client_scripts/mods/tfc.js index 4fa0081a4..733655ab5 100644 --- a/kubejs/client_scripts/mods/tfc.js +++ b/kubejs/client_scripts/mods/tfc.js @@ -42,4 +42,14 @@ const hideTFCFluids = (event) => { event.hide('tfc:metal/black_steel') event.hide('tfc:metal/red_steel') event.hide('tfc:metal/blue_steel') + event.hide('tfc:metal/cast_iron') + event.hide('tfc:metal/pig_iron') + event.hide('tfc:metal/high_carbon_steel') + event.hide('tfc:metal/high_carbon_black_steel') + event.hide('tfc:metal/high_carbon_red_steel') + event.hide('tfc:metal/high_carbon_blue_steel') + event.hide('tfc:metal/weak_steel') + event.hide('tfc:metal/weak_red_steel') + event.hide('tfc:metal/weak_blue_steel') + event.hide('tfc:metal/unknown') } \ No newline at end of file diff --git a/kubejs/server_scripts/firmaciv/recipes.js b/kubejs/server_scripts/firmaciv/recipes.js index fcd28554e..a2bf0eaed 100644 --- a/kubejs/server_scripts/firmaciv/recipes.js +++ b/kubejs/server_scripts/firmaciv/recipes.js @@ -3,10 +3,9 @@ const registerFirmaCivRecipes = (event) => { event.remove({ id: '/firmaciv:quern/' }) - event.remove({ id: 'firmaciv:anvil/copper_bolt' }) event.recipes.tfc.heating('firmaciv:oarlock', 1535) - .resultFluid(Fluid.of('tfc:metal/cast_iron', 288)) - .id(`tfg:firmaciv/heating/oarlock`) + .resultFluid(Fluid.of('gtceu:iron', 288)) + .id(`firmaciv:heating/oarlock`) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index cca262b30..4335ff76f 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -4,10 +4,23 @@ const registerTFCRecipes = (event) => { //#region Металлы + // Удаление рецептов руд TFC event.remove({ id: /tfc:heating\/ore\/poor_*/ }) event.remove({ id: /tfc:heating\/ore\/normal_*/ }) event.remove({ id: /tfc:heating\/ore\/rich_*/ }) + // Удаление рецептов блоков + event.remove({ id: /tfc:crafting\/metal\/block\/*/ }) + event.remove({ id: /tfc:heating\/metal\/*_block/ }) + + // Удаление рецептов ступеней + event.remove({ id: /tfc:crafting\/metal\/block\/*_stairs/ }) + event.remove({ id: /tfc:heating\/metal\/*_block_stairs/ }) + + // Удалание рецептов полублоков + event.remove({ id: /tfc:crafting\/metal\/block\/*_slab/ }) + event.remove({ id: /tfc:heating\/metal\/*_block_slab/ }) + GTRegistries.MATERIALS.forEach(material => { let tfcProperty = material.getProperty(TFGPropertyKey.TFC_PROPERTY) @@ -921,18 +934,6 @@ const registerTFCRecipes = (event) => { // Anvils, Lamps, Trapdors, Chains if (material.hasFlag(TFGMaterialFlags.HAS_TFC_UTILITY)) { - // Удаление рецептов блоков - event.remove({ id: `tfc:crafting/metal/block/${material}` }) - event.remove({ id: `tfc:heating/metal/${material}_block` }) - - // Удаление рецептов ступеней - event.remove({ id: `tfc:crafting/metal/block/${material}_stairs` }) - event.remove({ id: `tfc:heating/metal/${material}_block_stairs` }) - - // Удалание рецептов полублоков - event.remove({ id: `tfc:crafting/metal/block/${material}_slab` }) - event.remove({ id: `tfc:heating/metal/${material}_block_slab` }) - // Декрафт незавершенной лампы в жидкость event.recipes.tfc.heating(`tfc:metal/unfinished_lamp/${material}`, tfcProperty.getMeltTemp()) .resultFluid(Fluid.of(outputMaterial.getFluid(), 144)) @@ -1141,7 +1142,7 @@ const registerTFCRecipes = (event) => { } }) - + //#region Рецепты для новых сплавов event.recipes.tfc.alloy('tfg:red_alloy', [ @@ -1332,22 +1333,22 @@ const registerTFCRecipes = (event) => { // Декрафт сырой крицы в жидкость event.recipes.tfc.heating(`tfc:raw_iron_bloom`, 1535) - .resultFluid(Fluid.of('tfc:metal/cast_iron', 144)) + .resultFluid(Fluid.of('gtceu:iron', 144)) .id(`tfc:heating/raw_bloom`) // Декрафт укрепленной крицы в жидкость event.recipes.tfc.heating(`tfc:refined_iron_bloom`, 1535) - .resultFluid(Fluid.of('tfc:metal/cast_iron', 144)) + .resultFluid(Fluid.of('gtceu:iron', 144)) .id(`tfc:heating/refined_bloom`) // Гриль event.recipes.tfc.heating('tfc:wrought_iron_grill', 1535) - .resultFluid(Fluid.of('tfc:metal/cast_iron', 288)) + .resultFluid(Fluid.of('gtceu:iron', 288)) .id(`tfc:heating/grill`) // Ванильная дверь декрафт event.recipes.tfc.heating('minecraft:iron_door', 1535) - .resultFluid(Fluid.of('tfc:metal/cast_iron', 288)) + .resultFluid(Fluid.of('gtceu:iron', 288)) .id(`tfc:heating/iron_door`) // Ванильная дверь на наковальне @@ -1376,9 +1377,13 @@ const registerTFCRecipes = (event) => { .id('tfc:anvil/blue_steel_ingot') // Cast iron -> Raw Iron Bloom - event.recipes.tfc.bloomery('tfc:raw_iron_bloom', 'minecraft:charcoal', Fluid.of('tfc:metal/cast_iron', 144), 15000) + event.recipes.tfc.bloomery('tfc:raw_iron_bloom', 'minecraft:charcoal', Fluid.of('gtceu:iron', 144), 15000) .id('tfc:bloomery/raw_iron_bloom') + // Cast Iron -> Pig Iron + event.recipes.tfc.blast_furnace(Fluid.of('gtceu:pig_iron', 1), '#tfc:flux', Fluid.of('gtceu:iron', 1)) + .id('tfc:blast_furnace/pig_iron') + //#endregion //#endregion diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index a59ad6fb0..fdf6f81e6 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -207,44 +207,86 @@ const registerTFCBlockTags = (event) => { } const registerTFCFluidTags = (event) => { - event.add('tfc:usable_in_ingot_mold', "gtceu:bismuth") - event.add('tfc:usable_in_ingot_mold', "gtceu:bismuth_bronze") - event.add('tfc:usable_in_ingot_mold', "gtceu:black_bronze") - event.add('tfc:usable_in_ingot_mold', "gtceu:bronze") - event.add('tfc:usable_in_ingot_mold', "gtceu:brass") - event.add('tfc:usable_in_ingot_mold', "gtceu:copper") - event.add('tfc:usable_in_ingot_mold', "gtceu:gold") - event.add('tfc:usable_in_ingot_mold', "gtceu:nickel") - event.add('tfc:usable_in_ingot_mold', "gtceu:rose_gold") - event.add('tfc:usable_in_ingot_mold', "gtceu:silver") - event.add('tfc:usable_in_ingot_mold', "gtceu:tin") - event.add('tfc:usable_in_ingot_mold', "gtceu:zinc") - event.add('tfc:usable_in_ingot_mold', "gtceu:sterling_silver") - event.add('tfc:usable_in_ingot_mold', "gtceu:wrought_iron") - event.add('tfc:usable_in_ingot_mold', "gtceu:iron") - event.add('tfc:usable_in_ingot_mold', "gtceu:steel") - event.add('tfc:usable_in_ingot_mold', "gtceu:black_steel") - event.add('tfc:usable_in_ingot_mold', "gtceu:blue_steel") - event.add('tfc:usable_in_ingot_mold', "gtceu:red_steel") + // Удаление TFC металлов из возможных в форме слитка + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/bismuth') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/bismuth_bronze') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/bronze') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/black_bronze') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/brass') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/copper') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/gold') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/nickel') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/rose_gold') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/silver') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/tin') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/zinc') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/sterling_silver') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/wrought_iron') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/steel') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/black_steel') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/red_steel') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/blue_steel') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/cast_iron') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/pig_iron') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/high_carbon_steel') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/high_carbon_black_steel') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/high_carbon_red_steel') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/high_carbon_blue_steel') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/weak_steel') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/weak_red_steel') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/weak_blue_steel') + event.remove('tfc:usable_in_ingot_mold', 'tfc:metal/unknown') - event.add('tfc:usable_in_ingot_mold', "gtceu:red_alloy") - event.add('tfc:usable_in_ingot_mold', "gtceu:tin_alloy") + // Добавление GTCEu металлов в форму слитков + event.add('tfc:usable_in_ingot_mold', 'gtceu:bismuth') + event.add('tfc:usable_in_ingot_mold', 'gtceu:bismuth_bronze') + event.add('tfc:usable_in_ingot_mold', 'gtceu:black_bronze') + event.add('tfc:usable_in_ingot_mold', 'gtceu:bronze') + event.add('tfc:usable_in_ingot_mold', 'gtceu:brass') + event.add('tfc:usable_in_ingot_mold', 'gtceu:copper') + event.add('tfc:usable_in_ingot_mold', 'gtceu:gold') + event.add('tfc:usable_in_ingot_mold', 'gtceu:nickel') + event.add('tfc:usable_in_ingot_mold', 'gtceu:rose_gold') + event.add('tfc:usable_in_ingot_mold', 'gtceu:silver') + event.add('tfc:usable_in_ingot_mold', 'gtceu:tin') + event.add('tfc:usable_in_ingot_mold', 'gtceu:zinc') + event.add('tfc:usable_in_ingot_mold', 'gtceu:sterling_silver') + event.add('tfc:usable_in_ingot_mold', 'gtceu:wrought_iron') + event.add('tfc:usable_in_ingot_mold', 'gtceu:iron') + event.add('tfc:usable_in_ingot_mold', 'gtceu:steel') + event.add('tfc:usable_in_ingot_mold', 'gtceu:black_steel') + event.add('tfc:usable_in_ingot_mold', 'gtceu:blue_steel') + event.add('tfc:usable_in_ingot_mold', 'gtceu:red_steel') + event.add('tfc:usable_in_ingot_mold', 'gtceu:pig_iron') + event.add('tfc:usable_in_ingot_mold', 'gtceu:high_carbon_steel') + event.add('tfc:usable_in_ingot_mold', 'gtceu:high_carbon_black_steel') + event.add('tfc:usable_in_ingot_mold', 'gtceu:high_carbon_red_steel') + event.add('tfc:usable_in_ingot_mold', 'gtceu:high_carbon_blue_steel') + event.add('tfc:usable_in_ingot_mold', 'gtceu:weak_steel') + event.add('tfc:usable_in_ingot_mold', 'gtceu:weak_red_steel') + event.add('tfc:usable_in_ingot_mold', 'gtceu:weak_blue_steel') + event.add('tfc:usable_in_ingot_mold', 'gtceu:unknown') - event.add('tfc:usable_in_bell_mold', "gtceu:bronze") - event.add('tfc:usable_in_bell_mold', "gtceu:gold") - event.add('tfc:usable_in_bell_mold', "gtceu:brass") + event.add('tfc:usable_in_ingot_mold', 'gtceu:red_alloy') + event.add('tfc:usable_in_ingot_mold', 'gtceu:tin_alloy') - event.add('tfc:usable_in_tool_head_mold', "gtceu:copper") - event.add('tfc:usable_in_tool_head_mold', "gtceu:bismuth_bronze") - event.add('tfc:usable_in_tool_head_mold', "gtceu:black_bronze") - event.add('tfc:usable_in_tool_head_mold', "gtceu:bronze") + // + event.add('tfc:usable_in_bell_mold', 'gtceu:bronze') + event.add('tfc:usable_in_bell_mold', 'gtceu:gold') + event.add('tfc:usable_in_bell_mold', 'gtceu:brass') - event.add('tfc:usable_in_pot', "gtceu:latex") + // + event.add('tfc:usable_in_tool_head_mold', 'gtceu:copper') + event.add('tfc:usable_in_tool_head_mold', 'gtceu:bismuth_bronze') + event.add('tfc:usable_in_tool_head_mold', 'gtceu:black_bronze') + event.add('tfc:usable_in_tool_head_mold', 'gtceu:bronze') - event.add('tfc:usable_in_barrel', "gtceu:latex") - - event.add('tfc:usable_in_wooden_bucket', "gtceu:latex") + // + event.add('tfc:usable_in_pot', 'gtceu:latex') + event.add('tfc:usable_in_barrel', 'gtceu:latex') + event.add('tfc:usable_in_wooden_bucket', 'gtceu:latex') + // event.add('tfc:usable_in_barrel', 'gtceu:creosote') event.add('tfc:usable_in_wooden_bucket', 'gtceu:creosote') event.add('tfc:usable_in_red_steel_bucket', 'gtceu:creosote') diff --git a/kubejs/server_scripts/water_flasks/recipes.js b/kubejs/server_scripts/water_flasks/recipes.js index 8a6f2c4ca..2896658a1 100644 --- a/kubejs/server_scripts/water_flasks/recipes.js +++ b/kubejs/server_scripts/water_flasks/recipes.js @@ -4,17 +4,17 @@ const registerWaterFlasksRecipes = (event) => { // Декрафт Unfinished Water Flask event.recipes.tfc.heating('waterflasks:unfinished_iron_flask', 1535) - .resultFluid(Fluid.of('tfc:metal/cast_iron', 144)) + .resultFluid(Fluid.of('gtceu:iron', 144)) .id(`waterflasks:heating/wrought_iron_unfinished_iron_flask`) // Декрафт Broken Water Flask event.recipes.tfc.heating('waterflasks:broken_iron_flask', 1535) - .resultFluid(Fluid.of('tfc:metal/cast_iron', 144)) + .resultFluid(Fluid.of('gtceu:iron', 144)) .id(`waterflasks:heating/wrought_iron_broken_iron_flask`) // Декрафт Water Flask event.recipes.tfc.heating('waterflasks:iron_flask', 1535) - .resultFluid(Fluid.of('tfc:metal/cast_iron', 144)) + .resultFluid(Fluid.of('gtceu:iron', 144)) .useDurability(true) .id(`waterflasks:heating/wrought_iron_iron_flask`)