From 9c2472a25834d962fc876d1ce41b2343839b56a4 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 24 Dec 2023 18:56:43 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D0=BF=D0=B8=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D0=B8=D0=BA=20=D0=B8=20=D0=9D=D0=BE=D0=B6=20=D0=BC=D1=8F=D1=81?= =?UTF-8?q?=D0=BD=D0=B8=D0=BA=D0=B0=20=D0=B2=20=D0=BD=D0=B0=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BB=D1=8C=D0=BD=D0=B5=20=D1=82=D1=84=D0=BA=20+?= =?UTF-8?q?=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubejs/server_scripts/gregtech/recipes.js | 9 +++++ kubejs/server_scripts/tfc/recipes.js | 42 +++++++++++++++++++++++ kubejs/startup_scripts/gtceu/constants.js | 2 ++ kubejs/startup_scripts/tfc/constants.js | 2 +- 4 files changed, 54 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index feecd434e..c75a878dc 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -929,6 +929,15 @@ const registerGTCEURecipes = (event) => { //#endregion + //#region Выход: Деревянное оголовья инструментов (что?) + + event.remove({id: 'gtceu:shaped/screwdriver_tip_wood'}) + event.remove({id: 'gtceu:shaped/wrench_head_wood'}) + event.remove({id: 'gtceu:shaped/drill_head_wood'}) + event.remove({id: 'gtceu:shaped/chainsaw_head_wood'}) + + //#endregion + // Удаление рецептов связанных с Primitive Blast Furnace event.remove({id: 'gtceu:arc_furnace/arc_primitive_blast_furnace'}) event.remove({id: 'gtceu:macerator/macerate_primitive_blast_furnace'}) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 07e158028..947cfd291 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -629,6 +629,48 @@ const registerTFCRecipes = (event) => { //#endregion + //#region Мясницкий нож + + // Декрафт инструмента в жидкость + event.recipes.tfc.heating(`gtceu:${metal}_butchery_knife`, metalSpecs.melt_temp) + .resultFluid(Fluid.of(metalSpecs.fluid, 144)) + .useDurability(true) + .id(`tfc:heating/metal/${metal}_butchery_knife`) + + // Крафт оголовья + event.recipes.tfc.anvil(`gtceu:${metal}_knife_butchery_head`, `#forge:ingots/${metal}`, ['punch_last', 'bend_not_last', 'bend_not_last']) + .tier(metalSpecs.tier) + .bonus(true) + .id(`tfc:anvil/${metal}_knife_butchery_head`) + + // Декрафт оголовья в жидкость + event.recipes.tfc.heating(`gtceu:${metal}_knife_butchery_head`, metalSpecs.melt_temp) + .resultFluid(Fluid.of(metalSpecs.fluid, 144)) + .id(`tfc:heating/metal/${metal}_knife_butchery_head`) + + //#endregion + + //#region Напильник + + // Декрафт инструмента в жидкость + event.recipes.tfc.heating(`gtceu:${metal}_file`, metalSpecs.melt_temp) + .resultFluid(Fluid.of(metalSpecs.fluid, 144)) + .useDurability(true) + .id(`tfc:heating/metal/${metal}_file`) + + // Крафт оголовья + event.recipes.tfc.anvil(`gtceu:${metal}_file_head`, `#forge:ingots/${metal}`, ['upset_last', 'bend_not_last', 'punch_not_last']) + .tier(metalSpecs.tier) + .bonus(true) + .id(`tfc:anvil/${metal}_file_head`) + + // Декрафт оголовья в жидкость + event.recipes.tfc.heating(`gtceu:${metal}_file_head`, metalSpecs.melt_temp) + .resultFluid(Fluid.of(metalSpecs.fluid, 144)) + .id(`tfc:heating/metal/${metal}_file_head`) + + //#endregion + } if (metalSpecs.props.includes('utility')) { diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index c60158004..2cbd69de6 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -14,6 +14,8 @@ global.GTCEU_DISABLED_ITEMS = [ 'gtceu:wood_drum', 'gtceu:primitive_blast_furnace', + 'gtceu:wood_screwdriver_tip', + 'gtceu:wood_wrench_tip', 'gtceu:wood_drill_head', 'gtceu:wood_chainsaw_head', 'gtceu:rubber_sapling', diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 2cefb064d..d973d0929 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -606,7 +606,7 @@ global.TFC_DISABLED_ITEMS = [ 'tfc:stone/shovel/igneous_extrusive', 'tfc:stone/shovel/igneous_intrusive', - 'tfc:stone/shovel/sedimentary', + 'tfc:stone/shovel/metamorphic', 'tfc:stone/shovel/sedimentary', 'tfc:stone/hammer_head/igneous_extrusive',