From 0b44c184838c42556b618f62162535f87e34fb9d Mon Sep 17 00:00:00 2001 From: James103 <37945304+James103@users.noreply.github.com> Date: Sat, 9 Aug 2025 21:22:58 -0500 Subject: [PATCH] Unify the Quantum Storage and Digital Singularity Components Bigger AE2's Quantum Cells use Advanced AE's Quantum Storage Components instead of Bigger AE2's Quantum Cell Components. The MEGA Bulk Item Storage Cell uses a Digital Singularity Cell Component from Bigger AE2 in place of MEGA Cells' own Bulk Storage Component. The Digital Singularity Cell Component gets a new recipe, which costs Accumulation Processors, a Vibrant Quartz Glass, and a Spatial Storage Component in addition to Quantum Storage Components. This more closely matches the recipe difficulty of said Quantum Storage Components. --- .../quantum_chemical_storage_cell.json | 20 ++++++++++++++++++ .../quantum_fluid_storage_cell.json | 14 +++++++++++++ .../quantum_flux_storage_cell.json | 20 ++++++++++++++++++ .../quantum_item_storage_cell.json | 14 +++++++++++++ .../quantum_source_storage_cell.json | 20 ++++++++++++++++++ kubejs/server_scripts/EMIThings/Hide.js | 2 ++ kubejs/server_scripts/Mods/AE2/Recipes.js | 21 +++++++++++++++++++ kubejs/server_scripts/Mods/AE2/Tooltips.js | 10 +++++++++ 8 files changed, 121 insertions(+) create mode 100644 kubejs/data/bigger_ae2/recipe/cell_upgrade/quantum_chemical_storage_cell.json create mode 100644 kubejs/data/bigger_ae2/recipe/cell_upgrade/quantum_fluid_storage_cell.json create mode 100644 kubejs/data/bigger_ae2/recipe/cell_upgrade/quantum_flux_storage_cell.json create mode 100644 kubejs/data/bigger_ae2/recipe/cell_upgrade/quantum_item_storage_cell.json create mode 100644 kubejs/data/bigger_ae2/recipe/cell_upgrade/quantum_source_storage_cell.json diff --git a/kubejs/data/bigger_ae2/recipe/cell_upgrade/quantum_chemical_storage_cell.json b/kubejs/data/bigger_ae2/recipe/cell_upgrade/quantum_chemical_storage_cell.json new file mode 100644 index 00000000..5b7cc7f0 --- /dev/null +++ b/kubejs/data/bigger_ae2/recipe/cell_upgrade/quantum_chemical_storage_cell.json @@ -0,0 +1,20 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "appmek" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "bigger_ae2:quantum_chemical_storage_cell", + "cell_disassembly_items": [ + { + "count": 1, + "id": "bigger_ae2:advanced_chemical_cell_housing" + }, + { + "count": 1, + "id": "advanced_ae:quantum_storage_component" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/bigger_ae2/recipe/cell_upgrade/quantum_fluid_storage_cell.json b/kubejs/data/bigger_ae2/recipe/cell_upgrade/quantum_fluid_storage_cell.json new file mode 100644 index 00000000..a171468f --- /dev/null +++ b/kubejs/data/bigger_ae2/recipe/cell_upgrade/quantum_fluid_storage_cell.json @@ -0,0 +1,14 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "bigger_ae2:quantum_fluid_storage_cell", + "cell_disassembly_items": [ + { + "count": 1, + "id": "advanced_ae:quantum_storage_component" + }, + { + "count": 1, + "id": "bigger_ae2:advanced_fluid_cell_housing" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/bigger_ae2/recipe/cell_upgrade/quantum_flux_storage_cell.json b/kubejs/data/bigger_ae2/recipe/cell_upgrade/quantum_flux_storage_cell.json new file mode 100644 index 00000000..ff47a659 --- /dev/null +++ b/kubejs/data/bigger_ae2/recipe/cell_upgrade/quantum_flux_storage_cell.json @@ -0,0 +1,20 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "appex" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "bigger_ae2:quantum_flux_storage_cell", + "cell_disassembly_items": [ + { + "count": 1, + "id": "bigger_ae2:advanced_flux_cell_housing" + }, + { + "count": 1, + "id": "advanced_ae:quantum_storage_component" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/bigger_ae2/recipe/cell_upgrade/quantum_item_storage_cell.json b/kubejs/data/bigger_ae2/recipe/cell_upgrade/quantum_item_storage_cell.json new file mode 100644 index 00000000..8188a61a --- /dev/null +++ b/kubejs/data/bigger_ae2/recipe/cell_upgrade/quantum_item_storage_cell.json @@ -0,0 +1,14 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "bigger_ae2:quantum_item_storage_cell", + "cell_disassembly_items": [ + { + "count": 1, + "id": "advanced_ae:quantum_storage_component" + }, + { + "count": 1, + "id": "bigger_ae2:advanced_item_cell_housing" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/bigger_ae2/recipe/cell_upgrade/quantum_source_storage_cell.json b/kubejs/data/bigger_ae2/recipe/cell_upgrade/quantum_source_storage_cell.json new file mode 100644 index 00000000..62c2dc9b --- /dev/null +++ b/kubejs/data/bigger_ae2/recipe/cell_upgrade/quantum_source_storage_cell.json @@ -0,0 +1,20 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "arseng" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "bigger_ae2:quantum_source_storage_cell", + "cell_disassembly_items": [ + { + "count": 1, + "id": "bigger_ae2:advanced_source_cell_housing" + }, + { + "count": 1, + "id": "advanced_ae:quantum_storage_component" + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/EMIThings/Hide.js b/kubejs/server_scripts/EMIThings/Hide.js index ccb476e9..83ebbdf7 100644 --- a/kubejs/server_scripts/EMIThings/Hide.js +++ b/kubejs/server_scripts/EMIThings/Hide.js @@ -31,6 +31,8 @@ RecipeViewerEvents.removeEntriesCompletely('item', event => { event.remove(item.id); }); + event.remove(['megacells:bulk_cell_component', 'bigger_ae2:quantum_cell_component']); + event.remove(Ingredient.of('@displaydelight').except(['displaydelight:food_plate', 'displaydelight:small_food_plate'])); }); diff --git a/kubejs/server_scripts/Mods/AE2/Recipes.js b/kubejs/server_scripts/Mods/AE2/Recipes.js index 01f36a8c..0b8e90a0 100644 --- a/kubejs/server_scripts/Mods/AE2/Recipes.js +++ b/kubejs/server_scripts/Mods/AE2/Recipes.js @@ -38,11 +38,32 @@ ServerEvents.recipes(event => { }) .id('bigger_ae2:advanced_source_cell_housing'); + event + .shaped('bigger_ae2:digital_singularity_cell_component', ['ASA', 'QGQ', 'AQA'], { + A: 'megacells:accumulation_processor', + S: 'ae2:spatial_cell_component_128', + Q: 'advanced_ae:quantum_storage_component', + G: 'ae2:quartz_vibrant_glass', + }) + .id('bigger_ae2:digital_singularity_cell_component'); + event.replaceInput({ id: 'advanced_ae:quantum_helmet' }, 'minecraft:netherite_helmet', 'mekanism:mekasuit_helmet'); event.replaceInput({ id: 'advanced_ae:quantum_chest' }, 'minecraft:netherite_chestplate', 'mekanism:mekasuit_bodyarmor'); event.replaceInput({ id: 'advanced_ae:quantum_leggings' }, 'minecraft:netherite_leggings', 'mekanism:mekasuit_pants'); event.replaceInput({ id: 'advanced_ae:quantum_boots' }, 'minecraft:netherite_boots', 'mekanism:mekasuit_boots'); + event.replaceInput({ id: 'megacells:cells/standard/bulk_item_cell' }, 'megacells:bulk_cell_component', 'bigger_ae2:digital_singularity_cell_component'); + + event.replaceInput({ id: 'bigger_ae2:quantum_fluid_storage_cell' }, 'bigger_ae2:quantum_cell_component', 'advanced_ae:quantum_storage_component'); + event.replaceInput({ id: 'bigger_ae2:quantum_chemical_storage_cell' }, 'bigger_ae2:quantum_cell_component', 'advanced_ae:quantum_storage_component'); + event.replaceInput({ id: 'bigger_ae2:quantum_source_storage_cell' }, 'bigger_ae2:quantum_cell_component', 'advanced_ae:quantum_storage_component'); + + event.remove({ id: 'bigger_ae2:quantum_cell_component' }); + event.shapeless('advanced_ae:quantum_storage_component', 'bigger_ae2:quantum_cell_component'); + + event.remove({ id: 'megacells:crafting/bulk_cell_component' }); + event.shapeless('bigger_ae2:digital_singularity_cell_component', 'megacells:bulk_cell_component'); + ae2.crystalAssembler('advanced_ae:adv_pattern_provider_capacity_upgrade', [ '#ae2:metal_ingots', '3x ae2:capacity_card', diff --git a/kubejs/server_scripts/Mods/AE2/Tooltips.js b/kubejs/server_scripts/Mods/AE2/Tooltips.js index 3414571e..90ed8eb4 100644 --- a/kubejs/server_scripts/Mods/AE2/Tooltips.js +++ b/kubejs/server_scripts/Mods/AE2/Tooltips.js @@ -6,4 +6,14 @@ ItemEvents.modifyTooltips(e => { Text.translate('tooltip.ae2wtlib.quantum_bridge_card.2').gray(), Text.translate('tooltip.ae2wtlib.quantum_bridge_card.3').gray(), ]); + + e.add('bigger_ae2:quantum_cell_component', [ + Text.red('This item has been disabled in favor of Advanced AE\'s Quantum Storage Component.'), + Text.red('Please convert this item in any crafting table, as it is no longer craftable or usable.'), + ]); + + e.add('megacells:bulk_cell_component', [ + Text.red('This item has been disabled in favor of Bigger AE2\'s Digital Singularity Cell Component.'), + Text.red('Please convert this item in any crafting table, as it is no longer craftable or usable.'), + ]); });