diff --git a/kubejs/assets/emi/recipe/filters/categories.json b/kubejs/assets/emi/recipe/filters/categories.json index 00dad3f3c..285a39850 100644 --- a/kubejs/assets/emi/recipe/filters/categories.json +++ b/kubejs/assets/emi/recipe/filters/categories.json @@ -32,6 +32,9 @@ }, { "id": "/emi:/crafting/repairing/[^*]+/" + }, + { + "id": "/emi:/grindstone/repairing/minecraft/[^*]+/" } ] } \ No newline at end of file diff --git a/kubejs/jsconfig.json b/kubejs/jsconfig.json deleted file mode 100644 index e2acac6af..000000000 --- a/kubejs/jsconfig.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "compilerOptions": { - "lib": [ - "ES5", - "ES2015" - ], - "rootDirs": [ - "probe/generated", - "probe/user", - "server_scripts", - "startup_scripts", - "client_scripts" - ], - "target": "ES2015" - } -} \ No newline at end of file diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 2ddee0415..c8c3df8c2 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -2,6 +2,101 @@ const registerFirmaLifeRecipes = (event) => { + //#region Удаление других рецептов + + event.remove({ id: 'firmalife:crafting/compost_tumbler' }) + event.remove({ id: 'firmalife:crafting/pumping_station' }) + + // - Chromium + + // Ingot + event.remove({ id: 'firmalife:casting/chromium_ingot' }) + event.remove({ id: 'firmalife:casting/chromium_ingot_fire' }) + event.remove({ id: 'firmalife:heating/metal/chromium_ingot' }) + + // Double Ingot + event.remove({ id: 'firmalife:welding/chromium_double_ingot' }) + event.remove({ id: 'firmalife:heating/metal/chromium_double_ingot' }) + + // Sheet + event.remove({ id: 'firmalife:anvil/chromium_sheet' }) + event.remove({ id: 'firmalife:heating/metal/chromium_sheet' }) + + // Double Sheet + event.remove({ id: 'firmalife:welding/chromium_double_sheet' }) + event.remove({ id: 'firmalife:heating/metal/chromium_double_sheet' }) + + // Rod + event.remove({ id: 'firmalife:anvil/chromium_rod' }) + event.remove({ id: 'firmalife:heating/metal/chromium_rod' }) + + // Ores + event.remove({ id: 'firmalife:heating/ore/small_chromite' }) + event.remove({ id: 'firmalife:heating/ore/poor_chromite' }) + event.remove({ id: 'firmalife:heating/ore/normal_chromite' }) + event.remove({ id: 'firmalife:heating/ore/rich_chromite' }) + + // - Stainless Steel + + // Ingot + event.remove({ id: 'firmalife:casting/stainless_steel_ingot' }) + event.remove({ id: 'firmalife:casting/stainless_steel_ingot_fire' }) + event.remove({ id: 'firmalife:heating/metal/stainless_steel_ingot' }) + + // Double Ingot + event.remove({ id: 'firmalife:welding/stainless_steel_double_ingot' }) + event.remove({ id: 'firmalife:heating/metal/stainless_steel_double_ingot' }) + + // Sheet + event.remove({ id: 'firmalife:anvil/stainless_steel_sheet' }) + event.remove({ id: 'firmalife:heating/metal/stainless_steel_sheet' }) + + // Double Sheet + event.remove({ id: 'firmalife:welding/stainless_steel_double_sheet' }) + event.remove({ id: 'firmalife:heating/metal/stainless_steel_double_sheet' }) + + // Rod + event.remove({ id: 'firmalife:anvil/stainless_steel_rod' }) + event.remove({ id: 'firmalife:heating/metal/stainless_steel_rod' }) + + //#endregion + + // Декрафт Jag Lid + event.recipes.tfc.heating('tfc:jar_lid', 230) + .resultFluid(Fluid.of('gtceu:tin', 9)) + .id(`tfc:heating/jar_lid`) + + // Pie Pan + event.recipes.tfc.anvil('4x firmalife:pie_pan', '#forge:plates/wrought_iron', ["hit_last", "hit_second_last", "draw_third_last"]) + .tier(3) + .id('firmalife:anvil/pie_pan') + + // Jarring Station + event.shaped('firmalife:jarring_station', [ + 'A A', + 'BBB' + ], { + A: '#forge:plates/wrought_iron', + B: 'firmalife:treated_lumber' + }).id('firmalife:crafting/jarring_station') + + // Vat + event.shaped('firmalife:vat', [ + 'A A', + 'BAB' + ], { + A: '#forge:plates/wrought_iron', + B: 'firmalife:beeswax' + }).id('firmalife:crafting/vat') + + // Jar Lid + event.recipes.gtceu.assembler(`tfg:firmalife/jar_lid`) + .itemInputs('#forge:ingots/tin') + .circuit(7) + .itemOutputs('16x tfc:jar_lid') + .duration(50) + .EUt(7) + //#region Рецепты теплиц //#region Медная @@ -185,93 +280,19 @@ const registerFirmaLifeRecipes = (event) => { //#endregion - //#region Удаление других рецептов + //#region Укрепленное стекло - event.remove({ id: 'firmalife:crafting/compost_tumbler' }) - event.remove({ id: 'firmalife:crafting/pumping_station' }) + event.shaped('firmalife:reinforced_glass', [ + 'AB' + ], { + A: '#tfc:saws', + B: 'gtceu:tempered_glass' + }).id('tfg:shaped/reinforced_glass') - // - Chromium - - // Ingot - event.remove({ id: 'firmalife:casting/chromium_ingot' }) - event.remove({ id: 'firmalife:casting/chromium_ingot_fire' }) - event.remove({ id: 'firmalife:heating/metal/chromium_ingot' }) - - // Double Ingot - event.remove({ id: 'firmalife:welding/chromium_double_ingot' }) - event.remove({ id: 'firmalife:heating/metal/chromium_double_ingot' }) - - // Sheet - event.remove({ id: 'firmalife:anvil/chromium_sheet' }) - event.remove({ id: 'firmalife:heating/metal/chromium_sheet' }) - - // Double Sheet - event.remove({ id: 'firmalife:welding/chromium_double_sheet' }) - event.remove({ id: 'firmalife:heating/metal/chromium_double_sheet' }) - - // Rod - event.remove({ id: 'firmalife:anvil/chromium_rod' }) - event.remove({ id: 'firmalife:heating/metal/chromium_rod' }) - - // Ores - event.remove({ id: 'firmalife:heating/ore/small_chromite' }) - event.remove({ id: 'firmalife:heating/ore/poor_chromite' }) - event.remove({ id: 'firmalife:heating/ore/normal_chromite' }) - event.remove({ id: 'firmalife:heating/ore/rich_chromite' }) - - // - Stainless Steel - - // Ingot - event.remove({ id: 'firmalife:casting/stainless_steel_ingot' }) - event.remove({ id: 'firmalife:casting/stainless_steel_ingot_fire' }) - event.remove({ id: 'firmalife:heating/metal/stainless_steel_ingot' }) - - // Double Ingot - event.remove({ id: 'firmalife:welding/stainless_steel_double_ingot' }) - event.remove({ id: 'firmalife:heating/metal/stainless_steel_double_ingot' }) - - // Sheet - event.remove({ id: 'firmalife:anvil/stainless_steel_sheet' }) - event.remove({ id: 'firmalife:heating/metal/stainless_steel_sheet' }) - - // Double Sheet - event.remove({ id: 'firmalife:welding/stainless_steel_double_sheet' }) - event.remove({ id: 'firmalife:heating/metal/stainless_steel_double_sheet' }) - - // Rod - event.remove({ id: 'firmalife:anvil/stainless_steel_rod' }) - event.remove({ id: 'firmalife:heating/metal/stainless_steel_rod' }) + generateCutterRecipe(event, '3x gtceu:tempered_glass', null, '8x firmalife:reinforced_glass', 100, 7, 'reinforced_glass') //#endregion - // Декрафт Jag Lid - event.recipes.tfc.heating('tfc:jar_lid', 230) - .resultFluid(Fluid.of('gtceu:tin', 9)) - .id(`tfc:heating/jar_lid`) - - // Pie Pan - event.recipes.tfc.anvil('4x firmalife:pie_pan', '#forge:plates/wrought_iron', ["hit_last", "hit_second_last", "draw_third_last"]) - .tier(3) - .id('firmalife:anvil/pie_pan') - - // Jarring Station - event.shaped('firmalife:jarring_station', [ - 'A A', - 'BBB' - ], { - A: '#forge:plates/wrought_iron', - B: 'firmalife:treated_lumber' - }).id('firmalife:crafting/jarring_station') - - // Vat - event.shaped('firmalife:vat', [ - 'A A', - 'BAB' - ], { - A: '#forge:plates/wrought_iron', - B: 'firmalife:beeswax' - }).id('firmalife:crafting/vat') - //#region Рецепты электрической теплицы // Дерево @@ -309,16 +330,4 @@ const registerFirmaLifeRecipes = (event) => { }) //#endregion -} - -/* - -event.shaped('', [ - '' - ], { - A: '', - B: '', - C: '' - }).id() - -*/ \ No newline at end of file +} \ No newline at end of file diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 26ced9c3b..60d66a94b 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -70,6 +70,7 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Булыжник плита event.remove({ id: 'minecraft:cobblestone_slab' }) + event.remove({ id: 'gtceu:shaped/cobblestone_slab_saw' }) event.remove({ id: 'minecraft:cobblestone_slab_from_cobblestone_stonecutting' }) //#endregion @@ -99,6 +100,7 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Каменные кирпичи плита event.remove({ id: 'minecraft:stone_brick_slab' }) + event.remove({ id: 'gtceu:shaped/stone_brick_slab_saw' }) event.remove({ id: 'minecraft:stone_brick_slab_from_stone_stonecutting' }) event.remove({ id: 'minecraft:stone_brick_slab_from_stone_bricks_stonecutting' }) @@ -611,12 +613,9 @@ const registerMinecraftRecipes = (event) => { event.remove({ id: 'minecraft:coal_from_smelting_coal_ore' }) event.remove({ id: 'minecraft:coal_from_smelting_deepslate_coal_ore' }) + event.remove({ id: 'minecraft:coal_from_blasting_coal_ore' }) event.remove({ id: 'minecraft:coal_from_blasting_deepslate_coal_ore' }) - event.remove({ id: 'ad_astra:recipes/coal_from_smelting_venus_coal_ore' }) - event.remove({ id: 'ad_astra:recipes/coal_from_blasting_venus_coal_ore' }) - event.remove({ id: 'ad_astra:recipes/coal_from_smelting_glacio_coal_ore' }) - event.remove({ id: 'ad_astra:recipes/coal_from_blasting_glacio_coal_ore' }) //#endregion @@ -624,10 +623,9 @@ const registerMinecraftRecipes = (event) => { event.remove({ id: 'minecraft:copper_ingot_from_smelting_copper_ore' }) event.remove({ id: 'minecraft:copper_ingot_from_smelting_deepslate_copper_ore' }) - event.remove({ id: 'ad_astra:recipes/copper_ingot_from_smelting_glacio_copper_ore' }) + event.remove({ id: 'minecraft:copper_ingot_from_blasting_copper_ore' }) event.remove({ id: 'minecraft:copper_ingot_from_blasting_deepslate_copper_ore' }) - event.remove({ id: 'ad_astra:recipes/copper_ingot_from_blasting_glacio_copper_ore' }) //#endregion @@ -635,16 +633,9 @@ const registerMinecraftRecipes = (event) => { event.remove({ id: 'minecraft:iron_ingot_from_smelting_iron_ore' }) event.remove({ id: 'minecraft:iron_ingot_from_smelting_deepslate_iron_ore' }) + event.remove({ id: 'minecraft:iron_ingot_from_blasting_iron_ore' }) event.remove({ id: 'minecraft:iron_ingot_from_blasting_deepslate_iron_ore' }) - event.remove({ id: 'ad_astra:recipes/iron_ingot_from_smelting_moon_iron_ore' }) - event.remove({ id: 'ad_astra:recipes/iron_ingot_from_blasting_moon_iron_ore' }) - event.remove({ id: 'ad_astra:recipes/iron_ingot_from_smelting_mercury_iron_ore' }) - event.remove({ id: 'ad_astra:recipes/iron_ingot_from_blasting_mercury_iron_ore' }) - event.remove({ id: 'ad_astra:recipes/iron_ingot_from_smelting_mars_iron_ore' }) - event.remove({ id: 'ad_astra:recipes/iron_ingot_from_blasting_mars_iron_ore' }) - event.remove({ id: 'ad_astra:recipes/iron_ingot_from_smelting_glacio_iron_ore' }) - event.remove({ id: 'ad_astra:recipes/iron_ingot_from_blasting_glacio_iron_ore' }) //#endregion @@ -652,10 +643,9 @@ const registerMinecraftRecipes = (event) => { event.remove({ id: 'minecraft:lapis_lazuli_from_smelting_lapis_ore' }) event.remove({ id: 'minecraft:lapis_lazuli_from_smelting_deepslate_lapis_ore' }) - event.remove({ id: 'ad_astra:recipes/lapis_lazuli_from_smelting_glacio_lapis_ore' }) + event.remove({ id: 'minecraft:lapis_lazuli_from_blasting_lapis_ore' }) event.remove({ id: 'minecraft:lapis_lazuli_from_blasting_deepslate_lapis_ore' }) - event.remove({ id: 'ad_astra:recipes/lapis_lazuli_from_blasting_glacio_lapis_ore' }) //#endregion @@ -664,17 +654,17 @@ const registerMinecraftRecipes = (event) => { event.remove({ id: 'minecraft:gold_ingot_from_smelting_gold_ore' }) event.remove({ id: 'minecraft:gold_ingot_from_smelting_deepslate_gold_ore' }) event.remove({ id: 'minecraft:gold_ingot_from_smelting_nether_gold_ore' }) - event.remove({ id: 'ad_astra:recipes/gold_ingot_from_smelting_venus_gold_ore' }) + event.remove({ id: 'minecraft:gold_ingot_from_blasting_gold_ore' }) event.remove({ id: 'minecraft:gold_ingot_from_blasting_deepslate_gold_ore' }) event.remove({ id: 'minecraft:gold_ingot_from_blasting_nether_gold_ore' }) - event.remove({ id: 'ad_astra:recipes/gold_ingot_from_blasting_venus_gold_ore' }) //#endregion //#region Выход: Золотой самородок event.remove({ id: 'minecraft:gold_nugget_from_smelting' }) + event.remove({ id: 'minecraft:gold_nugget_from_blasting' }) //#endregion @@ -683,6 +673,7 @@ const registerMinecraftRecipes = (event) => { event.remove({ id: 'minecraft:redstone_from_smelting_redstone_ore' }) event.remove({ id: 'minecraft:redstone_from_smelting_deepslate_redstone_ore' }) + event.remove({ id: 'minecraft:redstone_from_blasting_redstone_ore' }) event.remove({ id: 'minecraft:redstone_from_blasting_deepslate_redstone_ore' }) @@ -692,6 +683,7 @@ const registerMinecraftRecipes = (event) => { event.remove({ id: 'minecraft:emerald_from_smelting_emerald_ore' }) event.remove({ id: 'minecraft:emerald_from_smelting_deepslate_emerald_ore' }) + event.remove({ id: 'minecraft:emerald_from_blasting_emerald_ore' }) event.remove({ id: 'minecraft:emerald_from_blasting_deepslate_emerald_ore' }) @@ -701,12 +693,9 @@ const registerMinecraftRecipes = (event) => { event.remove({ id: 'minecraft:diamond_from_smelting_diamond_ore' }) event.remove({ id: 'minecraft:diamond_from_smelting_deepslate_diamond_ore' }) - event.remove({ id: 'ad_astra:recipes/diamond_from_smelting_venus_diamond_ore' }) - event.remove({ id: 'ad_astra:recipes/diamond_from_smelting_mars_diamond_ore' }) + event.remove({ id: 'minecraft:diamond_from_blasting_diamond_ore' }) event.remove({ id: 'minecraft:diamond_from_blasting_deepslate_diamond_ore' }) - event.remove({ id: 'ad_astra:recipes/diamond_from_blasting_venus_diamond_ore' }) - event.remove({ id: 'ad_astra:recipes/diamond_from_blasting_mars_diamond_ore' }) //#endregion @@ -786,6 +775,7 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Гладкий песчанник ступень event.remove({ id: 'minecraft:smooth_sandstone_stairs' }) + event.remove({ id: 'gtceu:shaped/smooth_sandstone_slab_saw' }) event.remove({ id: 'minecraft:smooth_sandstone_stairs_from_smooth_sandstone_stonecutting' }) //#endregion @@ -864,6 +854,7 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Красный гладкий песчанник плита event.remove({ id: 'minecraft:smooth_red_sandstone_slab' }) + event.remove({ id: 'gtceu:shaped/red_sandstone_slab_saw' }) event.remove({ id: 'minecraft:smooth_red_sandstone_slab_from_smooth_red_sandstone_stonecutting' }) //#endregion @@ -898,7 +889,7 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Земля - event.remove({ id: 'ae2:entropy/cool/grass_block_dirt' }) + event.remove({ id: 'ae2:entropy/cool/grass_block_dirt' }) // TODO: Сделать с тфк землей event.recipes.gtceu.macerator('dirt_from_bio_chaff') .itemInputs('gtceu:bio_chaff') @@ -945,6 +936,7 @@ const registerMinecraftRecipes = (event) => { event.remove({ id: `gtceu:assembler/${wood}_fence_gate` }) event.remove({ id: `minecraft:${wood}_sign` }) event.remove({ id: `minecraft:${wood}_hanging_sign` }) + event.remove({ id: `gtceu:assembler/${wood}_sign` }) }); //#endregion @@ -1048,6 +1040,15 @@ const registerMinecraftRecipes = (event) => { //#endregion + //#region Выход: Бамбуковые доски + + event.shapeless('2x minecraft:bamboo_planks', [ + '#minecraft:bamboo_blocks', + '#tfc:saws' + ]).id('tfg:shapeless/bamboo_planks') + + //#endregion + //#region Красители // White @@ -1543,6 +1544,7 @@ const registerMinecraftRecipes = (event) => { //#endregion //#region Выход: Золотая нажимная плита + event.shaped('2x minecraft:light_weighted_pressure_plate', [ 'ABA', 'CDC', @@ -2603,10 +2605,10 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Элитра // Ну и херь я придумал - event.recipes.gtceu.assembler('tfg:elytra') + event.recipes.gtceu.assembler('tfg:minecraft/elytra') .itemInputs('6x #forge:plates/polyvinyl_butyral', '2x #forge:rings/titanium', '2x #forge:rods/titanium', '4x #forge:single_cables/aluminium') .circuit(32) - .itemOutputs(Item.of('minecraft:elytra', "{Damage:0,display:{Name:'{\"text\":\"Божественные крылья\",\"italic\":true}'}}")) + .itemOutputs(Item.of('minecraft:elytra', "{Damage:0,display:{Name:'{\"text\":\"Wings of Gods\",\"italic\":true}'}}")) .duration(1600) .EUt(666) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index a673d41b5..ab7b622a1 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -2818,6 +2818,36 @@ const registerTFCRecipes = (event) => { //#endregion + //#region Молды в ассемблере + + for (let i = 0; i < global.TFC_CLAY_TO_UNFIRED_MOLD_RECIPE_COMPONENTS.length; i++) { + + let element = global.TFC_CLAY_TO_UNFIRED_MOLD_RECIPE_COMPONENTS[i]; + + event.recipes.gtceu.macerator(`tfg:tfc/${element.name}`) + .itemInputs(element.input) + .circuit(i) + .itemOutputs(element.output) + .duration(450) + .EUt(2) + } + + + //#endregion + + //#region Стеклянные смеси в бутылки в ассемблере + + global.TFC_BATCH_TO_BOTTLE_ASSEMBLING_RECIPE_COMPONENTS.forEach(element => { + event.recipes.gtceu.alloy_smelter(`tfg:tfc/${element.name}`) + .itemInputs(element.input) + .notConsumable('gtceu:bottle_casting_mold') + .itemOutputs(element.output) + .duration(100) + .EUt(2) + }) + + //#endregion + // Другое event.remove({ id: `tfc:crafting/trip_hammer` }) event.remove({ id: `tfc:anvil/steel_pump` }) @@ -2842,10 +2872,42 @@ const registerTFCRecipes = (event) => { B: 'tfc:pumpkin' }) + // Lime + event.smelting('tfc:powder/lime', 'tfc:powder/flux') + .id('tfg:smelting/lime') + + // Kaolinite Clay + event.smelting('tfc:kaolin_clay', 'tfc:powder/kaolinite') + .id('tfg:smelting/kaolinite_clay') + // Fire Brick event.smelting('tfc:ceramic/fire_brick', 'gtceu:compressed_fireclay') .id('tfg:smelting/fireclay_brick') + // Lamp Glass + event.recipes.gtceu.alloy_smelter(`tfg:tfc/lamp_glass`) + .itemInputs('#tfc:glass_batches') + .notConsumable('tfg:unfinished_lamps') + .itemOutputs('tfc:lamp_glass') + .duration(100) + .EUt(2) + + // Glass lens + event.recipes.gtceu.alloy_smelter(`tfg:tfc/glass_lens`) + .itemInputs('tfc:silica_glass_batch') + .notConsumable('#forge:lenses') + .itemOutputs('tfc:lens') + .duration(100) + .EUt(2) + + // Empty Jar + event.recipes.gtceu.assember(`tfg:tfc/glass_jar`) + .itemInputs('#tfc:glass_batches_tier_2') + .circuit(2) + .itemOutputs('tfc:empty_jar') + .duration(100) + .EUt(2) + // Wool Yarn event.recipes.gtceu.macerator('macerate_wool') .itemInputs('#minecraft:wool') diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 57a0f64a7..1c9b75cb2 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -127,6 +127,7 @@ const registerTFCItemTags = (event) => { event.add('tfg:metal_bars', 'tfc:metal/bars/blue_steel') event.add('tfg:metal_bars', 'tfc:metal/bars/red_steel') + // Тэги для цепей event.add('tfg:metal_chains', 'tfc:metal/chain/bismuth_bronze') event.add('tfg:metal_chains', 'tfc:metal/chain/black_bronze') event.add('tfg:metal_chains', 'tfc:metal/chain/bronze') @@ -137,6 +138,17 @@ const registerTFCItemTags = (event) => { event.add('tfg:metal_chains', 'tfc:metal/chain/blue_steel') event.add('tfg:metal_chains', 'tfc:metal/chain/red_steel') + // Теги для незаконченных ламп + event.add('tfg:unfinished_lamps', 'tfc:metal/unfinished_lamp/bismuth_bronze') + event.add('tfg:unfinished_lamps', 'tfc:metal/unfinished_lamp/black_bronze') + event.add('tfg:unfinished_lamps', 'tfc:metal/unfinished_lamp/bronze') + event.add('tfg:unfinished_lamps', 'tfc:metal/unfinished_lamp/copper') + event.add('tfg:unfinished_lamps', 'tfc:metal/unfinished_lamp/wrought_iron') + event.add('tfg:unfinished_lamps', 'tfc:metal/unfinished_lamp/steel') + event.add('tfg:unfinished_lamps', 'tfc:metal/unfinished_lamp/black_steel') + event.add('tfg:unfinished_lamps', 'tfc:metal/unfinished_lamp/blue_steel') + event.add('tfg:unfinished_lamps', 'tfc:metal/unfinished_lamp/red_steel') + // Теги для кораллов event.add('tfc:corals', 'tfc:coral/tube_coral_fan') event.add('tfc:corals', 'tfc:coral/brain_coral_fan') diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 36e0a5ab5..9db38f627 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -752,6 +752,8 @@ global.TFC_WOOD_ITEM_TYPES_TO_WOOD_DUST = { '#tfcastikorcarts:plow': { name: 'plow', output: ['2x gtceu:wood_dust'] }, '#tfcastikorcarts:animal_cart': { name: 'animal_cart', output: ['2x gtceu:wood_dust'] }, '#tfcastikorcarts:supply_cart': { name: 'supply_cart', output: ['2x gtceu:wood_dust'] }, + '#firmalife:food_shelves': { name: 'food_shelves', output: ['2x gtceu:wood_dust'] }, + '#firmalife:hangers': { name: 'hangers', output: ['1x gtceu:wood_dust'] }, }; /** @@ -853,6 +855,48 @@ global.TFC_FURNACE_MOLD_RECIPE_COMPONENTS = [ { input: 'tfc:ceramic/unfired_spindle_head', output: 'tfc:ceramic/spindle_head', name: 'spindle_head' }, { input: 'tfc:ceramic/unfired_vessel', output: 'tfc:ceramic/vessel', name: 'vessel' }, { input: 'tfc:ceramic/unfired_large_vessel', output: 'tfc:ceramic/large_vessel', name: 'large_vessel' }, + { input: 'tfcchannelcasting:unfired_channel', output: 'tfcchannelcasting:channel', name: 'channel' }, + { input: 'tfcchannelcasting:unfired_mold_table', output: 'tfcchannelcasting:mold_table', name: 'mold_table' }, +]; + +global.TFC_CLAY_TO_UNFIRED_MOLD_RECIPE_COMPONENTS = [ + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_ingot_mold', name: 'ingot_mold' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_pickaxe_head_mold', name: 'pickaxe_head_mold' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_propick_head_mold', name: 'propick_head_mold' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_axe_head_mold', name: 'axe_head_mold' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_shovel_head_mold', name: 'shovel_head_mold' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_hoe_head_mold', name: 'hoe_head_mold' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_chisel_head_mold', name: 'chisel_head_mold' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_hammer_head_mold', name: 'hammer_head_mold' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_saw_blade_mold', name: 'saw_blade_mold' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_javelin_head_mold', name: 'javelin_head_mold' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_sword_blade_mold', name: 'sword_blade_mold' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_mace_head_mold', name: 'mace_head_mold' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_knife_blade_mold', name: 'knife_blade_mold' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_scythe_blade_mold', name: 'scythe_blade_mold' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_bell_mold', name: 'bell_mold' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_brick', name: 'brick' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_flower_pot', name: 'flower_pot' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_pan', name: 'pan' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_blowpipe', name: 'ceramic_blowpipe' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_bowl', name: 'bowl' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_jug', name: 'jug' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_pot', name: 'pot' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_spindle_head', name: 'spindle_head' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_vessel', name: 'vessel' }, + { input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_large_vessel', name: 'large_vessel' }, + { input: '5x tfc:fire_clay', output: 'tfc:ceramic/unfired_fire_ingot_mold', name: 'fire_ingot_mold' }, + { input: '5x tfc:fire_clay', output: 'tfc:ceramic/unfired_fire_brick', name: 'fire_brick' }, + { input: '5x tfc:fire_clay', output: 'tfc:ceramic/unfired_crucible', name: 'crucible' }, + { input: '5x tfc:fire_clay', output: 'tfcchannelcasting:unfired_channel', name: 'channel' }, + { input: '5x tfc:fire_clay', output: 'tfcchannelcasting:unfired_mold_table', name: 'mold_table' }, +]; + +global.TFC_BATCH_TO_BOTTLE_ASSEMBLING_RECIPE_COMPONENTS = [ + { input: 'tfc:silica_glass_batch', output: 'tfc:silica_glass_bottle', name: 'silica_glass_bottle' }, + { input: 'tfc:hematitic_glass_batch', output: 'tfc:hematitic_glass_bottle', name: 'hematitic_glass_bottle' }, + { input: 'tfc:olivine_glass_batch', output: 'tfc:olivine_glass_bottle', name: 'olivine_glass_bottle' }, + { input: 'tfc:volcanic_glass_batch', output: 'tfc:volcanic_glass_bottle', name: 'volcanic_glass_bottle' }, ]; global.TFC_FURNACE_MEAT_RECIPE_COMPONENTS = [