diff --git a/build.gradle.kts b/build.gradle.kts index f4a95d5b..56c355cb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { compileOnly(libs.ae2wtlibapi) runtimeOnly(libs.ae2wtlib) - compileOnly(libs.appmek) + implementation(libs.appmek) compileOnly(libs.mekanism) compileOnly(variantOf(libs.mekanism) { classifier("generators") }) runtimeOnly(variantOf(libs.mekanism) { classifier("all") }) @@ -74,6 +74,7 @@ neoForge { "--all", "--output", file("src/generated/resources/").absolutePath, "--existing", file("src/main/resources/").absolutePath, + "--existing", file("src/main/resources/optional_cell_colours").absolutePath, "--existing-mod", "ae2" ) sourceSet = sourceSets.getByName("data") diff --git a/settings.gradle.kts b/settings.gradle.kts index fe166201..62c31804 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -90,7 +90,7 @@ run { version("neoforge", "${nf + (if (!nf.contains('.')) ".0" else "")}.66") version("parchment", "2024.07.28") - version("ae2", "19.0.25") + version("ae2", "19.1.1-beta") library("ae2", "appeng", "appliedenergistics2").versionRef("ae2") version("ae2wtlib", "19.1.3-beta") diff --git a/src/data/java/gripe/_90/megacells/datagen/MEGADataGenerators.java b/src/data/java/gripe/_90/megacells/datagen/MEGADataGenerators.java index d3b919f7..cbb7c46b 100644 --- a/src/data/java/gripe/_90/megacells/datagen/MEGADataGenerators.java +++ b/src/data/java/gripe/_90/megacells/datagen/MEGADataGenerators.java @@ -29,5 +29,9 @@ public static void onGatherData(GatherDataEvent event) { generator.addProvider( event.includeServer(), new MEGATagProvider.ItemTags(output, registries, blockTags.contentsGetter(), existing)); + + generator.addProvider( + event.includeClient(), + new OverrideModelProvider(generator.getPackOutput("optional_cell_colours"), existing)); } } diff --git a/src/data/java/gripe/_90/megacells/datagen/MEGAModelProvider.java b/src/data/java/gripe/_90/megacells/datagen/MEGAModelProvider.java index be3f9eba..6a168564 100644 --- a/src/data/java/gripe/_90/megacells/datagen/MEGAModelProvider.java +++ b/src/data/java/gripe/_90/megacells/datagen/MEGAModelProvider.java @@ -220,7 +220,7 @@ private void portable(ItemDefinition portable, String housingType) { "layer0", MEGACells.makeId("item/portable_cell_" + housingType + "_housing")) .texture("layer1", AppEng.makeId("item/portable_cell_led")) - .texture("layer2", MEGACells.makeId("item/portable_cell_screen")) + .texture("layer2", AppEng.makeId("item/portable_cell_screen")) .texture("layer3", MEGACells.makeId("item/portable_cell_side" + tierSuffix)); } diff --git a/src/data/java/gripe/_90/megacells/datagen/OverrideModelProvider.java b/src/data/java/gripe/_90/megacells/datagen/OverrideModelProvider.java new file mode 100644 index 00000000..07775598 --- /dev/null +++ b/src/data/java/gripe/_90/megacells/datagen/OverrideModelProvider.java @@ -0,0 +1,73 @@ +package gripe._90.megacells.datagen; + +import org.jetbrains.annotations.NotNull; + +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.ItemLike; +import net.neoforged.neoforge.client.model.generators.ItemModelProvider; +import net.neoforged.neoforge.common.data.ExistingFileHelper; + +import appeng.core.AppEng; +import appeng.core.definitions.AEItems; + +import me.ramidzkh.mekae2.AMItems; + +import gripe._90.arseng.definition.ArsEngItems; +import gripe._90.megacells.MEGACells; + +public class OverrideModelProvider extends ItemModelProvider { + public OverrideModelProvider(PackOutput output, ExistingFileHelper existing) { + super(output, MEGACells.MODID, existing); + } + + @Override + protected void registerModels() { + cell(AEItems.ITEM_CELL_1K, AEItems.ITEM_CELL_HOUSING); + cell(AEItems.ITEM_CELL_4K, AEItems.ITEM_CELL_HOUSING); + cell(AEItems.ITEM_CELL_16K, AEItems.ITEM_CELL_HOUSING); + cell(AEItems.ITEM_CELL_64K, AEItems.ITEM_CELL_HOUSING); + cell(AEItems.ITEM_CELL_256K, AEItems.ITEM_CELL_HOUSING); + + cell(AEItems.FLUID_CELL_1K, AEItems.FLUID_CELL_HOUSING); + cell(AEItems.FLUID_CELL_4K, AEItems.FLUID_CELL_HOUSING); + cell(AEItems.FLUID_CELL_16K, AEItems.FLUID_CELL_HOUSING); + cell(AEItems.FLUID_CELL_64K, AEItems.FLUID_CELL_HOUSING); + cell(AEItems.FLUID_CELL_256K, AEItems.FLUID_CELL_HOUSING); + + existingFileHelper.trackGenerated(textureLocation(AMItems.CHEMICAL_CELL_HOUSING), TEXTURE); + cell(AMItems.CHEMICAL_CELL_1K, AMItems.CHEMICAL_CELL_HOUSING); + cell(AMItems.CHEMICAL_CELL_4K, AMItems.CHEMICAL_CELL_HOUSING); + cell(AMItems.CHEMICAL_CELL_16K, AMItems.CHEMICAL_CELL_HOUSING); + cell(AMItems.CHEMICAL_CELL_64K, AMItems.CHEMICAL_CELL_HOUSING); + cell(AMItems.CHEMICAL_CELL_256K, AMItems.CHEMICAL_CELL_HOUSING); + + existingFileHelper.trackGenerated(textureLocation(ArsEngItems.SOURCE_CELL_HOUSING), TEXTURE); + cell(ArsEngItems.SOURCE_CELL_1K, ArsEngItems.SOURCE_CELL_HOUSING); + cell(ArsEngItems.SOURCE_CELL_4K, ArsEngItems.SOURCE_CELL_HOUSING); + cell(ArsEngItems.SOURCE_CELL_16K, ArsEngItems.SOURCE_CELL_HOUSING); + cell(ArsEngItems.SOURCE_CELL_64K, ArsEngItems.SOURCE_CELL_HOUSING); + cell(ArsEngItems.SOURCE_CELL_256K, ArsEngItems.SOURCE_CELL_HOUSING); + } + + private void cell(ItemLike cell, ItemLike housing) { + var id = BuiltInRegistries.ITEM.getKey(cell.asItem()); + var tierSuffix = id.getPath().substring(id.getPath().lastIndexOf('_')); + + singleTexture(id.toString(), mcLoc("item/generated"), "layer0", textureLocation(housing)) + .texture("layer1", AppEng.makeId("item/storage_cell_led")) + .texture("layer2", AppEng.makeId("item/storage_cell_side" + tierSuffix)); + } + + private ResourceLocation textureLocation(ItemLike item) { + var id = BuiltInRegistries.ITEM.getKey(item.asItem()); + return ResourceLocation.fromNamespaceAndPath(id.getNamespace(), "item/" + id.getPath()); + } + + @NotNull + @Override + public String getName() { + return "Item Models (Classic Cell Colours)"; + } +} diff --git a/src/generated/resources/.cache/89b86ab0e66f527166d98df92ddbcf5416ed58f6 b/src/generated/resources/.cache/89b86ab0e66f527166d98df92ddbcf5416ed58f6 index 62986d33..2614e0b3 100644 --- a/src/generated/resources/.cache/89b86ab0e66f527166d98df92ddbcf5416ed58f6 +++ b/src/generated/resources/.cache/89b86ab0e66f527166d98df92ddbcf5416ed58f6 @@ -1,2 +1,2 @@ -// 1.21.1 2024-11-18T23:07:51.796909718 Language -9e9924e9ebb1aaf3dced54bdb41bfadab31c7fae assets/megacells/lang/en_us.json +// 1.21.1 2024-12-21T18:53:00.281933828 Language +2dc5bcb57d26ecd11be21e08877d7fde105915eb assets/megacells/lang/en_us.json diff --git a/src/generated/resources/.cache/cc4b70e39bb0fb6efac7e3196e5bd714468e6114 b/src/generated/resources/.cache/cc4b70e39bb0fb6efac7e3196e5bd714468e6114 index d94107c3..7105a22f 100644 --- a/src/generated/resources/.cache/cc4b70e39bb0fb6efac7e3196e5bd714468e6114 +++ b/src/generated/resources/.cache/cc4b70e39bb0fb6efac7e3196e5bd714468e6114 @@ -1,4 +1,4 @@ -// 1.21.1 2024-12-21T15:00:50.678735112 Block States / Models +// 1.21.1 2024-12-21T19:16:08.82136211 Block States / Models 8d69a3c391bcb75b5aac370510d15fa9c367b200 assets/megacells/blockstates/16m_crafting_storage.json 6b8ebbdecbd556e59c1c0d9abb4222d5de046e9a assets/megacells/blockstates/1m_crafting_storage.json c716f5bd44bda4274f6e5f2c2f2b09f6223a8de7 assets/megacells/blockstates/256m_crafting_storage.json @@ -106,26 +106,26 @@ a31fadf8962f679c8fc76b36b705c49d64a494e4 assets/megacells/models/item/mega_inter a4708e37ca1954b67e57a24d60c5955a437b0ef5 assets/megacells/models/item/mega_pattern_provider.json 6762bae761c01dfae6e5a358e1da5ec25b4b3c93 assets/megacells/models/item/mega_source_cell_housing.json f9f81f7f70a276807ae69104dca94146e9f709b6 assets/megacells/models/item/portable_cell_workbench.json -8f512390b83e5bd7975dc82c22d2e6cea5ce1a6f assets/megacells/models/item/portable_chemical_cell_16m.json -441d2f585212d57f88aebdfba013fb170d46e8da assets/megacells/models/item/portable_chemical_cell_1m.json -411e7e6dd40450ae6a3e346db3250dfd8ed08c77 assets/megacells/models/item/portable_chemical_cell_256m.json -72c4b802417ccb1e61cd4b18c1b19fb22ccbb5c9 assets/megacells/models/item/portable_chemical_cell_4m.json -f61b1ca46ebfbdd3d772f21671d4db2803344973 assets/megacells/models/item/portable_chemical_cell_64m.json -6cb60d9c472ce5db515243d58a43543ecf0b6db1 assets/megacells/models/item/portable_fluid_cell_16m.json -0677182bce213cfb00aa0afb003cca3be683b2f6 assets/megacells/models/item/portable_fluid_cell_1m.json -3874c515c587c844827427b0ca6b564f64f595fb assets/megacells/models/item/portable_fluid_cell_256m.json -ad000480e8f68de829d7aa1a0430c7162c9158ca assets/megacells/models/item/portable_fluid_cell_4m.json -cb5bb7f06433aa16444e83f3789b98eb421f5e6c assets/megacells/models/item/portable_fluid_cell_64m.json -77e3d088b83e5a5d9e599ac29b8a4b3f0428f637 assets/megacells/models/item/portable_item_cell_16m.json -5f72a78a92f377bcd009d1554350f91527b62228 assets/megacells/models/item/portable_item_cell_1m.json -5de0872e91d50b0db2936ac97026aef7c5ba557c assets/megacells/models/item/portable_item_cell_256m.json -134971070fbc017150b9748c1752618da58e427e assets/megacells/models/item/portable_item_cell_4m.json -9ec2d30f460bc62b3be58603a5bf3fc7a4a230f5 assets/megacells/models/item/portable_item_cell_64m.json -c0bc57d44c48dce57d705d985b1c2aeab1446ed5 assets/megacells/models/item/portable_source_cell_16m.json -aea4f4f4ccb84a9ebdc8f7995a32cb3ea4d5ad96 assets/megacells/models/item/portable_source_cell_1m.json -6d47ce9d995dc7631123bc4d7d7a532fe3296a00 assets/megacells/models/item/portable_source_cell_256m.json -a1b083da619d1e7f0175c1569aae378b48d068a6 assets/megacells/models/item/portable_source_cell_4m.json -a6d05144fbc693dd8b2391ba7e6423446bb4aa6a assets/megacells/models/item/portable_source_cell_64m.json +5b1ce25b1e145790ad63c546b931b95c3e6e1f15 assets/megacells/models/item/portable_chemical_cell_16m.json +99ca2f844894826092157d737815135537a89a96 assets/megacells/models/item/portable_chemical_cell_1m.json +c139775da40c64abc4ce79d128f36ae0daeb40e0 assets/megacells/models/item/portable_chemical_cell_256m.json +fabb115b69cb61ee3ccc3d62d4989da3f7dc958c assets/megacells/models/item/portable_chemical_cell_4m.json +8b57b430861e9c379288be0cf6a7d53df4080c0f assets/megacells/models/item/portable_chemical_cell_64m.json +1fb24da59c7c551e3efed30fbf8f8ea7ee19ca1c assets/megacells/models/item/portable_fluid_cell_16m.json +7c9c1897b69a8363d4db611b582f823008e5c1a8 assets/megacells/models/item/portable_fluid_cell_1m.json +b391efcebc7ad8e5a21fc74c41c356894f9b5336 assets/megacells/models/item/portable_fluid_cell_256m.json +5e5ce2bfec20d8eef80bbefa2548010f40b61fad assets/megacells/models/item/portable_fluid_cell_4m.json +5aeef3db9e10d8f5ca83eb3796a7d6fb59ffd3fa assets/megacells/models/item/portable_fluid_cell_64m.json +3656ea79ce68a8b8822eacc9c169e5a49a8f61ad assets/megacells/models/item/portable_item_cell_16m.json +367233ef164a017159e3c07fcd16014e9b4a819b assets/megacells/models/item/portable_item_cell_1m.json +aec79efa2a5ba31d3b993a7f9fa88bccd0968759 assets/megacells/models/item/portable_item_cell_256m.json +1d7d311d891f529d7ee61581524c8a7dc1040655 assets/megacells/models/item/portable_item_cell_4m.json +a45756facd0b394864742f16ff04036d48c524e5 assets/megacells/models/item/portable_item_cell_64m.json +37635091e0bd56b7a3451eaadf1d5fa64f7ba161 assets/megacells/models/item/portable_source_cell_16m.json +0878463320b3e6172e48af4058dd916b431c7c14 assets/megacells/models/item/portable_source_cell_1m.json +61ca11f896b07b1dd3df47920b7a959ff2072b78 assets/megacells/models/item/portable_source_cell_256m.json +808f2cfda04724a23a9a1d7ff8f9b252e04ab8c9 assets/megacells/models/item/portable_source_cell_4m.json +86d5703f2360ae15285a9e7684e09dc3ad07b6de assets/megacells/models/item/portable_source_cell_64m.json 8b14c7b99697775bf466df16fb333bb0f30c2477 assets/megacells/models/item/printed_accumulation_processor.json 454ad4ee48a6ad12dfb8323d38a6c25e997f2e7a assets/megacells/models/item/radioactive_cell_component.json 201e556789821512ffd4ab81eefaf7219ecfac50 assets/megacells/models/item/radioactive_chemical_cell.json diff --git a/src/generated/resources/.cache/ea639ff5ce2575eb1f8e37a5c90b144ce934d6fc b/src/generated/resources/.cache/ea639ff5ce2575eb1f8e37a5c90b144ce934d6fc new file mode 100644 index 00000000..ed476608 --- /dev/null +++ b/src/generated/resources/.cache/ea639ff5ce2575eb1f8e37a5c90b144ce934d6fc @@ -0,0 +1,21 @@ +// 1.21.1 2024-12-21T19:18:50.660574979 Item Models (Classic Cell Colours) +94835dda1d5fc0b64f3b8d17cf55a9f25539e675 optional_cell_colours/assets/ae2/models/item/fluid_storage_cell_16k.json +389a98c7e00c1a767aba11552e656847d35d16b9 optional_cell_colours/assets/ae2/models/item/fluid_storage_cell_1k.json +0e499abd7e13c11b38c1751736d9f3be783b491c optional_cell_colours/assets/ae2/models/item/fluid_storage_cell_256k.json +9696a8123c05891f4caf90da26e6b6e397e5e5e0 optional_cell_colours/assets/ae2/models/item/fluid_storage_cell_4k.json +9bae4575fa941774fdf0e4e903ae66ff76efb200 optional_cell_colours/assets/ae2/models/item/fluid_storage_cell_64k.json +2207bcb4472dd412f55986b27f48ee5939a1342e optional_cell_colours/assets/ae2/models/item/item_storage_cell_16k.json +276bf78658a21496e488e25c8a994276b339c2e8 optional_cell_colours/assets/ae2/models/item/item_storage_cell_1k.json +ce295ff4b8abf3116a5a1c22e39bf609eaf060de optional_cell_colours/assets/ae2/models/item/item_storage_cell_256k.json +b148926c6e21755af6af04f9ffc8c5b2e4fe6ce2 optional_cell_colours/assets/ae2/models/item/item_storage_cell_4k.json +9b182321313fa45e900137bedffa989bc2ec665c optional_cell_colours/assets/ae2/models/item/item_storage_cell_64k.json +3e6fef3a262cffc1d8f9bcbcfd425a263abfd56e optional_cell_colours/assets/appmek/models/item/chemical_storage_cell_16k.json +c8072caf9dec0990e7bda333dd374f353213f46c optional_cell_colours/assets/appmek/models/item/chemical_storage_cell_1k.json +049cedbc0dad900bb050c8d0b5c06525d9b940a3 optional_cell_colours/assets/appmek/models/item/chemical_storage_cell_256k.json +a36610987c88bcbaacd92b3a1b3e534fc01f2701 optional_cell_colours/assets/appmek/models/item/chemical_storage_cell_4k.json +57a347dda4111dfa6370c3dd27660d11834d07ca optional_cell_colours/assets/appmek/models/item/chemical_storage_cell_64k.json +2dd0c89b1eb4b6caf41e67816153a1e0ae699656 optional_cell_colours/assets/arseng/models/item/source_storage_cell_16k.json +09b810ea95ad8803fefe37dfe8ce723c3f121a16 optional_cell_colours/assets/arseng/models/item/source_storage_cell_1k.json +c6908a5fb55b8e29e0883a3034578584a424df88 optional_cell_colours/assets/arseng/models/item/source_storage_cell_256k.json +4bf75c0e1312882f9191705ef952315dceb72b01 optional_cell_colours/assets/arseng/models/item/source_storage_cell_4k.json +fb3b49845aad8f62c51a08e81f473581a1adea27 optional_cell_colours/assets/arseng/models/item/source_storage_cell_64k.json diff --git a/src/generated/resources/assets/megacells/lang/en_us.json b/src/generated/resources/assets/megacells/lang/en_us.json index b149e7fa..631ff337 100644 --- a/src/generated/resources/assets/megacells/lang/en_us.json +++ b/src/generated/resources/assets/megacells/lang/en_us.json @@ -97,5 +97,7 @@ "item.megacells.source_storage_cell_1m": "1M MEGA Source Storage Cell", "item.megacells.source_storage_cell_256m": "256M MEGA Source Storage Cell", "item.megacells.source_storage_cell_4m": "4M MEGA Source Storage Cell", - "item.megacells.source_storage_cell_64m": "64M MEGA Source Storage Cell" + "item.megacells.source_storage_cell_64m": "64M MEGA Source Storage Cell", + "pack.megacells.ClassicCellColours": "MEGA: Classic Cell Colours", + "pack.megacells.ClassicCellColoursDesc": "Old red-purple colours for both AE2 and MEGA cell tiers." } \ No newline at end of file diff --git a/src/generated/resources/assets/megacells/models/item/portable_chemical_cell_16m.json b/src/generated/resources/assets/megacells/models/item/portable_chemical_cell_16m.json index 0268c09e..6f11a97f 100644 --- a/src/generated/resources/assets/megacells/models/item/portable_chemical_cell_16m.json +++ b/src/generated/resources/assets/megacells/models/item/portable_chemical_cell_16m.json @@ -3,7 +3,7 @@ "textures": { "layer0": "megacells:item/portable_cell_chemical_housing", "layer1": "ae2:item/portable_cell_led", - "layer2": "megacells:item/portable_cell_screen", + "layer2": "ae2:item/portable_cell_screen", "layer3": "megacells:item/portable_cell_side_16m" } } \ No newline at end of file diff --git a/src/generated/resources/assets/megacells/models/item/portable_chemical_cell_1m.json b/src/generated/resources/assets/megacells/models/item/portable_chemical_cell_1m.json index 5e5bb553..af13d8bd 100644 --- a/src/generated/resources/assets/megacells/models/item/portable_chemical_cell_1m.json +++ b/src/generated/resources/assets/megacells/models/item/portable_chemical_cell_1m.json @@ -3,7 +3,7 @@ "textures": { "layer0": "megacells:item/portable_cell_chemical_housing", "layer1": "ae2:item/portable_cell_led", - "layer2": "megacells:item/portable_cell_screen", + "layer2": "ae2:item/portable_cell_screen", "layer3": "megacells:item/portable_cell_side_1m" } } \ No newline at end of file diff --git a/src/generated/resources/assets/megacells/models/item/portable_chemical_cell_256m.json b/src/generated/resources/assets/megacells/models/item/portable_chemical_cell_256m.json index 140fb479..020fdf20 100644 --- a/src/generated/resources/assets/megacells/models/item/portable_chemical_cell_256m.json +++ b/src/generated/resources/assets/megacells/models/item/portable_chemical_cell_256m.json @@ -3,7 +3,7 @@ "textures": { "layer0": "megacells:item/portable_cell_chemical_housing", "layer1": "ae2:item/portable_cell_led", - "layer2": "megacells:item/portable_cell_screen", + "layer2": "ae2:item/portable_cell_screen", "layer3": "megacells:item/portable_cell_side_256m" } } \ No newline at end of file diff --git a/src/generated/resources/assets/megacells/models/item/portable_chemical_cell_4m.json b/src/generated/resources/assets/megacells/models/item/portable_chemical_cell_4m.json index 39117681..14097109 100644 --- a/src/generated/resources/assets/megacells/models/item/portable_chemical_cell_4m.json +++ b/src/generated/resources/assets/megacells/models/item/portable_chemical_cell_4m.json @@ -3,7 +3,7 @@ "textures": { "layer0": "megacells:item/portable_cell_chemical_housing", "layer1": "ae2:item/portable_cell_led", - "layer2": "megacells:item/portable_cell_screen", + "layer2": "ae2:item/portable_cell_screen", "layer3": "megacells:item/portable_cell_side_4m" } } \ No newline at end of file diff --git a/src/generated/resources/assets/megacells/models/item/portable_chemical_cell_64m.json b/src/generated/resources/assets/megacells/models/item/portable_chemical_cell_64m.json index 4cf63ec1..ca18c7c9 100644 --- a/src/generated/resources/assets/megacells/models/item/portable_chemical_cell_64m.json +++ b/src/generated/resources/assets/megacells/models/item/portable_chemical_cell_64m.json @@ -3,7 +3,7 @@ "textures": { "layer0": "megacells:item/portable_cell_chemical_housing", "layer1": "ae2:item/portable_cell_led", - "layer2": "megacells:item/portable_cell_screen", + "layer2": "ae2:item/portable_cell_screen", "layer3": "megacells:item/portable_cell_side_64m" } } \ No newline at end of file diff --git a/src/generated/resources/assets/megacells/models/item/portable_fluid_cell_16m.json b/src/generated/resources/assets/megacells/models/item/portable_fluid_cell_16m.json index a06b89f7..97a17fe1 100644 --- a/src/generated/resources/assets/megacells/models/item/portable_fluid_cell_16m.json +++ b/src/generated/resources/assets/megacells/models/item/portable_fluid_cell_16m.json @@ -3,7 +3,7 @@ "textures": { "layer0": "megacells:item/portable_cell_fluid_housing", "layer1": "ae2:item/portable_cell_led", - "layer2": "megacells:item/portable_cell_screen", + "layer2": "ae2:item/portable_cell_screen", "layer3": "megacells:item/portable_cell_side_16m" } } \ No newline at end of file diff --git a/src/generated/resources/assets/megacells/models/item/portable_fluid_cell_1m.json b/src/generated/resources/assets/megacells/models/item/portable_fluid_cell_1m.json index 0e91b710..6d982a40 100644 --- a/src/generated/resources/assets/megacells/models/item/portable_fluid_cell_1m.json +++ b/src/generated/resources/assets/megacells/models/item/portable_fluid_cell_1m.json @@ -3,7 +3,7 @@ "textures": { "layer0": "megacells:item/portable_cell_fluid_housing", "layer1": "ae2:item/portable_cell_led", - "layer2": "megacells:item/portable_cell_screen", + "layer2": "ae2:item/portable_cell_screen", "layer3": "megacells:item/portable_cell_side_1m" } } \ No newline at end of file diff --git a/src/generated/resources/assets/megacells/models/item/portable_fluid_cell_256m.json b/src/generated/resources/assets/megacells/models/item/portable_fluid_cell_256m.json index 964186cb..f05a7b06 100644 --- a/src/generated/resources/assets/megacells/models/item/portable_fluid_cell_256m.json +++ b/src/generated/resources/assets/megacells/models/item/portable_fluid_cell_256m.json @@ -3,7 +3,7 @@ "textures": { "layer0": "megacells:item/portable_cell_fluid_housing", "layer1": "ae2:item/portable_cell_led", - "layer2": "megacells:item/portable_cell_screen", + "layer2": "ae2:item/portable_cell_screen", "layer3": "megacells:item/portable_cell_side_256m" } } \ No newline at end of file diff --git a/src/generated/resources/assets/megacells/models/item/portable_fluid_cell_4m.json b/src/generated/resources/assets/megacells/models/item/portable_fluid_cell_4m.json index 404451c1..102e84c9 100644 --- a/src/generated/resources/assets/megacells/models/item/portable_fluid_cell_4m.json +++ b/src/generated/resources/assets/megacells/models/item/portable_fluid_cell_4m.json @@ -3,7 +3,7 @@ "textures": { "layer0": "megacells:item/portable_cell_fluid_housing", "layer1": "ae2:item/portable_cell_led", - "layer2": "megacells:item/portable_cell_screen", + "layer2": "ae2:item/portable_cell_screen", "layer3": "megacells:item/portable_cell_side_4m" } } \ No newline at end of file diff --git a/src/generated/resources/assets/megacells/models/item/portable_fluid_cell_64m.json b/src/generated/resources/assets/megacells/models/item/portable_fluid_cell_64m.json index 65aa0021..d78c8022 100644 --- a/src/generated/resources/assets/megacells/models/item/portable_fluid_cell_64m.json +++ b/src/generated/resources/assets/megacells/models/item/portable_fluid_cell_64m.json @@ -3,7 +3,7 @@ "textures": { "layer0": "megacells:item/portable_cell_fluid_housing", "layer1": "ae2:item/portable_cell_led", - "layer2": "megacells:item/portable_cell_screen", + "layer2": "ae2:item/portable_cell_screen", "layer3": "megacells:item/portable_cell_side_64m" } } \ No newline at end of file diff --git a/src/generated/resources/assets/megacells/models/item/portable_item_cell_16m.json b/src/generated/resources/assets/megacells/models/item/portable_item_cell_16m.json index bdcbc9c3..c28c43c6 100644 --- a/src/generated/resources/assets/megacells/models/item/portable_item_cell_16m.json +++ b/src/generated/resources/assets/megacells/models/item/portable_item_cell_16m.json @@ -3,7 +3,7 @@ "textures": { "layer0": "megacells:item/portable_cell_item_housing", "layer1": "ae2:item/portable_cell_led", - "layer2": "megacells:item/portable_cell_screen", + "layer2": "ae2:item/portable_cell_screen", "layer3": "megacells:item/portable_cell_side_16m" } } \ No newline at end of file diff --git a/src/generated/resources/assets/megacells/models/item/portable_item_cell_1m.json b/src/generated/resources/assets/megacells/models/item/portable_item_cell_1m.json index 686e5b93..6333d895 100644 --- a/src/generated/resources/assets/megacells/models/item/portable_item_cell_1m.json +++ b/src/generated/resources/assets/megacells/models/item/portable_item_cell_1m.json @@ -3,7 +3,7 @@ "textures": { "layer0": "megacells:item/portable_cell_item_housing", "layer1": "ae2:item/portable_cell_led", - "layer2": "megacells:item/portable_cell_screen", + "layer2": "ae2:item/portable_cell_screen", "layer3": "megacells:item/portable_cell_side_1m" } } \ No newline at end of file diff --git a/src/generated/resources/assets/megacells/models/item/portable_item_cell_256m.json b/src/generated/resources/assets/megacells/models/item/portable_item_cell_256m.json index 782ccdf4..25a59899 100644 --- a/src/generated/resources/assets/megacells/models/item/portable_item_cell_256m.json +++ b/src/generated/resources/assets/megacells/models/item/portable_item_cell_256m.json @@ -3,7 +3,7 @@ "textures": { "layer0": "megacells:item/portable_cell_item_housing", "layer1": "ae2:item/portable_cell_led", - "layer2": "megacells:item/portable_cell_screen", + "layer2": "ae2:item/portable_cell_screen", "layer3": "megacells:item/portable_cell_side_256m" } } \ No newline at end of file diff --git a/src/generated/resources/assets/megacells/models/item/portable_item_cell_4m.json b/src/generated/resources/assets/megacells/models/item/portable_item_cell_4m.json index 56e28ca9..e9ddcd58 100644 --- a/src/generated/resources/assets/megacells/models/item/portable_item_cell_4m.json +++ b/src/generated/resources/assets/megacells/models/item/portable_item_cell_4m.json @@ -3,7 +3,7 @@ "textures": { "layer0": "megacells:item/portable_cell_item_housing", "layer1": "ae2:item/portable_cell_led", - "layer2": "megacells:item/portable_cell_screen", + "layer2": "ae2:item/portable_cell_screen", "layer3": "megacells:item/portable_cell_side_4m" } } \ No newline at end of file diff --git a/src/generated/resources/assets/megacells/models/item/portable_item_cell_64m.json b/src/generated/resources/assets/megacells/models/item/portable_item_cell_64m.json index 77c1657c..8df7a538 100644 --- a/src/generated/resources/assets/megacells/models/item/portable_item_cell_64m.json +++ b/src/generated/resources/assets/megacells/models/item/portable_item_cell_64m.json @@ -3,7 +3,7 @@ "textures": { "layer0": "megacells:item/portable_cell_item_housing", "layer1": "ae2:item/portable_cell_led", - "layer2": "megacells:item/portable_cell_screen", + "layer2": "ae2:item/portable_cell_screen", "layer3": "megacells:item/portable_cell_side_64m" } } \ No newline at end of file diff --git a/src/generated/resources/assets/megacells/models/item/portable_source_cell_16m.json b/src/generated/resources/assets/megacells/models/item/portable_source_cell_16m.json index 2c758b49..c9e48bec 100644 --- a/src/generated/resources/assets/megacells/models/item/portable_source_cell_16m.json +++ b/src/generated/resources/assets/megacells/models/item/portable_source_cell_16m.json @@ -3,7 +3,7 @@ "textures": { "layer0": "megacells:item/portable_cell_source_housing", "layer1": "ae2:item/portable_cell_led", - "layer2": "megacells:item/portable_cell_screen", + "layer2": "ae2:item/portable_cell_screen", "layer3": "megacells:item/portable_cell_side_16m" } } \ No newline at end of file diff --git a/src/generated/resources/assets/megacells/models/item/portable_source_cell_1m.json b/src/generated/resources/assets/megacells/models/item/portable_source_cell_1m.json index 3a827db7..ded12b78 100644 --- a/src/generated/resources/assets/megacells/models/item/portable_source_cell_1m.json +++ b/src/generated/resources/assets/megacells/models/item/portable_source_cell_1m.json @@ -3,7 +3,7 @@ "textures": { "layer0": "megacells:item/portable_cell_source_housing", "layer1": "ae2:item/portable_cell_led", - "layer2": "megacells:item/portable_cell_screen", + "layer2": "ae2:item/portable_cell_screen", "layer3": "megacells:item/portable_cell_side_1m" } } \ No newline at end of file diff --git a/src/generated/resources/assets/megacells/models/item/portable_source_cell_256m.json b/src/generated/resources/assets/megacells/models/item/portable_source_cell_256m.json index 39c8b6da..d5f00923 100644 --- a/src/generated/resources/assets/megacells/models/item/portable_source_cell_256m.json +++ b/src/generated/resources/assets/megacells/models/item/portable_source_cell_256m.json @@ -3,7 +3,7 @@ "textures": { "layer0": "megacells:item/portable_cell_source_housing", "layer1": "ae2:item/portable_cell_led", - "layer2": "megacells:item/portable_cell_screen", + "layer2": "ae2:item/portable_cell_screen", "layer3": "megacells:item/portable_cell_side_256m" } } \ No newline at end of file diff --git a/src/generated/resources/assets/megacells/models/item/portable_source_cell_4m.json b/src/generated/resources/assets/megacells/models/item/portable_source_cell_4m.json index 594e4311..f092688c 100644 --- a/src/generated/resources/assets/megacells/models/item/portable_source_cell_4m.json +++ b/src/generated/resources/assets/megacells/models/item/portable_source_cell_4m.json @@ -3,7 +3,7 @@ "textures": { "layer0": "megacells:item/portable_cell_source_housing", "layer1": "ae2:item/portable_cell_led", - "layer2": "megacells:item/portable_cell_screen", + "layer2": "ae2:item/portable_cell_screen", "layer3": "megacells:item/portable_cell_side_4m" } } \ No newline at end of file diff --git a/src/generated/resources/assets/megacells/models/item/portable_source_cell_64m.json b/src/generated/resources/assets/megacells/models/item/portable_source_cell_64m.json index 05c10c6b..3771a6de 100644 --- a/src/generated/resources/assets/megacells/models/item/portable_source_cell_64m.json +++ b/src/generated/resources/assets/megacells/models/item/portable_source_cell_64m.json @@ -3,7 +3,7 @@ "textures": { "layer0": "megacells:item/portable_cell_source_housing", "layer1": "ae2:item/portable_cell_led", - "layer2": "megacells:item/portable_cell_screen", + "layer2": "ae2:item/portable_cell_screen", "layer3": "megacells:item/portable_cell_side_64m" } } \ No newline at end of file diff --git a/src/generated/resources/optional_cell_colours/assets/ae2/models/item/fluid_storage_cell_16k.json b/src/generated/resources/optional_cell_colours/assets/ae2/models/item/fluid_storage_cell_16k.json new file mode 100644 index 00000000..cb0851c8 --- /dev/null +++ b/src/generated/resources/optional_cell_colours/assets/ae2/models/item/fluid_storage_cell_16k.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ae2:item/fluid_cell_housing", + "layer1": "ae2:item/storage_cell_led", + "layer2": "ae2:item/storage_cell_side_16k" + } +} \ No newline at end of file diff --git a/src/generated/resources/optional_cell_colours/assets/ae2/models/item/fluid_storage_cell_1k.json b/src/generated/resources/optional_cell_colours/assets/ae2/models/item/fluid_storage_cell_1k.json new file mode 100644 index 00000000..4f9c17b6 --- /dev/null +++ b/src/generated/resources/optional_cell_colours/assets/ae2/models/item/fluid_storage_cell_1k.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ae2:item/fluid_cell_housing", + "layer1": "ae2:item/storage_cell_led", + "layer2": "ae2:item/storage_cell_side_1k" + } +} \ No newline at end of file diff --git a/src/generated/resources/optional_cell_colours/assets/ae2/models/item/fluid_storage_cell_256k.json b/src/generated/resources/optional_cell_colours/assets/ae2/models/item/fluid_storage_cell_256k.json new file mode 100644 index 00000000..427b757c --- /dev/null +++ b/src/generated/resources/optional_cell_colours/assets/ae2/models/item/fluid_storage_cell_256k.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ae2:item/fluid_cell_housing", + "layer1": "ae2:item/storage_cell_led", + "layer2": "ae2:item/storage_cell_side_256k" + } +} \ No newline at end of file diff --git a/src/generated/resources/optional_cell_colours/assets/ae2/models/item/fluid_storage_cell_4k.json b/src/generated/resources/optional_cell_colours/assets/ae2/models/item/fluid_storage_cell_4k.json new file mode 100644 index 00000000..f66e80b9 --- /dev/null +++ b/src/generated/resources/optional_cell_colours/assets/ae2/models/item/fluid_storage_cell_4k.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ae2:item/fluid_cell_housing", + "layer1": "ae2:item/storage_cell_led", + "layer2": "ae2:item/storage_cell_side_4k" + } +} \ No newline at end of file diff --git a/src/generated/resources/optional_cell_colours/assets/ae2/models/item/fluid_storage_cell_64k.json b/src/generated/resources/optional_cell_colours/assets/ae2/models/item/fluid_storage_cell_64k.json new file mode 100644 index 00000000..fa00b342 --- /dev/null +++ b/src/generated/resources/optional_cell_colours/assets/ae2/models/item/fluid_storage_cell_64k.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ae2:item/fluid_cell_housing", + "layer1": "ae2:item/storage_cell_led", + "layer2": "ae2:item/storage_cell_side_64k" + } +} \ No newline at end of file diff --git a/src/generated/resources/optional_cell_colours/assets/ae2/models/item/item_storage_cell_16k.json b/src/generated/resources/optional_cell_colours/assets/ae2/models/item/item_storage_cell_16k.json new file mode 100644 index 00000000..2aa494f0 --- /dev/null +++ b/src/generated/resources/optional_cell_colours/assets/ae2/models/item/item_storage_cell_16k.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ae2:item/item_cell_housing", + "layer1": "ae2:item/storage_cell_led", + "layer2": "ae2:item/storage_cell_side_16k" + } +} \ No newline at end of file diff --git a/src/generated/resources/optional_cell_colours/assets/ae2/models/item/item_storage_cell_1k.json b/src/generated/resources/optional_cell_colours/assets/ae2/models/item/item_storage_cell_1k.json new file mode 100644 index 00000000..1efb724d --- /dev/null +++ b/src/generated/resources/optional_cell_colours/assets/ae2/models/item/item_storage_cell_1k.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ae2:item/item_cell_housing", + "layer1": "ae2:item/storage_cell_led", + "layer2": "ae2:item/storage_cell_side_1k" + } +} \ No newline at end of file diff --git a/src/generated/resources/optional_cell_colours/assets/ae2/models/item/item_storage_cell_256k.json b/src/generated/resources/optional_cell_colours/assets/ae2/models/item/item_storage_cell_256k.json new file mode 100644 index 00000000..7a2ebe3f --- /dev/null +++ b/src/generated/resources/optional_cell_colours/assets/ae2/models/item/item_storage_cell_256k.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ae2:item/item_cell_housing", + "layer1": "ae2:item/storage_cell_led", + "layer2": "ae2:item/storage_cell_side_256k" + } +} \ No newline at end of file diff --git a/src/generated/resources/optional_cell_colours/assets/ae2/models/item/item_storage_cell_4k.json b/src/generated/resources/optional_cell_colours/assets/ae2/models/item/item_storage_cell_4k.json new file mode 100644 index 00000000..69e65f81 --- /dev/null +++ b/src/generated/resources/optional_cell_colours/assets/ae2/models/item/item_storage_cell_4k.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ae2:item/item_cell_housing", + "layer1": "ae2:item/storage_cell_led", + "layer2": "ae2:item/storage_cell_side_4k" + } +} \ No newline at end of file diff --git a/src/generated/resources/optional_cell_colours/assets/ae2/models/item/item_storage_cell_64k.json b/src/generated/resources/optional_cell_colours/assets/ae2/models/item/item_storage_cell_64k.json new file mode 100644 index 00000000..8347bc92 --- /dev/null +++ b/src/generated/resources/optional_cell_colours/assets/ae2/models/item/item_storage_cell_64k.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ae2:item/item_cell_housing", + "layer1": "ae2:item/storage_cell_led", + "layer2": "ae2:item/storage_cell_side_64k" + } +} \ No newline at end of file diff --git a/src/generated/resources/optional_cell_colours/assets/appmek/models/item/chemical_storage_cell_16k.json b/src/generated/resources/optional_cell_colours/assets/appmek/models/item/chemical_storage_cell_16k.json new file mode 100644 index 00000000..31520ef7 --- /dev/null +++ b/src/generated/resources/optional_cell_colours/assets/appmek/models/item/chemical_storage_cell_16k.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "appmek:item/chemical_cell_housing", + "layer1": "ae2:item/storage_cell_led", + "layer2": "ae2:item/storage_cell_side_16k" + } +} \ No newline at end of file diff --git a/src/generated/resources/optional_cell_colours/assets/appmek/models/item/chemical_storage_cell_1k.json b/src/generated/resources/optional_cell_colours/assets/appmek/models/item/chemical_storage_cell_1k.json new file mode 100644 index 00000000..4d72875f --- /dev/null +++ b/src/generated/resources/optional_cell_colours/assets/appmek/models/item/chemical_storage_cell_1k.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "appmek:item/chemical_cell_housing", + "layer1": "ae2:item/storage_cell_led", + "layer2": "ae2:item/storage_cell_side_1k" + } +} \ No newline at end of file diff --git a/src/generated/resources/optional_cell_colours/assets/appmek/models/item/chemical_storage_cell_256k.json b/src/generated/resources/optional_cell_colours/assets/appmek/models/item/chemical_storage_cell_256k.json new file mode 100644 index 00000000..fe55ec45 --- /dev/null +++ b/src/generated/resources/optional_cell_colours/assets/appmek/models/item/chemical_storage_cell_256k.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "appmek:item/chemical_cell_housing", + "layer1": "ae2:item/storage_cell_led", + "layer2": "ae2:item/storage_cell_side_256k" + } +} \ No newline at end of file diff --git a/src/generated/resources/optional_cell_colours/assets/appmek/models/item/chemical_storage_cell_4k.json b/src/generated/resources/optional_cell_colours/assets/appmek/models/item/chemical_storage_cell_4k.json new file mode 100644 index 00000000..56a3f341 --- /dev/null +++ b/src/generated/resources/optional_cell_colours/assets/appmek/models/item/chemical_storage_cell_4k.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "appmek:item/chemical_cell_housing", + "layer1": "ae2:item/storage_cell_led", + "layer2": "ae2:item/storage_cell_side_4k" + } +} \ No newline at end of file diff --git a/src/generated/resources/optional_cell_colours/assets/appmek/models/item/chemical_storage_cell_64k.json b/src/generated/resources/optional_cell_colours/assets/appmek/models/item/chemical_storage_cell_64k.json new file mode 100644 index 00000000..71c6c33e --- /dev/null +++ b/src/generated/resources/optional_cell_colours/assets/appmek/models/item/chemical_storage_cell_64k.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "appmek:item/chemical_cell_housing", + "layer1": "ae2:item/storage_cell_led", + "layer2": "ae2:item/storage_cell_side_64k" + } +} \ No newline at end of file diff --git a/src/generated/resources/optional_cell_colours/assets/arseng/models/item/source_storage_cell_16k.json b/src/generated/resources/optional_cell_colours/assets/arseng/models/item/source_storage_cell_16k.json new file mode 100644 index 00000000..4f27be52 --- /dev/null +++ b/src/generated/resources/optional_cell_colours/assets/arseng/models/item/source_storage_cell_16k.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "arseng:item/source_cell_housing", + "layer1": "ae2:item/storage_cell_led", + "layer2": "ae2:item/storage_cell_side_16k" + } +} \ No newline at end of file diff --git a/src/generated/resources/optional_cell_colours/assets/arseng/models/item/source_storage_cell_1k.json b/src/generated/resources/optional_cell_colours/assets/arseng/models/item/source_storage_cell_1k.json new file mode 100644 index 00000000..87dc2925 --- /dev/null +++ b/src/generated/resources/optional_cell_colours/assets/arseng/models/item/source_storage_cell_1k.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "arseng:item/source_cell_housing", + "layer1": "ae2:item/storage_cell_led", + "layer2": "ae2:item/storage_cell_side_1k" + } +} \ No newline at end of file diff --git a/src/generated/resources/optional_cell_colours/assets/arseng/models/item/source_storage_cell_256k.json b/src/generated/resources/optional_cell_colours/assets/arseng/models/item/source_storage_cell_256k.json new file mode 100644 index 00000000..395ebd7c --- /dev/null +++ b/src/generated/resources/optional_cell_colours/assets/arseng/models/item/source_storage_cell_256k.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "arseng:item/source_cell_housing", + "layer1": "ae2:item/storage_cell_led", + "layer2": "ae2:item/storage_cell_side_256k" + } +} \ No newline at end of file diff --git a/src/generated/resources/optional_cell_colours/assets/arseng/models/item/source_storage_cell_4k.json b/src/generated/resources/optional_cell_colours/assets/arseng/models/item/source_storage_cell_4k.json new file mode 100644 index 00000000..e4d42616 --- /dev/null +++ b/src/generated/resources/optional_cell_colours/assets/arseng/models/item/source_storage_cell_4k.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "arseng:item/source_cell_housing", + "layer1": "ae2:item/storage_cell_led", + "layer2": "ae2:item/storage_cell_side_4k" + } +} \ No newline at end of file diff --git a/src/generated/resources/optional_cell_colours/assets/arseng/models/item/source_storage_cell_64k.json b/src/generated/resources/optional_cell_colours/assets/arseng/models/item/source_storage_cell_64k.json new file mode 100644 index 00000000..65ea7590 --- /dev/null +++ b/src/generated/resources/optional_cell_colours/assets/arseng/models/item/source_storage_cell_64k.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "arseng:item/source_cell_housing", + "layer1": "ae2:item/storage_cell_led", + "layer2": "ae2:item/storage_cell_side_64k" + } +} \ No newline at end of file diff --git a/src/main/java/gripe/_90/megacells/MEGACells.java b/src/main/java/gripe/_90/megacells/MEGACells.java index 7dae6c4a..654b54d1 100644 --- a/src/main/java/gripe/_90/megacells/MEGACells.java +++ b/src/main/java/gripe/_90/megacells/MEGACells.java @@ -7,7 +7,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.npc.VillagerTrades; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.trading.ItemCost; @@ -192,16 +191,12 @@ private static void initCapabilities(RegisterCapabilitiesEvent event) { (be, context) -> be.getLogic().getReturnInv()); for (var cell : MEGAItems.getTieredCells()) { - if (cell.portable()) { - registerPoweredItemCapability(event, cell.item().asItem()); + if (cell.portable() && cell.item().asItem() instanceof IAEItemPowerStorage powered) { + event.registerItem( + Capabilities.EnergyStorage.ITEM, + (stack, context) -> new PoweredItemCapabilities(stack, powered), + cell.item()); } } } - - private static void registerPoweredItemCapability(RegisterCapabilitiesEvent event, T item) { - if (item instanceof IAEItemPowerStorage powered) { - event.registerItem( - Capabilities.EnergyStorage.ITEM, (stack, ctx) -> new PoweredItemCapabilities(stack, powered), item); - } - } } diff --git a/src/main/java/gripe/_90/megacells/client/MEGACellsClient.java b/src/main/java/gripe/_90/megacells/client/MEGACellsClient.java index 0ed3cbd4..498bc546 100644 --- a/src/main/java/gripe/_90/megacells/client/MEGACellsClient.java +++ b/src/main/java/gripe/_90/megacells/client/MEGACellsClient.java @@ -3,16 +3,21 @@ import java.util.ArrayList; import net.minecraft.client.renderer.item.ItemProperties; +import net.minecraft.server.packs.PackType; +import net.minecraft.server.packs.repository.Pack; +import net.minecraft.server.packs.repository.PackSource; import net.minecraft.util.FastColor; import net.minecraft.world.level.ItemLike; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.common.Mod; import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; +import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; import net.neoforged.neoforge.client.event.EntityRenderersEvent; import net.neoforged.neoforge.client.event.RegisterClientTooltipComponentFactoriesEvent; import net.neoforged.neoforge.client.event.RegisterColorHandlersEvent; import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent; +import net.neoforged.neoforge.event.AddPackFindersEvent; import appeng.api.client.StorageCellModels; import appeng.block.networking.EnergyCellBlockItem; @@ -38,6 +43,7 @@ import gripe._90.megacells.definition.MEGABlocks; import gripe._90.megacells.definition.MEGAItems; import gripe._90.megacells.definition.MEGAMenus; +import gripe._90.megacells.definition.MEGATranslations; import gripe._90.megacells.item.cell.PortableCellWorkbenchTooltipComponent; @Mod(value = MEGACells.MODID, dist = Dist.CLIENT) @@ -51,6 +57,7 @@ public MEGACellsClient(IEventBus eventBus) { eventBus.addListener(MEGACellsClient::initStorageCellModels); eventBus.addListener(MEGACellsClient::initItemColours); eventBus.addListener(MEGACellsClient::initTooltipComponents); + eventBus.addListener(MEGACellsClient::initResourcePackFinder); } private static void initCraftingUnitModels() { @@ -97,7 +104,9 @@ private static void initEnergyCellProps(FMLClientSetupEvent event) { })); } - private static void initStorageCellModels(FMLClientSetupEvent event) { + private static void initStorageCellModels(FMLCommonSetupEvent event) { + // Has to be done in common setup, otherwise textures are broken when first entering a world until one forces a + // resource pack reload. event.enqueueWork(() -> { var modelPrefix = "block/drive/cells/"; @@ -123,11 +132,7 @@ private static void initItemColours(RegisterColorHandlersEvent.Item event) { var portableCells = new ArrayList(); for (var cell : MEGAItems.getTieredCells()) { - if (cell.portable()) { - portableCells.add(cell.item()); - } else { - standardCells.add(cell.item()); - } + (cell.portable() ? portableCells : standardCells).add(cell.item()); } standardCells.add(MEGAItems.BULK_ITEM_CELL); @@ -144,4 +149,16 @@ private static void initItemColours(RegisterColorHandlersEvent.Item event) { private static void initTooltipComponents(RegisterClientTooltipComponentFactoriesEvent event) { event.register(PortableCellWorkbenchTooltipComponent.class, PortableCellWorkbenchClientTooltipComponent::new); } + + private static void initResourcePackFinder(AddPackFindersEvent event) { + if (event.getPackType() == PackType.CLIENT_RESOURCES) { + event.addPackFinders( + MEGACells.makeId("optional_cell_colours"), + PackType.CLIENT_RESOURCES, + MEGATranslations.ClassicCellColours.text(), + PackSource.BUILT_IN, + false, + Pack.Position.TOP); + } + } } diff --git a/src/main/java/gripe/_90/megacells/definition/MEGATranslations.java b/src/main/java/gripe/_90/megacells/definition/MEGATranslations.java index 70e6fcf6..f6f09743 100644 --- a/src/main/java/gripe/_90/megacells/definition/MEGATranslations.java +++ b/src/main/java/gripe/_90/megacells/definition/MEGATranslations.java @@ -5,32 +5,38 @@ import gripe._90.megacells.MEGACells; public enum MEGATranslations implements LocalizationEnum { - AcceleratorThreads("Provides 4 co-processing threads per block.", Type.TOOLTIP), - ALot("A lot.", Type.TOOLTIP), - Compression("Compression: %s", Type.TOOLTIP), - CompressionCutoff("Bulk Compression Cutoff", Type.TOOLTIP), - Contains("Contains: %s", Type.TOOLTIP), - Disabled("Disabled", Type.TOOLTIP), - Empty("Empty", Type.TOOLTIP), - Enabled("Enabled", Type.TOOLTIP), - FilterChemicalUnsupported("Filter chemical unsupported!", Type.TOOLTIP), - Cutoff("Cutoff: %s", Type.TOOLTIP), - MismatchedFilter("Mismatched filter!", Type.TOOLTIP), - ModName("MEGA Cells", Type.GUI), - NotInstalled("%s not installed.", Type.TOOLTIP), - PartitionedFor("Partitioned for: %s", Type.TOOLTIP), - ProcessingOnly("Supports processing patterns only.", Type.TOOLTIP), - Quantity("Quantity: %s", Type.TOOLTIP), - NotPartitioned("Not Partitioned", Type.TOOLTIP), - WorkbenchCell("Cell:", Type.TOOLTIP), - WorkbenchConfig("Config:", Type.TOOLTIP); + AcceleratorThreads("Provides 4 co-processing threads per block."), + ALot("A lot."), + ClassicCellColours("MEGA: Classic Cell Colours", "pack"), + ClassicCellColoursDesc("Old red-purple colours for both AE2 and MEGA cell tiers.", "pack"), + Compression("Compression: %s"), + CompressionCutoff("Bulk Compression Cutoff"), + Contains("Contains: %s"), + Disabled("Disabled"), + Empty("Empty"), + Enabled("Enabled"), + FilterChemicalUnsupported("Filter chemical unsupported!"), + Cutoff("Cutoff: %s"), + MismatchedFilter("Mismatched filter!"), + ModName("MEGA Cells", "gui"), + NotInstalled("%s not installed."), + PartitionedFor("Partitioned for: %s"), + ProcessingOnly("Supports processing patterns only."), + Quantity("Quantity: %s"), + NotPartitioned("Not Partitioned"), + WorkbenchCell("Cell:"), + WorkbenchConfig("Config:"); private final String englishText; - private final Type type; + private final String root; - MEGATranslations(String englishText, Type type) { + MEGATranslations(String englishText, String root) { this.englishText = englishText; - this.type = type; + this.root = root; + } + + MEGATranslations(String englishText) { + this(englishText, "gui.tooltips"); } @Override @@ -40,17 +46,6 @@ public String getEnglishText() { @Override public String getTranslationKey() { - return String.format("%s.%s.%s", type.root, MEGACells.MODID, name()); - } - - private enum Type { - GUI("gui"), - TOOLTIP("gui.tooltips"); - - private final String root; - - Type(String root) { - this.root = root; - } + return String.format("%s.%s.%s", root, MEGACells.MODID, name()); } } diff --git a/src/main/resources/assets/megacells/textures/item/portable_cell_screen.png b/src/main/resources/assets/megacells/textures/item/portable_cell_screen.png deleted file mode 100644 index f7568c29..00000000 Binary files a/src/main/resources/assets/megacells/textures/item/portable_cell_screen.png and /dev/null differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/16k_storage.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/16k_storage.png new file mode 100644 index 00000000..88c2330b Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/16k_storage.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/16k_storage_light.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/16k_storage_light.png new file mode 100644 index 00000000..0ed98d31 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/16k_storage_light.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/1k_storage.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/1k_storage.png new file mode 100644 index 00000000..4853990c Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/1k_storage.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/1k_storage_light.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/1k_storage_light.png new file mode 100644 index 00000000..3ac88256 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/1k_storage_light.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/256k_storage.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/256k_storage.png new file mode 100644 index 00000000..fc721246 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/256k_storage.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/256k_storage_light.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/256k_storage_light.png new file mode 100644 index 00000000..86d7b523 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/256k_storage_light.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/4k_storage.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/4k_storage.png new file mode 100644 index 00000000..48cf08d3 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/4k_storage.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/4k_storage_light.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/4k_storage_light.png new file mode 100644 index 00000000..e8233248 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/4k_storage_light.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/64k_storage.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/64k_storage.png new file mode 100644 index 00000000..632c9f63 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/64k_storage.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/64k_storage_light.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/64k_storage_light.png new file mode 100644 index 00000000..28d1a62d Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/64k_storage_light.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/accelerator.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/accelerator.png new file mode 100644 index 00000000..e26c4399 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/accelerator.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/accelerator_light.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/accelerator_light.png new file mode 100644 index 00000000..fe0ba57d Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/crafting/accelerator_light.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/block/drive/drive_cells.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/drive/drive_cells.png new file mode 100644 index 00000000..afa48e26 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/block/drive/drive_cells.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/item/portable_cell_side_16k.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/item/portable_cell_side_16k.png new file mode 100644 index 00000000..06ed7b3c Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/item/portable_cell_side_16k.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/item/portable_cell_side_1k.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/item/portable_cell_side_1k.png new file mode 100644 index 00000000..31307a26 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/item/portable_cell_side_1k.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/item/portable_cell_side_256k.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/item/portable_cell_side_256k.png new file mode 100644 index 00000000..37e00964 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/item/portable_cell_side_256k.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/item/portable_cell_side_4k.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/item/portable_cell_side_4k.png new file mode 100644 index 00000000..5e1c1dbd Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/item/portable_cell_side_4k.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/item/portable_cell_side_64k.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/item/portable_cell_side_64k.png new file mode 100644 index 00000000..92f91e3c Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/item/portable_cell_side_64k.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/item/storage_cell_side_16k.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/item/storage_cell_side_16k.png new file mode 100644 index 00000000..61666b69 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/item/storage_cell_side_16k.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/item/storage_cell_side_1k.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/item/storage_cell_side_1k.png new file mode 100644 index 00000000..906192f9 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/item/storage_cell_side_1k.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/item/storage_cell_side_256k.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/item/storage_cell_side_256k.png new file mode 100644 index 00000000..901ed110 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/item/storage_cell_side_256k.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/item/storage_cell_side_4k.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/item/storage_cell_side_4k.png new file mode 100644 index 00000000..0418aa5c Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/item/storage_cell_side_4k.png differ diff --git a/src/main/resources/optional_cell_colours/assets/ae2/textures/item/storage_cell_side_64k.png b/src/main/resources/optional_cell_colours/assets/ae2/textures/item/storage_cell_side_64k.png new file mode 100644 index 00000000..c58bbc90 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/ae2/textures/item/storage_cell_side_64k.png differ diff --git a/src/main/resources/optional_cell_colours/assets/appmek/textures/block/drive/drive_cells.png b/src/main/resources/optional_cell_colours/assets/appmek/textures/block/drive/drive_cells.png new file mode 100644 index 00000000..2e1b869b Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/appmek/textures/block/drive/drive_cells.png differ diff --git a/src/main/resources/optional_cell_colours/assets/appmek/textures/item/portable_chemical_cell_16k.png b/src/main/resources/optional_cell_colours/assets/appmek/textures/item/portable_chemical_cell_16k.png new file mode 100644 index 00000000..06ed7b3c Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/appmek/textures/item/portable_chemical_cell_16k.png differ diff --git a/src/main/resources/optional_cell_colours/assets/appmek/textures/item/portable_chemical_cell_1k.png b/src/main/resources/optional_cell_colours/assets/appmek/textures/item/portable_chemical_cell_1k.png new file mode 100644 index 00000000..31307a26 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/appmek/textures/item/portable_chemical_cell_1k.png differ diff --git a/src/main/resources/optional_cell_colours/assets/appmek/textures/item/portable_chemical_cell_256k.png b/src/main/resources/optional_cell_colours/assets/appmek/textures/item/portable_chemical_cell_256k.png new file mode 100644 index 00000000..37e00964 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/appmek/textures/item/portable_chemical_cell_256k.png differ diff --git a/src/main/resources/optional_cell_colours/assets/appmek/textures/item/portable_chemical_cell_4k.png b/src/main/resources/optional_cell_colours/assets/appmek/textures/item/portable_chemical_cell_4k.png new file mode 100644 index 00000000..5e1c1dbd Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/appmek/textures/item/portable_chemical_cell_4k.png differ diff --git a/src/main/resources/optional_cell_colours/assets/appmek/textures/item/portable_chemical_cell_64k.png b/src/main/resources/optional_cell_colours/assets/appmek/textures/item/portable_chemical_cell_64k.png new file mode 100644 index 00000000..92f91e3c Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/appmek/textures/item/portable_chemical_cell_64k.png differ diff --git a/src/main/resources/optional_cell_colours/assets/arseng/textures/block/source_drive_cell.png b/src/main/resources/optional_cell_colours/assets/arseng/textures/block/source_drive_cell.png new file mode 100644 index 00000000..5e7317ed Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/arseng/textures/block/source_drive_cell.png differ diff --git a/src/main/resources/optional_cell_colours/assets/arseng/textures/item/portable_source_cell_16k.png b/src/main/resources/optional_cell_colours/assets/arseng/textures/item/portable_source_cell_16k.png new file mode 100644 index 00000000..06ed7b3c Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/arseng/textures/item/portable_source_cell_16k.png differ diff --git a/src/main/resources/optional_cell_colours/assets/arseng/textures/item/portable_source_cell_1k.png b/src/main/resources/optional_cell_colours/assets/arseng/textures/item/portable_source_cell_1k.png new file mode 100644 index 00000000..31307a26 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/arseng/textures/item/portable_source_cell_1k.png differ diff --git a/src/main/resources/optional_cell_colours/assets/arseng/textures/item/portable_source_cell_256k.png b/src/main/resources/optional_cell_colours/assets/arseng/textures/item/portable_source_cell_256k.png new file mode 100644 index 00000000..37e00964 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/arseng/textures/item/portable_source_cell_256k.png differ diff --git a/src/main/resources/optional_cell_colours/assets/arseng/textures/item/portable_source_cell_4k.png b/src/main/resources/optional_cell_colours/assets/arseng/textures/item/portable_source_cell_4k.png new file mode 100644 index 00000000..5e1c1dbd Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/arseng/textures/item/portable_source_cell_4k.png differ diff --git a/src/main/resources/optional_cell_colours/assets/arseng/textures/item/portable_source_cell_64k.png b/src/main/resources/optional_cell_colours/assets/arseng/textures/item/portable_source_cell_64k.png new file mode 100644 index 00000000..92f91e3c Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/arseng/textures/item/portable_source_cell_64k.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/16m_storage.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/16m_storage.png new file mode 100644 index 00000000..58921c1d Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/16m_storage.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/16m_storage_light.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/16m_storage_light.png new file mode 100644 index 00000000..cc2b4c98 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/16m_storage_light.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/1m_storage.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/1m_storage.png new file mode 100644 index 00000000..f051dad6 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/1m_storage.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/1m_storage_light.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/1m_storage_light.png new file mode 100644 index 00000000..b492af5e Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/1m_storage_light.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/256m_storage.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/256m_storage.png new file mode 100644 index 00000000..4951e9d3 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/256m_storage.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/256m_storage_light.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/256m_storage_light.png new file mode 100644 index 00000000..ba2f6159 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/256m_storage_light.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/4m_storage.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/4m_storage.png new file mode 100644 index 00000000..a5094416 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/4m_storage.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/4m_storage_light.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/4m_storage_light.png new file mode 100644 index 00000000..b25512fa Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/4m_storage_light.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/64m_storage.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/64m_storage.png new file mode 100644 index 00000000..6dd1660b Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/64m_storage.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/64m_storage_light.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/64m_storage_light.png new file mode 100644 index 00000000..0cc5b88f Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/64m_storage_light.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/accelerator.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/accelerator.png new file mode 100644 index 00000000..9c219403 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/accelerator.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/accelerator_light.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/accelerator_light.png new file mode 100644 index 00000000..68330dfd Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/accelerator_light.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/unit.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/unit.png new file mode 100644 index 00000000..8c251dd3 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/unit.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/unit_base.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/unit_base.png new file mode 100644 index 00000000..6865b80a Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/crafting/unit_base.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/block/drive/cells/mega_chemical_cell.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/drive/cells/mega_chemical_cell.png new file mode 100644 index 00000000..83b09248 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/drive/cells/mega_chemical_cell.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/block/drive/cells/mega_fluid_cell.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/drive/cells/mega_fluid_cell.png new file mode 100644 index 00000000..8f95d02a Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/drive/cells/mega_fluid_cell.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/block/drive/cells/mega_item_cell.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/drive/cells/mega_item_cell.png new file mode 100644 index 00000000..9ae5d33e Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/drive/cells/mega_item_cell.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/block/drive/cells/mega_mana_cell.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/drive/cells/mega_mana_cell.png new file mode 100644 index 00000000..ff2e47c1 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/drive/cells/mega_mana_cell.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/block/drive/cells/mega_source_cell.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/drive/cells/mega_source_cell.png new file mode 100644 index 00000000..f55f25c3 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/drive/cells/mega_source_cell.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/block/drive/cells/misc_cell.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/drive/cells/misc_cell.png new file mode 100644 index 00000000..cf58c77a Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/block/drive/cells/misc_cell.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/item/bulk_item_cell.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/bulk_item_cell.png new file mode 100644 index 00000000..a8e4444a Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/bulk_item_cell.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/item/portable_cell_side_16m.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/portable_cell_side_16m.png new file mode 100644 index 00000000..e936f565 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/portable_cell_side_16m.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/item/portable_cell_side_1m.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/portable_cell_side_1m.png new file mode 100644 index 00000000..83bd4a12 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/portable_cell_side_1m.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/item/portable_cell_side_256m.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/portable_cell_side_256m.png new file mode 100644 index 00000000..8479c2ff Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/portable_cell_side_256m.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/item/portable_cell_side_4m.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/portable_cell_side_4m.png new file mode 100644 index 00000000..15ab0562 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/portable_cell_side_4m.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/item/portable_cell_side_64m.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/portable_cell_side_64m.png new file mode 100644 index 00000000..a587bf30 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/portable_cell_side_64m.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/item/radioactive_cell_component.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/radioactive_cell_component.png new file mode 100644 index 00000000..b537cb5d Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/radioactive_cell_component.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/item/radioactive_chemical_cell.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/radioactive_chemical_cell.png new file mode 100644 index 00000000..f9c2e5bd Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/radioactive_chemical_cell.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/item/storage_cell_side_16m.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/storage_cell_side_16m.png new file mode 100644 index 00000000..a2d8da53 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/storage_cell_side_16m.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/item/storage_cell_side_1m.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/storage_cell_side_1m.png new file mode 100644 index 00000000..8455830d Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/storage_cell_side_1m.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/item/storage_cell_side_256m.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/storage_cell_side_256m.png new file mode 100644 index 00000000..e68d9c27 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/storage_cell_side_256m.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/item/storage_cell_side_4m.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/storage_cell_side_4m.png new file mode 100644 index 00000000..c307b2ba Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/storage_cell_side_4m.png differ diff --git a/src/main/resources/optional_cell_colours/assets/megacells/textures/item/storage_cell_side_64m.png b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/storage_cell_side_64m.png new file mode 100644 index 00000000..2452c241 Binary files /dev/null and b/src/main/resources/optional_cell_colours/assets/megacells/textures/item/storage_cell_side_64m.png differ diff --git a/src/main/resources/optional_cell_colours/pack.mcmeta b/src/main/resources/optional_cell_colours/pack.mcmeta new file mode 100644 index 00000000..04ced28d --- /dev/null +++ b/src/main/resources/optional_cell_colours/pack.mcmeta @@ -0,0 +1,8 @@ +{ + "pack": { + "description": { + "translate": "pack.megacells.ClassicCellColoursDesc" + }, + "pack_format": 34 + } +} \ No newline at end of file diff --git a/src/main/resources/optional_cell_colours/pack.png b/src/main/resources/optional_cell_colours/pack.png new file mode 100644 index 00000000..0a822579 Binary files /dev/null and b/src/main/resources/optional_cell_colours/pack.png differ