From f13381f8f085ba04d835854e25a611edec48663d Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 19 Dec 2023 12:33:18 +0700 Subject: [PATCH] =?UTF-8?q?=D0=BD=D1=83=20=D0=B8=20=D1=85=D0=B5=D1=80?= =?UTF-8?q?=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubejs/server_scripts/minecraft/recipes.js | 43 +++++- kubejs/server_scripts/tfc/recipes.js | 141 +++++++++++++++++- kubejs/startup_scripts/minecraft/constants.js | 13 +- kubejs/startup_scripts/tfc/constants.js | 7 + 4 files changed, 193 insertions(+), 11 deletions(-) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index dbfce2ac5..d676bff0b 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -951,9 +951,48 @@ const registerMinecraftRecipes = (event) => { //#endregion - + //#region Выход: Плотная грязь + + event.remove({ id: 'minecraft:packed_mud' }) + + //#endregion + + //#region Выход: Грязные кирпичи + + event.remove({ id: 'minecraft:mud_bricks' }) + + //#endregion + + //#region Выход: Грязные кирпичи ступень + + event.remove({ id: 'minecraft:mud_brick_stairs' }) + event.remove({ id: 'minecraft:mud_brick_stairs_from_mud_bricks_stonecutting' }) + + //#endregion + + //#region Выход: Грязные кирпичи плита + + event.remove({ id: 'minecraft:mud_brick_slab' }) + event.remove({ id: 'minecraft:mud_brick_slab_from_mud_bricks_stonecutting' }) + + //#endregion + + //#region Выход: Грязные кирпичи стена + + event.remove({ id: 'minecraft:mud_brick_wall' }) + event.remove({ id: 'minecraft:mud_brick_wall_from_mud_bricks_stonecutting' }) + + //#endregion + + //#region Выход: Медный блок (Подчищаем за разрабом грега) + + event.remove({ id: 'minecraft:copper_block' }) + + //#endregion + + + - diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index d3033d0de..e6158a977 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -896,6 +896,133 @@ const registerTFCRecipes = (event) => { //#endregion + //#region Земля + + // Loam + Silt -> Silty Loam (Миксер) + event.recipes.gtceu.mixer('silty_loam_dirt') + .itemInputs('tfc:dirt/loam', 'tfc:dirt/silt') + .itemOutputs('tfc:dirt/silty_loam') + .duration(1600) + .EUt(12) + + // Silty Loam + Sticks -> Rooted Silty Loam (Миксер) + event.recipes.gtceu.mixer('rooted_silty_loam_dirt') + .itemInputs('tfc:dirt/silty_loam', '#tfc:can_be_lit_on_torch') + .itemOutputs('tfc:rooted_dirt/silty_loam') + .duration(1600) + .EUt(12) + + // Loam + Sand -> Sandy Loam (Миксер) + event.recipes.gtceu.mixer('sandy_loam_dirt') + .itemInputs('tfc:dirt/loam', '#forge:sand') + .itemOutputs('tfc:dirt/sandy_loam') + .duration(1600) + .EUt(12) + + // Loam + Silt -> Silty Loam (Create Миксер) + event.recipes.gtceu.create_mixer('silty_loam_dirt') + .itemInputs('tfc:dirt/loam', 'tfc:dirt/silt') + .itemOutputs('tfc:dirt/silty_loam') + .duration(1600) + .EUt(12) + .rpm(60) + + // Silty Loam + Sticks -> Rooted Silty Loam (Create Миксер) + event.recipes.gtceu.create_mixer('rooted_silty_loam_dirt') + .itemInputs('tfc:dirt/silty_loam', '#tfc:can_be_lit_on_torch') + .itemOutputs('tfc:rooted_dirt/silty_loam') + .duration(1600) + .EUt(12) + .rpm(60) + + // Loam + Sand -> Sandy Loam (Create Миксер) + event.recipes.gtceu.create_mixer('sandy_loam_dirt') + .itemInputs('tfc:dirt/loam', '#forge:sand') + .itemOutputs('tfc:dirt/sandy_loam') + .duration(1600) + .EUt(12) + .rpm(60) + + global.TFC_MUD_TYPES.forEach(mud => { + event.smelting(`tfc:dirt/${mud}`, `tfc:mud/${mud}`) + .id(`tfg:smelting/${mud}_mud_to_grass`) + }) + + //#endregion + + //#region Грязь + + global.TFC_MUD_TYPES.forEach(mud => { + // Dirt -> Mud + event.recipes.gtceu.mixer(`${mud}_grass_to_mud`) + .itemInputs(`tfc:dirt/${mud}`) + .inputFluids(Fluid.of('minecraft:water', 100)) + .itemOutputs(`tfc:mud/${mud}`) + .duration(200) + .EUt(16) + }) + + //#endregion + + //#region Грязь кирпичи + + global.TFC_MUD_TYPES.forEach(mud => { + + // Влажный кирпич -> Кирпич + event.smelting(`tfc:mud_brick/${mud}`, `tfc:drying_bricks/${mud}`) + .id(`tfg:smelting/${mud}_drying_brick_to_brick`) + + // Кирпич -> Блок кирпичей + event.shaped(`tfc:mud_bricks/${mud}`, [ + 'ABA', + 'BAB', + 'ABA' + ], { + A: `tfc:mud_brick/${mud}`, + B: '#tfc:mortar' + }).id(`tfc:crafting/soil/${mud}_mud_bricks`) + + event.recipes.gtceu.assembler(`mud_bricks_${mud}`) + .itemInputs(`5x tfc:mud_brick/${mud}`) + .inputFluids(Fluid.of('gtceu:concrete', 72)) + .itemOutputs(`4x tfc:mud_bricks/${mud}`) + .duration(50) + .EUt(2) + + // Блок кирпичей -> Ступени + event.remove({ id: `tfc:crafting/soil/${mud}_mud_bricks_stairs` }) + + event.recipes.gtceu.cutter(`${mud}_mud_bricks_to_stairs`) + .itemInputs(`tfc:mud_bricks/${mud}`) + .circuit(0) + .itemOutputs(`tfc:mud_bricks/${mud}_stairs`) + .duration(100) + .EUt(8) + + // Блок кирпичей -> Плиты + event.remove({ id: `tfc:crafting/soil/${mud}_mud_bricks_slab` }) + + event.recipes.gtceu.cutter(`${mud}_mud_bricks_to_slab`) + .itemInputs(`tfc:mud_bricks/${mud}`) + .circuit(1) + .itemOutputs(`2x tfc:mud_bricks/${mud}_slab`) + .duration(100) + .EUt(8) + + // Блок кирпичей -> Стена + event.remove({ id: `tfc:crafting/soil/${mud}_mud_bricks_wall` }) + + event.recipes.gtceu.cutter(`${mud}_mud_bricks_to_wall`) + .itemInputs(`tfc:mud_bricks/${mud}`) + .circuit(2) + .itemOutputs(`tfc:mud_bricks/${mud}_wall`) + .duration(100) + .EUt(8) + + }) + + //#endregion + //#region Камень global.TFC_STONE_TYPES.forEach(stone => { @@ -941,7 +1068,7 @@ const registerTFCRecipes = (event) => { event.recipes.gtceu.cutter(`${stone}_raw_to_wall`) .itemInputs(`tfc:rock/raw/${stone}`) .circuit(2) - .itemOutputs(`2x tfc:rock/raw/${stone}_wall`) + .itemOutputs(`tfc:rock/raw/${stone}_wall`) .duration(100) .EUt(8) @@ -1036,7 +1163,7 @@ const registerTFCRecipes = (event) => { event.recipes.gtceu.cutter(`${stone}_cobble_to_wall`) .itemInputs(`tfc:rock/cobble/${stone}`) .circuit(2) - .itemOutputs(`2x tfc:rock/cobble/${stone}_wall`) + .itemOutputs(`tfc:rock/cobble/${stone}_wall`) .duration(100) .EUt(8) @@ -1087,7 +1214,7 @@ const registerTFCRecipes = (event) => { event.recipes.gtceu.cutter(`${stone}_smooth_to_wall`) .itemInputs(`tfc:rock/smooth/${stone}`) .circuit(2) - .itemOutputs(`2x tfc:rock/smooth/${stone}_wall`) + .itemOutputs(`tfc:rock/smooth/${stone}_wall`) .duration(100) .EUt(8) @@ -1130,7 +1257,7 @@ const registerTFCRecipes = (event) => { event.recipes.gtceu.cutter(`${stone}_bricks_to_wall`) .itemInputs(`tfc:rock/bricks/${stone}`) .circuit(2) - .itemOutputs(`2x tfc:rock/bricks/${stone}_wall`) + .itemOutputs(`tfc:rock/bricks/${stone}_wall`) .duration(100) .EUt(8) @@ -1171,7 +1298,7 @@ const registerTFCRecipes = (event) => { event.recipes.gtceu.cutter(`${stone}_cracked_bricks_to_wall`) .itemInputs(`tfc:rock/cracked_bricks/${stone}`) .circuit(2) - .itemOutputs(`2x tfc:rock/cracked_bricks/${stone}_wall`) + .itemOutputs(`tfc:rock/cracked_bricks/${stone}_wall`) .duration(100) .EUt(8) @@ -1231,7 +1358,7 @@ const registerTFCRecipes = (event) => { event.recipes.gtceu.cutter(`${stone}_mossy_cobble_to_wall`) .itemInputs(`tfc:rock/mossy_cobble/${stone}`) .circuit(2) - .itemOutputs(`2x tfc:rock/mossy_cobble/${stone}_wall`) + .itemOutputs(`tfc:rock/mossy_cobble/${stone}_wall`) .duration(100) .EUt(8) @@ -1274,7 +1401,7 @@ const registerTFCRecipes = (event) => { event.recipes.gtceu.cutter(`${stone}_mossy_bricks_to_wall`) .itemInputs(`tfc:rock/mossy_bricks/${stone}`) .circuit(2) - .itemOutputs(`2x tfc:rock/mossy_bricks/${stone}_wall`) + .itemOutputs(`tfc:rock/mossy_bricks/${stone}_wall`) .duration(100) .EUt(8) diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 9c51e2e6e..fbd8d145d 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -110,6 +110,13 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:deepslate', 'minecraft:reinforced_deepslate', + // Грязь + 'minecraft:mud_brick_wall', + 'minecraft:packed_mud', + 'minecraft:mud_bricks', + 'minecraft:mud_brick_stairs', + 'minecraft:mud_brick_slab', + // Руды 'minecraft:coal_ore', 'minecraft:iron_ore', @@ -322,7 +329,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ "minecraft:mangrove_propagule", "minecraft:mangrove_log", // "minecraft:mangrove_roots", - // "minecraft:muddy_mangrove_roots", + "minecraft:muddy_mangrove_roots", "minecraft:stripped_mangrove_log", "minecraft:stripped_mangrove_wood", "minecraft:mangrove_wood", @@ -353,7 +360,9 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:netherite_scrap', 'minecraft:suspicious_gravel', 'minecraft:stonecutter', - 'minecraft:gravel' + 'minecraft:gravel', + 'minecraft:gold_ingot', + 'minecraft:copper_ingot' /* // Other diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 65c48793f..665d37e11 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -631,6 +631,13 @@ global.TFC_WOOD_TYPES = [ "willow" ]; +global.TFC_MUD_TYPES = [ + 'silt', + 'loam', + 'sandy_loam', + 'silty_loam' +]; + global.TFC_WOOD_ITEM_TYPES_TO_WOOD_DUST = { '#tfc:lumber': { name: 'lumber', output: ['1x gtceu:wood_dust'] }, '#tfc:support_beams': { name: 'support_beams', output: ['2x gtceu:wood_dust'] },