diff --git a/build.gradle.kts b/build.gradle.kts index eb0b0273..ecc4f314 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -150,7 +150,8 @@ subprojects { json { target("src/**/resources/**/*.json") targetExclude("src/generated/resources/**") - jackson() + biome() + indentWithSpaces(2) endWithNewline() } } diff --git a/common/src/data/resources/megacells.data.mixins.json b/common/src/data/resources/megacells.data.mixins.json index a3612225..cb51108c 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 f27e6a9e..48204338 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 64176e3a..99342799 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 21884286..de423928 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/models/item/cell_dock.json b/common/src/main/resources/assets/megacells/models/item/cell_dock.json index a18acd8d..69f48f2b 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,155 +6,167 @@ "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": "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": "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": [ 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": [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": [ 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": [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": [ 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": [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 ] - } ] + ], + "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 8b7ee1db..39b98bd2 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,127 +6,137 @@ "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": "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": "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": [ 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": [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": [ 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": [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 ] - } ] + ], + "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 3d2670e2..d84e7587 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,155 +4,167 @@ "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": "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": "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": "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": [ 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": [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": [ 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": [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 ] - } ] + ], + "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 b789b959..95e3839a 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,128 +4,138 @@ "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": "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": "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": [ 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": [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": [ 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": [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 ] - } ] + ], + "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 824743ef..ee1fa607 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,16 +1,22 @@ { "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 e086903d..a06da976 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 d23e69b8..494e22cc 100644 --- a/fabric/src/data/resources/fabric.mod.json +++ b/fabric/src/data/resources/fabric.mod.json @@ -2,8 +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 348f6208..b7300d90 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -4,7 +4,7 @@ "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" @@ -13,11 +13,11 @@ "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/src/data/resources/megacells.data.forge.mixins.json b/forge/src/data/resources/megacells.data.forge.mixins.json index 74cad491..adde65df 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 12bc7bc3..652c898f 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 } diff --git a/settings.gradle.kts b/settings.gradle.kts index d42f52c3..33cae985 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -13,7 +13,7 @@ dependencyResolutionManagement { plugin("loom", "dev.architectury.loom").version("1.4-SNAPSHOT") plugin("architectury", "architectury-plugin").version("3.4-SNAPSHOT") plugin("shadow", "com.github.johnrengelman.shadow").version("8.1.1") - plugin("spotless", "com.diffplug.spotless").version("6.20.0") + plugin("spotless", "com.diffplug.spotless").version("6.22.0") val minecraftVersion = "1.20.1" version("minecraft", minecraftVersion)