From 32b1802db37cd3c96299d481e1475c18d2e42b5c Mon Sep 17 00:00:00 2001 From: 90 Date: Tue, 10 Dec 2024 23:42:04 +0000 Subject: [PATCH] Update to AE2 19.0.24+ --- build.gradle.kts | 8 ++- settings.gradle.kts | 18 ++---- .../megacells/datagen/MEGARecipeProvider.java | 20 +++++++ .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 49 ++++++++++++++++- ...ortable_chemical_cell_16m_disassembly.json | 28 ++++++++++ ...portable_chemical_cell_1m_disassembly.json | 28 ++++++++++ ...rtable_chemical_cell_256m_disassembly.json | 28 ++++++++++ ...portable_chemical_cell_4m_disassembly.json | 28 ++++++++++ ...ortable_chemical_cell_64m_disassembly.json | 28 ++++++++++ .../portable_fluid_cell_16m_disassembly.json | 22 ++++++++ .../portable_fluid_cell_1m_disassembly.json | 22 ++++++++ .../portable_fluid_cell_256m_disassembly.json | 22 ++++++++ .../portable_fluid_cell_4m_disassembly.json | 22 ++++++++ .../portable_fluid_cell_64m_disassembly.json | 22 ++++++++ .../portable_item_cell_16m_disassembly.json | 22 ++++++++ .../portable_item_cell_1m_disassembly.json | 22 ++++++++ .../portable_item_cell_256m_disassembly.json | 22 ++++++++ .../portable_item_cell_4m_disassembly.json | 22 ++++++++ .../portable_item_cell_64m_disassembly.json | 22 ++++++++ .../portable_source_cell_16m_disassembly.json | 28 ++++++++++ .../portable_source_cell_1m_disassembly.json | 28 ++++++++++ ...portable_source_cell_256m_disassembly.json | 28 ++++++++++ .../portable_source_cell_4m_disassembly.json | 28 ++++++++++ .../portable_source_cell_64m_disassembly.json | 28 ++++++++++ ...chemical_storage_cell_16m_disassembly.json | 20 +++++++ .../chemical_storage_cell_1m_disassembly.json | 20 +++++++ ...hemical_storage_cell_256m_disassembly.json | 20 +++++++ .../chemical_storage_cell_4m_disassembly.json | 20 +++++++ ...chemical_storage_cell_64m_disassembly.json | 20 +++++++ .../fluid_storage_cell_16m_disassembly.json | 14 +++++ .../fluid_storage_cell_1m_disassembly.json | 14 +++++ .../fluid_storage_cell_256m_disassembly.json | 14 +++++ .../fluid_storage_cell_4m_disassembly.json | 14 +++++ .../fluid_storage_cell_64m_disassembly.json | 14 +++++ .../item_storage_cell_16m_disassembly.json | 14 +++++ .../item_storage_cell_1m_disassembly.json | 14 +++++ .../item_storage_cell_256m_disassembly.json | 14 +++++ .../item_storage_cell_4m_disassembly.json | 14 +++++ .../item_storage_cell_64m_disassembly.json | 14 +++++ .../source_storage_cell_16m_disassembly.json | 20 +++++++ .../source_storage_cell_1m_disassembly.json | 20 +++++++ .../source_storage_cell_256m_disassembly.json | 20 +++++++ .../source_storage_cell_4m_disassembly.json | 20 +++++++ .../source_storage_cell_64m_disassembly.json | 20 +++++++ .../16m_crafting_storage_disassembly.json | 5 ++ .../1m_crafting_storage_disassembly.json | 5 ++ .../256m_crafting_storage_disassembly.json | 5 ++ .../4m_crafting_storage_disassembly.json | 5 ++ .../64m_crafting_storage_disassembly.json | 5 ++ ...mega_crafting_accelerator_disassembly.json | 5 ++ .../mega_crafting_monitor_disassembly.json | 5 ++ .../block/MEGACraftingBlockItem.java | 55 ------------------- .../_90/megacells/definition/MEGABlocks.java | 51 ++++++++--------- .../_90/megacells/definition/MEGAItems.java | 4 -- .../integration/appmek/AppMekIntegration.java | 2 +- .../integration/arseng/ArsEngIntegration.java | 2 +- .../megacells/misc/DecompressionPattern.java | 7 +-- .../resources/META-INF/neoforge.mods.toml | 17 +++++- src/main/resources/megacells.mixins.json | 6 +- 59 files changed, 1002 insertions(+), 112 deletions(-) create mode 100644 src/generated/resources/data/megacells/recipe/cells/portable/portable_chemical_cell_16m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/portable/portable_chemical_cell_1m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/portable/portable_chemical_cell_256m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/portable/portable_chemical_cell_4m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/portable/portable_chemical_cell_64m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/portable/portable_fluid_cell_16m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/portable/portable_fluid_cell_1m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/portable/portable_fluid_cell_256m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/portable/portable_fluid_cell_4m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/portable/portable_fluid_cell_64m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/portable/portable_item_cell_16m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/portable/portable_item_cell_1m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/portable/portable_item_cell_256m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/portable/portable_item_cell_4m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/portable/portable_item_cell_64m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/portable/portable_source_cell_16m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/portable/portable_source_cell_1m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/portable/portable_source_cell_256m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/portable/portable_source_cell_4m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/portable/portable_source_cell_64m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/standard/chemical_storage_cell_16m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/standard/chemical_storage_cell_1m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/standard/chemical_storage_cell_256m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/standard/chemical_storage_cell_4m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/standard/chemical_storage_cell_64m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/standard/fluid_storage_cell_16m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/standard/fluid_storage_cell_1m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/standard/fluid_storage_cell_256m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/standard/fluid_storage_cell_4m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/standard/fluid_storage_cell_64m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/standard/item_storage_cell_16m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/standard/item_storage_cell_1m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/standard/item_storage_cell_256m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/standard/item_storage_cell_4m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/standard/item_storage_cell_64m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/standard/source_storage_cell_16m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/standard/source_storage_cell_1m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/standard/source_storage_cell_256m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/standard/source_storage_cell_4m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/cells/standard/source_storage_cell_64m_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/crafting/16m_crafting_storage_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/crafting/1m_crafting_storage_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/crafting/256m_crafting_storage_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/crafting/4m_crafting_storage_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/crafting/64m_crafting_storage_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/crafting/mega_crafting_accelerator_disassembly.json create mode 100644 src/generated/resources/data/megacells/recipe/crafting/mega_crafting_monitor_disassembly.json delete mode 100644 src/main/java/gripe/_90/megacells/block/MEGACraftingBlockItem.java diff --git a/build.gradle.kts b/build.gradle.kts index 8c316e37..f4a95d5b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,10 +13,10 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(21) dependencies { implementation(libs.ae2) - implementation(libs.ae2wtlibapi) + compileOnly(libs.ae2wtlibapi) runtimeOnly(libs.ae2wtlib) - implementation(libs.appmek) + compileOnly(libs.appmek) compileOnly(libs.mekanism) compileOnly(variantOf(libs.mekanism) { classifier("generators") }) runtimeOnly(variantOf(libs.mekanism) { classifier("all") }) @@ -98,7 +98,9 @@ tasks { val props = mapOf( "version" to version, "ae2Version" to libs.versions.ae2.get(), - "ae2VersionEnd" to libs.versions.ae2.get().substringBefore('.').toInt() + 1, + "ae2wtlibVersion" to libs.versions.ae2wtlib.get(), + "appmekVersion" to libs.versions.appmek.get(), + "arsengVersion" to libs.versions.arseng.get() ) inputs.properties(props) diff --git a/settings.gradle.kts b/settings.gradle.kts index 4b996990..fe166201 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -79,14 +79,6 @@ run { includeGroup("curse.maven") } } - - maven { - name = "Modrinth Maven" - url = uri("https://api.modrinth.com/maven") - content { - includeGroup("maven.modrinth") - } - } } versionCatalogs { @@ -98,18 +90,20 @@ run { version("neoforge", "${nf + (if (!nf.contains('.')) ".0" else "")}.66") version("parchment", "2024.07.28") - version("ae2", "19.0.23-beta") + version("ae2", "19.0.25") library("ae2", "appeng", "appliedenergistics2").versionRef("ae2") version("ae2wtlib", "19.1.3-beta") library("ae2wtlib", "de.mari_023", "ae2wtlib").versionRef("ae2wtlib") library("ae2wtlibapi", "de.mari_023", "ae2wtlib_api").versionRef("ae2wtlib") - library("appmek", "maven.modrinth", "applied-mekanistics").version("GCScYwwI") + version("appmek", "1.6.2") + library("appmek", "curse.maven", "applied-mekanistics-574300").version("5978711") library("mekanism", "mekanism", "Mekanism").version("$mc-10.7.4.60") - library("arseng", "maven.modrinth", "ars-energistique").version("smOxCSOc") - library("arsnouveau", "com.hollingsworth.ars_nouveau", "ars_nouveau-1.21.0").version("5.1.0.736") + version("arseng", "2.0.4-beta") + library("arseng", "curse.maven", "ars-energistique-905641").version("5978726") + library("arsnouveau", "com.hollingsworth.ars_nouveau", "ars_nouveau-1.21.1").version("5.3.5.844") } } } diff --git a/src/data/java/gripe/_90/megacells/datagen/MEGARecipeProvider.java b/src/data/java/gripe/_90/megacells/datagen/MEGARecipeProvider.java index c4cc5d78..88825303 100644 --- a/src/data/java/gripe/_90/megacells/datagen/MEGARecipeProvider.java +++ b/src/data/java/gripe/_90/megacells/datagen/MEGARecipeProvider.java @@ -34,6 +34,8 @@ import appeng.core.definitions.ItemDefinition; import appeng.datagen.providers.tags.ConventionTags; import appeng.items.storage.StorageTier; +import appeng.recipes.game.CraftingUnitTransformRecipe; +import appeng.recipes.game.StorageCellDisassemblyRecipe; import appeng.recipes.handlers.InscriberProcessType; import appeng.recipes.handlers.InscriberRecipeBuilder; import appeng.recipes.transform.TransformCircumstance; @@ -436,6 +438,10 @@ private static void cell( .unlockedBy("has_" + component.id().getPath(), has(component)) .unlockedBy("has_" + housing.id().getPath(), has(housing)) .save(output, MEGACells.makeId("cells/standard/" + cell.id().getPath() + "_with_housing")); + output.accept( + MEGACells.makeId("cells/standard/" + cell.id().getPath() + "_disassembly"), + new StorageCellDisassemblyRecipe(cell.asItem(), List.of(component.stack(), housing.stack())), + null); } private static void cell( @@ -468,6 +474,16 @@ private static void portable( .unlockedBy("has_" + component.id().getPath(), has(component)) .unlockedBy("has_dense_energy_cell", has(AEBlocks.DENSE_ENERGY_CELL)) .save(output, MEGACells.makeId("cells/portable/" + cell.id().getPath())); + output.accept( + MEGACells.makeId("cells/portable/" + cell.id().getPath() + "_disassembly"), + new StorageCellDisassemblyRecipe( + cell.asItem(), + List.of( + component.stack(), + housing.stack(), + AEBlocks.ME_CHEST.stack(), + AEBlocks.DENSE_ENERGY_CELL.stack())), + null); } private static void craftingBlock(RecipeOutput output, BlockDefinition unit, ItemLike part) { @@ -476,5 +492,9 @@ private static void craftingBlock(RecipeOutput output, BlockDefinition unit, .requires(part) .unlockedBy("has_mega_crafting_unit", has(MEGABlocks.MEGA_CRAFTING_UNIT)) .save(output, MEGACells.makeId("crafting/" + unit.id().getPath())); + output.accept( + MEGACells.makeId("crafting/" + unit.id().getPath() + "_disassembly"), + new CraftingUnitTransformRecipe(unit.block(), part.asItem()), + null); } } diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 85a77fb1..cacbbf1d 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.21.1 2024-11-19T15:13:43.988949657 Recipes +// 1.21.1 2024-12-08T21:04:15.259741786 Recipes 94f8f9445346bc6aa07cda2a3ca730d685c7abfe data/megacells/advancement/recipes/building_blocks/crafting/sky_bronze_block.json bafe5e1847658b51c654ec6f0888ca6d10be429b data/megacells/advancement/recipes/building_blocks/crafting/sky_osmium_block.json c7454f25cf0053a6a4b616c628ff7ad67714d1dd data/megacells/advancement/recipes/building_blocks/crafting/sky_steel_block.json @@ -102,74 +102,121 @@ f66a61c854317cc7cac7fb6fc3f3d700f2706763 data/megacells/recipe/cells/cell_compon b5ebd179e85f27fd8e8d4f8a536df3d3ac0ab846 data/megacells/recipe/cells/mega_fluid_cell_housing.json 4713d9a9c8ab7f28486ca883716b8e76d43ec88d data/megacells/recipe/cells/mega_item_cell_housing.json 288b00a0d7b03ab5826718b24c2871dac3b0d5e8 data/megacells/recipe/cells/portable/portable_chemical_cell_16m.json +ebcb9ae199461fc4e4551ad4bac0f5586dcf1c35 data/megacells/recipe/cells/portable/portable_chemical_cell_16m_disassembly.json 1c3cc179ae442daa393df9a84aac01247d73453b data/megacells/recipe/cells/portable/portable_chemical_cell_1m.json +044812bcde7fc78565c5e4a544f9c7962737a6aa data/megacells/recipe/cells/portable/portable_chemical_cell_1m_disassembly.json b034fc4295d5de69f8f08fcf845b1b5ef4fe656a data/megacells/recipe/cells/portable/portable_chemical_cell_256m.json +6d6f11b2cf8cb5a3654d971e6375c98c84acc183 data/megacells/recipe/cells/portable/portable_chemical_cell_256m_disassembly.json 77da03752d6bc44976b37e07e3ff711dfea87887 data/megacells/recipe/cells/portable/portable_chemical_cell_4m.json +2fedc94fa6425c7b636ba3dc85c0c08d2235df28 data/megacells/recipe/cells/portable/portable_chemical_cell_4m_disassembly.json 8d9c13c56ffa876c38a9b0be878145baa36c738d data/megacells/recipe/cells/portable/portable_chemical_cell_64m.json +7fb0ea27d13bb6d3f88a520ebeb9df81ea736656 data/megacells/recipe/cells/portable/portable_chemical_cell_64m_disassembly.json 691993be26c26f4fd9e2573d6cdc3802e80c294f data/megacells/recipe/cells/portable/portable_fluid_cell_16m.json +eff0d4460c52e04ede9399bf0b2c49398957cf4a data/megacells/recipe/cells/portable/portable_fluid_cell_16m_disassembly.json 3eacb5abff956401c17a2c3e082c00f91783d4cb data/megacells/recipe/cells/portable/portable_fluid_cell_1m.json +e6b69edb0748651f6ea608564b902438304084e2 data/megacells/recipe/cells/portable/portable_fluid_cell_1m_disassembly.json b3d44e0b040edf117a9733fe1255b9118547f955 data/megacells/recipe/cells/portable/portable_fluid_cell_256m.json +86834a158751ffbfe3838909cffd01606c183217 data/megacells/recipe/cells/portable/portable_fluid_cell_256m_disassembly.json b8febfef3c66d4bd039d517d8df7ee772f67932d data/megacells/recipe/cells/portable/portable_fluid_cell_4m.json +99e896a2fad6bbcbf3f27a331260a8f7920399c3 data/megacells/recipe/cells/portable/portable_fluid_cell_4m_disassembly.json 1e525e141da5f60b757b313f85c17d97215924c6 data/megacells/recipe/cells/portable/portable_fluid_cell_64m.json +dc18ed9970e77f9475677b7adce879681f11c080 data/megacells/recipe/cells/portable/portable_fluid_cell_64m_disassembly.json 6aea0cd29f996621fdc274591dcf535c33958eba data/megacells/recipe/cells/portable/portable_item_cell_16m.json +a2528f9ccd829404d7ed1734f98ad7cc9939772a data/megacells/recipe/cells/portable/portable_item_cell_16m_disassembly.json 1babb96738903008c9b016918ceb7c0b20f0741f data/megacells/recipe/cells/portable/portable_item_cell_1m.json +2dabce050d3b5ecb669136c2f4a442a01b06f597 data/megacells/recipe/cells/portable/portable_item_cell_1m_disassembly.json 4df0751609c8e31230319e436d6c0c57db2eb221 data/megacells/recipe/cells/portable/portable_item_cell_256m.json +07a3bc749397f52be287766b07190e8b19723357 data/megacells/recipe/cells/portable/portable_item_cell_256m_disassembly.json f701a50b4ba2f58d9ee3f46391917a96a5f4a5e9 data/megacells/recipe/cells/portable/portable_item_cell_4m.json +313cc9a5a640066a29c7a62519c9a2f5f348e182 data/megacells/recipe/cells/portable/portable_item_cell_4m_disassembly.json a892fc1e0eb5150a6be7ac0c5c0fda27e688d068 data/megacells/recipe/cells/portable/portable_item_cell_64m.json +336129ecc2fbc7bb0962525fee1e6b50ed2fdd5f data/megacells/recipe/cells/portable/portable_item_cell_64m_disassembly.json 8a4d63cdb5e44c80e27225ba0ef33303cb66ff53 data/megacells/recipe/cells/portable/portable_source_cell_16m.json +a030fa80baf78fea621c69201a4136a3fd9b3162 data/megacells/recipe/cells/portable/portable_source_cell_16m_disassembly.json 400f1a0d98f0651865c69d6a56b91563bebf2359 data/megacells/recipe/cells/portable/portable_source_cell_1m.json +0899e236b19bdd54e5e0074e9fe8022db670a732 data/megacells/recipe/cells/portable/portable_source_cell_1m_disassembly.json 97c5db7f1fab43cc307b878848c7fa9cf892ebc7 data/megacells/recipe/cells/portable/portable_source_cell_256m.json +769ccb8d1120f1de5a36966433380351bfb3d3f2 data/megacells/recipe/cells/portable/portable_source_cell_256m_disassembly.json b912b697c5316be1e27035ef111b3f3dc6395362 data/megacells/recipe/cells/portable/portable_source_cell_4m.json +9e1e65a3728a047389edb647acb3da42fcd19ec1 data/megacells/recipe/cells/portable/portable_source_cell_4m_disassembly.json d15561e2b2629525b24c0f980ba630c9224eda29 data/megacells/recipe/cells/portable/portable_source_cell_64m.json +0e166348ec3cfb3eb083669babc99959a6b541cc data/megacells/recipe/cells/portable/portable_source_cell_64m_disassembly.json 377c518c95b5913862432998287dbce0184d95c9 data/megacells/recipe/cells/standard/bulk_item_cell.json b935f34ad93380b0732d674284a36d4c24bfe4e4 data/megacells/recipe/cells/standard/chemical_storage_cell_16m.json +a1dee1bf9b1d7a2727ad3356f3d7585bafd5e034 data/megacells/recipe/cells/standard/chemical_storage_cell_16m_disassembly.json 9bae716ab7f1bc6c3a49dc49a51f0435649095fb data/megacells/recipe/cells/standard/chemical_storage_cell_16m_with_housing.json 40b4e856f207e6bb16976af3f6d83063a79c6f89 data/megacells/recipe/cells/standard/chemical_storage_cell_1m.json +e71d13879fac374028529483dcafe6515315051c data/megacells/recipe/cells/standard/chemical_storage_cell_1m_disassembly.json 098471938a9f57b18891ec47ed9e5425f8c0b11b data/megacells/recipe/cells/standard/chemical_storage_cell_1m_with_housing.json 237fa111d87bb6b22c88ad76bc5cd51e9a52c4d3 data/megacells/recipe/cells/standard/chemical_storage_cell_256m.json +ebf5a1e7ba4e9686ab8e3c0a1a89501b8436f6dc data/megacells/recipe/cells/standard/chemical_storage_cell_256m_disassembly.json 3a80cf06af388a2adbaa554beecc2dcf81d709ee data/megacells/recipe/cells/standard/chemical_storage_cell_256m_with_housing.json e2d9625d2a175eea9c10c6fa29cae57ddddaab92 data/megacells/recipe/cells/standard/chemical_storage_cell_4m.json +0a56f50ff1073771330662baa31992a643197c4d data/megacells/recipe/cells/standard/chemical_storage_cell_4m_disassembly.json 5900e89e6d806068c546ec4a243867bba5d28553 data/megacells/recipe/cells/standard/chemical_storage_cell_4m_with_housing.json e11f3d36c5d4fe33e307697d949256334d204d94 data/megacells/recipe/cells/standard/chemical_storage_cell_64m.json +b786ece594d1c2b557f4644df565972f3429ee60 data/megacells/recipe/cells/standard/chemical_storage_cell_64m_disassembly.json 1621243b2846ad8c8dd73720d708adcfe8f1cb93 data/megacells/recipe/cells/standard/chemical_storage_cell_64m_with_housing.json c33d82628819527ea5d173314504c891da346912 data/megacells/recipe/cells/standard/fluid_storage_cell_16m.json +17199ff1fa27427ce804282d46af010be0855187 data/megacells/recipe/cells/standard/fluid_storage_cell_16m_disassembly.json daea0ead4e93695ecaa5177b32a9f3e04041ae4d data/megacells/recipe/cells/standard/fluid_storage_cell_16m_with_housing.json aa70b809617ccf73c8418994f9b2257b3e24b967 data/megacells/recipe/cells/standard/fluid_storage_cell_1m.json +191e43c8772ff1889d3990d30266922989f9c47e data/megacells/recipe/cells/standard/fluid_storage_cell_1m_disassembly.json 4bf7ecc3062a0632a4d62cbabef05b7a9cd9b5d3 data/megacells/recipe/cells/standard/fluid_storage_cell_1m_with_housing.json 5d423998b9014ff67581a4b7cbd1b288331205ef data/megacells/recipe/cells/standard/fluid_storage_cell_256m.json +904bb79ed141756d7c6bdceec609475492b00fc2 data/megacells/recipe/cells/standard/fluid_storage_cell_256m_disassembly.json c56b44caa491c6b10d621d82074e55aa4c24be72 data/megacells/recipe/cells/standard/fluid_storage_cell_256m_with_housing.json f4d7742b7bfebc6f8e0d5b62c555a3d621b17fe8 data/megacells/recipe/cells/standard/fluid_storage_cell_4m.json +8cf0740c3d1a0a0ab5a4ffb076e4b8b024beafa6 data/megacells/recipe/cells/standard/fluid_storage_cell_4m_disassembly.json c629805addc33db770bfc809e8285578ce65ad31 data/megacells/recipe/cells/standard/fluid_storage_cell_4m_with_housing.json fc9d42bc5ef50ad909d1e5e00b43cc99fa9d4d16 data/megacells/recipe/cells/standard/fluid_storage_cell_64m.json +54e303ec7a4c884a0bbfd133ea7956d1e7750fd6 data/megacells/recipe/cells/standard/fluid_storage_cell_64m_disassembly.json 358144bfd37ca52df17261d2f397bd6a3a4d1a10 data/megacells/recipe/cells/standard/fluid_storage_cell_64m_with_housing.json 01cfbc3bfd71026c4321334a2999a757b5c4f7c6 data/megacells/recipe/cells/standard/item_storage_cell_16m.json +836f0f3f7dd9040741861332063c9d74f39a2ff1 data/megacells/recipe/cells/standard/item_storage_cell_16m_disassembly.json 28ef9169081abc79e86aa822aa812b348799a571 data/megacells/recipe/cells/standard/item_storage_cell_16m_with_housing.json 69ddc8db6ff7f414f791b42734a2b1ce9430bd81 data/megacells/recipe/cells/standard/item_storage_cell_1m.json +af3f6f18356c79bcf00785e9aec259f014252dd8 data/megacells/recipe/cells/standard/item_storage_cell_1m_disassembly.json aacd92d16e803939e6665587d3054b4d77c9467b data/megacells/recipe/cells/standard/item_storage_cell_1m_with_housing.json 557c3e486496b250de640028327dfe352150e6bf data/megacells/recipe/cells/standard/item_storage_cell_256m.json +bcc00b26711bcc4a659f8e99d702d56150755e28 data/megacells/recipe/cells/standard/item_storage_cell_256m_disassembly.json 6702e54050ee398c0f7e8cfc3514c5b3283a0353 data/megacells/recipe/cells/standard/item_storage_cell_256m_with_housing.json d20f447e332410a002a141412bb4a2ef380b7001 data/megacells/recipe/cells/standard/item_storage_cell_4m.json +46358b4f9502554c8ea4f6d5cd1aec0d9347bb40 data/megacells/recipe/cells/standard/item_storage_cell_4m_disassembly.json 52352debdb17791456fd759524b27bce5d1e8984 data/megacells/recipe/cells/standard/item_storage_cell_4m_with_housing.json 35269126ae3042dea72ed10215f41f2800485b0d data/megacells/recipe/cells/standard/item_storage_cell_64m.json +db3c5c962bf680d477ce0d355dc3e0f82c85ae6c data/megacells/recipe/cells/standard/item_storage_cell_64m_disassembly.json 8fd6ba7ff2bdaba2b59c9020f64051575eab3715 data/megacells/recipe/cells/standard/item_storage_cell_64m_with_housing.json 2405ae522b2d595513199005f2d5d763bd4051b8 data/megacells/recipe/cells/standard/radioactive_chemical_cell.json +c01c4c20be5317c6759fab48ff7641659482cc50 data/megacells/recipe/cells/standard/source_storage_cell_16m_disassembly.json 7c2ab00020aa97be67e6730906486ffb0e14ddb7 data/megacells/recipe/cells/standard/source_storage_cell_16m_with_housing.json +a503a0f0b6c6bc29b59887d93aa0e151eb1f75e2 data/megacells/recipe/cells/standard/source_storage_cell_1m_disassembly.json f4bb70838b45054473df99cbb77907bec9d6bdba data/megacells/recipe/cells/standard/source_storage_cell_1m_with_housing.json +8b5615981dae5a291a7b0fd770016c42dd2f2187 data/megacells/recipe/cells/standard/source_storage_cell_256m_disassembly.json 4d01785897b0007e5a17cf41bc3f1b5cf46c90dc data/megacells/recipe/cells/standard/source_storage_cell_256m_with_housing.json +ee8ca3b059c7fc3fecfbe015537e084384090ea0 data/megacells/recipe/cells/standard/source_storage_cell_4m_disassembly.json 9b3bb54abf88deeead9be5557a56f3c1ead84488 data/megacells/recipe/cells/standard/source_storage_cell_4m_with_housing.json +08c96bfdc2963cb2c3c0708805e7f46dc055b5cf data/megacells/recipe/cells/standard/source_storage_cell_64m_disassembly.json 87f595f8aa083f7dc85eb5e2298acae60903ca3e data/megacells/recipe/cells/standard/source_storage_cell_64m_with_housing.json 3b23da42a2e3ae91d1bfae9a2ef8278b9c4e2dab data/megacells/recipe/crafting/16m_crafting_storage.json +3f60694a36cebab7f4a4ec409f9526c9004d90c7 data/megacells/recipe/crafting/16m_crafting_storage_disassembly.json cffe1fc8df3bfd2a3d5fb6b79e842e1b7842119b data/megacells/recipe/crafting/1m_crafting_storage.json +da7505ff376f3266c485311b28638da683c45437 data/megacells/recipe/crafting/1m_crafting_storage_disassembly.json ad73c1f04f88daff27e7578965cb5cda590090e5 data/megacells/recipe/crafting/256m_crafting_storage.json +9128f8637f4559c5c16c72c2dab97f531f3ba527 data/megacells/recipe/crafting/256m_crafting_storage_disassembly.json a45fb45f820e8996ba79f0e9068bdecaa2162128 data/megacells/recipe/crafting/4m_crafting_storage.json +da9da3ef45754470bece072b247657908eb62040 data/megacells/recipe/crafting/4m_crafting_storage_disassembly.json 582132e5e6b78adbb7b64015c117bca12262937d data/megacells/recipe/crafting/64m_crafting_storage.json +babe99258a179b81d0ee196a3e896ac13fdd0632 data/megacells/recipe/crafting/64m_crafting_storage_disassembly.json e043154d4d4f72a2dc954d06ef8e11c00e35cfb3 data/megacells/recipe/crafting/bulk_cell_component.json 3c30c36194d1313da3132844fcfc41f696442c55 data/megacells/recipe/crafting/compression_card.json 35943bb122f6efa2ac7e6101db5bd554cf353fa2 data/megacells/recipe/crafting/decompression_module.json c63782179e650dd8f2894868c96f5130e96e3b83 data/megacells/recipe/crafting/greater_energy_card.json aa08ec17d721578cb117d1141f079bfbb6fc1c49 data/megacells/recipe/crafting/greater_energy_card_upgraded.json 9167031cb066501d20c147b60d5f892fb4c5bb15 data/megacells/recipe/crafting/mega_crafting_accelerator.json +a1a3a53b0f09ba4553c77748d963686efdc31ceb data/megacells/recipe/crafting/mega_crafting_accelerator_disassembly.json f489e6dd9e126cddeaf657a1b89c592a42913036 data/megacells/recipe/crafting/mega_crafting_monitor.json +4e56f209014e8464085028d1c115728b6e5a4d81 data/megacells/recipe/crafting/mega_crafting_monitor_disassembly.json 1ad6e8f561e5c8ac8aab407b977b0af370df5b34 data/megacells/recipe/crafting/mega_crafting_unit.json 7f42762447eed3ecb96c6d2db8f208f56e0df15f data/megacells/recipe/crafting/mega_energy_cell.json 2665392a355cdf54a1ace7c999238f138eadc83b data/megacells/recipe/crafting/radioactive_cell_component.json diff --git a/src/generated/resources/data/megacells/recipe/cells/portable/portable_chemical_cell_16m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/portable/portable_chemical_cell_16m_disassembly.json new file mode 100644 index 00000000..f9f8b0c0 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/portable/portable_chemical_cell_16m_disassembly.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "appmek" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:portable_chemical_cell_16m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_16m" + }, + { + "count": 1, + "id": "megacells:mega_chemical_cell_housing" + }, + { + "count": 1, + "id": "ae2:chest" + }, + { + "count": 1, + "id": "ae2:dense_energy_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/portable/portable_chemical_cell_1m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/portable/portable_chemical_cell_1m_disassembly.json new file mode 100644 index 00000000..a60c90fc --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/portable/portable_chemical_cell_1m_disassembly.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "appmek" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:portable_chemical_cell_1m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_1m" + }, + { + "count": 1, + "id": "megacells:mega_chemical_cell_housing" + }, + { + "count": 1, + "id": "ae2:chest" + }, + { + "count": 1, + "id": "ae2:dense_energy_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/portable/portable_chemical_cell_256m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/portable/portable_chemical_cell_256m_disassembly.json new file mode 100644 index 00000000..75e946ff --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/portable/portable_chemical_cell_256m_disassembly.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "appmek" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:portable_chemical_cell_256m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_256m" + }, + { + "count": 1, + "id": "megacells:mega_chemical_cell_housing" + }, + { + "count": 1, + "id": "ae2:chest" + }, + { + "count": 1, + "id": "ae2:dense_energy_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/portable/portable_chemical_cell_4m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/portable/portable_chemical_cell_4m_disassembly.json new file mode 100644 index 00000000..21461d0a --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/portable/portable_chemical_cell_4m_disassembly.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "appmek" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:portable_chemical_cell_4m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_4m" + }, + { + "count": 1, + "id": "megacells:mega_chemical_cell_housing" + }, + { + "count": 1, + "id": "ae2:chest" + }, + { + "count": 1, + "id": "ae2:dense_energy_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/portable/portable_chemical_cell_64m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/portable/portable_chemical_cell_64m_disassembly.json new file mode 100644 index 00000000..d00df677 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/portable/portable_chemical_cell_64m_disassembly.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "appmek" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:portable_chemical_cell_64m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_64m" + }, + { + "count": 1, + "id": "megacells:mega_chemical_cell_housing" + }, + { + "count": 1, + "id": "ae2:chest" + }, + { + "count": 1, + "id": "ae2:dense_energy_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/portable/portable_fluid_cell_16m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/portable/portable_fluid_cell_16m_disassembly.json new file mode 100644 index 00000000..111de581 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/portable/portable_fluid_cell_16m_disassembly.json @@ -0,0 +1,22 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:portable_fluid_cell_16m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_16m" + }, + { + "count": 1, + "id": "megacells:mega_fluid_cell_housing" + }, + { + "count": 1, + "id": "ae2:chest" + }, + { + "count": 1, + "id": "ae2:dense_energy_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/portable/portable_fluid_cell_1m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/portable/portable_fluid_cell_1m_disassembly.json new file mode 100644 index 00000000..7dc98827 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/portable/portable_fluid_cell_1m_disassembly.json @@ -0,0 +1,22 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:portable_fluid_cell_1m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_1m" + }, + { + "count": 1, + "id": "megacells:mega_fluid_cell_housing" + }, + { + "count": 1, + "id": "ae2:chest" + }, + { + "count": 1, + "id": "ae2:dense_energy_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/portable/portable_fluid_cell_256m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/portable/portable_fluid_cell_256m_disassembly.json new file mode 100644 index 00000000..3623b09c --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/portable/portable_fluid_cell_256m_disassembly.json @@ -0,0 +1,22 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:portable_fluid_cell_256m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_256m" + }, + { + "count": 1, + "id": "megacells:mega_fluid_cell_housing" + }, + { + "count": 1, + "id": "ae2:chest" + }, + { + "count": 1, + "id": "ae2:dense_energy_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/portable/portable_fluid_cell_4m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/portable/portable_fluid_cell_4m_disassembly.json new file mode 100644 index 00000000..20fe126e --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/portable/portable_fluid_cell_4m_disassembly.json @@ -0,0 +1,22 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:portable_fluid_cell_4m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_4m" + }, + { + "count": 1, + "id": "megacells:mega_fluid_cell_housing" + }, + { + "count": 1, + "id": "ae2:chest" + }, + { + "count": 1, + "id": "ae2:dense_energy_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/portable/portable_fluid_cell_64m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/portable/portable_fluid_cell_64m_disassembly.json new file mode 100644 index 00000000..01f09430 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/portable/portable_fluid_cell_64m_disassembly.json @@ -0,0 +1,22 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:portable_fluid_cell_64m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_64m" + }, + { + "count": 1, + "id": "megacells:mega_fluid_cell_housing" + }, + { + "count": 1, + "id": "ae2:chest" + }, + { + "count": 1, + "id": "ae2:dense_energy_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/portable/portable_item_cell_16m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/portable/portable_item_cell_16m_disassembly.json new file mode 100644 index 00000000..cf7d4973 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/portable/portable_item_cell_16m_disassembly.json @@ -0,0 +1,22 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:portable_item_cell_16m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_16m" + }, + { + "count": 1, + "id": "megacells:mega_item_cell_housing" + }, + { + "count": 1, + "id": "ae2:chest" + }, + { + "count": 1, + "id": "ae2:dense_energy_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/portable/portable_item_cell_1m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/portable/portable_item_cell_1m_disassembly.json new file mode 100644 index 00000000..590b7b2a --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/portable/portable_item_cell_1m_disassembly.json @@ -0,0 +1,22 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:portable_item_cell_1m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_1m" + }, + { + "count": 1, + "id": "megacells:mega_item_cell_housing" + }, + { + "count": 1, + "id": "ae2:chest" + }, + { + "count": 1, + "id": "ae2:dense_energy_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/portable/portable_item_cell_256m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/portable/portable_item_cell_256m_disassembly.json new file mode 100644 index 00000000..ca2bae57 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/portable/portable_item_cell_256m_disassembly.json @@ -0,0 +1,22 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:portable_item_cell_256m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_256m" + }, + { + "count": 1, + "id": "megacells:mega_item_cell_housing" + }, + { + "count": 1, + "id": "ae2:chest" + }, + { + "count": 1, + "id": "ae2:dense_energy_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/portable/portable_item_cell_4m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/portable/portable_item_cell_4m_disassembly.json new file mode 100644 index 00000000..47dac0db --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/portable/portable_item_cell_4m_disassembly.json @@ -0,0 +1,22 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:portable_item_cell_4m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_4m" + }, + { + "count": 1, + "id": "megacells:mega_item_cell_housing" + }, + { + "count": 1, + "id": "ae2:chest" + }, + { + "count": 1, + "id": "ae2:dense_energy_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/portable/portable_item_cell_64m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/portable/portable_item_cell_64m_disassembly.json new file mode 100644 index 00000000..4cf52ba8 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/portable/portable_item_cell_64m_disassembly.json @@ -0,0 +1,22 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:portable_item_cell_64m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_64m" + }, + { + "count": 1, + "id": "megacells:mega_item_cell_housing" + }, + { + "count": 1, + "id": "ae2:chest" + }, + { + "count": 1, + "id": "ae2:dense_energy_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/portable/portable_source_cell_16m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/portable/portable_source_cell_16m_disassembly.json new file mode 100644 index 00000000..e31149de --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/portable/portable_source_cell_16m_disassembly.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "arseng" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:portable_source_cell_16m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_16m" + }, + { + "count": 1, + "id": "megacells:mega_source_cell_housing" + }, + { + "count": 1, + "id": "ae2:chest" + }, + { + "count": 1, + "id": "ae2:dense_energy_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/portable/portable_source_cell_1m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/portable/portable_source_cell_1m_disassembly.json new file mode 100644 index 00000000..e25de38b --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/portable/portable_source_cell_1m_disassembly.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "arseng" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:portable_source_cell_1m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_1m" + }, + { + "count": 1, + "id": "megacells:mega_source_cell_housing" + }, + { + "count": 1, + "id": "ae2:chest" + }, + { + "count": 1, + "id": "ae2:dense_energy_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/portable/portable_source_cell_256m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/portable/portable_source_cell_256m_disassembly.json new file mode 100644 index 00000000..1088536b --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/portable/portable_source_cell_256m_disassembly.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "arseng" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:portable_source_cell_256m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_256m" + }, + { + "count": 1, + "id": "megacells:mega_source_cell_housing" + }, + { + "count": 1, + "id": "ae2:chest" + }, + { + "count": 1, + "id": "ae2:dense_energy_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/portable/portable_source_cell_4m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/portable/portable_source_cell_4m_disassembly.json new file mode 100644 index 00000000..f7937d13 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/portable/portable_source_cell_4m_disassembly.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "arseng" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:portable_source_cell_4m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_4m" + }, + { + "count": 1, + "id": "megacells:mega_source_cell_housing" + }, + { + "count": 1, + "id": "ae2:chest" + }, + { + "count": 1, + "id": "ae2:dense_energy_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/portable/portable_source_cell_64m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/portable/portable_source_cell_64m_disassembly.json new file mode 100644 index 00000000..e7b072b4 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/portable/portable_source_cell_64m_disassembly.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "arseng" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:portable_source_cell_64m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_64m" + }, + { + "count": 1, + "id": "megacells:mega_source_cell_housing" + }, + { + "count": 1, + "id": "ae2:chest" + }, + { + "count": 1, + "id": "ae2:dense_energy_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/standard/chemical_storage_cell_16m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/standard/chemical_storage_cell_16m_disassembly.json new file mode 100644 index 00000000..53ac8803 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/standard/chemical_storage_cell_16m_disassembly.json @@ -0,0 +1,20 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "appmek" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:chemical_storage_cell_16m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_16m" + }, + { + "count": 1, + "id": "megacells:mega_chemical_cell_housing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/standard/chemical_storage_cell_1m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/standard/chemical_storage_cell_1m_disassembly.json new file mode 100644 index 00000000..afaffd07 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/standard/chemical_storage_cell_1m_disassembly.json @@ -0,0 +1,20 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "appmek" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:chemical_storage_cell_1m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_1m" + }, + { + "count": 1, + "id": "megacells:mega_chemical_cell_housing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/standard/chemical_storage_cell_256m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/standard/chemical_storage_cell_256m_disassembly.json new file mode 100644 index 00000000..34f6fcaf --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/standard/chemical_storage_cell_256m_disassembly.json @@ -0,0 +1,20 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "appmek" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:chemical_storage_cell_256m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_256m" + }, + { + "count": 1, + "id": "megacells:mega_chemical_cell_housing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/standard/chemical_storage_cell_4m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/standard/chemical_storage_cell_4m_disassembly.json new file mode 100644 index 00000000..b71051a3 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/standard/chemical_storage_cell_4m_disassembly.json @@ -0,0 +1,20 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "appmek" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:chemical_storage_cell_4m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_4m" + }, + { + "count": 1, + "id": "megacells:mega_chemical_cell_housing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/standard/chemical_storage_cell_64m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/standard/chemical_storage_cell_64m_disassembly.json new file mode 100644 index 00000000..73d44801 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/standard/chemical_storage_cell_64m_disassembly.json @@ -0,0 +1,20 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "appmek" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:chemical_storage_cell_64m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_64m" + }, + { + "count": 1, + "id": "megacells:mega_chemical_cell_housing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/standard/fluid_storage_cell_16m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/standard/fluid_storage_cell_16m_disassembly.json new file mode 100644 index 00000000..d9e3aa50 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/standard/fluid_storage_cell_16m_disassembly.json @@ -0,0 +1,14 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:fluid_storage_cell_16m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_16m" + }, + { + "count": 1, + "id": "megacells:mega_fluid_cell_housing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/standard/fluid_storage_cell_1m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/standard/fluid_storage_cell_1m_disassembly.json new file mode 100644 index 00000000..454284f4 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/standard/fluid_storage_cell_1m_disassembly.json @@ -0,0 +1,14 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:fluid_storage_cell_1m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_1m" + }, + { + "count": 1, + "id": "megacells:mega_fluid_cell_housing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/standard/fluid_storage_cell_256m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/standard/fluid_storage_cell_256m_disassembly.json new file mode 100644 index 00000000..190f1059 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/standard/fluid_storage_cell_256m_disassembly.json @@ -0,0 +1,14 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:fluid_storage_cell_256m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_256m" + }, + { + "count": 1, + "id": "megacells:mega_fluid_cell_housing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/standard/fluid_storage_cell_4m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/standard/fluid_storage_cell_4m_disassembly.json new file mode 100644 index 00000000..15d0e541 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/standard/fluid_storage_cell_4m_disassembly.json @@ -0,0 +1,14 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:fluid_storage_cell_4m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_4m" + }, + { + "count": 1, + "id": "megacells:mega_fluid_cell_housing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/standard/fluid_storage_cell_64m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/standard/fluid_storage_cell_64m_disassembly.json new file mode 100644 index 00000000..a3e2d42f --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/standard/fluid_storage_cell_64m_disassembly.json @@ -0,0 +1,14 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:fluid_storage_cell_64m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_64m" + }, + { + "count": 1, + "id": "megacells:mega_fluid_cell_housing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/standard/item_storage_cell_16m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/standard/item_storage_cell_16m_disassembly.json new file mode 100644 index 00000000..159e69fc --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/standard/item_storage_cell_16m_disassembly.json @@ -0,0 +1,14 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:item_storage_cell_16m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_16m" + }, + { + "count": 1, + "id": "megacells:mega_item_cell_housing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/standard/item_storage_cell_1m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/standard/item_storage_cell_1m_disassembly.json new file mode 100644 index 00000000..d9a1128d --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/standard/item_storage_cell_1m_disassembly.json @@ -0,0 +1,14 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:item_storage_cell_1m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_1m" + }, + { + "count": 1, + "id": "megacells:mega_item_cell_housing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/standard/item_storage_cell_256m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/standard/item_storage_cell_256m_disassembly.json new file mode 100644 index 00000000..87744c40 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/standard/item_storage_cell_256m_disassembly.json @@ -0,0 +1,14 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:item_storage_cell_256m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_256m" + }, + { + "count": 1, + "id": "megacells:mega_item_cell_housing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/standard/item_storage_cell_4m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/standard/item_storage_cell_4m_disassembly.json new file mode 100644 index 00000000..e14fd382 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/standard/item_storage_cell_4m_disassembly.json @@ -0,0 +1,14 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:item_storage_cell_4m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_4m" + }, + { + "count": 1, + "id": "megacells:mega_item_cell_housing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/standard/item_storage_cell_64m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/standard/item_storage_cell_64m_disassembly.json new file mode 100644 index 00000000..e80ea7e9 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/standard/item_storage_cell_64m_disassembly.json @@ -0,0 +1,14 @@ +{ + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:item_storage_cell_64m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_64m" + }, + { + "count": 1, + "id": "megacells:mega_item_cell_housing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/standard/source_storage_cell_16m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/standard/source_storage_cell_16m_disassembly.json new file mode 100644 index 00000000..102b57be --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/standard/source_storage_cell_16m_disassembly.json @@ -0,0 +1,20 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "arseng" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:source_storage_cell_16m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_16m" + }, + { + "count": 1, + "id": "megacells:mega_source_cell_housing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/standard/source_storage_cell_1m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/standard/source_storage_cell_1m_disassembly.json new file mode 100644 index 00000000..e0fbeccc --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/standard/source_storage_cell_1m_disassembly.json @@ -0,0 +1,20 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "arseng" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:source_storage_cell_1m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_1m" + }, + { + "count": 1, + "id": "megacells:mega_source_cell_housing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/standard/source_storage_cell_256m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/standard/source_storage_cell_256m_disassembly.json new file mode 100644 index 00000000..4950cbd4 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/standard/source_storage_cell_256m_disassembly.json @@ -0,0 +1,20 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "arseng" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:source_storage_cell_256m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_256m" + }, + { + "count": 1, + "id": "megacells:mega_source_cell_housing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/standard/source_storage_cell_4m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/standard/source_storage_cell_4m_disassembly.json new file mode 100644 index 00000000..48010dcc --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/standard/source_storage_cell_4m_disassembly.json @@ -0,0 +1,20 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "arseng" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:source_storage_cell_4m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_4m" + }, + { + "count": 1, + "id": "megacells:mega_source_cell_housing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/cells/standard/source_storage_cell_64m_disassembly.json b/src/generated/resources/data/megacells/recipe/cells/standard/source_storage_cell_64m_disassembly.json new file mode 100644 index 00000000..0238cbc6 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/cells/standard/source_storage_cell_64m_disassembly.json @@ -0,0 +1,20 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "arseng" + } + ], + "type": "ae2:storage_cell_disassembly", + "cell": "megacells:source_storage_cell_64m", + "cell_disassembly_items": [ + { + "count": 1, + "id": "megacells:cell_component_64m" + }, + { + "count": 1, + "id": "megacells:mega_source_cell_housing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/crafting/16m_crafting_storage_disassembly.json b/src/generated/resources/data/megacells/recipe/crafting/16m_crafting_storage_disassembly.json new file mode 100644 index 00000000..31b1ebc4 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/crafting/16m_crafting_storage_disassembly.json @@ -0,0 +1,5 @@ +{ + "type": "ae2:crafting_unit_transform", + "upgrade_item": "megacells:cell_component_16m", + "upgraded_block": "megacells:16m_crafting_storage" +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/crafting/1m_crafting_storage_disassembly.json b/src/generated/resources/data/megacells/recipe/crafting/1m_crafting_storage_disassembly.json new file mode 100644 index 00000000..5f0493ec --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/crafting/1m_crafting_storage_disassembly.json @@ -0,0 +1,5 @@ +{ + "type": "ae2:crafting_unit_transform", + "upgrade_item": "megacells:cell_component_1m", + "upgraded_block": "megacells:1m_crafting_storage" +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/crafting/256m_crafting_storage_disassembly.json b/src/generated/resources/data/megacells/recipe/crafting/256m_crafting_storage_disassembly.json new file mode 100644 index 00000000..24a4af53 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/crafting/256m_crafting_storage_disassembly.json @@ -0,0 +1,5 @@ +{ + "type": "ae2:crafting_unit_transform", + "upgrade_item": "megacells:cell_component_256m", + "upgraded_block": "megacells:256m_crafting_storage" +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/crafting/4m_crafting_storage_disassembly.json b/src/generated/resources/data/megacells/recipe/crafting/4m_crafting_storage_disassembly.json new file mode 100644 index 00000000..2e3664cd --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/crafting/4m_crafting_storage_disassembly.json @@ -0,0 +1,5 @@ +{ + "type": "ae2:crafting_unit_transform", + "upgrade_item": "megacells:cell_component_4m", + "upgraded_block": "megacells:4m_crafting_storage" +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/crafting/64m_crafting_storage_disassembly.json b/src/generated/resources/data/megacells/recipe/crafting/64m_crafting_storage_disassembly.json new file mode 100644 index 00000000..630db8ae --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/crafting/64m_crafting_storage_disassembly.json @@ -0,0 +1,5 @@ +{ + "type": "ae2:crafting_unit_transform", + "upgrade_item": "megacells:cell_component_64m", + "upgraded_block": "megacells:64m_crafting_storage" +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/crafting/mega_crafting_accelerator_disassembly.json b/src/generated/resources/data/megacells/recipe/crafting/mega_crafting_accelerator_disassembly.json new file mode 100644 index 00000000..c2d8bac2 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/crafting/mega_crafting_accelerator_disassembly.json @@ -0,0 +1,5 @@ +{ + "type": "ae2:crafting_unit_transform", + "upgrade_item": "ae2:engineering_processor", + "upgraded_block": "megacells:mega_crafting_accelerator" +} \ No newline at end of file diff --git a/src/generated/resources/data/megacells/recipe/crafting/mega_crafting_monitor_disassembly.json b/src/generated/resources/data/megacells/recipe/crafting/mega_crafting_monitor_disassembly.json new file mode 100644 index 00000000..d87387e6 --- /dev/null +++ b/src/generated/resources/data/megacells/recipe/crafting/mega_crafting_monitor_disassembly.json @@ -0,0 +1,5 @@ +{ + "type": "ae2:crafting_unit_transform", + "upgrade_item": "ae2:storage_monitor", + "upgraded_block": "megacells:mega_crafting_monitor" +} \ No newline at end of file diff --git a/src/main/java/gripe/_90/megacells/block/MEGACraftingBlockItem.java b/src/main/java/gripe/_90/megacells/block/MEGACraftingBlockItem.java deleted file mode 100644 index ea57dd76..00000000 --- a/src/main/java/gripe/_90/megacells/block/MEGACraftingBlockItem.java +++ /dev/null @@ -1,55 +0,0 @@ -package gripe._90.megacells.block; - -import static gripe._90.megacells.definition.MEGABlocks.CRAFTING_ACCELERATOR; -import static gripe._90.megacells.definition.MEGABlocks.MEGA_CRAFTING_UNIT; -import static gripe._90.megacells.definition.MEGATranslations.AcceleratorThreads; - -import java.util.List; -import java.util.function.Supplier; - -import org.jetbrains.annotations.NotNull; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResultHolder; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.ItemLike; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; - -import appeng.block.crafting.CraftingBlockItem; -import appeng.core.AEConfig; -import appeng.core.localization.Tooltips; -import appeng.util.InteractionUtil; - -public class MEGACraftingBlockItem extends CraftingBlockItem { - public MEGACraftingBlockItem(Block id, Properties props, Supplier disassemblyExtra) { - super(id, props, disassemblyExtra); - } - - @NotNull - @Override - public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { - if (AEConfig.instance().isDisassemblyCraftingEnabled() && InteractionUtil.isInAlternateUseMode(player)) { - int itemCount = player.getItemInHand(hand).getCount(); - player.setItemInHand(hand, ItemStack.EMPTY); - - player.getInventory().placeItemBackInInventory(MEGA_CRAFTING_UNIT.stack(itemCount)); - player.getInventory().placeItemBackInInventory(new ItemStack(disassemblyExtra.get(), itemCount)); - - return InteractionResultHolder.sidedSuccess(player.getItemInHand(hand), level.isClientSide()); - } - - return super.use(level, player, hand); - } - - @Override - public void addCheckedInformation( - ItemStack stack, TooltipContext context, List lines, TooltipFlag flag) { - if (this.getBlock().equals(CRAFTING_ACCELERATOR.block())) { - lines.add(Tooltips.of(AcceleratorThreads.text())); - } - } -} diff --git a/src/main/java/gripe/_90/megacells/definition/MEGABlocks.java b/src/main/java/gripe/_90/megacells/definition/MEGABlocks.java index dfff6a85..da2c31c8 100644 --- a/src/main/java/gripe/_90/megacells/definition/MEGABlocks.java +++ b/src/main/java/gripe/_90/megacells/definition/MEGABlocks.java @@ -7,9 +7,11 @@ import java.util.function.Function; import java.util.function.Supplier; +import net.minecraft.network.chat.Component; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; -import net.minecraft.world.level.ItemLike; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; @@ -17,18 +19,16 @@ import net.neoforged.neoforge.registries.DeferredRegister; import appeng.block.AEBaseBlockItem; +import appeng.block.crafting.CraftingBlockItem; import appeng.block.crafting.CraftingMonitorBlock; import appeng.block.crafting.CraftingUnitBlock; import appeng.block.networking.EnergyCellBlock; import appeng.block.networking.EnergyCellBlockItem; -import appeng.core.definitions.AEItems; -import appeng.core.definitions.AEParts; import appeng.core.definitions.BlockDefinition; import appeng.core.definitions.ItemDefinition; import appeng.decorative.AEDecorativeBlock; import gripe._90.megacells.MEGACells; -import gripe._90.megacells.block.MEGACraftingBlockItem; import gripe._90.megacells.block.MEGACraftingUnitType; import gripe._90.megacells.block.MEGAInterfaceBlock; import gripe._90.megacells.block.MEGAPatternProviderBlock; @@ -86,41 +86,47 @@ public static List> getBlocks() { "mega_crafting_unit", () -> new CraftingUnitBlock(MEGACraftingUnitType.UNIT), AEBaseBlockItem::new); - public static final BlockDefinition CRAFTING_ACCELERATOR = craftingBlock( + public static final BlockDefinition CRAFTING_ACCELERATOR = block( "MEGA Crafting Co-Processing Unit", "mega_crafting_accelerator", () -> new CraftingUnitBlock(MEGACraftingUnitType.ACCELERATOR), - () -> AEItems.ENGINEERING_PROCESSOR); - public static final BlockDefinition CRAFTING_STORAGE_1M = craftingBlock( + (block, props) -> new CraftingBlockItem(block, props) { + @Override + public void addCheckedInformation( + ItemStack stack, TooltipContext context, List lines, TooltipFlag adv) { + lines.add(MEGATranslations.AcceleratorThreads.text()); + } + }); + public static final BlockDefinition CRAFTING_STORAGE_1M = block( "1M MEGA Crafting Storage", "1m_crafting_storage", () -> new CraftingUnitBlock(MEGACraftingUnitType.STORAGE_1M), - () -> MEGAItems.CELL_COMPONENT_1M); - public static final BlockDefinition CRAFTING_STORAGE_4M = craftingBlock( + CraftingBlockItem::new); + public static final BlockDefinition CRAFTING_STORAGE_4M = block( "4M MEGA Crafting Storage", "4m_crafting_storage", () -> new CraftingUnitBlock(MEGACraftingUnitType.STORAGE_4M), - () -> MEGAItems.CELL_COMPONENT_4M); - public static final BlockDefinition CRAFTING_STORAGE_16M = craftingBlock( + CraftingBlockItem::new); + public static final BlockDefinition CRAFTING_STORAGE_16M = block( "16M MEGA Crafting Storage", "16m_crafting_storage", () -> new CraftingUnitBlock(MEGACraftingUnitType.STORAGE_16M), - () -> MEGAItems.CELL_COMPONENT_16M); - public static final BlockDefinition CRAFTING_STORAGE_64M = craftingBlock( + CraftingBlockItem::new); + public static final BlockDefinition CRAFTING_STORAGE_64M = block( "64M MEGA Crafting Storage", "64m_crafting_storage", () -> new CraftingUnitBlock(MEGACraftingUnitType.STORAGE_64M), - () -> MEGAItems.CELL_COMPONENT_64M); - public static final BlockDefinition CRAFTING_STORAGE_256M = craftingBlock( + CraftingBlockItem::new); + public static final BlockDefinition CRAFTING_STORAGE_256M = block( "256M MEGA Crafting Storage", "256m_crafting_storage", () -> new CraftingUnitBlock(MEGACraftingUnitType.STORAGE_256M), - () -> MEGAItems.CELL_COMPONENT_256M); - public static final BlockDefinition CRAFTING_MONITOR = craftingBlock( + CraftingBlockItem::new); + public static final BlockDefinition CRAFTING_MONITOR = block( "MEGA Crafting Monitor", "mega_crafting_monitor", () -> new CraftingMonitorBlock(MEGACraftingUnitType.MONITOR), - () -> AEParts.STORAGE_MONITOR); + CraftingBlockItem::new); public static final BlockDefinition MEGA_INTERFACE = block("MEGA Interface", "mega_interface", MEGAInterfaceBlock::new, AEBaseBlockItem::new); @@ -130,15 +136,6 @@ public static List> getBlocks() { MEGAPatternProviderBlock::new, MEGAPatternProviderBlockItem::new); - private static BlockDefinition craftingBlock( - String englishName, String id, Supplier blockSupplier, Supplier disassemblyExtra) { - return block( - englishName, - id, - blockSupplier, - (block, props) -> new MEGACraftingBlockItem(block, props, disassemblyExtra)); - } - private static BlockDefinition block( String englishName, String id, diff --git a/src/main/java/gripe/_90/megacells/definition/MEGAItems.java b/src/main/java/gripe/_90/megacells/definition/MEGAItems.java index baaee893..1152dea4 100644 --- a/src/main/java/gripe/_90/megacells/definition/MEGAItems.java +++ b/src/main/java/gripe/_90/megacells/definition/MEGAItems.java @@ -204,8 +204,6 @@ private static ItemDefinition itemCell(StorageTier tier) { "item_storage_cell_" + tier.namePrefix(), p -> new BasicStorageCell( p.stacksTo(1), - tier.componentSupplier().get(), - MEGA_ITEM_CELL_HOUSING, tier.idleDrain(), tier.bytes() / 1024, tier.bytes() / 128, @@ -221,8 +219,6 @@ private static ItemDefinition fluidCell(StorageTier tier) { "fluid_storage_cell_" + tier.namePrefix(), p -> new BasicStorageCell( p.stacksTo(1), - tier.componentSupplier().get(), - MEGA_FLUID_CELL_HOUSING, tier.idleDrain(), tier.bytes() / 1024, tier.bytes() / 128, diff --git a/src/main/java/gripe/_90/megacells/integration/appmek/AppMekIntegration.java b/src/main/java/gripe/_90/megacells/integration/appmek/AppMekIntegration.java index a6e0e8b2..315b9083 100644 --- a/src/main/java/gripe/_90/megacells/integration/appmek/AppMekIntegration.java +++ b/src/main/java/gripe/_90/megacells/integration/appmek/AppMekIntegration.java @@ -26,7 +26,7 @@ public final class AppMekIntegration implements IntegrationHelper { @Override public Function createCell(StorageTier tier) { - return p -> new ChemicalStorageCell(p, tier, MEGAItems.MEGA_CHEMICAL_CELL_HOUSING); + return p -> new ChemicalStorageCell(p, tier); } @Override diff --git a/src/main/java/gripe/_90/megacells/integration/arseng/ArsEngIntegration.java b/src/main/java/gripe/_90/megacells/integration/arseng/ArsEngIntegration.java index 70de5efb..168eaccd 100644 --- a/src/main/java/gripe/_90/megacells/integration/arseng/ArsEngIntegration.java +++ b/src/main/java/gripe/_90/megacells/integration/arseng/ArsEngIntegration.java @@ -21,7 +21,7 @@ public class ArsEngIntegration implements IntegrationHelper { @Override public Function createCell(StorageTier tier) { - return p -> new SourceCellItem(p, tier, MEGAItems.MEGA_SOURCE_CELL_HOUSING); + return p -> new SourceCellItem(p, tier); } @Override diff --git a/src/main/java/gripe/_90/megacells/misc/DecompressionPattern.java b/src/main/java/gripe/_90/megacells/misc/DecompressionPattern.java index c67bc178..0c7a4f28 100644 --- a/src/main/java/gripe/_90/megacells/misc/DecompressionPattern.java +++ b/src/main/java/gripe/_90/megacells/misc/DecompressionPattern.java @@ -1,5 +1,6 @@ package gripe._90.megacells.misc; +import java.util.Collections; import java.util.List; import com.mojang.serialization.Codec; @@ -51,14 +52,12 @@ public IInput[] getInputs() { @Override public List getOutputs() { - return List.of(toCompress ? new GenericStack(variant, 1) : new GenericStack(base, factor)); + return Collections.singletonList(toCompress ? new GenericStack(variant, 1) : new GenericStack(base, factor)); } @Override public boolean equals(Object obj) { - return obj != null - && obj.getClass() == getClass() - && ((DecompressionPattern) obj).definition.equals(definition); + return obj instanceof DecompressionPattern pattern && pattern.definition.equals(definition); } @Override diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml index f4a92503..258ebbf3 100644 --- a/src/main/resources/META-INF/neoforge.mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -21,4 +21,19 @@ config = "megacells.mixins.json" [[dependencies]] modId = "ae2" -versionRange = "[$ae2Version,$ae2VersionEnd)" +versionRange = "[$ae2Version,)" + +[[dependencies]] +modId = "ae2wtlib" +type = "optional" +versionRange = "[$ae2wtlibVersion,)" + +[[dependencies]] +modId = "appmek" +type = "optional" +versionRange = "[$appmekVersion,)" + +[[dependencies]] +modId = "arseng" +type = "optional" +versionRange = "[$arsengVersion,)" diff --git a/src/main/resources/megacells.mixins.json b/src/main/resources/megacells.mixins.json index 3ef1dff0..22a3f69f 100644 --- a/src/main/resources/megacells.mixins.json +++ b/src/main/resources/megacells.mixins.json @@ -3,11 +3,11 @@ "minVersion": "0.8.5", "package": "gripe._90.megacells.mixin", "mixins": [ - "ItemEntityMixin", - "PatternProviderMenuAccessor", "CellWorkbenchBlockEntityMixin", "CellWorkbenchMenuMixin", - "ItemMenuHostMixin" + "ItemEntityMixin", + "ItemMenuHostMixin", + "PatternProviderMenuAccessor" ], "client": [ "client.BuiltInModelHooksAccessor",