From b164b8ef39af0d630c4e2b09cbe163ba582825de Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 23 Dec 2023 12:51:25 +0700 Subject: [PATCH] =?UTF-8?q?=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20=D1=82?= =?UTF-8?q?=D1=84=D0=BA=20=D0=BA=D0=B0=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D1=85?= =?UTF-8?q?=20=D0=B8=D0=BD=D1=81=D1=82=D1=80=D0=BE=D0=B2=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=B3=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubejs/server_scripts/tfc/recipes.js | 213 +++++++++++++++++++++++- kubejs/startup_scripts/tfc/constants.js | 51 ++++++ 2 files changed, 262 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 7565933fe..07e158028 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -2159,6 +2159,215 @@ const registerTFCRecipes = (event) => { //#endregion + //#region Выход: Каменные инструменты + + //#region Топор + + // Инструмент + event.remove({ id: `tfc:crafting/stone/axe_igneous_extrusive` }) + event.remove({ id: `tfc:crafting/stone/axe_igneous_intrusive` }) + event.remove({ id: `tfc:crafting/stone/axe_metamorphic` }) + event.remove({ id: `tfc:crafting/stone/axe_sedimentary` }) + + // Оголовья + event.remove({ id: `tfc:rock_knapping/axe_head_igneous_extrusive` }) + event.remove({ id: `tfc:rock_knapping/axe_head_igneous_intrusive` }) + event.remove({ id: `tfc:rock_knapping/axe_head_metamorphic` }) + event.remove({ id: `tfc:rock_knapping/axe_head_sedimentary` }) + + event.recipes.tfc.knapping('gtceu:stone_axe_head', 'tfc:rock', [ + " X ", + "XXXX ", + "XXXXX", + "XXXX ", + " X " + ]) + .ingredient('#tfc:rock_knapping') + .outsideSlotRequired(false) + .id('tfg:rock_knapping/stone_axe_head') + + //#endregion + + //#region Молот + + // Инструмент + event.remove({ id: `tfc:crafting/stone/hammer_igneous_extrusive` }) + event.remove({ id: `tfc:crafting/stone/hammer_igneous_intrusive` }) + event.remove({ id: `tfc:crafting/stone/hammer_metamorphic` }) + event.remove({ id: `tfc:crafting/stone/hammer_sedimentary` }) + + // Оголовья + event.remove({ id: `tfc:rock_knapping/hammer_head_igneous_extrusive` }) + event.remove({ id: `tfc:rock_knapping/hammer_head_igneous_intrusive` }) + event.remove({ id: `tfc:rock_knapping/hammer_head_metamorphic` }) + event.remove({ id: `tfc:rock_knapping/hammer_head_sedimentary` }) + + event.recipes.tfc.knapping('gtceu:stone_hammer_head', 'tfc:rock', [ + "XXXXX", + "XXXXX", + " X " + ]) + .ingredient('#tfc:rock_knapping') + .outsideSlotRequired(false) + .id('tfg:rock_knapping/stone_hammer_head') + + //#endregion + + //#region Мотыга + + // Инструмент + event.remove({ id: `tfc:crafting/stone/hoe_igneous_extrusive` }) + event.remove({ id: `tfc:crafting/stone/hoe_igneous_intrusive` }) + event.remove({ id: `tfc:crafting/stone/hoe_metamorphic` }) + event.remove({ id: `tfc:crafting/stone/hoe_sedimentary` }) + + // Оголовья + event.remove({ id: `tfc:rock_knapping/hoe_head_igneous_extrusive` }) + event.remove({ id: `tfc:rock_knapping/hoe_head_1_igneous_extrusive` }) + event.remove({ id: `tfc:rock_knapping/hoe_head_2_igneous_extrusive` }) + event.remove({ id: `tfc:rock_knapping/hoe_head_igneous_intrusive` }) + event.remove({ id: `tfc:rock_knapping/hoe_head_1_igneous_intrusive` }) + event.remove({ id: `tfc:rock_knapping/hoe_head_2_igneous_intrusive` }) + event.remove({ id: `tfc:rock_knapping/hoe_head_metamorphic` }) + event.remove({ id: `tfc:rock_knapping/hoe_head_1_metamorphic` }) + event.remove({ id: `tfc:rock_knapping/hoe_head_2_metamorphic` }) + event.remove({ id: `tfc:rock_knapping/hoe_head_sedimentary` }) + event.remove({ id: `tfc:rock_knapping/hoe_head_1_sedimentary` }) + event.remove({ id: `tfc:rock_knapping/hoe_head_2_sedimentary` }) + + event.recipes.tfc.knapping('gtceu:stone_hoe_head', 'tfc:rock', [ + "XXXXX", + " XX" + ]) + .ingredient('#tfc:rock_knapping') + .outsideSlotRequired(false) + .id('tfg:rock_knapping/stone_hoe_head') + + event.recipes.tfc.knapping('2x gtceu:stone_hoe_head', 'tfc:rock', [ + "XXXXX", + "XX ", + " ", + "XXXXX", + "XX " + ]) + .ingredient('#tfc:rock_knapping') + .outsideSlotRequired(false) + .id('tfg:rock_knapping/stone_hoe_head_1') + + event.recipes.tfc.knapping('2x gtceu:stone_hoe_head', 'tfc:rock', [ + "XXXXX", + "XX ", + " ", + "XXXXX", + " XX" + ]) + .ingredient('#tfc:rock_knapping') + .outsideSlotRequired(false) + .id('tfg:rock_knapping/stone_hoe_head_2') + + //#endregion + + //#region Нож + + // Инструмент + event.remove({ id: `tfc:crafting/stone/knife_igneous_extrusive` }) + event.remove({ id: `tfc:crafting/stone/knife_igneous_intrusive` }) + event.remove({ id: `tfc:crafting/stone/knife_metamorphic` }) + event.remove({ id: `tfc:crafting/stone/knife_sedimentary` }) + + // Оголовья + event.remove({ id: `tfc:rock_knapping/knife_head_igneous_extrusive` }) + event.remove({ id: `tfc:rock_knapping/knife_head_1_igneous_extrusive` }) + event.remove({ id: `tfc:rock_knapping/knife_head_2_igneous_extrusive` }) + event.remove({ id: `tfc:rock_knapping/knife_head_3_igneous_extrusive` }) + event.remove({ id: `tfc:rock_knapping/knife_head_igneous_intrusive` }) + event.remove({ id: `tfc:rock_knapping/knife_head_1_igneous_intrusive` }) + event.remove({ id: `tfc:rock_knapping/knife_head_2_igneous_intrusive` }) + event.remove({ id: `tfc:rock_knapping/knife_head_3_igneous_intrusive` }) + event.remove({ id: `tfc:rock_knapping/knife_head_metamorphic` }) + event.remove({ id: `tfc:rock_knapping/knife_head_1_metamorphic` }) + event.remove({ id: `tfc:rock_knapping/knife_head_2_metamorphic` }) + event.remove({ id: `tfc:rock_knapping/knife_head_3_metamorphic` }) + event.remove({ id: `tfc:rock_knapping/knife_head_sedimentary` }) + event.remove({ id: `tfc:rock_knapping/knife_head_1_sedimentary` }) + event.remove({ id: `tfc:rock_knapping/knife_head_2_sedimentary` }) + event.remove({ id: `tfc:rock_knapping/knife_head_3_sedimentary` }) + + event.recipes.tfc.knapping('gtceu:stone_knife_head', 'tfc:rock', [ + "X ", + "XX", + "XX", + "XX", + "XX" + ]) + .ingredient('#tfc:rock_knapping') + .outsideSlotRequired(false) + .id('tfg:rock_knapping/stone_knife_head') + + event.recipes.tfc.knapping('2x gtceu:stone_knife_head', 'tfc:rock', [ + "X X ", + "XX XX", + "XX XX", + "XX XX", + "XX XX" + ]) + .ingredient('#tfc:rock_knapping') + .outsideSlotRequired(false) + .id('tfg:rock_knapping/stone_knife_head_1') + + event.recipes.tfc.knapping('2x gtceu:stone_knife_head', 'tfc:rock', [ + "X X", + "XX XX", + "XX XX", + "XX XX", + "XX XX" + ]) + .ingredient('#tfc:rock_knapping') + .outsideSlotRequired(false) + .id('tfg:rock_knapping/stone_knife_head_2') + + event.recipes.tfc.knapping('2x gtceu:stone_knife_head', 'tfc:rock', [ + " X X ", + "XX XX", + "XX XX", + "XX XX", + "XX XX" + ]) + .ingredient('#tfc:rock_knapping') + .outsideSlotRequired(false) + .id('tfg:rock_knapping/stone_knife_head_3') + + //#endregion + + //#region Лопата + + // Инструмент + event.remove({ id: `tfc:crafting/stone/shovel_igneous_extrusive` }) + event.remove({ id: `tfc:crafting/stone/shovel_igneous_intrusive` }) + event.remove({ id: `tfc:crafting/stone/shovel_metamorphic` }) + event.remove({ id: `tfc:crafting/stone/shovel_sedimentary` }) + + // Оголовья + event.remove({ id: `tfc:rock_knapping/shovel_head_igneous_extrusive` }) + event.remove({ id: `tfc:rock_knapping/shovel_head_igneous_intrusive` }) + event.remove({ id: `tfc:rock_knapping/shovel_head_metamorphic` }) + event.remove({ id: `tfc:rock_knapping/shovel_head_sedimentary` }) + + event.recipes.tfc.knapping('gtceu:stone_shovel_head', 'tfc:rock', [ + "XXX", + "XXX", + "XXX", + "XXX", + " X " + ]) + .ingredient('#tfc:rock_knapping') + .outsideSlotRequired(false) + .id('tfg:rock_knapping/stone_shovel_head') + + //#endregion + + //#endregion + // Другое event.remove({ id: `tfc:crafting/trip_hammer` }) event.remove({ id: `tfc:anvil/steel_pump` }) @@ -2176,12 +2385,12 @@ const registerTFCRecipes = (event) => { }).id('tfc:crafting/blast_furnace') // Тыква -> Кусочки тыквы - event.recipes.tfc.damage_inputs_shaped_crafting(event.recipes.minecraft.crafting_shaped('5x tfc:food/pumpkin_chunks', [ + event.recipes.minecraft.crafting_shaped('5x tfc:food/pumpkin_chunks', [ 'AB' ], { A: '#tfc:knives', B: 'tfc:pumpkin' - })) + }) // Fire Brick event.smelting('tfc:ceramic/fire_brick', 'gtceu:compressed_fireclay') diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index d9da33b37..2cefb064d 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -578,6 +578,57 @@ global.TFC_DISABLED_ITEMS = [ "tfc:red_windmill_blade", "tfc:black_windmill_blade", + // Каменные инстрменты + 'tfc:stone/knife_head/igneous_extrusive', + 'tfc:stone/knife_head/igneous_intrusive', + 'tfc:stone/knife_head/metamorphic', + 'tfc:stone/knife_head/sedimentary', + + 'tfc:stone/knife/igneous_extrusive', + 'tfc:stone/knife/igneous_intrusive', + 'tfc:stone/knife/metamorphic', + 'tfc:stone/knife/sedimentary', + + 'tfc:stone/axe_head/igneous_extrusive', + 'tfc:stone/axe_head/igneous_intrusive', + 'tfc:stone/axe_head/metamorphic', + 'tfc:stone/axe_head/sedimentary', + + 'tfc:stone/axe/igneous_extrusive', + 'tfc:stone/axe/igneous_intrusive', + 'tfc:stone/axe/metamorphic', + 'tfc:stone/axe/sedimentary', + + 'tfc:stone/shovel_head/igneous_extrusive', + 'tfc:stone/shovel_head/igneous_intrusive', + 'tfc:stone/shovel_head/metamorphic', + 'tfc:stone/shovel_head/sedimentary', + + 'tfc:stone/shovel/igneous_extrusive', + 'tfc:stone/shovel/igneous_intrusive', + 'tfc:stone/shovel/sedimentary', + 'tfc:stone/shovel/sedimentary', + + 'tfc:stone/hammer_head/igneous_extrusive', + 'tfc:stone/hammer_head/igneous_intrusive', + 'tfc:stone/hammer_head/metamorphic', + 'tfc:stone/hammer_head/sedimentary', + + 'tfc:stone/hammer/igneous_extrusive', + 'tfc:stone/hammer/igneous_intrusive', + 'tfc:stone/hammer/metamorphic', + 'tfc:stone/hammer/sedimentary', + + 'tfc:stone/hoe_head/igneous_extrusive', + 'tfc:stone/hoe_head/igneous_intrusive', + 'tfc:stone/hoe_head/metamorphic', + 'tfc:stone/hoe_head/sedimentary', + + 'tfc:stone/hoe/igneous_extrusive', + 'tfc:stone/hoe/igneous_intrusive', + 'tfc:stone/hoe/metamorphic', + 'tfc:stone/hoe/sedimentary', + // Other "tfc:trip_hammer", 'tfc:steel_pipe',