diff --git a/build.gradle.kts b/build.gradle.kts index aef501b9..eb0b0273 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,6 +14,10 @@ val modId: String by project val modVersion = (System.getenv("MEGA_VERSION") ?: "v0.0.0").substring(1) val minecraftVersion: String = libs.versions.minecraft.get() +val platforms by extra { + property("enabledPlatforms").toString().split(',') +} + tasks { register("releaseInfo") { doLast { @@ -117,6 +121,11 @@ subprojects { } spotless { + kotlinGradle { + target("*.kts") + diktat() + } + java { target("src/**/java/**/*.java") endWithNewline() @@ -141,12 +150,13 @@ subprojects { json { target("src/**/resources/**/*.json") targetExclude("src/generated/resources/**") - prettier().config(mapOf("parser" to "json")) + jackson() + endWithNewline() } } } -for (platform in property("enabledPlatforms").toString().split(',')) { +for (platform in platforms) { project(":$platform") { apply(plugin = rootProject.libs.plugins.shadow.get().pluginId) diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 5bcca906..f2386837 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -1,6 +1,5 @@ architectury { - val platforms = property("enabledPlatforms").toString().split(',') - println("Platforms: $platforms") + val platforms: List by rootProject.extra common(platforms) } diff --git a/common/src/data/resources/megacells.data.mixins.json b/common/src/data/resources/megacells.data.mixins.json index cb51108c..a3612225 100644 --- a/common/src/data/resources/megacells.data.mixins.json +++ b/common/src/data/resources/megacells.data.mixins.json @@ -2,5 +2,5 @@ "required": true, "minVersion": "0.8.5", "package": "gripe._90.megacells.mixin.data", - "mixins": ["TextureSlotAccessor"] + "mixins": [ "TextureSlotAccessor" ] } diff --git a/common/src/main/resources/assets/ae2/screens/megacells/cell_dock.json b/common/src/main/resources/assets/ae2/screens/megacells/cell_dock.json index 48204338..f27e6a9e 100644 --- a/common/src/main/resources/assets/ae2/screens/megacells/cell_dock.json +++ b/common/src/main/resources/assets/ae2/screens/megacells/cell_dock.json @@ -1,9 +1,9 @@ { "$schema": "../schema.json", - "includes": ["../common/common.json", "../common/player_inventory.json"], + "includes": [ "../common/common.json", "../common/player_inventory.json" ], "background": { "texture": "guis/chest.png", - "srcRect": [0, 0, 176, 166] + "srcRect": [ 0, 0, 176, 166 ] }, "slots": { "STORAGE_CELL": { diff --git a/common/src/main/resources/assets/ae2/screens/megacells/mega_interface.json b/common/src/main/resources/assets/ae2/screens/megacells/mega_interface.json index 99342799..64176e3a 100644 --- a/common/src/main/resources/assets/ae2/screens/megacells/mega_interface.json +++ b/common/src/main/resources/assets/ae2/screens/megacells/mega_interface.json @@ -1,9 +1,9 @@ { "$schema": "../schema.json", - "includes": ["../common/common.json", "../common/player_inventory.json"], + "includes": [ "../common/common.json", "../common/player_inventory.json" ], "background": { "texture": "guis/megacells/mega_interface.png", - "srcRect": [0, 0, 176, 238] + "srcRect": [ 0, 0, 176, 238 ] }, "slots": { "CONFIG": { diff --git a/common/src/main/resources/assets/ae2/screens/megacells/mega_pattern_provider.json b/common/src/main/resources/assets/ae2/screens/megacells/mega_pattern_provider.json index de423928..21884286 100644 --- a/common/src/main/resources/assets/ae2/screens/megacells/mega_pattern_provider.json +++ b/common/src/main/resources/assets/ae2/screens/megacells/mega_pattern_provider.json @@ -1,9 +1,9 @@ { "$schema": "../schema.json", - "includes": ["../common/common.json", "../common/player_inventory.json"], + "includes": [ "../common/common.json", "../common/player_inventory.json" ], "background": { "texture": "guis/megacells/mega_pattern_provider.png", - "srcRect": [0, 0, 176, 213] + "srcRect": [ 0, 0, 176, 213 ] }, "slots": { "ENCODED_PATTERN": { diff --git a/common/src/main/resources/assets/megacells/lang/ru_ru.json b/common/src/main/resources/assets/megacells/lang/ru_ru.json index 9f8fd308..f96d4b4a 100644 --- a/common/src/main/resources/assets/megacells/lang/ru_ru.json +++ b/common/src/main/resources/assets/megacells/lang/ru_ru.json @@ -1,74 +1,58 @@ { "gui.megacells.ModName": "MEGA Cells", - "item.megacells.cell_component_1m": "1M МЭ МЕГА компонент хранения", "item.megacells.cell_component_4m": "4M МЭ МЕГА компонент хранения", "item.megacells.cell_component_16m": "16M МЭ МЕГА компонент хранения", "item.megacells.cell_component_64m": "64M МЭ МЕГА компонент хранения", "item.megacells.cell_component_256m": "256M МЭ МЕГА компонент хранения", - "item.megacells.mega_item_cell_housing": "МЭ МЕГА корпус для предметной ячейки", "item.megacells.mega_fluid_cell_housing": "МЭ МЕГА корпус для жидкостной ячейки", "item.megacells.mega_chemical_cell_housing": "МЭ МЕГА корпус для химической ячейки", - "item.megacells.item_storage_cell_1m": "1M МЭ МЕГА предметная ячейка хранения", "item.megacells.item_storage_cell_4m": "4M МЭ МЕГА предметная ячейка хранения", "item.megacells.item_storage_cell_16m": "16M МЭ МЕГА предметная ячейка хранения", "item.megacells.item_storage_cell_64m": "64M МЭ МЕГА предметная ячейка хранения", "item.megacells.item_storage_cell_256m": "256M МЭ МЕГА предметная ячейка хранения", - "item.megacells.fluid_storage_cell_1m": "1M МЭ МЕГА жидкостная ячейка хранения", "item.megacells.fluid_storage_cell_4m": "4M МЭ МЕГА жидкостная ячейка хранения", "item.megacells.fluid_storage_cell_16m": "16M МЭ МЕГА жидкостная ячейка хранения", "item.megacells.fluid_storage_cell_64m": "64M МЭ МЕГА жидкостная ячейка хранения", "item.megacells.fluid_storage_cell_256m": "256M МЭ МЕГА жидкостная ячейка хранения", - "item.megacells.chemical_storage_cell_1m": "1M МЭ МЕГА химическая ячейка хранения", "item.megacells.chemical_storage_cell_4m": "4M МЭ МЕГА химическая ячейка хранения", "item.megacells.chemical_storage_cell_16m": "16M МЭ МЕГА химическая ячейка хранения", "item.megacells.chemical_storage_cell_64m": "64M МЭ МЕГА химическая ячейка хранения", "item.megacells.chemical_storage_cell_256m": "256M МЭ МЕГА химическая ячейка хранения", - "item.megacells.bulk_cell_component": "МЭ МЕГА компонент массового хранения", "item.megacells.bulk_item_cell": "МЭ МЕГА ячейка массового хранения", - "item.megacells.radioactive_cell_component": "МЭ МЕГА компонент радиоактивного хранения", "item.megacells.radioactive_chemical_cell": "МЭ МЕГА ячейка радиоактивного хранения", - "item.megacells.portable_item_cell_1m": "1M Переносная предметная ячейка", "item.megacells.portable_item_cell_4m": "4M Переносная предметная ячейка", "item.megacells.portable_item_cell_16m": "16M Переносная предметная ячейка", "item.megacells.portable_item_cell_64m": "64M Переносная предметная ячейка", "item.megacells.portable_item_cell_256m": "256M Переносная предметная ячейка", - "item.megacells.portable_fluid_cell_1m": "1M Переносная жидкостная ячейка", "item.megacells.portable_fluid_cell_4m": "4M Переносная жидкостная ячейка", "item.megacells.portable_fluid_cell_16m": "16M Переносная жидкостная ячейка", "item.megacells.portable_fluid_cell_64m": "64M Переносная жидкостная ячейка", "item.megacells.portable_fluid_cell_256m": "256M Переносная жидкостная ячейка", - "item.megacells.portable_chemical_cell_1m": "1M Переносная химическая ячейка", "item.megacells.portable_chemical_cell_4m": "4M Переносная химическая ячейка", "item.megacells.portable_chemical_cell_16m": "16M Переносная химическая ячейка", "item.megacells.portable_chemical_cell_64m": "64M Переносная химическая ячейка", "item.megacells.portable_chemical_cell_256m": "256M Переносная химическая ячейка", - "item.megacells.compression_card": "Компрессионная карта", "item.megacells.greater_energy_card": "Расширенная энергетическая карта", - "item.megacells.cable_mega_pattern_provider": "МЕГА поставщик шаблонов", "item.megacells.cable_mega_interface": "МЕГА интерфейс", - "item.megacells.decompression_module": "Модуль декомпрессии", "item.megacells.decompression_pattern": "Декомпрессионный поставщик", - "item.megacells.accumulation_processor": "Аккумулирующий процессор", "item.megacells.accumulation_processor_press": "Аккумулирующий пресс", "item.megacells.printed_accumulation_processor": "Печатная аккумулирующая схема", - "item.megacells.cell_dock": "МЭ станция для ячеек", "item.megacells.sky_steel_ingot": "Небесный стальной слиток", - "block.megacells.1m_crafting_storage": "МЕГА хранилище для изготовления на 1M", "block.megacells.4m_crafting_storage": "МЕГА хранилище для изготовления на 4M", "block.megacells.16m_crafting_storage": "МЕГА хранилище для изготовления на 16M", @@ -81,7 +65,6 @@ "block.megacells.mega_pattern_provider": "МЕГА поставщик шаблонов", "block.megacells.mega_interface": "МЕГА интерфейс", "block.megacells.sky_steel_block": "Небесный стальной блок", - "gui.tooltips.megacells.ALot": "Много.", "gui.tooltips.megacells.AcceleratorThreads": "Обеспечивает 4 потока совместной обработки на блок.", "gui.tooltips.megacells.Compression": "Сжатие: %s", @@ -95,7 +78,6 @@ "gui.tooltips.megacells.PartitionedFor": "Разбито на разделы для: %s", "gui.tooltips.megacells.ProcessingOnly": "Поддерживаются только шаблоны обработки.", "gui.tooltips.megacells.Quantity": "Количество: %s", - "text.autoconfig.megacells.option.AllowSpentWaste": "(AppMek) Разрешить использование отработавших ядерных отходов", "text.autoconfig.megacells.option.AllowSpentWaste.@Tooltip": "Должна ли МЕГА радиоактивная ячейка иметь возможность хранить отработанные ядерные отходы.", "text.autoconfig.megacells.option.CompressionChainLimit": "Предельный объем сжатия", diff --git a/common/src/main/resources/assets/megacells/models/item/cell_dock.json b/common/src/main/resources/assets/megacells/models/item/cell_dock.json index f4d6fd1c..a18acd8d 100644 --- a/common/src/main/resources/assets/megacells/models/item/cell_dock.json +++ b/common/src/main/resources/assets/megacells/models/item/cell_dock.json @@ -6,84 +6,155 @@ "side": "megacells:part/cell_dock_side", "particle": "megacells:part/cell_dock_side" }, - "elements": [ - { - "name": "body", - "from": [3, 3, 5], - "to": [13, 13, 9], - "faces": { - "north": { "uv": [5, 3, 15, 13], "texture": "#front" }, - "east": { "uv": [0, 6, 4, 16], "rotation": 180, "texture": "#side" }, - "south": { "uv": [4, 6, 14, 16], "texture": "#side" }, - "west": { "uv": [0, 6, 4, 16], "texture": "#side" }, - "up": { "uv": [1, 3, 5, 13], "rotation": 90, "texture": "#front" }, - "down": { "uv": [0, 6, 4, 16], "rotation": 270, "texture": "#side" } + "elements": [ { + "name": "body", + "from": [ 3, 3, 5 ], + "to": [ 13, 13, 9 ], + "faces": { + "north": { + "uv": [ 5, 3, 15, 13 ], + "texture": "#front" + }, + "east": { + "uv": [ 0, 6, 4, 16 ], + "rotation": 180, + "texture": "#side" + }, + "south": { + "uv": [ 4, 6, 14, 16 ], + "texture": "#side" + }, + "west": { + "uv": [ 0, 6, 4, 16 ], + "texture": "#side" + }, + "up": { + "uv": [ 1, 3, 5, 13 ], + "rotation": 90, + "texture": "#front" + }, + "down": { + "uv": [ 0, 6, 4, 16 ], + "rotation": 270, + "texture": "#side" } - }, - { - "name": "slot", - "from": [11.01, 13.01, 8.01], - "to": [4.99, 10.01, 5.99], - "faces": { - "north": { "uv": [7, 10.05, 13, 13], "texture": "#front" }, - "east": { "uv": [9, 10.05, 11, 13], "texture": "#front" }, - "south": { "uv": [7, 10.05, 13, 13], "texture": "#front" }, - "west": { "uv": [9, 10.05, 11, 13], "texture": "#front" }, - "up": { "uv": [7, 10, 13, 12], "rotation": 180, "texture": "#front" } - } - }, - { - "name": "base", - "from": [5, 5, 9], - "to": [11, 11, 10], - "faces": { - "north": { "uv": [10, 0, 16, 6], "texture": "#side" }, - "east": { "uv": [15, 0, 16, 6], "texture": "#side" }, - "south": { "uv": [10, 0, 16, 6], "texture": "#side" }, - "west": { "uv": [10, 0, 11, 6], "texture": "#side" }, - "up": { "uv": [10, 0, 16, 1], "texture": "#side" }, - "down": { "uv": [10, 5, 16, 6], "texture": "#side" } + } + }, { + "name": "slot", + "from": [ 11.01, 13.01, 8.01 ], + "to": [ 4.99, 10.01, 5.99 ], + "faces": { + "north": { + "uv": [ 7, 10.05, 13, 13 ], + "texture": "#front" + }, + "east": { + "uv": [ 9, 10.05, 11, 13 ], + "texture": "#front" + }, + "south": { + "uv": [ 7, 10.05, 13, 13 ], + "texture": "#front" + }, + "west": { + "uv": [ 9, 10.05, 11, 13 ], + "texture": "#front" + }, + "up": { + "uv": [ 7, 10, 13, 12 ], + "rotation": 180, + "texture": "#front" } - }, - { - "name": "internals", - "from": [9, 5, 9], - "to": [7, 11, 10], - "faces": { - "east": { "uv": [15, 10, 16, 16], "texture": "#side" }, - "west": { "uv": [15, 10, 16, 16], "texture": "#side" } + } + }, { + "name": "base", + "from": [ 5, 5, 9 ], + "to": [ 11, 11, 10 ], + "faces": { + "north": { + "uv": [ 10, 0, 16, 6 ], + "texture": "#side" + }, + "east": { + "uv": [ 15, 0, 16, 6 ], + "texture": "#side" + }, + "south": { + "uv": [ 10, 0, 16, 6 ], + "texture": "#side" + }, + "west": { + "uv": [ 10, 0, 11, 6 ], + "texture": "#side" + }, + "up": { + "uv": [ 10, 0, 16, 1 ], + "texture": "#side" + }, + "down": { + "uv": [ 10, 5, 16, 6 ], + "texture": "#side" } - }, - { - "name": "internals", - "from": [5, 9, 9], - "to": [11, 7, 10], - "faces": { - "up": { "uv": [15, 10, 16, 16], "rotation": 270, "texture": "#side" }, - "down": { "uv": [15, 10, 16, 16], "rotation": 270, "texture": "#side" } + } + }, { + "name": "internals", + "from": [ 9, 5, 9 ], + "to": [ 7, 11, 10 ], + "faces": { + "east": { + "uv": [ 15, 10, 16, 16 ], + "texture": "#side" + }, + "west": { + "uv": [ 15, 10, 16, 16 ], + "texture": "#side" } - }, - { - "name": "internals", - "from": [6, 6, 9], - "to": [10, 10, 10], - "faces": { - "east": { "uv": [14, 1, 15, 5], "texture": "#side" }, - "west": { "uv": [14, 1, 15, 5], "texture": "#side" }, - "up": { "uv": [14, 1, 15, 5], "rotation": 90, "texture": "#side" }, - "down": { "uv": [14, 1, 15, 5], "rotation": 90, "texture": "#side" } + } + }, { + "name": "internals", + "from": [ 5, 9, 9 ], + "to": [ 11, 7, 10 ], + "faces": { + "up": { + "uv": [ 15, 10, 16, 16 ], + "rotation": 270, + "texture": "#side" + }, + "down": { + "uv": [ 15, 10, 16, 16 ], + "rotation": 270, + "texture": "#side" } } - ], - "groups": [ - 0, - 1, - 2, - { - "name": "base internals", - "origin": [0, 0, 0], - "color": 0, - "children": [3, 4, 5] + }, { + "name": "internals", + "from": [ 6, 6, 9 ], + "to": [ 10, 10, 10 ], + "faces": { + "east": { + "uv": [ 14, 1, 15, 5 ], + "texture": "#side" + }, + "west": { + "uv": [ 14, 1, 15, 5 ], + "texture": "#side" + }, + "up": { + "uv": [ 14, 1, 15, 5 ], + "rotation": 90, + "texture": "#side" + }, + "down": { + "uv": [ 14, 1, 15, 5 ], + "rotation": 90, + "texture": "#side" + } } - ] + } ], + "groups": [ 0, 1, 2, { + "name": "base internals", + "origin": [ 0, 0, 0 ], + "color": 0, + "children": [ 3, 4, 5 ] + } ] } diff --git a/common/src/main/resources/assets/megacells/models/item/decompression_module.json b/common/src/main/resources/assets/megacells/models/item/decompression_module.json index d0a32f22..8b7ee1db 100644 --- a/common/src/main/resources/assets/megacells/models/item/decompression_module.json +++ b/common/src/main/resources/assets/megacells/models/item/decompression_module.json @@ -6,70 +6,127 @@ "front": "megacells:part/decompression_module", "particle": "megacells:part/decompression_module_side" }, - "elements": [ - { - "from": [3, 3, 5], - "to": [13, 13, 9], - "faces": { - "north": { "uv": [3, 3, 13, 13], "texture": "#front" }, - "east": { "uv": [0, 6, 4, 16], "rotation": 180, "texture": "#1" }, - "south": { "uv": [4, 6, 14, 16], "texture": "#1" }, - "west": { "uv": [0, 6, 4, 16], "texture": "#1" }, - "up": { "uv": [0, 6, 4, 16], "rotation": 90, "texture": "#1" }, - "down": { "uv": [0, 6, 4, 16], "rotation": 270, "texture": "#1" } + "elements": [ { + "from": [ 3, 3, 5 ], + "to": [ 13, 13, 9 ], + "faces": { + "north": { + "uv": [ 3, 3, 13, 13 ], + "texture": "#front" + }, + "east": { + "uv": [ 0, 6, 4, 16 ], + "rotation": 180, + "texture": "#1" + }, + "south": { + "uv": [ 4, 6, 14, 16 ], + "texture": "#1" + }, + "west": { + "uv": [ 0, 6, 4, 16 ], + "texture": "#1" + }, + "up": { + "uv": [ 0, 6, 4, 16 ], + "rotation": 90, + "texture": "#1" + }, + "down": { + "uv": [ 0, 6, 4, 16 ], + "rotation": 270, + "texture": "#1" } - }, - { - "name": "base", - "from": [5, 5, 9], - "to": [11, 11, 10], - "faces": { - "north": { "uv": [10, 0, 16, 6], "texture": "#1" }, - "east": { "uv": [15, 0, 16, 6], "texture": "#1" }, - "south": { "uv": [10, 0, 16, 6], "texture": "#1" }, - "west": { "uv": [10, 0, 11, 6], "texture": "#1" }, - "up": { "uv": [10, 0, 16, 1], "texture": "#1" }, - "down": { "uv": [10, 5, 16, 6], "texture": "#1" } - } - }, - { - "name": "internals", - "from": [9, 5, 9], - "to": [7, 11, 10], - "faces": { - "east": { "uv": [15, 10, 16, 16], "texture": "#1" }, - "west": { "uv": [15, 10, 16, 16], "texture": "#1" } + } + }, { + "name": "base", + "from": [ 5, 5, 9 ], + "to": [ 11, 11, 10 ], + "faces": { + "north": { + "uv": [ 10, 0, 16, 6 ], + "texture": "#1" + }, + "east": { + "uv": [ 15, 0, 16, 6 ], + "texture": "#1" + }, + "south": { + "uv": [ 10, 0, 16, 6 ], + "texture": "#1" + }, + "west": { + "uv": [ 10, 0, 11, 6 ], + "texture": "#1" + }, + "up": { + "uv": [ 10, 0, 16, 1 ], + "texture": "#1" + }, + "down": { + "uv": [ 10, 5, 16, 6 ], + "texture": "#1" } - }, - { - "name": "internals", - "from": [5, 9, 9], - "to": [11, 7, 10], - "faces": { - "up": { "uv": [15, 10, 16, 16], "rotation": 270, "texture": "#1" }, - "down": { "uv": [15, 10, 16, 16], "rotation": 270, "texture": "#1" } + } + }, { + "name": "internals", + "from": [ 9, 5, 9 ], + "to": [ 7, 11, 10 ], + "faces": { + "east": { + "uv": [ 15, 10, 16, 16 ], + "texture": "#1" + }, + "west": { + "uv": [ 15, 10, 16, 16 ], + "texture": "#1" } - }, - { - "name": "internals", - "from": [6, 6, 9], - "to": [10, 10, 10], - "faces": { - "east": { "uv": [14, 1, 15, 5], "texture": "#1" }, - "west": { "uv": [14, 1, 15, 5], "texture": "#1" }, - "up": { "uv": [14, 1, 15, 5], "rotation": 90, "texture": "#1" }, - "down": { "uv": [14, 1, 15, 5], "rotation": 90, "texture": "#1" } + } + }, { + "name": "internals", + "from": [ 5, 9, 9 ], + "to": [ 11, 7, 10 ], + "faces": { + "up": { + "uv": [ 15, 10, 16, 16 ], + "rotation": 270, + "texture": "#1" + }, + "down": { + "uv": [ 15, 10, 16, 16 ], + "rotation": 270, + "texture": "#1" } } - ], - "groups": [ - 0, - 1, - { - "name": "base internals", - "origin": [0, 0, 0], - "color": 0, - "children": [2, 3, 4] + }, { + "name": "internals", + "from": [ 6, 6, 9 ], + "to": [ 10, 10, 10 ], + "faces": { + "east": { + "uv": [ 14, 1, 15, 5 ], + "texture": "#1" + }, + "west": { + "uv": [ 14, 1, 15, 5 ], + "texture": "#1" + }, + "up": { + "uv": [ 14, 1, 15, 5 ], + "rotation": 90, + "texture": "#1" + }, + "down": { + "uv": [ 14, 1, 15, 5 ], + "rotation": 90, + "texture": "#1" + } } - ] + } ], + "groups": [ 0, 1, { + "name": "base internals", + "origin": [ 0, 0, 0 ], + "color": 0, + "children": [ 2, 3, 4 ] + } ] } diff --git a/common/src/main/resources/assets/megacells/models/part/cell_dock.json b/common/src/main/resources/assets/megacells/models/part/cell_dock.json index 31a2e8e8..3d2670e2 100644 --- a/common/src/main/resources/assets/megacells/models/part/cell_dock.json +++ b/common/src/main/resources/assets/megacells/models/part/cell_dock.json @@ -4,84 +4,155 @@ "front": "megacells:part/cell_dock", "side": "megacells:part/cell_dock_side" }, - "elements": [ - { - "name": "body", - "from": [3, 3, 0], - "to": [13, 13, 4], - "faces": { - "north": { "uv": [5, 3, 15, 13], "texture": "#front" }, - "east": { "uv": [0, 6, 4, 16], "rotation": 180, "texture": "#side" }, - "south": { "uv": [4, 6, 14, 16], "texture": "#side" }, - "west": { "uv": [0, 6, 4, 16], "texture": "#side" }, - "up": { "uv": [1, 3, 5, 13], "rotation": 90, "texture": "#front" }, - "down": { "uv": [0, 6, 4, 16], "rotation": 270, "texture": "#side" } + "elements": [ { + "name": "body", + "from": [ 3, 3, 0 ], + "to": [ 13, 13, 4 ], + "faces": { + "north": { + "uv": [ 5, 3, 15, 13 ], + "texture": "#front" + }, + "east": { + "uv": [ 0, 6, 4, 16 ], + "rotation": 180, + "texture": "#side" + }, + "south": { + "uv": [ 4, 6, 14, 16 ], + "texture": "#side" + }, + "west": { + "uv": [ 0, 6, 4, 16 ], + "texture": "#side" + }, + "up": { + "uv": [ 1, 3, 5, 13 ], + "rotation": 90, + "texture": "#front" + }, + "down": { + "uv": [ 0, 6, 4, 16 ], + "rotation": 270, + "texture": "#side" } - }, - { - "name": "slot", - "from": [11.01, 13.01, 3.01], - "to": [4.99, 10.01, 0.99], - "faces": { - "north": { "uv": [7, 10.05, 13, 13], "texture": "#front" }, - "east": { "uv": [9, 10.05, 11, 13], "texture": "#front" }, - "south": { "uv": [7, 10.05, 13, 13], "texture": "#front" }, - "west": { "uv": [9, 10.05, 11, 13], "texture": "#front" }, - "up": { "uv": [7, 10, 13, 12], "rotation": 180, "texture": "#front" } - } - }, - { - "name": "base", - "from": [5, 5, 4], - "to": [11, 11, 5.01], - "faces": { - "north": { "uv": [10, 0, 16, 6], "texture": "#side" }, - "east": { "uv": [15, 0, 16, 6], "texture": "#side" }, - "south": { "uv": [10, 0, 16, 6], "texture": "#side" }, - "west": { "uv": [10, 0, 11, 6], "texture": "#side" }, - "up": { "uv": [10, 0, 16, 1], "texture": "#side" }, - "down": { "uv": [10, 5, 16, 6], "texture": "#side" } + } + }, { + "name": "slot", + "from": [ 11.01, 13.01, 3.01 ], + "to": [ 4.99, 10.01, 0.99 ], + "faces": { + "north": { + "uv": [ 7, 10.05, 13, 13 ], + "texture": "#front" + }, + "east": { + "uv": [ 9, 10.05, 11, 13 ], + "texture": "#front" + }, + "south": { + "uv": [ 7, 10.05, 13, 13 ], + "texture": "#front" + }, + "west": { + "uv": [ 9, 10.05, 11, 13 ], + "texture": "#front" + }, + "up": { + "uv": [ 7, 10, 13, 12 ], + "rotation": 180, + "texture": "#front" } - }, - { - "name": "internals", - "from": [9, 5, 4], - "to": [7, 11, 5], - "faces": { - "east": { "uv": [15, 10, 16, 16], "texture": "#side" }, - "west": { "uv": [15, 10, 16, 16], "texture": "#side" } + } + }, { + "name": "base", + "from": [ 5, 5, 4 ], + "to": [ 11, 11, 5.01 ], + "faces": { + "north": { + "uv": [ 10, 0, 16, 6 ], + "texture": "#side" + }, + "east": { + "uv": [ 15, 0, 16, 6 ], + "texture": "#side" + }, + "south": { + "uv": [ 10, 0, 16, 6 ], + "texture": "#side" + }, + "west": { + "uv": [ 10, 0, 11, 6 ], + "texture": "#side" + }, + "up": { + "uv": [ 10, 0, 16, 1 ], + "texture": "#side" + }, + "down": { + "uv": [ 10, 5, 16, 6 ], + "texture": "#side" } - }, - { - "name": "internals", - "from": [5, 9, 4], - "to": [11, 7, 5], - "faces": { - "up": { "uv": [15, 10, 16, 16], "rotation": 270, "texture": "#side" }, - "down": { "uv": [15, 10, 16, 16], "rotation": 270, "texture": "#side" } + } + }, { + "name": "internals", + "from": [ 9, 5, 4 ], + "to": [ 7, 11, 5 ], + "faces": { + "east": { + "uv": [ 15, 10, 16, 16 ], + "texture": "#side" + }, + "west": { + "uv": [ 15, 10, 16, 16 ], + "texture": "#side" } - }, - { - "name": "internals", - "from": [6.01, 6.01, 4], - "to": [9.99, 9.99, 5], - "faces": { - "east": { "uv": [14, 1, 15, 5], "texture": "#side" }, - "west": { "uv": [14, 1, 15, 5], "texture": "#side" }, - "up": { "uv": [14, 1, 15, 5], "rotation": 90, "texture": "#side" }, - "down": { "uv": [14, 1, 15, 5], "rotation": 90, "texture": "#side" } + } + }, { + "name": "internals", + "from": [ 5, 9, 4 ], + "to": [ 11, 7, 5 ], + "faces": { + "up": { + "uv": [ 15, 10, 16, 16 ], + "rotation": 270, + "texture": "#side" + }, + "down": { + "uv": [ 15, 10, 16, 16 ], + "rotation": 270, + "texture": "#side" } } - ], - "groups": [ - 0, - 1, - 2, - { - "name": "base internals", - "origin": [0, 0, 0], - "color": 0, - "children": [3, 4, 5] + }, { + "name": "internals", + "from": [ 6.01, 6.01, 4 ], + "to": [ 9.99, 9.99, 5 ], + "faces": { + "east": { + "uv": [ 14, 1, 15, 5 ], + "texture": "#side" + }, + "west": { + "uv": [ 14, 1, 15, 5 ], + "texture": "#side" + }, + "up": { + "uv": [ 14, 1, 15, 5 ], + "rotation": 90, + "texture": "#side" + }, + "down": { + "uv": [ 14, 1, 15, 5 ], + "rotation": 90, + "texture": "#side" + } } - ] + } ], + "groups": [ 0, 1, 2, { + "name": "base internals", + "origin": [ 0, 0, 0 ], + "color": 0, + "children": [ 3, 4, 5 ] + } ] } diff --git a/common/src/main/resources/assets/megacells/models/part/decompression_module.json b/common/src/main/resources/assets/megacells/models/part/decompression_module.json index f00bf7ea..b789b959 100644 --- a/common/src/main/resources/assets/megacells/models/part/decompression_module.json +++ b/common/src/main/resources/assets/megacells/models/part/decompression_module.json @@ -4,87 +4,128 @@ "front": "megacells:part/decompression_module", "side": "megacells:part/decompression_module_side" }, - "elements": [ - { - "name": "body", - "from": [3, 3, 0], - "to": [13, 13, 4], - "faces": { - "north": { "uv": [3, 3, 13, 13], "texture": "#front" }, - "east": { "uv": [0, 6, 4, 16], "rotation": 180, "texture": "#side" }, - "south": { "uv": [4, 6, 14, 16], "texture": "#side" }, - "west": { "uv": [0, 6, 4, 16], "texture": "#side" }, - "up": { "uv": [0, 6, 4, 16], "rotation": 90, "texture": "#side" }, - "down": { "uv": [0, 6, 4, 16], "rotation": 270, "texture": "#side" } + "elements": [ { + "name": "body", + "from": [ 3, 3, 0 ], + "to": [ 13, 13, 4 ], + "faces": { + "north": { + "uv": [ 3, 3, 13, 13 ], + "texture": "#front" + }, + "east": { + "uv": [ 0, 6, 4, 16 ], + "rotation": 180, + "texture": "#side" + }, + "south": { + "uv": [ 4, 6, 14, 16 ], + "texture": "#side" + }, + "west": { + "uv": [ 0, 6, 4, 16 ], + "texture": "#side" + }, + "up": { + "uv": [ 0, 6, 4, 16 ], + "rotation": 90, + "texture": "#side" + }, + "down": { + "uv": [ 0, 6, 4, 16 ], + "rotation": 270, + "texture": "#side" } - }, - { - "name": "base", - "from": [5, 5, 4], - "to": [11, 11, 5.01], - "faces": { - "north": { "uv": [10, 0, 16, 6], "texture": "#side" }, - "east": { "uv": [15, 0, 16, 6], "texture": "#side" }, - "south": { "uv": [10, 0, 16, 6], "texture": "#side" }, - "west": { "uv": [10, 0, 11, 6], "texture": "#side" }, - "up": { "uv": [10, 0, 16, 1], "texture": "#side" }, - "down": { "uv": [10, 5, 16, 6], "texture": "#side" } - } - }, - { - "name": "internals", - "from": [9, 5, 4], - "to": [7, 11, 5], - "faces": { - "east": { "uv": [15, 10, 16, 16], "texture": "#side" }, - "west": { "uv": [15, 10, 16, 16], "texture": "#side" } + } + }, { + "name": "base", + "from": [ 5, 5, 4 ], + "to": [ 11, 11, 5.01 ], + "faces": { + "north": { + "uv": [ 10, 0, 16, 6 ], + "texture": "#side" + }, + "east": { + "uv": [ 15, 0, 16, 6 ], + "texture": "#side" + }, + "south": { + "uv": [ 10, 0, 16, 6 ], + "texture": "#side" + }, + "west": { + "uv": [ 10, 0, 11, 6 ], + "texture": "#side" + }, + "up": { + "uv": [ 10, 0, 16, 1 ], + "texture": "#side" + }, + "down": { + "uv": [ 10, 5, 16, 6 ], + "texture": "#side" } - }, - { - "name": "internals", - "from": [5, 9, 4], - "to": [11, 7, 5], - "faces": { - "up": { - "uv": [15, 10, 16, 16], - "rotation": 270, - "texture": "#side" - }, - "down": { - "uv": [15, 10, 16, 16], - "rotation": 270, - "texture": "#side" - } + } + }, { + "name": "internals", + "from": [ 9, 5, 4 ], + "to": [ 7, 11, 5 ], + "faces": { + "east": { + "uv": [ 15, 10, 16, 16 ], + "texture": "#side" + }, + "west": { + "uv": [ 15, 10, 16, 16 ], + "texture": "#side" } - }, - { - "name": "internals", - "from": [6.01, 6.01, 4], - "to": [9.99, 9.99, 5], - "faces": { - "east": { "uv": [14, 1, 15, 5], "texture": "#side" }, - "west": { "uv": [14, 1, 15, 5], "texture": "#side" }, - "up": { - "uv": [14, 1, 15, 5], - "rotation": 90, - "texture": "#side" - }, - "down": { - "uv": [14, 1, 15, 5], - "rotation": 90, - "texture": "#side" - } + } + }, { + "name": "internals", + "from": [ 5, 9, 4 ], + "to": [ 11, 7, 5 ], + "faces": { + "up": { + "uv": [ 15, 10, 16, 16 ], + "rotation": 270, + "texture": "#side" + }, + "down": { + "uv": [ 15, 10, 16, 16 ], + "rotation": 270, + "texture": "#side" } } - ], - "groups": [ - 0, - 1, - { - "name": "base internals", - "origin": [0, 0, 0], - "color": 0, - "children": [2, 3, 4] + }, { + "name": "internals", + "from": [ 6.01, 6.01, 4 ], + "to": [ 9.99, 9.99, 5 ], + "faces": { + "east": { + "uv": [ 14, 1, 15, 5 ], + "texture": "#side" + }, + "west": { + "uv": [ 14, 1, 15, 5 ], + "texture": "#side" + }, + "up": { + "uv": [ 14, 1, 15, 5 ], + "rotation": 90, + "texture": "#side" + }, + "down": { + "uv": [ 14, 1, 15, 5 ], + "rotation": 90, + "texture": "#side" + } } - ] + } ], + "groups": [ 0, 1, { + "name": "base internals", + "origin": [ 0, 0, 0 ], + "color": 0, + "children": [ 2, 3, 4 ] + } ] } diff --git a/common/src/main/resources/data/megacells/recipes/cells/mega_mana_cell_housing.json b/common/src/main/resources/data/megacells/recipes/cells/mega_mana_cell_housing.json index ee1fa607..824743ef 100644 --- a/common/src/main/resources/data/megacells/recipes/cells/mega_mana_cell_housing.json +++ b/common/src/main/resources/data/megacells/recipes/cells/mega_mana_cell_housing.json @@ -1,22 +1,16 @@ { "type": "botania:terra_plate", - "ingredients": [ - { - "item": "appbot:mana_cell_housing" - }, - { - "item": "botania:mana_pearl" - }, - { - "item": "botania:mana_diamond" - }, - { - "item": "ae2:sky_dust" - }, - { - "item": "ae2:quartz_vibrant_glass" - } - ], + "ingredients": [ { + "item": "appbot:mana_cell_housing" + }, { + "item": "botania:mana_pearl" + }, { + "item": "botania:mana_diamond" + }, { + "item": "ae2:sky_dust" + }, { + "item": "ae2:quartz_vibrant_glass" + } ], "mana": 2000000, "result": { "item": "megacells:mega_mana_cell_housing" diff --git a/common/src/main/resources/megacells.mixins.json b/common/src/main/resources/megacells.mixins.json index a06da976..e086903d 100644 --- a/common/src/main/resources/megacells.mixins.json +++ b/common/src/main/resources/megacells.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8.5", "package": "gripe._90.megacells.mixin", - "mixins": ["ItemEntityMixin"], + "mixins": [ "ItemEntityMixin" ], "injectors": { "defaultRequire": 1 } diff --git a/fabric/src/data/resources/fabric.mod.json b/fabric/src/data/resources/fabric.mod.json index dc8d7080..d23e69b8 100644 --- a/fabric/src/data/resources/fabric.mod.json +++ b/fabric/src/data/resources/fabric.mod.json @@ -2,9 +2,8 @@ "schemaVersion": 1, "id": "megacells-data", "version": "1", - - "mixins": ["megacells.data.mixins.json"], + "mixins": [ "megacells.data.mixins.json" ], "entrypoints": { - "fabric-datagen": ["gripe._90.megacells.datagen.MEGADataGenerators"] + "fabric-datagen": [ "gripe._90.megacells.datagen.MEGADataGenerators" ] } } diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 5d5e1949..348f6208 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -2,26 +2,22 @@ "schemaVersion": 1, "id": "megacells", "version": "$version", - "name": "MEGA Cells", "description": "ME Greater Accumulation Cells - For when kilobytes just won't do.", - "authors": ["90"], + "authors": [ "90" ], "contact": { "homepage": "https://mega.90.gripe", "sources": "https://github.com/62832/MEGACells" }, - "license": "LGPLv3.0", "icon": "icon.png", - "environment": "*", "entrypoints": { - "ae2": ["gripe._90.megacells.fabric.MEGACellsFabric"], - "ae2:client": ["gripe._90.megacells.fabric.MEGACellsClient"], - "modmenu": ["gripe._90.megacells.integration.modmenu.ModMenuIntegration"] + "ae2": [ "gripe._90.megacells.fabric.MEGACellsFabric" ], + "ae2:client": [ "gripe._90.megacells.fabric.MEGACellsClient" ], + "modmenu": [ "gripe._90.megacells.integration.modmenu.ModMenuIntegration" ] }, - "mixins": ["megacells.mixins.json"], - + "mixins": [ "megacells.mixins.json" ], "depends": { "minecraft": "$minecraftVersion", "ae2": ">=$ae2Version", diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts index 83fb6f25..e96873c2 100644 --- a/forge/build.gradle.kts +++ b/forge/build.gradle.kts @@ -95,9 +95,10 @@ dependencies { tasks.processResources { val commonProps: Map by extra val forgeProps = mapOf( - "appmekVersion" to libs.versions.appmek.get(), - "loaderVersion" to libs.forge.get().version!!.substringAfter('-').substringBefore('.'), - "ae2VersionEnd" to libs.versions.ae2.get().substringBefore('.').toInt() + 1 + "appmekVersion" to libs.versions.appmek.get(), + "loaderVersion" to libs.forge.get().version!!.substringAfter('-') + .substringBefore('.'), + "ae2VersionEnd" to libs.versions.ae2.get().substringBefore('.').toInt() + 1 ) inputs.properties(commonProps) diff --git a/forge/src/data/resources/megacells.data.forge.mixins.json b/forge/src/data/resources/megacells.data.forge.mixins.json index adde65df..74cad491 100644 --- a/forge/src/data/resources/megacells.data.forge.mixins.json +++ b/forge/src/data/resources/megacells.data.forge.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8.5", "package": "gripe._90.megacells.mixin.data.forge", - "mixins": ["MainMixin"], + "mixins": [ "MainMixin" ], "injectors": { "defaultRequire": 1 } diff --git a/forge/src/main/resources/megacells.forge.mixins.json b/forge/src/main/resources/megacells.forge.mixins.json index 652c898f..12bc7bc3 100644 --- a/forge/src/main/resources/megacells.forge.mixins.json +++ b/forge/src/main/resources/megacells.forge.mixins.json @@ -2,8 +2,8 @@ "required": true, "minVersion": "0.8.5", "package": "gripe._90.megacells.mixin.forge", - "mixins": [], - "client": ["client.BuiltInModelHooksAccessor", "client.ModelBakeryMixin"], + "mixins": [ ], + "client": [ "client.BuiltInModelHooksAccessor", "client.ModelBakeryMixin" ], "injectors": { "defaultRequire": 1 }