From 28dbf41a0a6cff64f62025b3e084fbd15d90836e Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 19 Dec 2023 08:19:30 +0700 Subject: [PATCH] 123 --- kubejs/server_scripts/minecraft/recipes.js | 4 + kubejs/server_scripts/tfc/recipes.js | 364 +++++++++++++++++- kubejs/server_scripts/tfc/tags.js | 2 +- kubejs/startup_scripts/minecraft/constants.js | 1 + 4 files changed, 356 insertions(+), 15 deletions(-) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 0b8d1c86b..325168ae8 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -929,7 +929,11 @@ const registerMinecraftRecipes = (event) => { //#endregion + //#region Выход: Камнерез + event.remove({ id: 'minecraft:stonecutter' }) + + //#endregion diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index c37e4b657..0760f6d20 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -899,6 +899,8 @@ const registerTFCRecipes = (event) => { //#region Камень global.TFC_STONE_TYPES.forEach(stoneTypeName => { + //#region Сырой камень + // Сырой камень -> Сырой камень event.recipes.gtceu.rock_breaker(`${stoneTypeName}_raw`) .notConsumable(`tfc:rock/raw/${stoneTypeName}`) @@ -906,13 +908,6 @@ const registerTFCRecipes = (event) => { .duration(16) .EUt(7) - // Булыжник -> Булыжник - event.recipes.gtceu.rock_breaker(`${stoneTypeName}_cobble`) - .notConsumable(`tfc:rock/cobble/${stoneTypeName}`) - .itemOutputs(`tfc:rock/cobble/${stoneTypeName}`) - .duration(16) - .EUt(7) - // Сырой камень -> Булыжник event.recipes.gtceu.forge_hammer(`${stoneTypeName}_raw_to_cobble`) .itemInputs(`tfc:rock/raw/${stoneTypeName}`) @@ -920,14 +915,9 @@ const registerTFCRecipes = (event) => { .duration(10) .EUt(16) - // Булыжник -> Гравий - event.recipes.gtceu.forge_hammer(`${stoneTypeName}_cobble_to_gravel`) - .itemInputs(`tfc:rock/cobble/${stoneTypeName}`) - .itemOutputs(`tfc:rock/gravel/${stoneTypeName}`) - .duration(10) - .EUt(16) - // Сырой камень -> Ступени + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_raw_stairs` }) + event.recipes.gtceu.cutter(`${stoneTypeName}_raw_to_stairs`) .itemInputs(`tfc:rock/raw/${stoneTypeName}`) .circuit(0) @@ -936,6 +926,8 @@ const registerTFCRecipes = (event) => { .EUt(8) // Сырой камень -> Плиты + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_raw_slab` }) + event.recipes.gtceu.cutter(`${stoneTypeName}_raw_to_slab`) .itemInputs(`tfc:rock/raw/${stoneTypeName}`) .circuit(1) @@ -944,6 +936,8 @@ const registerTFCRecipes = (event) => { .EUt(8) // Сырой камень -> Стена + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_raw_wall` }) + event.recipes.gtceu.cutter(`${stoneTypeName}_raw_to_wall`) .itemInputs(`tfc:rock/raw/${stoneTypeName}`) .circuit(2) @@ -989,6 +983,348 @@ const registerTFCRecipes = (event) => { .itemOutputs(`4x tfc:rock/button/${stoneTypeName}`) .duration(50) .EUt(2) + + //#endregion + + //#region Булыжник + + // Булыжник -> Булыжник + event.recipes.gtceu.rock_breaker(`${stoneTypeName}_cobble`) + .notConsumable(`tfc:rock/cobble/${stoneTypeName}`) + .itemOutputs(`tfc:rock/cobble/${stoneTypeName}`) + .duration(16) + .EUt(7) + + // Булыжник -> Гравий + event.recipes.gtceu.forge_hammer(`${stoneTypeName}_cobble_to_gravel`) + .itemInputs(`tfc:rock/cobble/${stoneTypeName}`) + .itemOutputs(`tfc:rock/gravel/${stoneTypeName}`) + .duration(10) + .EUt(16) + + // Камни -> Булыжник + event.shaped(`tfc:rock/cobble/${stoneTypeName}`, [ + 'ABA', + 'BAB', + 'ABA' + ], { + A: `tfc:rock/loose/${stoneTypeName}`, + B: '#tfc:mortar' + }).id(`tfc:crafting/rock/${stoneTypeName}_loose_rocks_to_cobble`) + + event.recipes.gtceu.assembler(`${stoneTypeName}_loose_rocks_to_cobble`) + .itemInputs(`4x tfc:rock/loose/${stoneTypeName}`) + .circuit(0) + .inputFluids(Fluid.of('gtceu:concrete', 72)) + .itemOutputs(`tfc:rock/cobble/${stoneTypeName}`) + .duration(50) + .EUt(2) + + // Булыжник -> Ступени + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_cobble_stairs` }) + + event.recipes.gtceu.cutter(`${stoneTypeName}_cobble_to_stairs`) + .itemInputs(`tfc:rock/cobble/${stoneTypeName}`) + .circuit(0) + .itemOutputs(`tfc:rock/cobble/${stoneTypeName}_stairs`) + .duration(100) + .EUt(8) + + // Булыжник -> Плиты + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_cobble_slab` }) + + event.recipes.gtceu.cutter(`${stoneTypeName}_cobble_to_slab`) + .itemInputs(`tfc:rock/cobble/${stoneTypeName}`) + .circuit(1) + .itemOutputs(`2x tfc:rock/cobble/${stoneTypeName}_slab`) + .duration(100) + .EUt(8) + + // Булыжник -> Стена + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_cobble_wall` }) + + event.recipes.gtceu.cutter(`${stoneTypeName}_cobble_to_wall`) + .itemInputs(`tfc:rock/cobble/${stoneTypeName}`) + .circuit(2) + .itemOutputs(`2x tfc:rock/cobble/${stoneTypeName}_wall`) + .duration(100) + .EUt(8) + + + //#endregion + + //#region Гладкий + + // Сырой камень -> Гладкий + event.recipes.gtceu.laser_engraver(`raw_${stoneTypeName}_to_smooth`) + .itemInputs(`tfc:rock/raw/${stoneTypeName}`) + .notConsumable('gtceu:glass_lens') + .itemOutputs(`tfc:rock/smooth/${stoneTypeName}`) + .duration(32) + .EUt(100) + + // Укрепленный сырой камень -> Гладкий + event.recipes.gtceu.laser_engraver(`hardened_${stoneTypeName}_to_smooth`) + .itemInputs(`tfc:rock/hardened/${stoneTypeName}`) + .notConsumable('gtceu:glass_lens') + .itemOutputs(`tfc:rock/smooth/${stoneTypeName}`) + .duration(32) + .EUt(100) + + // Булыжник -> Ступени + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_smooth_stairs` }) + + event.recipes.gtceu.cutter(`${stoneTypeName}_smooth_to_stairs`) + .itemInputs(`tfc:rock/smooth/${stoneTypeName}`) + .circuit(0) + .itemOutputs(`tfc:rock/smooth/${stoneTypeName}_stairs`) + .duration(100) + .EUt(8) + + // Булыжник -> Плиты + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_smooth_slab` }) + + event.recipes.gtceu.cutter(`${stoneTypeName}_smooth_to_slab`) + .itemInputs(`tfc:rock/smooth/${stoneTypeName}`) + .circuit(1) + .itemOutputs(`2x tfc:rock/smooth/${stoneTypeName}_slab`) + .duration(100) + .EUt(8) + + // Булыжник -> Стена + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_smooth_wall` }) + + event.recipes.gtceu.cutter(`${stoneTypeName}_smooth_to_wall`) + .itemInputs(`tfc:rock/smooth/${stoneTypeName}`) + .circuit(2) + .itemOutputs(`2x tfc:rock/smooth/${stoneTypeName}_wall`) + .duration(100) + .EUt(8) + + //#endregion + + //#region Кирпич + + // Кирпич -> Блок кирпичей + event.recipes.gtceu.assembler(`bricks_${stoneTypeName}`) + .itemInputs(`5x tfc:brick/${stoneTypeName}`) + .circuit(0) + .inputFluids(Fluid.of('gtceu:concrete', 72)) + .itemOutputs(`4x tfc:rock/bricks/${stoneTypeName}`) + .duration(50) + .EUt(2) + + // Блок кирпичей -> Ступени + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_bricks_stairs` }) + + event.recipes.gtceu.cutter(`${stoneTypeName}_bricks_to_stairs`) + .itemInputs(`tfc:rock/bricks/${stoneTypeName}`) + .circuit(0) + .itemOutputs(`tfc:rock/bricks/${stoneTypeName}_stairs`) + .duration(100) + .EUt(8) + + // Блок кирпичей -> Плиты + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_bricks_slab` }) + + event.recipes.gtceu.cutter(`${stoneTypeName}_bricks_to_slab`) + .itemInputs(`tfc:rock/bricks/${stoneTypeName}`) + .circuit(1) + .itemOutputs(`2x tfc:rock/bricks/${stoneTypeName}_slab`) + .duration(100) + .EUt(8) + + // Блок кирпичей -> Стена + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_bricks_wall` }) + + event.recipes.gtceu.cutter(`${stoneTypeName}_bricks_to_wall`) + .itemInputs(`tfc:rock/bricks/${stoneTypeName}`) + .circuit(2) + .itemOutputs(`2x tfc:rock/bricks/${stoneTypeName}_wall`) + .duration(100) + .EUt(8) + + //#endregion + + //#region Потрескавшийся кирпич + + // Кирпич -> Потрескавшийся кирпич + event.recipes.gtceu.forge_hammer(`cracked_bricks_${stoneTypeName}`) + .itemInputs(`tfc:rock/bricks/${stoneTypeName}`) + .itemOutputs(`tfc:rock/cracked_bricks/${stoneTypeName}`) + .duration(25) + .EUt(8) + + // Потрескавшийся кирпич -> Ступени + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_cracked_bricks_stairs` }) + + event.recipes.gtceu.cutter(`${stoneTypeName}_cracked_bricks_to_stairs`) + .itemInputs(`tfc:rock/cracked_bricks/${stoneTypeName}`) + .circuit(0) + .itemOutputs(`tfc:rock/cracked_bricks/${stoneTypeName}_stairs`) + .duration(100) + .EUt(8) + + // Потрескавшийся кирпич -> Плиты + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_cracked_bricks_slab` }) + + event.recipes.gtceu.cutter(`${stoneTypeName}_cracked_bricks_to_slab`) + .itemInputs(`tfc:rock/cracked_bricks/${stoneTypeName}`) + .circuit(1) + .itemOutputs(`2x tfc:rock/cracked_bricks/${stoneTypeName}_slab`) + .duration(100) + .EUt(8) + + // Потрескавшийся кирпич -> Стена + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_cracked_bricks_wall` }) + + event.recipes.gtceu.cutter(`${stoneTypeName}_cracked_bricks_to_wall`) + .itemInputs(`tfc:rock/cracked_bricks/${stoneTypeName}`) + .circuit(2) + .itemOutputs(`2x tfc:rock/cracked_bricks/${stoneTypeName}_wall`) + .duration(100) + .EUt(8) + + //#endregion + + //#region Замшелый булыжник + + // Булыжник -> Замшелый булыжник + event.shaped(`tfc:rock/mossy_cobble/${stoneTypeName}`, [ + 'ABA', + 'BAB', + 'ABA' + ], { + A: `tfc:rock/mossy_loose/${stoneTypeName}`, + B: '#tfc:mortar' + }).id(`tfc:crafting/rock/${stoneTypeName}_mossy_loose_rocks_to_cobble`) + + event.recipes.gtceu.assembler(`${stoneTypeName}_mossy_loose_rocks_to_mossy_cobble`) + .itemInputs(`4x tfc:rock/mossy_loose/${stoneTypeName}`) + .circuit(0) + .inputFluids(Fluid.of('gtceu:concrete', 72)) + .itemOutputs(`tfc:rock/mossy_cobble/${stoneTypeName}`) + .duration(50) + .EUt(2) + + event.recipes.gtceu.assembler(`${stoneTypeName}_cobble_rocks_to_mossy_cobble`) + .itemInputs(`tfc:rock/cobble/${stoneTypeName}`, '#tfc:compost_greens_low') + .circuit(0) + .inputFluids(Fluid.of('minecraft:water', 144)) + .itemOutputs(`tfc:rock/mossy_cobble/${stoneTypeName}`) + .duration(50) + .EUt(2) + + // Замшелый булыжник -> Ступени + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_mossy_cobble_stairs` }) + + event.recipes.gtceu.cutter(`${stoneTypeName}_mossy_cobble_to_stairs`) + .itemInputs(`tfc:rock/mossy_cobble/${stoneTypeName}`) + .circuit(0) + .itemOutputs(`tfc:rock/mossy_cobble/${stoneTypeName}_stairs`) + .duration(100) + .EUt(8) + + //Замшелый булыжник -> Плиты + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_mossy_cobble_slab` }) + + event.recipes.gtceu.cutter(`${stoneTypeName}_mossy_cobble_to_slab`) + .itemInputs(`tfc:rock/mossy_cobble/${stoneTypeName}`) + .circuit(1) + .itemOutputs(`2x tfc:rock/mossy_cobble/${stoneTypeName}_slab`) + .duration(100) + .EUt(8) + + // Замшелый булыжник -> Стена + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_mossy_cobble_wall` }) + + event.recipes.gtceu.cutter(`${stoneTypeName}_mossy_cobble_to_wall`) + .itemInputs(`tfc:rock/mossy_cobble/${stoneTypeName}`) + .circuit(2) + .itemOutputs(`2x tfc:rock/mossy_cobble/${stoneTypeName}_wall`) + .duration(100) + .EUt(8) + + //#endregion + + //#region Замшелый кирпич + + // Блок кирпичей -> Замшелый кирпич + event.recipes.gtceu.assembler(`mossy_bricks_${stoneTypeName}`) + .itemInputs(`tfc:rock/bricks/${stoneTypeName}`, '#tfc:compost_greens_low') + .circuit(0) + .inputFluids(Fluid.of('minecraft:water', 144)) + .itemOutputs(`tfc:rock/mossy_bricks/${stoneTypeName}`) + .duration(50) + .EUt(2) + + // Замшелый булыжник -> Ступени + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_mossy_bricks_stairs` }) + + event.recipes.gtceu.cutter(`${stoneTypeName}_mossy_bricks_to_stairs`) + .itemInputs(`tfc:rock/mossy_bricks/${stoneTypeName}`) + .circuit(0) + .itemOutputs(`tfc:rock/mossy_bricks/${stoneTypeName}_stairs`) + .duration(100) + .EUt(8) + + //Замшелый булыжник -> Плиты + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_mossy_bricks_slab` }) + + event.recipes.gtceu.cutter(`${stoneTypeName}_mossy_bricks_to_slab`) + .itemInputs(`tfc:rock/mossy_bricks/${stoneTypeName}`) + .circuit(1) + .itemOutputs(`2x tfc:rock/mossy_bricks/${stoneTypeName}_slab`) + .duration(100) + .EUt(8) + + // Замшелый булыжник -> Стена + event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_mossy_bricks_wall` }) + + event.recipes.gtceu.cutter(`${stoneTypeName}_mossy_bricks_to_wall`) + .itemInputs(`tfc:rock/mossy_bricks/${stoneTypeName}`) + .circuit(2) + .itemOutputs(`2x tfc:rock/mossy_bricks/${stoneTypeName}_wall`) + .duration(100) + .EUt(8) + + //#endregion + + //#region Укрепленный камень + + event.recipes.gtceu.assembler(`hardened_${stoneTypeName}`) + .itemInputs(`5x tfc:rock/raw/${stoneTypeName}`) + .circuit(0) + .inputFluids(Fluid.of('gtceu:concrete', 72)) + .itemOutputs(`2x tfc:rock/hardened/${stoneTypeName}`) + .duration(250) + .EUt(8) + + //#endregion + + //#region Акведук + + event.recipes.gtceu.assembler(`aqueduct_${stoneTypeName}`) + .itemInputs(`3x tfc:brick/${stoneTypeName}`) + .circuit(1) + .inputFluids(Fluid.of('gtceu:concrete', 16)) + .itemOutputs(`tfc:rock/aqueduct/${stoneTypeName}`) + .duration(50) + .EUt(2) + + //#endregion + + //#region Резной кирпич + + // Блок кирпичей -> Резной кирпич + event.recipes.gtceu.laser_engraver(`chiseled_${stoneTypeName}`) + .itemInputs(`tfc:rock/bricks/${stoneTypeName}`) + .notConsumable('gtceu:glass_lens') + .itemOutputs(`tfc:rock/chiseled/${stoneTypeName}`) + .duration(32) + .EUt(100) + + //#endregion }) //#endregion diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 3db21d849..613a62b4b 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -8,7 +8,7 @@ const registerTFCItemTags = (event) => { }) // Теги для соответствия инструментов TFC и GT - event.add('tfc:axes', '#forge:tools/tree_felling') + event.add('tfc:axes', '#minecraft:axes') event.add('tfc:hammers', '#forge:tools/hammers') event.add('tfc:hoes', '#minecraft:hoes') event.add('tfc:knives', '#forge:tools/knives') diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 99f5bd23a..8cc4f0be2 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -352,6 +352,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:mud', 'minecraft:netherite_scrap', 'minecraft:suspicious_gravel', + 'minecraft:stonecutter', /* // Other