diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index 4be4ab203..e4d45483f 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -561,7 +561,7 @@ const registerAE2Recipes = (event) => { .itemInputs( '2x #forge:rods/aluminium', '3x ae2:quartz_fiber',) - .inputFluids(Fluid.of('gtceu:fluix', 144)) + .inputFluids(Fluid.of('tfg:fluix', 144)) .itemOutputs('ae2:fluix_glass_cable') .circuit(1) .duration(20) @@ -2041,7 +2041,7 @@ const registerAE2Recipes = (event) => { // Chemical Reactor event.recipes.gtceu.chemical_reactor('ae2:fluix_pearl') .itemInputs('4x #forge:gems/fluix', '#forge:gems/ender_eye') - .inputFluids(Fluid.of('gtceu:fluix', 576)) + .inputFluids(Fluid.of('tfg:fluix', 576)) .itemOutputs('ae2:fluix_pearl') .duration(200) .EUt(480) @@ -2087,4 +2087,14 @@ const registerAE2Recipes = (event) => { .itemOutputs('12x ae2:fluix_crystal') .duration(480) .EUt(256) + + //charger + event.recipes.gtceu.assembler('ae2:charger') + .itemInputs( + 'gtceu:hv_battery_buffer_4x', + '4x gtceu:mercury_barium_calcium_cuprate_quadruple_wire', ) + .inputFluids(Fluid.of('tfg:fluix', 476)) + .itemOutputs('ae2:charger') + .duration(200) + .EUt(480) } \ No newline at end of file diff --git a/kubejs/server_scripts/extended_ae2/recipes.js b/kubejs/server_scripts/extended_ae2/recipes.js index 914af5996..f2c4fdb91 100644 --- a/kubejs/server_scripts/extended_ae2/recipes.js +++ b/kubejs/server_scripts/extended_ae2/recipes.js @@ -467,6 +467,21 @@ const registerExtendedAE2Recipes = (event) => { .duration(200) .EUt(1920) + event.recipes.gtceu.assembler('expatternprovider:ex_charger') + .itemInputs( + '4x ae2:charger', + '4x ae2:storage_bus', + 'ae2:cable_interface', + '4x #forge:double_wires/uranium_triplatinum', + '4x ae2:logic_processor', + '4x ae2:engineering_processor', + '2x megacells:accumulation_processor', + + ) + .itemOutputs('expatternprovider:ex_charger') + .duration(200) + .EUt(1920) + } \ No newline at end of file diff --git a/kubejs/server_scripts/mega_cells/recipes.js b/kubejs/server_scripts/mega_cells/recipes.js index 4613750c6..25e9be48a 100644 --- a/kubejs/server_scripts/mega_cells/recipes.js +++ b/kubejs/server_scripts/mega_cells/recipes.js @@ -2,31 +2,36 @@ const registerMegaCellsRecipes = (event) => { - event.remove({ mod: 'megacells' }) + event.remove({ not: [ + {id: 'megacells:network/mega_pattern_provider_block'}, + {id: 'megacells:network/mega_interface_block'}, + {id: 'megacells:network/mega_interface_part'}, + {id: 'megacells:network/mega_pattern_provider_part'}, + ], mod: 'megacells' }) - // event.recipes.gtceu.assembler('') - // .itemInputs('8x ae2:dense_energy_cell', '8x gtceu:nichrome_quadruple_wire', '4x #gtceu:circuits/iv') - // .itemOutputs('megacells:mega_energy_cell') - // .circuit(1) - // .duration(960) - // .EUt(2048) + event.recipes.gtceu.assembler('megacells:mega_energy_cell') + .itemInputs('8x ae2:dense_energy_cell', '8x gtceu:nichrome_quadruple_wire', '4x #gtceu:circuits/iv') + .itemOutputs('megacells:mega_energy_cell') + .circuit(1) + .duration(960) + .EUt(2048) + + + // event.remove({ id: 'megacells:crafting/mega_energy_cell' }) + // event.remove({ id: 'megacells:crafting/sky_steel_block' }) + // event.remove({ id: 'megacells:crafting/sky_steel_ingot_from_sky_steel_block' }) + // event.remove({ id: 'megacells:transform/sky_steel_ingot' }) + // event.remove({ id: 'megacells:inscriber/accumulation_processor_press' }) + // event.remove({ id: 'megacells:inscriber/accumulation_processor_print' }) + // event.remove({ id: 'megacells:inscriber/accumulation_processor_press_extra' }) + // event.remove({ id: 'megacells:inscriber/accumulation_processor' }) + // event.remove({ id: 'megacells:cells/mega_fluid_cell_housing' }) + // event.remove({ id: 'megacells:cells/mega_item_cell_housing' }) + // event.remove({ id: 'megacells:crafting/decompression_module' }) + // event.remove({ id: 'megacells:cells/standard/bulk_item_cell' }) + // event.remove({ id: 'megacells:crafting/bulk_cell_component' }) + // event.remove({ id: 'megacells:crafting/compression_card' }) - /* - event.remove({ id: 'megacells:crafting/mega_energy_cell' }) - event.remove({ id: 'megacells:crafting/sky_steel_block' }) - event.remove({ id: 'megacells:crafting/sky_steel_ingot_from_sky_steel_block' }) - event.remove({ id: 'megacells:transform/sky_steel_ingot' }) - event.remove({ id: 'megacells:inscriber/accumulation_processor_press' }) - event.remove({ id: 'megacells:inscriber/accumulation_processor_print' }) - event.remove({ id: 'megacells:inscriber/accumulation_processor_press_extra' }) - event.remove({ id: 'megacells:inscriber/accumulation_processor' }) - event.remove({ id: 'megacells:cells/mega_fluid_cell_housing' }) - event.remove({ id: 'megacells:cells/mega_item_cell_housing' }) - event.remove({ id: 'megacells:crafting/decompression_module' }) - event.remove({ id: 'megacells:cells/standard/bulk_item_cell' }) - event.remove({ id: 'megacells:crafting/bulk_cell_component' }) - event.remove({ id: 'megacells:crafting/compression_card' }) -*/ //printed accumulation circuit event.recipes.gtceu.forming_press('megacells:printed_accumulation_processor') @@ -59,7 +64,7 @@ const registerMegaCellsRecipes = (event) => { '#gtceu:circuits/iv', '2x #gtceu:resistors', '2x #forge:fine_wires/niobium_titanium',) - .inputFluids(Fluid.of('gtceu:fluix', 144)) + .inputFluids(Fluid.of('tfg:fluix', 144)) .itemOutputs('2x megacells:accumulation_processor') .duration(20) .EUt(1920) @@ -72,13 +77,12 @@ const registerMegaCellsRecipes = (event) => { '#gtceu:circuits/iv', 'gtceu:advanced_smd_resistor', '2x #forge:fine_wires/niobium_titanium',) - .inputFluids(Fluid.of('gtceu:fluix', 144)) + .inputFluids(Fluid.of('tfg:fluix', 144)) .itemOutputs('2x megacells:accumulation_processor') .duration(20) .EUt(1920) .cleanroom(CleanroomType.CLEANROOM) - /* //Mega Item Cell Housing event.shaped('megacells:mega_item_cell_housing', [ 'ABA', @@ -204,7 +208,6 @@ const registerMegaCellsRecipes = (event) => { .duration(400) .EUt(122880) .cleanroom(CleanroomType.CLEANROOM) - */ //#endregion //#region MEGA interface @@ -345,20 +348,6 @@ const registerMegaCellsRecipes = (event) => { //#endregion - // cable mega interface - event.shapeless('megacells:cable_mega_interface', ['megacells:mega_interface']) - .id('megacells:crafting/cable_mega_interface') - - event.shapeless('megacells:mega_interface', ['megacells:cable_mega_interface']) - .id('megacells:crafting/mega_interface') - - // cable mega pattern provider - event.shapeless('megacells:cable_mega_pattern_provider', ['megacells:mega_pattern_provider']) - .id('megacells:crafting/cable_mega_pattern_provider') - - event.shapeless('megacells:mega_pattern_provider', ['megacells:cable_mega_pattern_provider']) - .id('megacells:crafting/mega_pattern_provider') - // greater energy card event.recipes.gtceu.assembler('megacells:greater_energy_card') .itemInputs( diff --git a/kubejs/startup_scripts/ae2/constants.js b/kubejs/startup_scripts/ae2/constants.js index 6b0ed577e..83fe2f62f 100644 --- a/kubejs/startup_scripts/ae2/constants.js +++ b/kubejs/startup_scripts/ae2/constants.js @@ -28,7 +28,6 @@ global.AE2_DISABLED_ITEMS = [ // Блоки 'ae2:vibration_chamber', 'ae2:crank', - 'ae2:charger', 'ae2:spatial_anchor', 'ae2:inscriber', 'ae2:growth_accelerator', diff --git a/kubejs/startup_scripts/mega_cells/constants.js b/kubejs/startup_scripts/mega_cells/constants.js index 653d96780..3d865f173 100644 --- a/kubejs/startup_scripts/mega_cells/constants.js +++ b/kubejs/startup_scripts/mega_cells/constants.js @@ -1,50 +1,47 @@ // priority: 0 global.MEGA_CELLS_DISABLED_ITEMS = [ - 'megacells:mega_energy_cell', 'megacells:sky_steel_block', 'megacells:sky_steel_ingot', - 'megacells:decompression_module', - 'megacells:bulk_item_cell', - 'megacells:bulk_cell_component', - 'megacells:compression_card', + // 'megacells:decompression_module', + // 'megacells:bulk_item_cell', + // 'megacells:bulk_cell_component', + // 'megacells:compression_card', - 'megacells:cell_component_1m', - 'megacells:cell_component_4m', - 'megacells:cell_component_16m', - 'megacells:cell_component_64m', - 'megacells:cell_component_256m', - 'megacells:item_storage_cell_1m', - 'megacells:item_storage_cell_4m', - 'megacells:item_storage_cell_16m', - 'megacells:item_storage_cell_64m', - 'megacells:item_storage_cell_256m', - 'megacells:fluid_storage_cell_1m', - 'megacells:fluid_storage_cell_4m', - 'megacells:fluid_storage_cell_16m', - 'megacells:fluid_storage_cell_64m', - 'megacells:fluid_storage_cell_256m', - 'megacells:portable_item_cell_1m', - 'megacells:portable_item_cell_4m', - 'megacells:portable_item_cell_16m', - 'megacells:portable_item_cell_64m', - 'megacells:portable_item_cell_256m', - 'megacells:portable_fluid_cell_1m', - 'megacells:portable_fluid_cell_4m', - 'megacells:portable_fluid_cell_16m', - 'megacells:portable_fluid_cell_64m', - 'megacells:portable_fluid_cell_256m', - 'megacells:1m_crafting_storage', - 'megacells:4m_crafting_storage', - 'megacells:16m_crafting_storage', - 'megacells:64m_crafting_storage', - 'megacells:256m_crafting_storage', - 'megacells:mega_crafting_unit', - 'megacells:mega_crafting_monitor', - 'megacells:mega_crafting_accelerator', - 'megacells:cell_dock', + // 'megacells:cell_component_1m', + // 'megacells:cell_component_4m', + // 'megacells:cell_component_16m', + // 'megacells:cell_component_64m', + // 'megacells:cell_component_256m', + // 'megacells:item_storage_cell_1m', + // 'megacells:item_storage_cell_4m', + // 'megacells:item_storage_cell_16m', + // 'megacells:item_storage_cell_64m', + // 'megacells:item_storage_cell_256m', + // 'megacells:fluid_storage_cell_1m', + // 'megacells:fluid_storage_cell_4m', + // 'megacells:fluid_storage_cell_16m', + // 'megacells:fluid_storage_cell_64m', + // 'megacells:fluid_storage_cell_256m', + // 'megacells:portable_item_cell_1m', + // 'megacells:portable_item_cell_4m', + // 'megacells:portable_item_cell_16m', + // 'megacells:portable_item_cell_64m', + // 'megacells:portable_item_cell_256m', + // 'megacells:portable_fluid_cell_1m', + // 'megacells:portable_fluid_cell_4m', + // 'megacells:portable_fluid_cell_16m', + // 'megacells:portable_fluid_cell_64m', + // 'megacells:portable_fluid_cell_256m', + // 'megacells:1m_crafting_storage', + // 'megacells:4m_crafting_storage', + // 'megacells:16m_crafting_storage', + // 'megacells:64m_crafting_storage', + // 'megacells:256m_crafting_storage', + // 'megacells:mega_crafting_unit', + // 'megacells:mega_crafting_monitor', + // 'megacells:mega_crafting_accelerator', + // 'megacells:cell_dock', - 'megacells:mega_item_cell_housing', - 'megacells:mega_fluid_cell_housing', ] \ No newline at end of file