From a5072b1a21cfe043b374fa772a4745be88c10568 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 19 Dec 2023 10:23:47 +0700 Subject: [PATCH] =?UTF-8?q?=D0=A0=D1=80=D1=80=D1=80=D0=B5=D0=B5=D0=B5?= =?UTF-8?q?=D1=86=D0=B5=D0=BF=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubejs/client_scripts/mods/minecraft.js | 2 +- kubejs/server_scripts/gregtech/recipes.js | 73 ++- kubejs/server_scripts/main_server_script.js | 2 +- kubejs/server_scripts/minecraft/recipes.js | 24 +- kubejs/server_scripts/tfc/recipes.js | 487 ++++++++++-------- kubejs/startup_scripts/minecraft/constants.js | 5 +- kubejs/startup_scripts/tfc/constants.js | 240 +++++---- 7 files changed, 485 insertions(+), 348 deletions(-) diff --git a/kubejs/client_scripts/mods/minecraft.js b/kubejs/client_scripts/mods/minecraft.js index 532e422d8..425dbb9c3 100644 --- a/kubejs/client_scripts/mods/minecraft.js +++ b/kubejs/client_scripts/mods/minecraft.js @@ -12,7 +12,7 @@ const registerMinecraftCategories = (event) => { event.remove('minecraft:plugins/stripping') // TODO: Сделать с вариантами TFC event.remove('minecraft:plugins/pathing') // TODO: Сделать с вариантами TFC event.remove('minecraft:plugins/waxing') // TODO: Сделать с вариантами TFC - event.remove('minecraft:plugins/wax_scrapping') // TODO: Сделать с вариантами TFC + event.remove('minecraft:plugins/wax_scraping') // TODO: Сделать с вариантами TFC event.remove('minecraft:plugins/oxidizing') // TODO: Сделать с вариантами TFC event.remove('minecraft:plugins/oxidation_scrapping') // TODO: Сделать с вариантами TFC } diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 120a6e135..a4449abe8 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -2,6 +2,77 @@ const registerGTCEURecipes = (event) => { + //#region Выход: Удобрение + + // В обычном миксере + event.recipes.gtceu.mixer('fertilizer') + .itemInputs( + '#tfc:dirt', + '2x #forge:dusts/wood', + '4x #forge:sand' + ) + .inputFluids(Fluid.of('minecraft:water', 1000)) + .itemOutputs('4x gtceu:fertilizer') + .duration(300) + .EUt(30) + + // В create миксере + event.recipes.gtceu.create_mixer('fertilizer') + .itemInputs( + '#tfc:dirt', + '2x #forge:dusts/wood', + '4x #forge:sand' + ) + .inputFluids(Fluid.of('minecraft:water', 1000)) + .itemOutputs('4x gtceu:fertilizer') + .duration(300) + .EUt(30) + .rpm(96) + + //#endregion + + //#region Выход: Кварцевый песок + + event.shaped('gtceu:quartz_sand_dust', [ + 'A', + 'B' + ], { + A: '#forge:sand', + B: '#forge:tools/mortars' + }).id('gtceu:shaped/quartz_sand') + + event.recipes.gtceu.macerator('quartz_sand_from_sand') + .itemInputs('#forge:sand') + .itemOutputs('gtceu:quartz_sand_dust') + .duration(30) + .EUt(2) + + //#endregion + + //#region Выход: Диоксид силикона + + event.recipes.gtceu.electrolyzer('sand_electrolysis') + .itemInputs('8x #forge:sand') + .itemOutputs('gtceu:silicon_dioxide_dust') + .duration(500) + .EUt(25) + + //#endregion + + + + + + + + + + + + + + + /* // Удаление рецептов связанных с Primitive Blast Furnace event.remove({id: 'gtceu:arc_furnace/arc_primitive_blast_furnace'}) event.remove({id: 'gtceu:macerator/macerate_primitive_blast_furnace'}) @@ -380,5 +451,5 @@ const registerGTCEURecipes = (event) => { // Latex -> Sticky Resin event.recipes.tfc.pot('tfc:powder/sulfur', Fluid.of('gtceu:latex', 1000), 5000, 300) .itemOutput('gtceu:sticky_resin') - .id('tfg:pot/sticky_resin') + .id('tfg:pot/sticky_resin')*/ } \ 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 dba2d66e8..9b6df288b 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -68,7 +68,7 @@ ServerEvents.recipes(event => { registerTreeTapRecipes(event) registerSmallShipsRecipes(event) registerMinecraftRecipes(event) - // registerGTCEURecipes(event) + registerGTCEURecipes(event) registerCreateRecipes(event) // registerAE2Recipes(event) // registerAE2WTLibRecipes(event) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 325168ae8..dbfce2ac5 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -884,7 +884,13 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Земля event.remove({ id: 'ae2:entropy/cool/grass_block_dirt' }) - event.remove({ id: 'gtceu:macerator/dirt_from_bio_chaff' }) + + event.recipes.gtceu.centrifuge('dirt_from_bio_chaff') + .itemInputs('gtceu:bio_chaff') + .itemOutputs('tfc:dirt/loam') + .duration(300) + .EUt(4) + //#endregion @@ -935,10 +941,17 @@ const registerMinecraftRecipes = (event) => { //#endregion + //#region Выход: Стекло + event.recipes.gtceu.arc_furnace('glass_from_sand') + .itemInputs('#forge:sand') + .itemOutputs('2x minecraft:glass') + .duration(20) + .EUt(30) + //#endregion - + @@ -1302,13 +1315,6 @@ const registerMinecraftRecipes = (event) => { ]) // Стекло - event.recipes.gtceu.alloy_smelter('glass') - .itemInputs('#forge:dusts/glass') - .notConsumable('gtceu:block_casting_mold') - .itemOutputs('minecraft:glass') - .duration(120) - .EUt(16) - event.recipes.gtceu.arc_furnace('glass_from_sand') .itemInputs('#forge:sand') .itemOutputs('2x minecraft:glass') diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 0760f6d20..d3033d0de 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -898,89 +898,79 @@ const registerTFCRecipes = (event) => { //#region Камень - global.TFC_STONE_TYPES.forEach(stoneTypeName => { + global.TFC_STONE_TYPES.forEach(stone => { //#region Сырой камень // Сырой камень -> Сырой камень - event.recipes.gtceu.rock_breaker(`${stoneTypeName}_raw`) - .notConsumable(`tfc:rock/raw/${stoneTypeName}`) - .itemOutputs(`tfc:rock/raw/${stoneTypeName}`) + event.recipes.gtceu.rock_breaker(`${stone}_raw`) + .notConsumable(`tfc:rock/raw/${stone}`) + .itemOutputs(`tfc:rock/raw/${stone}`) .duration(16) .EUt(7) // Сырой камень -> Булыжник - event.recipes.gtceu.forge_hammer(`${stoneTypeName}_raw_to_cobble`) - .itemInputs(`tfc:rock/raw/${stoneTypeName}`) - .itemOutputs(`tfc:rock/cobble/${stoneTypeName}`) + event.recipes.gtceu.forge_hammer(`${stone}_raw_to_cobble`) + .itemInputs(`tfc:rock/raw/${stone}`) + .itemOutputs(`tfc:rock/cobble/${stone}`) .duration(10) .EUt(16) // Сырой камень -> Ступени - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_raw_stairs` }) + event.remove({ id: `tfc:crafting/rock/${stone}_raw_stairs` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_raw_to_stairs`) - .itemInputs(`tfc:rock/raw/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_raw_to_stairs`) + .itemInputs(`tfc:rock/raw/${stone}`) .circuit(0) - .itemOutputs(`tfc:rock/raw/${stoneTypeName}_stairs`) + .itemOutputs(`tfc:rock/raw/${stone}_stairs`) .duration(100) .EUt(8) // Сырой камень -> Плиты - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_raw_slab` }) + event.remove({ id: `tfc:crafting/rock/${stone}_raw_slab` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_raw_to_slab`) - .itemInputs(`tfc:rock/raw/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_raw_to_slab`) + .itemInputs(`tfc:rock/raw/${stone}`) .circuit(1) - .itemOutputs(`2x tfc:rock/raw/${stoneTypeName}_slab`) + .itemOutputs(`2x tfc:rock/raw/${stone}_slab`) .duration(100) .EUt(8) // Сырой камень -> Стена - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_raw_wall` }) + event.remove({ id: `tfc:crafting/rock/${stone}_raw_wall` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_raw_to_wall`) - .itemInputs(`tfc:rock/raw/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_raw_to_wall`) + .itemInputs(`tfc:rock/raw/${stone}`) .circuit(2) - .itemOutputs(`2x tfc:rock/raw/${stoneTypeName}_wall`) + .itemOutputs(`2x tfc:rock/raw/${stone}_wall`) .duration(100) .EUt(8) // ? -> Сырая нажимная пластина - event.shaped(`tfc:rock/pressure_plate/${stoneTypeName}`, [ - 'DCD', - 'BEB' + event.shaped(`tfc:rock/pressure_plate/${stone}`, [ + 'ABA', + 'CDC', + 'AEA' ], { - B: '#tfc:mortar', - C: '#forge:springs', - D: `tfc:brick/${stoneTypeName}`, - E: '#forge:dusts/redstone' - }).id(`tfc:crafting/rock/${stoneTypeName}_pressure_plate`) + A: '#forge:screws/wrought_iron', + B: '#tfc:hammers', + C: `tfc:rock/raw/${stone}_slab`, + D: '#forge:springs', + E: '#forge:tools/screwdrivers' + }).id(`tfc:crafting/rock/${stone}_pressure_plate`) - event.recipes.gtceu.assembler(`${stoneTypeName}_raw_pressure_plate`) - .itemInputs('4x #forge:springs', '#forge:dusts/redstone', `2x tfc:brick/${stoneTypeName}`) + event.recipes.gtceu.assembler(`${stone}_raw_pressure_plate`) + .itemInputs('#forge:springs', `2x tfc:rock/raw/${stone}_slab`) .circuit(0) - .inputFluids(Fluid.of('gtceu:concrete', 16)) - .itemOutputs(`4x tfc:rock/pressure_plate/${stoneTypeName}`) + .itemOutputs(`2x tfc:rock/pressure_plate/${stone}`) .duration(50) .EUt(2) // ? -> Сырая кнопка - event.shaped(`tfc:rock/button/${stoneTypeName}`, [ - 'BD', - 'EC', - 'BD' - ], { - B: '#tfc:mortar', - C: '#forge:small_springs', - D: `tfc:brick/${stoneTypeName}`, - E: '#forge:dusts/redstone' - }).id(`tfc:crafting/rock/${stoneTypeName}_button`) + event.remove({ id: `tfc:crafting/rock/${stone}_button` }) - event.recipes.gtceu.assembler(`${stoneTypeName}_raw_button`) - .itemInputs('4x #forge:small_springs', '#forge:dusts/redstone', `tfc:brick/${stoneTypeName}`) - .circuit(1) - .inputFluids(Fluid.of('gtceu:concrete', 8)) - .itemOutputs(`4x tfc:rock/button/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_raw_button`) + .itemInputs(`2x tfc:rock/pressure_plate/${stone}`) + .itemOutputs(`12x tfc:rock/button/${stone}`) .duration(50) .EUt(2) @@ -989,64 +979,64 @@ const registerTFCRecipes = (event) => { //#region Булыжник // Булыжник -> Булыжник - event.recipes.gtceu.rock_breaker(`${stoneTypeName}_cobble`) - .notConsumable(`tfc:rock/cobble/${stoneTypeName}`) - .itemOutputs(`tfc:rock/cobble/${stoneTypeName}`) + event.recipes.gtceu.rock_breaker(`${stone}_cobble`) + .notConsumable(`tfc:rock/cobble/${stone}`) + .itemOutputs(`tfc:rock/cobble/${stone}`) .duration(16) .EUt(7) // Булыжник -> Гравий - event.recipes.gtceu.forge_hammer(`${stoneTypeName}_cobble_to_gravel`) - .itemInputs(`tfc:rock/cobble/${stoneTypeName}`) - .itemOutputs(`tfc:rock/gravel/${stoneTypeName}`) + event.recipes.gtceu.forge_hammer(`${stone}_cobble_to_gravel`) + .itemInputs(`tfc:rock/cobble/${stone}`) + .itemOutputs(`tfc:rock/gravel/${stone}`) .duration(10) .EUt(16) // Камни -> Булыжник - event.shaped(`tfc:rock/cobble/${stoneTypeName}`, [ + event.shaped(`tfc:rock/cobble/${stone}`, [ 'ABA', 'BAB', 'ABA' ], { - A: `tfc:rock/loose/${stoneTypeName}`, + A: `tfc:rock/loose/${stone}`, B: '#tfc:mortar' - }).id(`tfc:crafting/rock/${stoneTypeName}_loose_rocks_to_cobble`) + }).id(`tfc:crafting/rock/${stone}_loose_rocks_to_cobble`) - event.recipes.gtceu.assembler(`${stoneTypeName}_loose_rocks_to_cobble`) - .itemInputs(`4x tfc:rock/loose/${stoneTypeName}`) + event.recipes.gtceu.assembler(`${stone}_loose_rocks_to_cobble`) + .itemInputs(`4x tfc:rock/loose/${stone}`) .circuit(0) .inputFluids(Fluid.of('gtceu:concrete', 72)) - .itemOutputs(`tfc:rock/cobble/${stoneTypeName}`) + .itemOutputs(`tfc:rock/cobble/${stone}`) .duration(50) .EUt(2) // Булыжник -> Ступени - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_cobble_stairs` }) + event.remove({ id: `tfc:crafting/rock/${stone}_cobble_stairs` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_cobble_to_stairs`) - .itemInputs(`tfc:rock/cobble/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_cobble_to_stairs`) + .itemInputs(`tfc:rock/cobble/${stone}`) .circuit(0) - .itemOutputs(`tfc:rock/cobble/${stoneTypeName}_stairs`) + .itemOutputs(`tfc:rock/cobble/${stone}_stairs`) .duration(100) .EUt(8) // Булыжник -> Плиты - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_cobble_slab` }) + event.remove({ id: `tfc:crafting/rock/${stone}_cobble_slab` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_cobble_to_slab`) - .itemInputs(`tfc:rock/cobble/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_cobble_to_slab`) + .itemInputs(`tfc:rock/cobble/${stone}`) .circuit(1) - .itemOutputs(`2x tfc:rock/cobble/${stoneTypeName}_slab`) + .itemOutputs(`2x tfc:rock/cobble/${stone}_slab`) .duration(100) .EUt(8) // Булыжник -> Стена - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_cobble_wall` }) + event.remove({ id: `tfc:crafting/rock/${stone}_cobble_wall` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_cobble_to_wall`) - .itemInputs(`tfc:rock/cobble/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_cobble_to_wall`) + .itemInputs(`tfc:rock/cobble/${stone}`) .circuit(2) - .itemOutputs(`2x tfc:rock/cobble/${stoneTypeName}_wall`) + .itemOutputs(`2x tfc:rock/cobble/${stone}_wall`) .duration(100) .EUt(8) @@ -1056,48 +1046,48 @@ const registerTFCRecipes = (event) => { //#region Гладкий // Сырой камень -> Гладкий - event.recipes.gtceu.laser_engraver(`raw_${stoneTypeName}_to_smooth`) - .itemInputs(`tfc:rock/raw/${stoneTypeName}`) + event.recipes.gtceu.laser_engraver(`raw_${stone}_to_smooth`) + .itemInputs(`tfc:rock/raw/${stone}`) .notConsumable('gtceu:glass_lens') - .itemOutputs(`tfc:rock/smooth/${stoneTypeName}`) + .itemOutputs(`tfc:rock/smooth/${stone}`) .duration(32) .EUt(100) // Укрепленный сырой камень -> Гладкий - event.recipes.gtceu.laser_engraver(`hardened_${stoneTypeName}_to_smooth`) - .itemInputs(`tfc:rock/hardened/${stoneTypeName}`) + event.recipes.gtceu.laser_engraver(`hardened_${stone}_to_smooth`) + .itemInputs(`tfc:rock/hardened/${stone}`) .notConsumable('gtceu:glass_lens') - .itemOutputs(`tfc:rock/smooth/${stoneTypeName}`) + .itemOutputs(`tfc:rock/smooth/${stone}`) .duration(32) .EUt(100) // Булыжник -> Ступени - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_smooth_stairs` }) + event.remove({ id: `tfc:crafting/rock/${stone}_smooth_stairs` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_smooth_to_stairs`) - .itemInputs(`tfc:rock/smooth/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_smooth_to_stairs`) + .itemInputs(`tfc:rock/smooth/${stone}`) .circuit(0) - .itemOutputs(`tfc:rock/smooth/${stoneTypeName}_stairs`) + .itemOutputs(`tfc:rock/smooth/${stone}_stairs`) .duration(100) .EUt(8) // Булыжник -> Плиты - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_smooth_slab` }) + event.remove({ id: `tfc:crafting/rock/${stone}_smooth_slab` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_smooth_to_slab`) - .itemInputs(`tfc:rock/smooth/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_smooth_to_slab`) + .itemInputs(`tfc:rock/smooth/${stone}`) .circuit(1) - .itemOutputs(`2x tfc:rock/smooth/${stoneTypeName}_slab`) + .itemOutputs(`2x tfc:rock/smooth/${stone}_slab`) .duration(100) .EUt(8) // Булыжник -> Стена - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_smooth_wall` }) + event.remove({ id: `tfc:crafting/rock/${stone}_smooth_wall` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_smooth_to_wall`) - .itemInputs(`tfc:rock/smooth/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_smooth_to_wall`) + .itemInputs(`tfc:rock/smooth/${stone}`) .circuit(2) - .itemOutputs(`2x tfc:rock/smooth/${stoneTypeName}_wall`) + .itemOutputs(`2x tfc:rock/smooth/${stone}_wall`) .duration(100) .EUt(8) @@ -1106,41 +1096,41 @@ const registerTFCRecipes = (event) => { //#region Кирпич // Кирпич -> Блок кирпичей - event.recipes.gtceu.assembler(`bricks_${stoneTypeName}`) - .itemInputs(`5x tfc:brick/${stoneTypeName}`) + event.recipes.gtceu.assembler(`bricks_${stone}`) + .itemInputs(`5x tfc:brick/${stone}`) .circuit(0) .inputFluids(Fluid.of('gtceu:concrete', 72)) - .itemOutputs(`4x tfc:rock/bricks/${stoneTypeName}`) + .itemOutputs(`4x tfc:rock/bricks/${stone}`) .duration(50) .EUt(2) // Блок кирпичей -> Ступени - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_bricks_stairs` }) + event.remove({ id: `tfc:crafting/rock/${stone}_bricks_stairs` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_bricks_to_stairs`) - .itemInputs(`tfc:rock/bricks/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_bricks_to_stairs`) + .itemInputs(`tfc:rock/bricks/${stone}`) .circuit(0) - .itemOutputs(`tfc:rock/bricks/${stoneTypeName}_stairs`) + .itemOutputs(`tfc:rock/bricks/${stone}_stairs`) .duration(100) .EUt(8) // Блок кирпичей -> Плиты - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_bricks_slab` }) + event.remove({ id: `tfc:crafting/rock/${stone}_bricks_slab` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_bricks_to_slab`) - .itemInputs(`tfc:rock/bricks/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_bricks_to_slab`) + .itemInputs(`tfc:rock/bricks/${stone}`) .circuit(1) - .itemOutputs(`2x tfc:rock/bricks/${stoneTypeName}_slab`) + .itemOutputs(`2x tfc:rock/bricks/${stone}_slab`) .duration(100) .EUt(8) // Блок кирпичей -> Стена - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_bricks_wall` }) + event.remove({ id: `tfc:crafting/rock/${stone}_bricks_wall` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_bricks_to_wall`) - .itemInputs(`tfc:rock/bricks/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_bricks_to_wall`) + .itemInputs(`tfc:rock/bricks/${stone}`) .circuit(2) - .itemOutputs(`2x tfc:rock/bricks/${stoneTypeName}_wall`) + .itemOutputs(`2x tfc:rock/bricks/${stone}_wall`) .duration(100) .EUt(8) @@ -1149,39 +1139,39 @@ const registerTFCRecipes = (event) => { //#region Потрескавшийся кирпич // Кирпич -> Потрескавшийся кирпич - event.recipes.gtceu.forge_hammer(`cracked_bricks_${stoneTypeName}`) - .itemInputs(`tfc:rock/bricks/${stoneTypeName}`) - .itemOutputs(`tfc:rock/cracked_bricks/${stoneTypeName}`) + event.recipes.gtceu.forge_hammer(`cracked_bricks_${stone}`) + .itemInputs(`tfc:rock/bricks/${stone}`) + .itemOutputs(`tfc:rock/cracked_bricks/${stone}`) .duration(25) .EUt(8) // Потрескавшийся кирпич -> Ступени - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_cracked_bricks_stairs` }) + event.remove({ id: `tfc:crafting/rock/${stone}_cracked_bricks_stairs` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_cracked_bricks_to_stairs`) - .itemInputs(`tfc:rock/cracked_bricks/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_cracked_bricks_to_stairs`) + .itemInputs(`tfc:rock/cracked_bricks/${stone}`) .circuit(0) - .itemOutputs(`tfc:rock/cracked_bricks/${stoneTypeName}_stairs`) + .itemOutputs(`tfc:rock/cracked_bricks/${stone}_stairs`) .duration(100) .EUt(8) // Потрескавшийся кирпич -> Плиты - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_cracked_bricks_slab` }) + event.remove({ id: `tfc:crafting/rock/${stone}_cracked_bricks_slab` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_cracked_bricks_to_slab`) - .itemInputs(`tfc:rock/cracked_bricks/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_cracked_bricks_to_slab`) + .itemInputs(`tfc:rock/cracked_bricks/${stone}`) .circuit(1) - .itemOutputs(`2x tfc:rock/cracked_bricks/${stoneTypeName}_slab`) + .itemOutputs(`2x tfc:rock/cracked_bricks/${stone}_slab`) .duration(100) .EUt(8) // Потрескавшийся кирпич -> Стена - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_cracked_bricks_wall` }) + event.remove({ id: `tfc:crafting/rock/${stone}_cracked_bricks_wall` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_cracked_bricks_to_wall`) - .itemInputs(`tfc:rock/cracked_bricks/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_cracked_bricks_to_wall`) + .itemInputs(`tfc:rock/cracked_bricks/${stone}`) .circuit(2) - .itemOutputs(`2x tfc:rock/cracked_bricks/${stoneTypeName}_wall`) + .itemOutputs(`2x tfc:rock/cracked_bricks/${stone}_wall`) .duration(100) .EUt(8) @@ -1190,58 +1180,58 @@ const registerTFCRecipes = (event) => { //#region Замшелый булыжник // Булыжник -> Замшелый булыжник - event.shaped(`tfc:rock/mossy_cobble/${stoneTypeName}`, [ + event.shaped(`tfc:rock/mossy_cobble/${stone}`, [ 'ABA', 'BAB', 'ABA' ], { - A: `tfc:rock/mossy_loose/${stoneTypeName}`, + A: `tfc:rock/mossy_loose/${stone}`, B: '#tfc:mortar' - }).id(`tfc:crafting/rock/${stoneTypeName}_mossy_loose_rocks_to_cobble`) + }).id(`tfc:crafting/rock/${stone}_mossy_loose_rocks_to_cobble`) - event.recipes.gtceu.assembler(`${stoneTypeName}_mossy_loose_rocks_to_mossy_cobble`) - .itemInputs(`4x tfc:rock/mossy_loose/${stoneTypeName}`) + event.recipes.gtceu.assembler(`${stone}_mossy_loose_rocks_to_mossy_cobble`) + .itemInputs(`4x tfc:rock/mossy_loose/${stone}`) .circuit(0) .inputFluids(Fluid.of('gtceu:concrete', 72)) - .itemOutputs(`tfc:rock/mossy_cobble/${stoneTypeName}`) + .itemOutputs(`tfc:rock/mossy_cobble/${stone}`) .duration(50) .EUt(2) - event.recipes.gtceu.assembler(`${stoneTypeName}_cobble_rocks_to_mossy_cobble`) - .itemInputs(`tfc:rock/cobble/${stoneTypeName}`, '#tfc:compost_greens_low') + event.recipes.gtceu.assembler(`${stone}_cobble_rocks_to_mossy_cobble`) + .itemInputs(`tfc:rock/cobble/${stone}`, '#tfc:compost_greens_low') .circuit(0) .inputFluids(Fluid.of('minecraft:water', 144)) - .itemOutputs(`tfc:rock/mossy_cobble/${stoneTypeName}`) + .itemOutputs(`tfc:rock/mossy_cobble/${stone}`) .duration(50) .EUt(2) // Замшелый булыжник -> Ступени - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_mossy_cobble_stairs` }) + event.remove({ id: `tfc:crafting/rock/${stone}_mossy_cobble_stairs` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_mossy_cobble_to_stairs`) - .itemInputs(`tfc:rock/mossy_cobble/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_mossy_cobble_to_stairs`) + .itemInputs(`tfc:rock/mossy_cobble/${stone}`) .circuit(0) - .itemOutputs(`tfc:rock/mossy_cobble/${stoneTypeName}_stairs`) + .itemOutputs(`tfc:rock/mossy_cobble/${stone}_stairs`) .duration(100) .EUt(8) //Замшелый булыжник -> Плиты - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_mossy_cobble_slab` }) + event.remove({ id: `tfc:crafting/rock/${stone}_mossy_cobble_slab` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_mossy_cobble_to_slab`) - .itemInputs(`tfc:rock/mossy_cobble/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_mossy_cobble_to_slab`) + .itemInputs(`tfc:rock/mossy_cobble/${stone}`) .circuit(1) - .itemOutputs(`2x tfc:rock/mossy_cobble/${stoneTypeName}_slab`) + .itemOutputs(`2x tfc:rock/mossy_cobble/${stone}_slab`) .duration(100) .EUt(8) // Замшелый булыжник -> Стена - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_mossy_cobble_wall` }) + event.remove({ id: `tfc:crafting/rock/${stone}_mossy_cobble_wall` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_mossy_cobble_to_wall`) - .itemInputs(`tfc:rock/mossy_cobble/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_mossy_cobble_to_wall`) + .itemInputs(`tfc:rock/mossy_cobble/${stone}`) .circuit(2) - .itemOutputs(`2x tfc:rock/mossy_cobble/${stoneTypeName}_wall`) + .itemOutputs(`2x tfc:rock/mossy_cobble/${stone}_wall`) .duration(100) .EUt(8) @@ -1250,41 +1240,41 @@ const registerTFCRecipes = (event) => { //#region Замшелый кирпич // Блок кирпичей -> Замшелый кирпич - event.recipes.gtceu.assembler(`mossy_bricks_${stoneTypeName}`) - .itemInputs(`tfc:rock/bricks/${stoneTypeName}`, '#tfc:compost_greens_low') + event.recipes.gtceu.assembler(`mossy_bricks_${stone}`) + .itemInputs(`tfc:rock/bricks/${stone}`, '#tfc:compost_greens_low') .circuit(0) .inputFluids(Fluid.of('minecraft:water', 144)) - .itemOutputs(`tfc:rock/mossy_bricks/${stoneTypeName}`) + .itemOutputs(`tfc:rock/mossy_bricks/${stone}`) .duration(50) .EUt(2) // Замшелый булыжник -> Ступени - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_mossy_bricks_stairs` }) + event.remove({ id: `tfc:crafting/rock/${stone}_mossy_bricks_stairs` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_mossy_bricks_to_stairs`) - .itemInputs(`tfc:rock/mossy_bricks/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_mossy_bricks_to_stairs`) + .itemInputs(`tfc:rock/mossy_bricks/${stone}`) .circuit(0) - .itemOutputs(`tfc:rock/mossy_bricks/${stoneTypeName}_stairs`) + .itemOutputs(`tfc:rock/mossy_bricks/${stone}_stairs`) .duration(100) .EUt(8) //Замшелый булыжник -> Плиты - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_mossy_bricks_slab` }) + event.remove({ id: `tfc:crafting/rock/${stone}_mossy_bricks_slab` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_mossy_bricks_to_slab`) - .itemInputs(`tfc:rock/mossy_bricks/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_mossy_bricks_to_slab`) + .itemInputs(`tfc:rock/mossy_bricks/${stone}`) .circuit(1) - .itemOutputs(`2x tfc:rock/mossy_bricks/${stoneTypeName}_slab`) + .itemOutputs(`2x tfc:rock/mossy_bricks/${stone}_slab`) .duration(100) .EUt(8) // Замшелый булыжник -> Стена - event.remove({ id: `tfc:crafting/rock/${stoneTypeName}_mossy_bricks_wall` }) + event.remove({ id: `tfc:crafting/rock/${stone}_mossy_bricks_wall` }) - event.recipes.gtceu.cutter(`${stoneTypeName}_mossy_bricks_to_wall`) - .itemInputs(`tfc:rock/mossy_bricks/${stoneTypeName}`) + event.recipes.gtceu.cutter(`${stone}_mossy_bricks_to_wall`) + .itemInputs(`tfc:rock/mossy_bricks/${stone}`) .circuit(2) - .itemOutputs(`2x tfc:rock/mossy_bricks/${stoneTypeName}_wall`) + .itemOutputs(`2x tfc:rock/mossy_bricks/${stone}_wall`) .duration(100) .EUt(8) @@ -1292,11 +1282,11 @@ const registerTFCRecipes = (event) => { //#region Укрепленный камень - event.recipes.gtceu.assembler(`hardened_${stoneTypeName}`) - .itemInputs(`5x tfc:rock/raw/${stoneTypeName}`) + event.recipes.gtceu.assembler(`hardened_${stone}`) + .itemInputs(`5x tfc:rock/raw/${stone}`) .circuit(0) .inputFluids(Fluid.of('gtceu:concrete', 72)) - .itemOutputs(`2x tfc:rock/hardened/${stoneTypeName}`) + .itemOutputs(`2x tfc:rock/hardened/${stone}`) .duration(250) .EUt(8) @@ -1304,11 +1294,11 @@ const registerTFCRecipes = (event) => { //#region Акведук - event.recipes.gtceu.assembler(`aqueduct_${stoneTypeName}`) - .itemInputs(`3x tfc:brick/${stoneTypeName}`) + event.recipes.gtceu.assembler(`aqueduct_${stone}`) + .itemInputs(`3x tfc:brick/${stone}`) .circuit(1) .inputFluids(Fluid.of('gtceu:concrete', 16)) - .itemOutputs(`tfc:rock/aqueduct/${stoneTypeName}`) + .itemOutputs(`tfc:rock/aqueduct/${stone}`) .duration(50) .EUt(2) @@ -1317,14 +1307,81 @@ const registerTFCRecipes = (event) => { //#region Резной кирпич // Блок кирпичей -> Резной кирпич - event.recipes.gtceu.laser_engraver(`chiseled_${stoneTypeName}`) - .itemInputs(`tfc:rock/bricks/${stoneTypeName}`) + event.recipes.gtceu.laser_engraver(`chiseled_${stone}`) + .itemInputs(`tfc:rock/bricks/${stone}`) .notConsumable('gtceu:glass_lens') - .itemOutputs(`tfc:rock/chiseled/${stoneTypeName}`) + .itemOutputs(`tfc:rock/chiseled/${stone}`) .duration(32) .EUt(100) //#endregion + + //#region Декрафт блоков камня в пыль + + // Сырой + event.recipes.gtceu.macerator(`raw_${stone}_to_dust`) + .itemInputs(`tfc:rock/raw/${stone}`) + .itemOutputs(`gtceu:${stone}_dust`) + .duration(4) + .EUt(75) + + // Булыжник + event.recipes.gtceu.macerator(`cobble_${stone}_to_dust`) + .itemInputs(`tfc:rock/cobble/${stone}`) + .itemOutputs(`gtceu:${stone}_dust`) + .duration(4) + .EUt(75) + + // Гладкий + event.recipes.gtceu.macerator(`smooth_${stone}_to_dust`) + .itemInputs(`tfc:rock/smooth/${stone}`) + .itemOutputs(`gtceu:${stone}_dust`) + .duration(4) + .EUt(75) + + // Кирпичи + event.recipes.gtceu.macerator(`bricks_${stone}_to_dust`) + .itemInputs(`tfc:rock/bricks/${stone}`) + .itemOutputs(`gtceu:${stone}_dust`) + .duration(4) + .EUt(75) + + // Потрескавшиеся кирпичи + event.recipes.gtceu.macerator(`cracked_bricks_${stone}_to_dust`) + .itemInputs(`tfc:rock/cracked_bricks/${stone}`) + .itemOutputs(`gtceu:${stone}_dust`) + .duration(4) + .EUt(75) + + // Замшелый булыжник + event.recipes.gtceu.macerator(`mossy_cobble_${stone}_to_dust`) + .itemInputs(`tfc:rock/mossy_cobble/${stone}`) + .itemOutputs(`gtceu:${stone}_dust`) + .duration(4) + .EUt(75) + + // Замшелый кирпич + event.recipes.gtceu.macerator(`mossy_bricks_${stone}_to_dust`) + .itemInputs(`tfc:rock/mossy_bricks/${stone}`) + .itemOutputs(`gtceu:${stone}_dust`) + .duration(4) + .EUt(75) + + // Резной кирпич + event.recipes.gtceu.macerator(`chiseled_${stone}_to_dust`) + .itemInputs(`tfc:rock/chiseled/${stone}`) + .itemOutputs(`gtceu:${stone}_dust`) + .duration(4) + .EUt(75) + + // Укрепленный + event.recipes.gtceu.macerator(`hardened_${stone}_to_dust`) + .itemInputs(`tfc:rock/hardened/${stone}`) + .itemOutputs(`2x gtceu:${stone}_dust`) + .duration(8) + .EUt(150) + + //#endregion }) //#endregion @@ -1578,22 +1635,41 @@ const registerTFCRecipes = (event) => { event.remove({ id: `tfc:crafting/wood/${wood}_encased_axle` }) event.remove({ id: `tfc:crafting/wood/${wood}_clutch` }) event.remove({ id: `tfc:crafting/wood/${wood}_gear_box` }) - event.remove({ id: `tfc:crafting/wood/${wood}_gear_box` }) event.remove({ id: `tfc:crafting/wood/${wood}_water_wheel` }) + + // Бревна -> Пиломатериалы + event.recipes.gtceu.cutter(`${wood}_lumber_from_log`) + .itemInputs(`#tfc:${wood}_logs`) + .itemOutputs(`16x tfc:wood/lumber/${wood}`) + .duration(400) + .EUt(10) + + // Доски -> Пиломатериалы + event.recipes.gtceu.cutter(`${wood}_lumber_from_planks`) + .itemInputs(`tfc:wood/planks/${wood}`) + .itemOutputs(`4x tfc:wood/lumber/${wood}`) + .duration(200) + .EUt(10) + + // Ступень -> Пиломатериалы + event.recipes.gtceu.cutter(`${wood}_lumber_from_stairs`) + .itemInputs(`tfc:wood/planks/${wood}_stairs`) + .itemOutputs(`3x tfc:wood/lumber/${wood}`) + .duration(200) + .EUt(10) + + // Плита -> Пиломатериалы + event.recipes.gtceu.cutter(`${wood}_lumber_from_slab`) + .itemInputs(`tfc:wood/planks/${wood}_slab`) + .itemOutputs(`2x tfc:wood/lumber/${wood}`) + .duration(200) + .EUt(10) + + }) //#endregion - - - event.remove({ id: `tfc:crafting/trip_hammer` }) - event.remove({ id: `tfc:crafting/windmill_blade` }) - event.remove({ id: `tfc:barrel/dye/bleach_windmill_blades` }) - - global.MINECRAFT_DYE_NAMES.forEach(dye => { - event.remove({ id: `tfc:barrel/dye/${dye}_windmill_blade` }) - }) - //#region Порошки event.remove({ id: 'tfc:quern/cryolite' }) @@ -1766,6 +1842,15 @@ const registerTFCRecipes = (event) => { //#endregion + + event.remove({ id: `tfc:crafting/trip_hammer` }) + event.remove({ id: `tfc:crafting/windmill_blade` }) + event.remove({ id: `tfc:barrel/dye/bleach_windmill_blades` }) + + global.MINECRAFT_DYE_NAMES.forEach(dye => { + event.remove({ id: `tfc:barrel/dye/${dye}_windmill_blade` }) + }) + /* // Доменная печь event.shaped('tfc:blast_furnace', [ @@ -1963,60 +2048,6 @@ const registerTFCRecipes = (event) => { .duration(128) .EUt(3) - - - //#region Фикс рецептов связанных с песком - event.recipes.gtceu.electrolyzer('sand_electrolysis') - .itemInputs('8x #forge:sand') - .itemOutputs('gtceu:silicon_dioxide_dust') - .duration(500) - .EUt(25) - - // Рецепты кварц. песка из песка - event.shaped('gtceu:quartz_sand_dust', [ - 'A', - 'B' - ], { - A: '#forge:sand', - B: '#forge:tools/mortars' - }).id('gtceu:shaped/quartz_sand') - - event.recipes.gtceu.macerator('quartz_sand_from_sand') - .itemInputs('#forge:sand') - .itemOutputs('gtceu:quartz_sand_dust') - .duration(30) - .EUt(2) - - - - // Удобрение в обычном миксере - event.recipes.gtceu.mixer('fertilizer') - .itemInputs( - '#tfc:dirt', - '2x #forge:dusts/wood', - '4x #forge:sand' - ) - .inputFluids(Fluid.of('minecraft:water', 1000)) - .itemOutputs('4x gtceu:fertilizer') - .duration(300) - .EUt(30) - - // Удобрение в create миксере - - event.recipes.gtceu.create_mixer('fertilizer') - .itemInputs( - '#tfc:dirt', - '2x #forge:dusts/wood', - '4x #forge:sand' - ) - .inputFluids(Fluid.of('minecraft:water', 1000)) - .itemOutputs('4x gtceu:fertilizer') - .duration(300) - .EUt(30) - .rpm(96) - - //#endregion - //#region Рецепты ковки слитков в GT машинах // Сырая крица -> Укрепленная крица diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 8cc4f0be2..9c51e2e6e 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -321,8 +321,8 @@ global.MINECRAFT_DISABLED_ITEMS = [ "minecraft:mangrove_planks", "minecraft:mangrove_propagule", "minecraft:mangrove_log", - "minecraft:mangrove_roots", - "minecraft:muddy_mangrove_roots", + // "minecraft:mangrove_roots", + // "minecraft:muddy_mangrove_roots", "minecraft:stripped_mangrove_log", "minecraft:stripped_mangrove_wood", "minecraft:mangrove_wood", @@ -353,6 +353,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:netherite_scrap', 'minecraft:suspicious_gravel', 'minecraft:stonecutter', + 'minecraft:gravel' /* // Other diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 89afe2a0e..65c48793f 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -406,109 +406,117 @@ global.TFC_DISABLED_ITEMS = [ 'tfc:ore/lignite', 'tfc:ore/halite', - // Wood TFC Shit - "tfc:wood/axle/acacia", - "tfc:wood/bladed_axle/acacia", - "tfc:wood/encased_axle/acacia", - "tfc:wood/clutch/acacia", - "tfc:wood/gear_box/acacia", - "tfc:wood/axle/ash", - "tfc:wood/bladed_axle/ash", - "tfc:wood/encased_axle/ash", - "tfc:wood/clutch/ash", - "tfc:wood/gear_box/ash", - "tfc:wood/axle/aspen", - "tfc:wood/bladed_axle/aspen", - "tfc:wood/encased_axle/aspen", - "tfc:wood/clutch/aspen", - "tfc:wood/gear_box/aspen", - "tfc:wood/axle/birch", - "tfc:wood/bladed_axle/birch", - "tfc:wood/encased_axle/birch", - "tfc:wood/clutch/birch", - "tfc:wood/gear_box/birch", - "tfc:wood/axle/blackwood", - "tfc:wood/bladed_axle/blackwood", - "tfc:wood/encased_axle/blackwood", - "tfc:wood/clutch/blackwood", - "tfc:wood/gear_box/blackwood", - "tfc:wood/axle/chestnut", - "tfc:wood/bladed_axle/chestnut", - "tfc:wood/encased_axle/chestnut", - "tfc:wood/clutch/chestnut", - "tfc:wood/gear_box/chestnut", - "tfc:wood/axle/douglas_fir", - "tfc:wood/bladed_axle/douglas_fir", - "tfc:wood/encased_axle/douglas_fir", - "tfc:wood/clutch/douglas_fir", - "tfc:wood/gear_box/douglas_fir", - "tfc:wood/axle/hickory", - "tfc:wood/bladed_axle/hickory", - "tfc:wood/encased_axle/hickory", - "tfc:wood/clutch/hickory", - "tfc:wood/gear_box/hickory", - "tfc:wood/axle/kapok", - "tfc:wood/bladed_axle/kapok", - "tfc:wood/encased_axle/kapok", - "tfc:wood/clutch/kapok", - "tfc:wood/gear_box/kapok", - "tfc:wood/axle/magrove", - "tfc:wood/bladed_axle/magrove", - "tfc:wood/encased_axle/magrove", - "tfc:wood/clutch/magrove", - "tfc:wood/gear_box/magrove", - "tfc:wood/axle/maple", - "tfc:wood/bladed_axle/maple", - "tfc:wood/encased_axle/maple", - "tfc:wood/clutch/maple", - "tfc:wood/gear_box/maple", - "tfc:wood/axle/oak", - "tfc:wood/bladed_axle/oak", - "tfc:wood/encased_axle/oak", - "tfc:wood/clutch/oak", - "tfc:wood/gear_box/oak", - "tfc:wood/axle/palm", - "tfc:wood/bladed_axle/palm", - "tfc:wood/encased_axle/palm", - "tfc:wood/clutch/palm", - "tfc:wood/gear_box/palm", - "tfc:wood/axle/pine", - "tfc:wood/bladed_axle/pine", - "tfc:wood/encased_axle/pine", - "tfc:wood/clutch/pine", - "tfc:wood/gear_box/pine", - "tfc:wood/axle/rosewood", - "tfc:wood/bladed_axle/rosewood", - "tfc:wood/encased_axle/rosewood", - "tfc:wood/clutch/rosewood", - "tfc:wood/gear_box/rosewood", - "tfc:wood/axle/sequoia", - "tfc:wood/bladed_axle/sequoia", - "tfc:wood/encased_axle/sequoia", - "tfc:wood/clutch/sequoia", - "tfc:wood/gear_box/sequoia", - "tfc:wood/axle/spruce", - "tfc:wood/bladed_axle/spruce", - "tfc:wood/encased_axle/spruce", - "tfc:wood/clutch/spruce", - "tfc:wood/gear_box/spruce", - "tfc:wood/axle/sycamore", - "tfc:wood/bladed_axle/sycamore", - "tfc:wood/encased_axle/sycamore", - "tfc:wood/clutch/sycamore", - "tfc:wood/gear_box/sycamore", - "tfc:wood/axle/white_cedar", - "tfc:wood/bladed_axle/white_cedar", - "tfc:wood/encased_axle/white_cedar", - "tfc:wood/clutch/white_cedar", - "tfc:wood/gear_box/white_cedar", - "tfc:wood/axle/willow", - "tfc:wood/bladed_axle/willow", - "tfc:wood/encased_axle/willow", - "tfc:wood/clutch/willow", - "tfc:wood/gear_box/willow", + // Axles + 'tfc:wood/axle/acacia', + 'tfc:wood/axle/ash', + 'tfc:wood/axle/aspen', + 'tfc:wood/axle/birch', + 'tfc:wood/axle/blackwood', + 'tfc:wood/axle/chestnut', + 'tfc:wood/axle/douglas_fir', + 'tfc:wood/axle/hickory', + 'tfc:wood/axle/kapok', + 'tfc:wood/axle/mangrove', + 'tfc:wood/axle/maple', + 'tfc:wood/axle/oak', + 'tfc:wood/axle/palm', + 'tfc:wood/axle/pine', + 'tfc:wood/axle/rosewood', + 'tfc:wood/axle/sequoia', + 'tfc:wood/axle/spruce', + 'tfc:wood/axle/sycamore', + 'tfc:wood/axle/white_cedar', + 'tfc:wood/axle/willow', - // Water Wheels + // Bladed Axles + 'tfc:wood/bladed_axle/acacia', + 'tfc:wood/bladed_axle/ash', + 'tfc:wood/bladed_axle/aspen', + 'tfc:wood/bladed_axle/birch', + 'tfc:wood/bladed_axle/blackwood', + 'tfc:wood/bladed_axle/chestnut', + 'tfc:wood/bladed_axle/douglas_fir', + 'tfc:wood/bladed_axle/hickory', + 'tfc:wood/bladed_axle/kapok', + 'tfc:wood/bladed_axle/mangrove', + 'tfc:wood/bladed_axle/maple', + 'tfc:wood/bladed_axle/oak', + 'tfc:wood/bladed_axle/palm', + 'tfc:wood/bladed_axle/pine', + 'tfc:wood/bladed_axle/rosewood', + 'tfc:wood/bladed_axle/sequoia', + 'tfc:wood/bladed_axle/spruce', + 'tfc:wood/bladed_axle/sycamore', + 'tfc:wood/bladed_axle/white_cedar', + 'tfc:wood/bladed_axle/willow', + + // Encased Axles + 'tfc:wood/encased_axle/acacia', + 'tfc:wood/encased_axle/ash', + 'tfc:wood/encased_axle/aspen', + 'tfc:wood/encased_axle/birch', + 'tfc:wood/encased_axle/blackwood', + 'tfc:wood/encased_axle/chestnut', + 'tfc:wood/encased_axle/douglas_fir', + 'tfc:wood/encased_axle/hickory', + 'tfc:wood/encased_axle/kapok', + 'tfc:wood/encased_axle/mangrove', + 'tfc:wood/encased_axle/maple', + 'tfc:wood/encased_axle/oak', + 'tfc:wood/encased_axle/palm', + 'tfc:wood/encased_axle/pine', + 'tfc:wood/encased_axle/rosewood', + 'tfc:wood/encased_axle/sequoia', + 'tfc:wood/encased_axle/spruce', + 'tfc:wood/encased_axle/sycamore', + 'tfc:wood/encased_axle/white_cedar', + 'tfc:wood/encased_axle/willow', + + // Clutches + 'tfc:wood/clutch/acacia', + 'tfc:wood/clutch/ash', + 'tfc:wood/clutch/aspen', + 'tfc:wood/clutch/birch', + 'tfc:wood/clutch/blackwood', + 'tfc:wood/clutch/chestnut', + 'tfc:wood/clutch/douglas_fir', + 'tfc:wood/clutch/hickory', + 'tfc:wood/clutch/kapok', + 'tfc:wood/clutch/mangrove', + 'tfc:wood/clutch/maple', + 'tfc:wood/clutch/oak', + 'tfc:wood/clutch/palm', + 'tfc:wood/clutch/pine', + 'tfc:wood/clutch/rosewood', + 'tfc:wood/clutch/sequoia', + 'tfc:wood/clutch/spruce', + 'tfc:wood/clutch/sycamore', + 'tfc:wood/clutch/white_cedar', + 'tfc:wood/clutch/willow', + + // Gear Boxes + 'tfc:wood/gear_box/acacia', + 'tfc:wood/gear_box/ash', + 'tfc:wood/gear_box/aspen', + 'tfc:wood/gear_box/birch', + 'tfc:wood/gear_box/blackwood', + 'tfc:wood/gear_box/chestnut', + 'tfc:wood/gear_box/douglas_fir', + 'tfc:wood/gear_box/hickory', + 'tfc:wood/gear_box/kapok', + 'tfc:wood/gear_box/mangrove', + 'tfc:wood/gear_box/maple', + 'tfc:wood/gear_box/oak', + 'tfc:wood/gear_box/palm', + 'tfc:wood/gear_box/pine', + 'tfc:wood/gear_box/rosewood', + 'tfc:wood/gear_box/sequoia', + 'tfc:wood/gear_box/spruce', + 'tfc:wood/gear_box/sycamore', + 'tfc:wood/gear_box/white_cedar', + 'tfc:wood/gear_box/willow', + + // Water Wheels 'tfc:wood/water_wheel/acacia', 'tfc:wood/water_wheel/ash', 'tfc:wood/water_wheel/aspen', @@ -530,6 +538,28 @@ global.TFC_DISABLED_ITEMS = [ 'tfc:wood/water_wheel/white_cedar', 'tfc:wood/water_wheel/willow', + // Boat + 'tfc:wood/boat/acacia', + 'tfc:wood/boat/ash', + 'tfc:wood/boat/aspen', + 'tfc:wood/boat/birch', + 'tfc:wood/boat/blackwood', + 'tfc:wood/boat/chestnut', + 'tfc:wood/boat/douglas_fir', + 'tfc:wood/boat/hickory', + 'tfc:wood/boat/kapok', + 'tfc:wood/boat/mangrove', + 'tfc:wood/boat/maple', + 'tfc:wood/boat/oak', + 'tfc:wood/boat/palm', + 'tfc:wood/boat/pine', + 'tfc:wood/boat/rosewood', + 'tfc:wood/boat/sequoia', + 'tfc:wood/boat/spruce', + 'tfc:wood/boat/sycamore', + 'tfc:wood/boat/white_cedar', + 'tfc:wood/boat/willow', + // Windmill Blades "tfc:windmill_blade", "tfc:orange_windmill_blade", @@ -743,8 +773,7 @@ global.METAL_TO_SPECS = { global.ORE_CHUNKS_GEN, global.PART_GEN, global.TFC_SMALL_NATIVE_ORE_GEN - ], - isGTDup: true + ] }, copper: { @@ -766,8 +795,7 @@ global.METAL_TO_SPECS = { global.GT_TOOL_GEN, global.UTILITY_GEN, global.TFC_SMALL_NATIVE_ORE_GEN - ], - isGTDup: true + ] }, bismuth: {