Port #322 - part 3

kubejs/server_scripts/ae2/recipes.js

@@ -5,7 +5,13 @@ const registerAE2Recipes = (event) => {
     // Удаление рецептов мода
     event.remove({ not: [
         { id: 'ae2:transform/entangled_singularity_from_pearl' },
-        { id: 'ae2:transform/fluix_crystals' }
+        { id: 'ae2:transform/fluix_crystals' },
+        { id: 'ae2:network/parts/energy_acceptor' },
+        { id: 'ae2:network/blocks/energy_energy_acceptor_alt' },
+        { id: 'ae2:network/blocks/pattern_providers_interface_part' },
+        { id: 'ae2:network/blocks/pattern_providers_interface_alt' },
+        { id: 'ae2:network/blocks/interfaces_interface_part' },
+        { id: 'ae2:network/blocks/interfaces_interface_alt' },
     ], mod: 'ae2' });
 
     //#region Рецепты энтропии
@@ -370,13 +376,6 @@ const registerAE2Recipes = (event) => {
         E: 'ae2:engineering_processor'
     }).id('tfg:crafting/spatial_io_port')
 
-    // Interfaces
-    event.shapeless('ae2:interface', ['ae2:cable_interface'])
-        .id('tfg:crafting/interface')
-
-    event.shapeless('ae2:cable_interface', ['ae2:interface'])
-        .id('tfg:crafting/cable_interface')
-
     // Monitors
     event.shapeless('ae2:semi_dark_monitor', ['ae2:dark_monitor'])
         .id('tfg:crafting/semi_dark_monitor_2')
@@ -410,14 +409,6 @@ const registerAE2Recipes = (event) => {
         B: 'gtceu:hv_electric_piston',
         C: '#gtceu:circuits/hv',
     }).id('tfg:crafting/condenser')
-
-    
-    // Cable Pattern Provider
-    event.shapeless('ae2:pattern_provider', ['ae2:cable_pattern_provider'])
-        .id('tfg:crafting/pattern_provider')
-    
-    event.shapeless('ae2:cable_pattern_provider', ['ae2:pattern_provider'])
-        .id('tfg:crafting/cable_pattern_provider')
     
     // Toggle Bus
     event.shapeless('ae2:toggle_bus', ['ae2:inverted_toggle_bus'])
@@ -531,6 +522,30 @@ const registerAE2Recipes = (event) => {
         E: '#forge:rods/steel',
     }).id('tfg:crafting/color_applicator')
 
+    // Energy Cell
+    event.recipes.gtceu.assembler('tfg:ae2/energy_cell')
+        .itemInputs('gtceu:titanium_frame', '6x gtceu:titanium_plate', '24x gtceu:titanium_screw', 'gtceu:energy_crystal')
+        .itemOutputs('ae2:energy_cell')
+        .circuit(1)
+        .duration(960)
+        .EUt(256)
+
+    // Dense Energy Cell
+    event.recipes.gtceu.assembler('tfg:ae2/dense_energy_cell')
+        .itemInputs('8x ae2:energy_cell', '8x gtceu:silver_quadruple_wire', '4x #gtceu:circuits/ev')
+        .itemOutputs('ae2:dense_energy_cell')
+        .circuit(1)
+        .duration(960)
+        .EUt(512)
+
+    // Energy Acceptor
+    event.recipes.gtceu.assembler('tfg:ae2/energy_acceptor')
+        .itemInputs('5x gtceu:silver_double_cable', 'gtceu:hv_1a_energy_converter', 'gtceu:annealed_copper_single_cable')
+        .itemOutputs('ae2:energy_acceptor')
+        .circuit(1)
+        .duration(520)
+        .EUt(128)
+
     // Glass Cable
     event.recipes.gtceu.assembler('fluix_glass_cable')
         .itemInputs(

kubejs/server_scripts/extended_ae2/recipes.js

@@ -0,0 +1,10 @@
+// priority: 0
+
+const registerExtendedAE2Recipes = (event) => {
+    // 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)
+}

kubejs/server_scripts/extended_ae2/tags.js

@@ -0,0 +1,18 @@
+// priority: 0
+
+const registerExtendedAE2ItemTags = (event) => {
+    
+    // Удаление тегов у отключенных предметов
+    global.EXTENDED_AE2_DISABLED_ITEMS.forEach(item => {
+        event.removeAllTagsFrom(item)
+        event.add('c:hidden_from_recipe_viewers', item)
+    })
+}
+
+const registerExtendedAE2BlockTags = (event) => {
+    
+    // Удаление тегов у отключенных предметов
+    global.EXTENDED_AE2_DISABLED_ITEMS.forEach(item => {
+        event.removeAllTagsFrom(item)
+    })
+}

kubejs/server_scripts/gregtech/recipes.js

@@ -66,7 +66,7 @@ const registerGTCEURecipes = (event) => {
     event.recipes.gtceu.centrifuge('centrifuging_tfc_salt_water')             
         .inputFluids(Fluid.of('tfc:salt_water', 1000))
         .itemOutputs('1x gtceu:salt_dust')
-        .outputFluids(Fluid.of('minecraft:water', 500))
+        .outputFluids(Fluid.of('minecraft:water', 1000))
         .duration(51)
         .EUt(30)
 

kubejs/server_scripts/main_server_script.js

@@ -10,11 +10,13 @@ ServerEvents.tags('item', event => {
     registerComputerCraftItemTags(event)
     registerCreateItemTags(event)
     registerCreateAdditionsItemTags(event)
+    registerExtendedAE2ItemTags(event)
     registerFirmaCivItemTags(event)
     registerFirmaLifeItemTags(event)
     registerFramedBlocksItemTags(event)
     registerFTBQuestsItemTags(event)
     registerGTCEUItemTags(event)
+    registerMegaCellsItemTags(event)
     registerMinecraftItemTags(event)
     registerMoreRedItemTags(event)
     registerHotOrNotItemTags(event)
@@ -33,11 +35,13 @@ ServerEvents.tags('block', event => {
     registerComputerCraftBlockTags(event)
     registerCreateBlockTags(event)
     registerCreateAdditionsBlockTags(event)
+    registerExtendedAE2BlockTags(event)
     registerFirmaCivBlockTags(event)
     registerFirmaLifeBlockTags(event)
     registerFramedBlocksBlockTags(event)
     registerFTBQuestsBlockTags(event)
     registerGTCEUBlockTags(event)
+    registerMegaCellsBlockTags(event)
     registerMinecraftBlockTags(event)
     registerMoreRedBlockTags(event)
     registerHotOrNotBlockTags(event)
@@ -114,6 +118,7 @@ ServerEvents.recipes(event => {
     registerCreateRecipes(event)
     registerCreateAdditionsRecipes(event)
     registerCreateConnectedRecipes(event)
+    registerExtendedAE2Recipes(event)
     registerExposureRecipes(event)
     registerFirmaCivRecipes(event)
     registerFirmaLifeRecipes(event)
@@ -122,6 +127,7 @@ ServerEvents.recipes(event => {
     registerGTCEURecipes(event)
     registerHandGliderRecipes(event)
     registerHotOrNotRecipes(event)
+    registerMegaCellsRecipes(event)
     registerMinecraftRecipes(event)
     registerMoreRedRecipes(event)
     registerRailWaysRecipes(event)

kubejs/server_scripts/mega_cells/recipes.js

@@ -0,0 +1,10 @@
+// priority: 0
+
+const registerMegaCellsRecipes = (event) => {
+    // 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)
+}

kubejs/server_scripts/mega_cells/tags.js

@@ -0,0 +1,18 @@
+// priority: 0
+
+const registerMegaCellsItemTags = (event) => {
+    
+    // Удаление тегов у отключенных предметов
+    global.MEGA_CELLS_DISABLED_ITEMS.forEach(item => {
+        event.removeAllTagsFrom(item)
+        event.add('c:hidden_from_recipe_viewers', item)
+    })
+}
+
+const registerMegaCellsBlockTags = (event) => {
+    
+    // Удаление тегов у отключенных предметов
+    global.MEGA_CELLS_DISABLED_ITEMS.forEach(item => {
+        event.removeAllTagsFrom(item)
+    })
+}

kubejs/server_scripts/tfc/recipes.js

@@ -3070,6 +3070,20 @@ const registerTFCRecipes = (event) => {
     event.smelting('tfc:ceramic/fire_brick', 'gtceu:compressed_fireclay')
         .id('tfg:smelting/fireclay_brick')
 
+    // Salt Water
+    generateMixerRecipe(
+        event, 
+        ['#forge:dusts/salt'], 
+        Fluid.of('minecraft:water', 1000),
+        [],
+        null,
+        Fluid.of('tfc:salt_water', 1000),
+        40,
+        7,
+        64,
+        'tfg:tfc/salt_water'
+    )
+
     // Lamp Glass
     event.recipes.gtceu.alloy_smelter(`tfg:tfc/lamp_glass`)             
         .itemInputs('#tfc:glass_batches')

kubejs/startup_scripts/ae2/constants.js

@@ -85,10 +85,6 @@ global.AE2_DISABLED_ITEMS = [
     'ae2:meteorite_compass',
     'ae2:silicon',
     'ae2:sky_dust',
-    'ae2:energy_acceptor',
-    'ae2:cable_energy_acceptor',
-    'ae2:energy_cell',
-    'ae2:dense_energy_cell',
     'ae2:creative_energy_cell',
     'ae2:tiny_tnt'
 ];

kubejs/startup_scripts/extended_ae2/constants.js

@@ -0,0 +1,5 @@
+// priority: 0
+
+global.EXTENDED_AE2_DISABLED_ITEMS = [
+    
+];

kubejs/startup_scripts/mega_cells/constants.js

@@ -0,0 +1,5 @@
+// priority: 0
+
+global.MEGA_CELLS_DISABLED_ITEMS = [
+    
+];