diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index 11b4e8059..cd8abe841 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -3,14 +3,9 @@ const registerAE2Recipes = (event) => { // Удаление рецептов мода - event.remove({ mod: 'ae2' }); + //event.remove({ mod: 'ae2' }); // crafting Table - // ae2:cable_anchor - event.shapeless(('ae2:cable_anchor'), [ - '#forge:ingots', - '#ae2:knife' - ]) // network tool event.shaped('ae2:network_tool', [ 'AB', @@ -130,6 +125,13 @@ const registerAE2Recipes = (event) => { C: 'ae2:logic_processor', D: '#forge:gems/fluix' }); + //'ae2:void_card' + event.shapeless('ae2:void_card', ['ae2:basic_card','ae2:calculation_processor']); + //'ae2:equal_distribution_card' + event.shapeless('ae2:equal_distribution_card', ['ae2:advanced_card','ae2:calculation_processor']); + //'ae2:energy_card' + event.shapeless('ae2:energy_card', ['ae2:advanced_card','2x ae2:dense_energy_cell'] + ); // Quartz Fixture event.shapeless(('ae2:quartz_fixture'), @@ -277,10 +279,6 @@ const registerAE2Recipes = (event) => { D: 'ae2:calculation_processor', E: 'ae2:charged_certus_quartz_crystal' }); - - // Очистка шаблона - //event.shapeless('ae2:blank_pattern', ['ae2:crafting_pattern']); - // P2P Tunnel event.shaped('2x ae2:me_p2p_tunnel', [ 'ABA', @@ -319,28 +317,6 @@ const registerAE2Recipes = (event) => { E: '#forge:plates/titanium' }); - // certus quartz cutting knife - event.shaped('ae2:certus_quartz_cutting_knife', [ - ' A', - 'BA ', - 'CC ' - ], { - A: '#tfc:can_be_lit_on_torch', - B: '#forge:rods/iron', - C: '#forge:gems/certus_quartz' - }); - - // nether quartz cutting knife' - event.shaped('ae2:nether_quartz_cutting_knife', [ - ' A', - 'BA ', - 'CC ' - ], { - A: '#tfc:can_be_lit_on_torch', - B: '#forge:rods/iron', - C: '#forge:gems/nether_quartz' - }); - // Spatial Pylon event.shaped('ae2:spatial_pylon', [ 'ABA', @@ -422,7 +398,9 @@ const registerAE2Recipes = (event) => { //cable pattern provider event.shapeless('ae2:pattern_provider', ['ae2:cable_pattern_provider']); event.shapeless('ae2:cable_pattern_provider', ['ae2:pattern_provider']); - + //toggle_bus + event.shapeless('ae2:toggle_bus', ['ae2:inverted_toggle_bus']); + event.shapeless('ae2:inverted_toggle_bus', ['ae2:toggle_bus']); // ME Annihilation Plane event.shaped('ae2:annihilation_plane', [ @@ -503,6 +481,19 @@ const registerAE2Recipes = (event) => { F: '#forge:plates/steel', G: 'ae2:engineering_processor' }); + + //matter cannon + event.shaped('ae2:matter_cannon',[ + 'AAB', + 'CD ', + 'A ' + ], { + A: '#forge:plates/steel', + B: 'ae2:formation_core', + C: 'ae2:cell_component_4k', + D: 'ae2:dense_energy_cell' + }); + //assembler //glass cable @@ -1584,6 +1575,45 @@ const registerAE2Recipes = (event) => { .duration(20) .EUt(7) }; + //paint ball + //greg dye + for (var i = 0; i < 16; i++) { + event.recipes.gtceu.chemical_bath(global.AE2_PAINTBALL[i]+'gtceudye') + .itemInputs('8x ae2:matter_ball') + .inputFluids(Fluid.of(global.GTCEU_LIQUID_DYE[i], 36)) + .itemOutputs(global.AE2_PAINTBALL[i]) + .duration(20) + .EUt(7) + }; + //tfc dye + for (var i = 0; i < 16; i++) { + event.recipes.gtceu.chemical_bath(global.AE2_PAINTBALL[i]+'tfcdye') + .itemInputs('8x ae2:matter_ball') + .inputFluids(Fluid.of(global.TFC_LIQUID_DYE[i], 125)) + .itemOutputs(global.AE2_PAINTBALL[i]) + .duration(20) + .EUt(7) + }; + + //lumen paint ball + //greg dye + for (var i = 0; i < 16; i++) { + event.recipes.gtceu.chemical_bath(global.AE2_LUMEN_PAINTBALL[i]+'gtceudye') + .itemInputs('8x ae2:matter_ball') + .inputFluids(Fluid.of(global.GTCEU_LIQUID_DYE[i], 36)) + .itemOutputs(global.AE2_LUMEN_PAINTBALL[i]) + .duration(20) + .EUt(7) + }; + //tfc dye + for (var i = 0; i < 16; i++) { + event.recipes.gtceu.chemical_bath(global.AE2_LUMEN_PAINTBALL[i]+'tfcdye') + .itemInputs('8x ae2:matter_ball') + .inputFluids(Fluid.of(global.TFC_LIQUID_DYE[i], 125)) + .itemOutputs(global.AE2_LUMEN_PAINTBALL[i]) + .duration(20) + .EUt(7) + }; // laser_engraver // Inscriber Silicon Press @@ -1619,8 +1649,10 @@ const registerAE2Recipes = (event) => { .EUt(116) // // -// НЕ ЗАБЫТЬ СДЕЛАТЬ FLUIX LENS ДЛЯ КРАФТА НИЖЕ (В 1 12 в крафте используется fluix lens) -// так же надеюсь ты не забыл сделать жидкости для истин кварц и fluix, для крафта fluix pearl, fluix glass cable, fluix plate +// НЕ ЗАБЫТЬ СДЕЛАТЬ FLUIX LENS ДЛЯ КРАФТА НИЖЕ +// (В 1 12 в крафте используется fluix lens) +// так же надеюсь ты не забыл сделать жидкости +//для истин кварц и fluix, для крафта fluix pearl, fluix glass cable, fluix plate // сделать роды для quartz fiber // mixer.autoclave. // Inscriber engineering Press @@ -1721,7 +1753,7 @@ const registerAE2Recipes = (event) => { .itemOutputs( 'ae2:view_cell') .duration(10) - .EUt(7) + .EUt(12) .cleanroom(CleanroomType.CLEANROOM) event.recipes.gtceu.packer('ae2:item_storage_cell_1k') .itemInputs( @@ -1730,7 +1762,7 @@ const registerAE2Recipes = (event) => { .itemOutputs( 'ae2:item_storage_cell_1k') .duration(10) - .EUt(7) + .EUt(12) .cleanroom(CleanroomType.CLEANROOM) event.recipes.gtceu.packer('ae2:item_storage_cell_4k') .itemInputs( @@ -1739,7 +1771,7 @@ const registerAE2Recipes = (event) => { .itemOutputs( 'ae2:item_storage_cell_4k') .duration(10) - .EUt(7) + .EUt(12) .cleanroom(CleanroomType.CLEANROOM) event.recipes.gtceu.packer('ae2:item_storage_cell_16k') .itemInputs( @@ -1748,7 +1780,7 @@ const registerAE2Recipes = (event) => { .itemOutputs( 'ae2:item_storage_cell_16k') .duration(10) - .EUt(7) + .EUt(12) .cleanroom(CleanroomType.CLEANROOM) event.recipes.gtceu.packer('ae2:item_storage_cell_64k') .itemInputs( @@ -1757,7 +1789,7 @@ const registerAE2Recipes = (event) => { .itemOutputs( 'ae2:item_storage_cell_64k') .duration(10) - .EUt(7) + .EUt(12) .cleanroom(CleanroomType.CLEANROOM) event.recipes.gtceu.packer('ae2:item_storage_cell_256k') .itemInputs( @@ -1766,7 +1798,7 @@ const registerAE2Recipes = (event) => { .itemOutputs( 'ae2:item_storage_cell_256k') .duration(10) - .EUt(7) + .EUt(12) .cleanroom(CleanroomType.CLEANROOM) event.recipes.gtceu.packer('ae2:fluid_storage_cell_1k') @@ -1776,7 +1808,7 @@ const registerAE2Recipes = (event) => { .itemOutputs( 'ae2:fluid_storage_cell_1k') .duration(10) - .EUt(7) + .EUt(12) .cleanroom(CleanroomType.CLEANROOM) event.recipes.gtceu.packer('ae2:fluid_storage_cell_4k') .itemInputs( @@ -1785,7 +1817,7 @@ const registerAE2Recipes = (event) => { .itemOutputs( 'ae2:fluid_storage_cell_4k') .duration(10) - .EUt(7) + .EUt(12) .cleanroom(CleanroomType.CLEANROOM) event.recipes.gtceu.packer('ae2:fluid_storage_cell_16k') .itemInputs( @@ -1794,7 +1826,7 @@ const registerAE2Recipes = (event) => { .itemOutputs( 'ae2:fluid_storage_cell_16k') .duration(10) - .EUt(7) + .EUt(12) .cleanroom(CleanroomType.CLEANROOM) event.recipes.gtceu.packer('ae2:fluid_storage_cell_64k') .itemInputs( @@ -1803,7 +1835,7 @@ const registerAE2Recipes = (event) => { .itemOutputs( 'ae2:fluid_storage_cell_64k') .duration(10) - .EUt(7) + .EUt(12) .cleanroom(CleanroomType.CLEANROOM) event.recipes.gtceu.packer('ae2:fluid_storage_cell_256k') .itemInputs( @@ -1812,7 +1844,7 @@ const registerAE2Recipes = (event) => { .itemOutputs( 'ae2:fluid_storage_cell_256k') .duration(10) - .EUt(7) + .EUt(12) .cleanroom(CleanroomType.CLEANROOM) event.recipes.gtceu.packer('ae2:spatial_storage_cell_2') @@ -1822,7 +1854,7 @@ const registerAE2Recipes = (event) => { .itemOutputs( 'ae2:spatial_storage_cell_2') .duration(10) - .EUt(7) + .EUt(12) .cleanroom(CleanroomType.CLEANROOM) event.recipes.gtceu.packer('ae2:spatial_storage_cell_16') .itemInputs( @@ -1831,7 +1863,7 @@ const registerAE2Recipes = (event) => { .itemOutputs( 'ae2:spatial_storage_cell_16') .duration(10) - .EUt(7) + .EUt(12) .cleanroom(CleanroomType.CLEANROOM) event.recipes.gtceu.packer('ae2:spatial_storage_cell_128') .itemInputs( @@ -1840,7 +1872,7 @@ const registerAE2Recipes = (event) => { .itemOutputs( 'ae2:spatial_storage_cell_128') .duration(10) - .EUt(7) + .EUt(12) .cleanroom(CleanroomType.CLEANROOM) event.recipes.gtceu.packer('ae2:view_cell_back') @@ -1851,7 +1883,7 @@ const registerAE2Recipes = (event) => { 'ae2:item_cell_housing', '#forge:gems/certus_quartz') .duration(10) - .EUt(7) + .EUt(12) event.recipes.gtceu.packer('ae2:item_storage_cell_1k_back') .itemInputs( @@ -1860,7 +1892,7 @@ const registerAE2Recipes = (event) => { 'ae2:item_cell_housing', 'ae2:cell_component_1k') .duration(10) - .EUt(7) + .EUt(12) event.recipes.gtceu.packer('ae2:item_storage_cell_4k_back') .itemInputs( 'ae2:item_storage_cell_4k') @@ -1868,7 +1900,7 @@ const registerAE2Recipes = (event) => { 'ae2:item_cell_housing', 'ae2:cell_component_4k') .duration(10) - .EUt(7) + .EUt(12) event.recipes.gtceu.packer('ae2:item_storage_cell_16k_back') .itemInputs( 'ae2:item_storage_cell_16k') @@ -1876,7 +1908,7 @@ const registerAE2Recipes = (event) => { 'ae2:item_cell_housing', 'ae2:cell_component_16k') .duration(10) - .EUt(7) + .EUt(12) event.recipes.gtceu.packer('ae2:item_storage_cell_64k_back') .itemInputs( 'ae2:item_storage_cell_64k') @@ -1884,7 +1916,7 @@ const registerAE2Recipes = (event) => { 'ae2:item_cell_housing', 'ae2:cell_component_64k') .duration(10) - .EUt(7) + .EUt(12) event.recipes.gtceu.packer('ae2:item_storage_cell_256k_back') .itemInputs( 'ae2:item_storage_cell_256k') @@ -1892,7 +1924,7 @@ const registerAE2Recipes = (event) => { 'ae2:item_cell_housing', 'ae2:cell_component_256k') .duration(10) - .EUt(7) + .EUt(12) event.recipes.gtceu.packer('ae2:fluid_storage_cell_1k_back') .itemInputs( @@ -1901,7 +1933,7 @@ const registerAE2Recipes = (event) => { 'ae2:fluid_cell_housing', 'ae2:cell_component_1k') .duration(10) - .EUt(7) + .EUt(12) event.recipes.gtceu.packer('ae2:fluid_storage_cell_4k_back') .itemInputs( 'ae2:fluid_storage_cell_4k') @@ -1909,7 +1941,7 @@ const registerAE2Recipes = (event) => { 'ae2:fluid_cell_housing', 'ae2:cell_component_4k') .duration(10) - .EUt(7) + .EUt(12) event.recipes.gtceu.packer('ae2:fluid_storage_cell_16k_back') .itemInputs( 'ae2:fluid_storage_cell_16k') @@ -1917,7 +1949,7 @@ const registerAE2Recipes = (event) => { 'ae2:fluid_cell_housing', 'ae2:cell_component_16k') .duration(10) - .EUt(7) + .EUt(12) event.recipes.gtceu.packer('ae2:fluid_storage_cell_64k_back') .itemInputs( 'ae2:fluid_storage_cell_64k') @@ -1925,7 +1957,7 @@ const registerAE2Recipes = (event) => { 'ae2:fluid_cell_housing', 'ae2:cell_component_64k') .duration(10) - .EUt(7) + .EUt(12) event.recipes.gtceu.packer('ae2:fluid_storage_cell_256k_back') .itemInputs( 'ae2:fluid_storage_cell_256k') @@ -1933,7 +1965,7 @@ const registerAE2Recipes = (event) => { 'ae2:fluid_cell_housing', 'ae2:cell_component_256k') .duration(10) - .EUt(7) + .EUt(12) event.recipes.gtceu.packer('ae2:spatial_storage_cell_2_back') .itemInputs( @@ -1942,7 +1974,7 @@ const registerAE2Recipes = (event) => { 'ae2:item_cell_housing', 'ae2:spatial_cell_component_2') .duration(10) - .EUt(7) + .EUt(12) event.recipes.gtceu.packer('ae2:spatial_storage_cell_16_back') .itemInputs( 'ae2:spatial_storage_cell_16') @@ -1950,7 +1982,7 @@ const registerAE2Recipes = (event) => { 'ae2:item_cell_housing', 'ae2:spatial_cell_component_16') .duration(10) - .EUt(7) + .EUt(12) event.recipes.gtceu.packer('ae2:spatial_storage_cell_128_back') .itemInputs( 'ae2:spatial_storage_cell_128') @@ -1958,17 +1990,154 @@ const registerAE2Recipes = (event) => { 'ae2:item_cell_housing', 'ae2:spatial_cell_component_128') .duration(10) - .EUt(7) - + .EUt(12) + + //crafting storage + event.recipes.gtceu.packer('ae2:crafting_accelerator') + .itemInputs( + 'ae2:crafting_unit', + 'ae2:engineering_processor') + .itemOutputs( + 'ae2:crafting_accelerator') + .duration(10) + .EUt(12) + .cleanroom(CleanroomType.CLEANROOM) + event.recipes.gtceu.packer('ae2:1k_crafting_storage') + .itemInputs( + 'ae2:crafting_unit', + 'ae2:cell_component_1k') + .itemOutputs( + 'ae2:1k_crafting_storage') + .duration(10) + .EUt(12) + .cleanroom(CleanroomType.CLEANROOM) + event.recipes.gtceu.packer('ae2:4k_crafting_storage') + .itemInputs( + 'ae2:crafting_unit', + 'ae2:cell_component_4k') + .itemOutputs( + 'ae2:4k_crafting_storage') + .duration(10) + .EUt(12) + .cleanroom(CleanroomType.CLEANROOM) + event.recipes.gtceu.packer('ae2:16k_crafting_storage') + .itemInputs( + 'ae2:crafting_unit', + 'ae2:cell_component_16k') + .itemOutputs( + 'ae2:16k_crafting_storage') + .duration(10) + .EUt(12) + .cleanroom(CleanroomType.CLEANROOM) + event.recipes.gtceu.packer('ae2:64k_crafting_storage') + .itemInputs( + 'ae2:crafting_unit', + 'ae2:cell_component_64k') + .itemOutputs( + 'ae2:64k_crafting_storage') + .duration(10) + .EUt(12) + .cleanroom(CleanroomType.CLEANROOM) + event.recipes.gtceu.packer('ae2:256k_crafting_storage') + .itemInputs( + 'ae2:crafting_unit', + 'ae2:cell_component_256k') + .itemOutputs( + 'ae2:256k_crafting_storage') + .duration(10) + .EUt(12) + .cleanroom(CleanroomType.CLEANROOM) + event.recipes.gtceu.packer('ae2:crafting_monitor') + .itemInputs( + 'ae2:crafting_unit', + 'ae2:storage_monitor') + .itemOutputs( + 'ae2:crafting_monitor') + .duration(10) + .EUt(12) + .cleanroom(CleanroomType.CLEANROOM) + event.recipes.gtceu.packer('ae2:crafting_accelerator_back') + .itemInputs( + 'ae2:crafting_accelerator') + .itemOutputs( + 'ae2:crafting_unit', + 'ae2:engineering_processor') + .duration(10) + .EUt(12) + .cleanroom(CleanroomType.CLEANROOM) + event.recipes.gtceu.packer('ae2:1k_crafting_storage_back') + .itemInputs( + 'ae2:1k_crafting_storage') + .itemOutputs( + 'ae2:crafting_unit', + 'ae2:cell_component_1k') + .duration(10) + .EUt(12) + .cleanroom(CleanroomType.CLEANROOM) + event.recipes.gtceu.packer('ae2:4k_crafting_storage_back') + .itemInputs( + 'ae2:4k_crafting_storage') + .itemOutputs( + 'ae2:crafting_unit', + 'ae2:cell_component_4k') + .duration(10) + .EUt(12) + .cleanroom(CleanroomType.CLEANROOM) + event.recipes.gtceu.packer('ae2:16k_crafting_storage_back') + .itemInputs( + 'ae2:16k_crafting_storage') + .itemOutputs( + 'ae2:crafting_unit', + 'ae2:cell_component_16k') + .duration(10) + .EUt(12) + .cleanroom(CleanroomType.CLEANROOM) + event.recipes.gtceu.packer('ae2:64k_crafting_storage_back') + .itemInputs( + 'ae2:64k_crafting_storage') + .itemOutputs( + 'ae2:crafting_unit', + 'ae2:cell_component_64k') + .duration(10) + .EUt(12) + .cleanroom(CleanroomType.CLEANROOM) + event.recipes.gtceu.packer('ae2:256k_crafting_storage_back') + .itemInputs( + 'ae2:256k_crafting_storage') + .itemOutputs( + 'ae2:crafting_unit', + 'ae2:cell_component_256k') + .duration(10) + .EUt(12) + .cleanroom(CleanroomType.CLEANROOM) + event.recipes.gtceu.packer('ae2:crafting_monitor_back') + .itemInputs( + 'ae2:crafting_monitor') + .itemOutputs( + 'ae2:crafting_unit', + 'ae2:storage_monitor') + .duration(10) + .EUt(12) + .cleanroom(CleanroomType.CLEANROOM) //macerator event.recipes.gtceu.macerator('ae2:fluix_dust') .itemInputs( '#forge:gems/fluix') .itemOutputs( 'ae2:fluix_dust') - .duration(10) - .EUt(7) + .duration(56) + .EUt(2) + //extruder + event.recipes.gtceu.extruder('ae2:cable_anchor') + .itemInputs( + '#forge:plates/steel') + .notConsumable( + 'gtceu:bolt_extruder_mold') + .itemOutputs( + '8x ae2:cable_anchor') + .duration(15) + .EUt(120) } diff --git a/kubejs/startup_scripts/ae2/constants.js b/kubejs/startup_scripts/ae2/constants.js index 17a8e4dfd..bf6738818 100644 --- a/kubejs/startup_scripts/ae2/constants.js +++ b/kubejs/startup_scripts/ae2/constants.js @@ -22,6 +22,8 @@ global.AE2_DISABLED_ITEMS = [ 'ae2:fluix_pickaxe', 'ae2:entropy_manipulator', 'ae2:charged_staff', + '#ae2:knife', + 'ae2:name_press', //budding '#forge:buds', 'ae2:flawless_budding_quartz', @@ -61,6 +63,7 @@ global.AE2_DISABLED_ITEMS = [ 'ae2:charger', 'ae2:spatial_anchor', 'ae2:inscriber', + 'ae2:growth_accelerator', //dust 'ae2:silicon', 'ae2:certus_quartz_dust', @@ -170,45 +173,43 @@ global.AE2_SMART_DENSE_CABLE = [ 'ae2:black_smart_dense_cable', ] -/* + // Paint ball -global.AE2_paintBalls = [ - item('appliedenergistics2:paint_ball'), - item('appliedenergistics2:paint_ball', 1), - item('appliedenergistics2:paint_ball', 2), - item('appliedenergistics2:paint_ball', 3), - item('appliedenergistics2:paint_ball', 4), - item('appliedenergistics2:paint_ball', 5), - item('appliedenergistics2:paint_ball', 6), - item('appliedenergistics2:paint_ball', 7), - item('appliedenergistics2:paint_ball', 8), - item('appliedenergistics2:paint_ball', 9), - item('appliedenergistics2:paint_ball', 10), - item('appliedenergistics2:paint_ball', 11), - item('appliedenergistics2:paint_ball', 12), - item('appliedenergistics2:paint_ball', 13), - item('appliedenergistics2:paint_ball', 14), - item('appliedenergistics2:paint_ball', 15) +global.AE2_PAINTBALL = [ + 'ae2:white_paint_ball', + 'ae2:orange_paint_ball', + 'ae2:magenta_paint_ball', + 'ae2:light_blue_paint_ball', + 'ae2:yellow_paint_ball', + 'ae2:lime_paint_ball', + 'ae2:pink_paint_ball', + 'ae2:gray_paint_ball', + 'ae2:light_gray_paint_ball', + 'ae2:cyan_paint_ball', + 'ae2:purple_paint_ball', + 'ae2:blue_paint_ball', + 'ae2:brown_paint_ball', + 'ae2:green_paint_ball', + 'ae2:red_paint_ball', + 'ae2:black_paint_ball', ] - // Lumen paint ball -global.AE2_paintBallsLumen = [ - item('appliedenergistics2:paint_ball', 20), - item('appliedenergistics2:paint_ball', 21), - item('appliedenergistics2:paint_ball', 22), - item('appliedenergistics2:paint_ball', 23), - item('appliedenergistics2:paint_ball', 24), - item('appliedenergistics2:paint_ball', 25), - item('appliedenergistics2:paint_ball', 26), - item('appliedenergistics2:paint_ball', 27), - item('appliedenergistics2:paint_ball', 28), - item('appliedenergistics2:paint_ball', 29), - item('appliedenergistics2:paint_ball', 30), - item('appliedenergistics2:paint_ball', 31), - item('appliedenergistics2:paint_ball', 32), - item('appliedenergistics2:paint_ball', 33), - item('appliedenergistics2:paint_ball', 34), - item('appliedenergistics2:paint_ball', 35) +global.AE2_LUMEN_PAINTBALL = [ + 'ae2:white_lumen_paint_ball', + 'ae2:orange_lumen_paint_ball', + 'ae2:magenta_lumen_paint_ball', + 'ae2:light_blue_lumen_paint_ball', + 'ae2:yellow_lumen_paint_ball', + 'ae2:lime_lumen_paint_ball', + 'ae2:pink_lumen_paint_ball', + 'ae2:gray_lumen_paint_ball', + 'ae2:light_gray_lumen_paint_ball', + 'ae2:cyan_lumen_paint_ball', + 'ae2:purple_lumen_paint_ball', + 'ae2:blue_lumen_paint_ball', + 'ae2:brown_lumen_paint_ball', + 'ae2:green_lumen_paint_ball', + 'ae2:red_lumen_paint_ball', + 'ae2:black_lumen_paint_ball', ] -*/