From 94478c53b73fa957ed4a704b2ba445d0f844bb54 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 10 Dec 2023 20:12:31 +0700 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D1=8B=20FirmaLife,=20W?= =?UTF-8?q?aterFlasks=20=D0=B8=20=D0=B4=D1=80=D1=83=D0=B3=D0=BE=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubejs/server_scripts/firmalife/recipes.js | 10 ++ kubejs/server_scripts/main_server_script.js | 2 + kubejs/server_scripts/tfc/recipes.js | 42 ++++-- kubejs/server_scripts/water_flasks/recipes.js | 21 +++ kubejs/startup_scripts/tfc/constants.js | 141 +++++++++--------- 5 files changed, 136 insertions(+), 80 deletions(-) create mode 100644 kubejs/server_scripts/firmalife/recipes.js create mode 100644 kubejs/server_scripts/water_flasks/recipes.js diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js new file mode 100644 index 000000000..880649d94 --- /dev/null +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -0,0 +1,10 @@ +// priority: 0 + +const registerFirmaLifeRecipes = (event) => { + + // Декрафт Jag Lid + event.recipes.tfc.heating('tfc:jar_lid', 230) + .resultFluid(Fluid.of('gtceu:tin', 9)) + .id(`tfc:heating/jar_lid`) + +} \ No newline at end of file diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index a1b4fc125..eeac0006c 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -54,6 +54,8 @@ TFCEvents.data(event => { ServerEvents.recipes(event => { // registerMinecraftRecipes(event) registerTFCRecipes(event) + registerFirmaLifeRecipes(event) + registerWaterFlasksRecipes(event) // registerGTCEURecipes(event) // registerCreateRecipes(event) // registerAE2Recipes(event) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 19c81422c..ab27c719f 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -7,8 +7,7 @@ const registerTFCRecipes = (event) => { let metalSpecs = keyValuePair[1] // Одинарные слитки - if (metalSpecs.props.includes('ingot')) - { + if (metalSpecs.props.includes('ingot')) { // Металлы дублирующие гт if (metalSpecs.isGTDup != undefined) { @@ -45,16 +44,14 @@ const registerTFCRecipes = (event) => { } // Двойные слитки - if (metalSpecs.props.includes('double_ingot')) - { + if (metalSpecs.props.includes('double_ingot')) { // Декрафт двойного слитка в жидкость event.recipes.tfc.heating(`tfc:metal/double_ingot/${metal}`, metalSpecs.melt_temp) .resultFluid(Fluid.of(metalSpecs.fluid, 288)) .id(`tfc:heating/metal/${metal}_double_ingot`) } - if (metalSpecs.props.includes('part')) - { + if (metalSpecs.props.includes('part')) { // Удаление рецептов блоков event.remove({ id: `tfc:crafting/metal/block/${metal}` }) event.remove({ id: `tfc:heating/metal/${metal}_block` }) @@ -98,8 +95,7 @@ const registerTFCRecipes = (event) => { .id(`tfc:heating/metal/${metal}_double_sheet`) } - if (metalSpecs.props.includes('armor')) - { + if (metalSpecs.props.includes('armor')) { //#region Шлем // Декрафт незавершенного шлема в жидкость @@ -201,8 +197,7 @@ const registerTFCRecipes = (event) => { //#endregion } - if (metalSpecs.props.includes('tool')) - { + if (metalSpecs.props.includes('tool')) { //#region Фурма // Декрафт инструмента в жидкость @@ -688,8 +683,7 @@ const registerTFCRecipes = (event) => { } - if (metalSpecs.props.includes('utility')) - { + if (metalSpecs.props.includes('utility')) { // Декрафт незавершенной лампы в жидкость event.recipes.tfc.heating(`tfc:metal/unfinished_lamp/${metal}`, metalSpecs.melt_temp) .resultFluid(Fluid.of(metalSpecs.fluid, 144)) @@ -758,6 +752,10 @@ const registerTFCRecipes = (event) => { event.remove({ id: `tfc:heating/ore/rich_native_${metal}` }) } + if (metalSpecs.props.includes('dusts')) { + + } + }) //#region Вырезание предметов из CastIron @@ -851,6 +849,16 @@ const registerTFCRecipes = (event) => { //#endregion + // Декрафт Jacks + event.recipes.tfc.heating('tfc:jacks', 930) + .resultFluid(Fluid.of('gtceu:brass', 144)) + .id(`tfc:heating/jacks`) + + // Декрафт Gem Saw + event.recipes.tfc.heating('tfc:gem_saw', 930) + .resultFluid(Fluid.of('gtceu:brass', 72)) + .id(`tfc:heating/gem_saw`) + // Декрафт сырой крицы в жидкость event.recipes.tfc.heating(`tfc:raw_iron_bloom`, 1535) .resultFluid(Fluid.of('tfc:metal/cast_iron', 144)) @@ -881,5 +889,13 @@ const registerTFCRecipes = (event) => { event.recipes.tfc.anvil('gtceu:blue_steel_ingot', 'tfc:metal/ingot/high_carbon_blue_steel', ['hit_last', 'hit_second_last', 'hit_third_last']).tier(5) .id('tfc:anvil/blue_steel_ingot') - + // Доменная печь + event.shaped('tfc:blast_furnace', [ + 'AAA', + 'ABA', + 'AAA' + ], { + A: '#forge:plates/wrought_iron', + B: 'tfc:crucible' + }).id('tfc:crafting/blast_furnace') } \ No newline at end of file diff --git a/kubejs/server_scripts/water_flasks/recipes.js b/kubejs/server_scripts/water_flasks/recipes.js new file mode 100644 index 000000000..8a6f2c4ca --- /dev/null +++ b/kubejs/server_scripts/water_flasks/recipes.js @@ -0,0 +1,21 @@ +// priority: 0 + +const registerWaterFlasksRecipes = (event) => { + + // Декрафт Unfinished Water Flask + event.recipes.tfc.heating('waterflasks:unfinished_iron_flask', 1535) + .resultFluid(Fluid.of('tfc:metal/cast_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)) + .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)) + .useDurability(true) + .id(`waterflasks:heating/wrought_iron_iron_flask`) + +} \ No newline at end of file diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 665fd7b50..bd9dfa689 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -768,6 +768,70 @@ global.METAL_TO_SPECS = { * у которых должны быть удалены тэги и они должны быть скрыты в REI. */ global.TFC_DISABLED_ITEMS = [ + + // Blocks + 'tfc:metal/block/bismuth', + 'tfc:metal/block/bismuth_bronze', + 'tfc:metal/block/black_bronze', + 'tfc:metal/block/bronze', + 'tfc:metal/block/brass', + 'tfc:metal/block/copper', + 'tfc:metal/block/gold', + 'tfc:metal/block/nickel', + 'tfc:metal/block/rose_gold', + 'tfc:metal/block/silver', + 'tfc:metal/block/tin', + 'tfc:metal/block/zinc', + 'tfc:metal/block/sterling_silver', + 'tfc:metal/block/wrought_iron', + 'tfc:metal/block/cast_iron', + 'tfc:metal/block/steel', + 'tfc:metal/block/black_steel', + 'tfc:metal/block/blue_steel', + 'tfc:metal/block/red_steel', + + // Stairs + 'tfc:metal/block/bismuth_stairs', + 'tfc:metal/block/bismuth_bronze_stairs', + 'tfc:metal/block/black_bronze_stairs', + 'tfc:metal/block/bronze_stairs', + 'tfc:metal/block/brass_stairs', + 'tfc:metal/block/copper_stairs', + 'tfc:metal/block/gold_stairs', + 'tfc:metal/block/nickel_stairs', + 'tfc:metal/block/rose_gold_stairs', + 'tfc:metal/block/silver_stairs', + 'tfc:metal/block/tin_stairs', + 'tfc:metal/block/zinc_stairs', + 'tfc:metal/block/sterling_silver_stairs', + 'tfc:metal/block/wrought_iron_stairs', + 'tfc:metal/block/cast_iron_stairs', + 'tfc:metal/block/steel_stairs', + 'tfc:metal/block/black_steel_stairs', + 'tfc:metal/block/blue_steel_stairs', + 'tfc:metal/block/red_steel_stairs', + + // Slabs + 'tfc:metal/block/bismuth_slab', + 'tfc:metal/block/bismuth_bronze_slab', + 'tfc:metal/block/black_bronze_slab', + 'tfc:metal/block/bronze_slab', + 'tfc:metal/block/brass_slab', + 'tfc:metal/block/copper_slab', + 'tfc:metal/block/gold_slab', + 'tfc:metal/block/nickel_slab', + 'tfc:metal/block/rose_gold_slab', + 'tfc:metal/block/silver_slab', + 'tfc:metal/block/tin_slab', + 'tfc:metal/block/zinc_slab', + 'tfc:metal/block/sterling_silver_slab', + 'tfc:metal/block/wrought_iron_slab', + 'tfc:metal/block/cast_iron_slab', + 'tfc:metal/block/steel_slab', + 'tfc:metal/block/black_steel_slab', + 'tfc:metal/block/blue_steel_slab', + 'tfc:metal/block/red_steel_slab', + // Ingots "tfc:metal/ingot/bismuth", "tfc:metal/ingot/bismuth_bronze", @@ -787,6 +851,10 @@ global.TFC_DISABLED_ITEMS = [ "tfc:metal/ingot/silver", "tfc:metal/ingot/tin", "tfc:metal/ingot/zinc", + "tfc:metal/ingot/cast_iron", + + // Double Ingots + "tfc:metal/double_ingot/cast_iron", // Sheets "tfc:metal/sheet/bismuth", @@ -808,6 +876,7 @@ global.TFC_DISABLED_ITEMS = [ "tfc:metal/sheet/silver", "tfc:metal/sheet/tin", "tfc:metal/sheet/zinc", + "tfc:metal/sheet/cast_iron", // Double Sheets "tfc:metal/double_sheet/bismuth", @@ -829,6 +898,7 @@ global.TFC_DISABLED_ITEMS = [ "tfc:metal/double_sheet/silver", "tfc:metal/double_sheet/tin", "tfc:metal/double_sheet/zinc", + "tfc:metal/double_sheet/cast_iron", // Rods "tfc:metal/rod/bismuth", @@ -850,8 +920,8 @@ global.TFC_DISABLED_ITEMS = [ "tfc:metal/rod/silver", "tfc:metal/rod/tin", "tfc:metal/rod/zinc", + "tfc:metal/rod/cast_iron", - /* // Tool Heads // Copper 'tfc:metal/pickaxe/copper', @@ -1032,7 +1102,8 @@ global.TFC_DISABLED_ITEMS = [ 'tfc:metal/knife_blade/blue_steel', 'tfc:metal/scythe/blue_steel', 'tfc:metal/scythe_blade/blue_steel', - + + /* // Ores 'tfc:ore/poor_native_copper', 'tfc:ore/normal_native_copper', @@ -1101,71 +1172,7 @@ global.TFC_DISABLED_ITEMS = [ 'tfc:ore/bituminous_coal', 'tfc:ore/lignite', 'tfc:ore/halite', - - // Blocks - 'tfc:metal/block/bismuth', - 'tfc:metal/block/bismuth_bronze', - 'tfc:metal/block/black_bronze', - 'tfc:metal/block/bronze', - 'tfc:metal/block/brass', - 'tfc:metal/block/copper', - 'tfc:metal/block/gold', - 'tfc:metal/block/nickel', - 'tfc:metal/block/rose_gold', - 'tfc:metal/block/silver', - 'tfc:metal/block/tin', - 'tfc:metal/block/zinc', - 'tfc:metal/block/sterling_silver', - 'tfc:metal/block/wrought_iron', - 'tfc:metal/block/cast_iron', - 'tfc:metal/block/steel', - 'tfc:metal/block/black_steel', - 'tfc:metal/block/blue_steel', - 'tfc:metal/block/red_steel', - - // Stairs - 'tfc:metal/block/bismuth_stairs', - 'tfc:metal/block/bismuth_bronze_stairs', - 'tfc:metal/block/black_bronze_stairs', - 'tfc:metal/block/bronze_stairs', - 'tfc:metal/block/brass_stairs', - 'tfc:metal/block/copper_stairs', - 'tfc:metal/block/gold_stairs', - 'tfc:metal/block/nickel_stairs', - 'tfc:metal/block/rose_gold_stairs', - 'tfc:metal/block/silver_stairs', - 'tfc:metal/block/tin_stairs', - 'tfc:metal/block/zinc_stairs', - 'tfc:metal/block/sterling_silver_stairs', - 'tfc:metal/block/wrought_iron_stairs', - 'tfc:metal/block/cast_iron_stairs', - 'tfc:metal/block/steel_stairs', - 'tfc:metal/block/black_steel_stairs', - 'tfc:metal/block/blue_steel_stairs', - 'tfc:metal/block/red_steel_stairs', - - // Slabs - 'tfc:metal/block/bismuth_slab', - 'tfc:metal/block/bismuth_bronze_slab', - 'tfc:metal/block/black_bronze_slab', - 'tfc:metal/block/bronze_slab', - 'tfc:metal/block/brass_slab', - 'tfc:metal/block/copper_slab', - 'tfc:metal/block/gold_slab', - 'tfc:metal/block/nickel_slab', - 'tfc:metal/block/rose_gold_slab', - 'tfc:metal/block/silver_slab', - 'tfc:metal/block/tin_slab', - 'tfc:metal/block/zinc_slab', - 'tfc:metal/block/sterling_silver_slab', - 'tfc:metal/block/wrought_iron_slab', - 'tfc:metal/block/cast_iron_slab', - 'tfc:metal/block/steel_slab', - 'tfc:metal/block/black_steel_slab', - 'tfc:metal/block/blue_steel_slab', - 'tfc:metal/block/red_steel_slab',*/ - - + */ ]; global.TFC_SIMPLE_MATERIALS = [