diff --git a/schemas/atlas.json b/schemas/atlas.json index 3de04651f..987b678b8 100644 --- a/schemas/atlas.json +++ b/schemas/atlas.json @@ -39,6 +39,32 @@ "type": "object", "patternProperties": { "[0-9]+": { + "properties": { + "start": { + "$ref": "#/definitions/vec2i" + }, + "end": { + "$ref": "#/definitions/vec2i" + }, + "section": { + "type": "integer" + }, + "type": { + "enum": ["default", "main_hand", "off_hand", "feet", "legs", "chest", "head", "read_only"] + } + }, + "required": [ + "start", + "end" + ], + "additionalProperties": false + } + } + }, + "areas": { + "type": "object", + "patternProperties": { + "\\w+": { "properties": { "start": { "$ref": "#/definitions/vec2i" @@ -62,7 +88,8 @@ "end" ], "optional": [ - "slots" + "slots", + "areas" ], "additionalProperties": false } diff --git a/src/main/resources/assets/minosoft/mapping/atlas.json b/src/main/resources/assets/minosoft/mapping/atlas.json index 0aa000fcd..9452ff297 100644 --- a/src/main/resources/assets/minosoft/mapping/atlas.json +++ b/src/main/resources/assets/minosoft/mapping/atlas.json @@ -715,187 +715,245 @@ "slots": { "0": { "start": [154, 28], - "end": [171, 45] + "end": [171, 45], + "type": "read_only", + "section": -1 }, "1": { "start": [98, 18], - "end": [115, 35] + "end": [115, 35], + "section": -1 }, "2": { "start": [116, 18], - "end": [133, 35] + "end": [133, 35], + "section": -1 }, "3": { "start": [98, 36], - "end": [115, 53] + "end": [115, 53], + "section": -1 }, "4": { "start": [116, 36], - "end": [133, 53] + "end": [133, 53], + "section": -1 }, "5": { "start": [8, 8], - "end": [25, 25] + "end": [25, 25], + "section": 0, + "type": "head" }, "6": { "start": [8, 26], - "end": [25, 43] + "end": [25, 43], + "section": 0, + "type": "chest" }, "7": { "start": [8, 44], - "end": [25, 61] + "end": [25, 61], + "section": 0, + "type": "legs" }, "8": { "start": [8, 62], - "end": [25, 79] + "end": [25, 79], + "section": 0, + "type": "feet" }, "9": { "start": [8, 84], - "end": [25, 101] + "end": [25, 101], + "section": 1 }, "10": { "start": [26, 84], - "end": [43, 101] + "end": [43, 101], + "section": 1 }, "11": { "start": [44, 84], - "end": [61, 101] + "end": [61, 101], + "section": 1 }, "12": { "start": [62, 84], - "end": [79, 101] + "end": [79, 101], + "section": 1 }, "13": { "start": [80, 84], - "end": [97, 101] + "end": [97, 101], + "section": 1 }, "14": { "start": [98, 84], - "end": [115, 101] + "end": [115, 101], + "section": 1 }, "15": { "start": [116, 84], - "end": [133, 101] + "end": [133, 101], + "section": 1 }, "16": { "start": [134, 84], - "end": [151, 101] + "end": [151, 101], + "section": 1 }, "17": { "start": [152, 84], - "end": [169, 101] + "end": [169, 101], + "section": 1 }, "18": { "start": [8, 102], - "end": [25, 119] + "end": [25, 119], + "section": 1 }, "19": { "start": [26, 102], - "end": [43, 119] + "end": [43, 119], + "section": 1 }, "20": { "start": [44, 102], - "end": [61, 119] + "end": [61, 119], + "section": 1 }, "21": { "start": [62, 102], - "end": [79, 119] + "end": [79, 119], + "section": 1 }, "22": { "start": [80, 102], - "end": [97, 119] + "end": [97, 119], + "section": 1 }, "23": { "start": [98, 102], - "end": [115, 119] + "end": [115, 119], + "section": 1 }, "24": { "start": [116, 102], - "end": [133, 119] + "end": [133, 119], + "section": 1 }, "25": { "start": [134, 102], - "end": [151, 119] + "end": [151, 119], + "section": 1 }, "26": { "start": [152, 102], - "end": [169, 119] + "end": [169, 119], + "section": 1 }, "27": { "start": [8, 120], - "end": [25, 137] + "end": [25, 137], + "section": 1 }, "28": { "start": [26, 120], - "end": [43, 137] + "end": [43, 137], + "section": 1 }, "29": { "start": [44, 120], - "end": [61, 137] + "end": [61, 137], + "section": 1 }, "30": { "start": [62, 120], - "end": [79, 137] + "end": [79, 137], + "section": 1 }, "31": { "start": [80, 120], - "end": [97, 137] + "end": [97, 137], + "section": 1 }, "32": { "start": [98, 120], - "end": [115, 137] + "end": [115, 137], + "section": 1 }, "33": { "start": [116, 120], - "end": [133, 137] + "end": [133, 137], + "section": 1 }, "34": { "start": [134, 120], - "end": [151, 137] + "end": [151, 137], + "section": 1 }, "35": { "start": [152, 120], - "end": [169, 137] + "end": [169, 137], + "section": 1 }, "36": { "start": [8, 142], - "end": [25, 159] + "end": [25, 159], + "section": 2 }, "37": { "start": [26, 142], - "end": [43, 159] + "end": [43, 159], + "section": 2 }, "38": { "start": [44, 142], - "end": [61, 159] + "end": [61, 159], + "section": 2 }, "39": { "start": [62, 142], - "end": [79, 159] + "end": [79, 159], + "section": 2 }, "40": { "start": [80, 142], - "end": [97, 159] + "end": [97, 159], + "section": 2 }, "41": { "start": [98, 142], - "end": [115, 159] + "end": [115, 159], + "section": 2 }, "42": { "start": [116, 142], - "end": [133, 159] + "end": [133, 159], + "section": 2 }, "43": { "start": [134, 142], - "end": [151, 159] + "end": [151, 159], + "section": 2 }, "44": { "start": [152, 142], - "end": [169, 159] + "end": [169, 159], + "section": 2 }, "45": { "start": [77, 62], - "end": [94, 79] + "end": [94, 79], + "type": "off_hand", + "section": -1 + } + }, + "areas": { + "skin": { + "start": [26, 8], + "end": [75, 78] } } }