Skip to content

Commit

Permalink
Switch to Biome instead of Jackson
Browse files Browse the repository at this point in the history
  • Loading branch information
62832 committed Nov 27, 2023
1 parent e57cb8c commit a8624c2
Show file tree
Hide file tree
Showing 16 changed files with 605 additions and 554 deletions.
3 changes: 2 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ subprojects {
json {
target("src/**/resources/**/*.json")
targetExclude("src/generated/resources/**")
jackson()
biome()
indentWithSpaces(2)
endWithNewline()
}
}
Expand Down
2 changes: 1 addition & 1 deletion common/src/data/resources/megacells.data.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"required": true,
"minVersion": "0.8.5",
"package": "gripe._90.megacells.mixin.data",
"mixins": [ "TextureSlotAccessor" ]
"mixins": ["TextureSlotAccessor"]
}
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
300 changes: 156 additions & 144 deletions common/src/main/resources/assets/megacells/models/item/cell_dock.json
Original file line number Diff line number Diff line change
Expand Up @@ -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]
}
]
}
Loading

0 comments on commit a8624c2

Please sign in to comment.