diff --git a/src/main/resources/assets/ornamentum/blockstates/iron_shelf.json b/src/main/resources/assets/ornamentum/blockstates/iron_shelf.json index e2d6cbf..26199a9 100644 --- a/src/main/resources/assets/ornamentum/blockstates/iron_shelf.json +++ b/src/main/resources/assets/ornamentum/blockstates/iron_shelf.json @@ -1,76 +1,80 @@ { "variants": { "facing=north": [ - { "model": "ornamentum:block/iron_shelf", "weight": 10 }, + { "model": "ornamentum:block/iron_shelf", "weight": 25 }, { "model": "ornamentum:block/iron_shelf_things_1", "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_2", "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_3", "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_4", "weight": 1 }, - { "model": "ornamentum:block/iron_shelf_things_5", "weight": 2 }, + { "model": "ornamentum:block/iron_shelf_things_5", "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_6", "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_7", "weight": 1 }, - { "model": "ornamentum:block/iron_shelf_things_8", "weight": 2 }, - { "model": "ornamentum:block/iron_shelf_things_9", "weight": 2 }, + { "model": "ornamentum:block/iron_shelf_things_8", "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_9", "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_10", "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_11", "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_12", "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_13", "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_14", "weight": 1 }, - { "model": "ornamentum:block/iron_shelf_things_15", "weight": 1 } + { "model": "ornamentum:block/iron_shelf_things_15", "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_16", "weight": 1 } ], "facing=south": [ - { "model": "ornamentum:block/iron_shelf", "y": 180, "weight": 10 }, - { "model": "ornamentum:block/iron_shelf_things_1", "y": 180, "weight": 1}, - { "model": "ornamentum:block/iron_shelf_things_2", "y": 180, "weight": 1}, - { "model": "ornamentum:block/iron_shelf_things_3", "y": 180, "weight": 1}, - { "model": "ornamentum:block/iron_shelf_things_4", "y": 180, "weight": 1}, - { "model": "ornamentum:block/iron_shelf_things_5", "y": 180, "weight": 2}, - { "model": "ornamentum:block/iron_shelf_things_6", "y": 180, "weight": 1}, - { "model": "ornamentum:block/iron_shelf_things_7", "y": 180, "weight": 1}, - { "model": "ornamentum:block/iron_shelf_things_8", "y": 180, "weight": 2}, - { "model": "ornamentum:block/iron_shelf_things_9", "y": 180, "weight": 2}, + { "model": "ornamentum:block/iron_shelf", "y": 180, "weight": 25 }, + { "model": "ornamentum:block/iron_shelf_things_1", "y": 180, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_2", "y": 180, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_3", "y": 180, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_4", "y": 180, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_5", "y": 180, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_6", "y": 180, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_7", "y": 180, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_8", "y": 180, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_9", "y": 180, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_10", "y": 180, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_11", "y": 180, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_12", "y": 180, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_13", "y": 180, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_14", "y": 180, "weight": 1 }, - { "model": "ornamentum:block/iron_shelf_things_15", "y": 180, "weight": 1 } + { "model": "ornamentum:block/iron_shelf_things_15", "y": 180, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_16", "y": 180, "weight": 2 } ], "facing=east": [ - { "model": "ornamentum:block/iron_shelf", "y": 90, "weight": 10 }, + { "model": "ornamentum:block/iron_shelf", "y": 90, "weight": 25 }, { "model": "ornamentum:block/iron_shelf_things_1", "y": 90, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_2", "y": 90, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_3", "y": 90, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_4", "y": 90, "weight": 1 }, - { "model": "ornamentum:block/iron_shelf_things_5", "y": 90, "weight": 2 }, + { "model": "ornamentum:block/iron_shelf_things_5", "y": 90, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_6", "y": 90, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_7", "y": 90, "weight": 1 }, - { "model": "ornamentum:block/iron_shelf_things_8", "y": 90, "weight": 2 }, - { "model": "ornamentum:block/iron_shelf_things_9", "y": 90, "weight": 2 }, + { "model": "ornamentum:block/iron_shelf_things_8", "y": 90, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_9", "y": 90, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_10", "y": 90, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_11", "y": 90, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_12", "y": 90, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_13", "y": 90, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_14", "y": 90, "weight": 1 }, - { "model": "ornamentum:block/iron_shelf_things_15", "y": 90, "weight": 1 } + { "model": "ornamentum:block/iron_shelf_things_15", "y": 90, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_16", "y": 90, "weight": 2 } ], "facing=west": [ - { "model": "ornamentum:block/iron_shelf", "y": 270, "weight": 10 }, + { "model": "ornamentum:block/iron_shelf", "y": 270, "weight": 25 }, { "model": "ornamentum:block/iron_shelf_things_1", "y": 270, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_2", "y": 270, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_3", "y": 270, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_4", "y": 270, "weight": 1 }, - { "model": "ornamentum:block/iron_shelf_things_5", "y": 270, "weight": 2 }, - { "model": "ornamentum:block/iron_shelf_things_6", "y": 270, "weight": 2 }, + { "model": "ornamentum:block/iron_shelf_things_5", "y": 270, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_6", "y": 270, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_7", "y": 270, "weight": 1 }, - { "model": "ornamentum:block/iron_shelf_things_8", "y": 270, "weight": 2 }, - { "model": "ornamentum:block/iron_shelf_things_9", "y": 270, "weight": 2 }, + { "model": "ornamentum:block/iron_shelf_things_8", "y": 270, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_9", "y": 270, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_10", "y": 270, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_11", "y": 270, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_12", "y": 270, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_13", "y": 270, "weight": 1 }, { "model": "ornamentum:block/iron_shelf_things_14", "y": 270, "weight": 1 }, - { "model": "ornamentum:block/iron_shelf_things_15", "y": 270, "weight": 1 } + { "model": "ornamentum:block/iron_shelf_things_15", "y": 270, "weight": 1 }, + { "model": "ornamentum:block/iron_shelf_things_16", "y": 270, "weight": 1 } ] } } \ No newline at end of file diff --git a/src/main/resources/assets/ornamentum/models/block/iron_shelf_things_16.json b/src/main/resources/assets/ornamentum/models/block/iron_shelf_things_16.json new file mode 100644 index 0000000..4e073fd --- /dev/null +++ b/src/main/resources/assets/ornamentum/models/block/iron_shelf_things_16.json @@ -0,0 +1,264 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench by ian1337", + "parent": "block/block", + "textures": { + "1": "ornamentum:block/iron_shelf/iron_shelf", + "2": "ornamentum:block/turtle_baby", + "particle": "ornamentum:block/iron_shelf/iron_shelf" + }, + "elements": [ + { + "name": "frame_R", + "from": [0, 0, 0], + "to": [1, 16, 1], + "faces": { + "north": {"uv": [1, 0, 2, 16], "texture": "#1"}, + "east": {"uv": [1, 0, 2, 16], "texture": "#1"}, + "south": {"uv": [5, 0, 6, 16], "texture": "#1"}, + "west": {"uv": [3, 0, 4, 16], "texture": "#1"}, + "up": {"uv": [12, 0, 13, 1], "texture": "#1"}, + "down": {"uv": [14, 15, 15, 16], "texture": "#1"} + } + }, + { + "name": "Frame_R_back", + "from": [0, 0, 15], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 14]}, + "faces": { + "north": {"uv": [7, 0, 8, 16], "texture": "#1"}, + "east": {"uv": [3, 0, 4, 16], "texture": "#1"}, + "south": {"uv": [9, 0, 10, 16], "texture": "#1"}, + "west": {"uv": [5, 0, 6, 16], "texture": "#1"}, + "up": {"uv": [1, 1, 2, 2], "texture": "#1"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#1"} + } + }, + { + "name": "Frame_L_back", + "from": [15, 0, 15], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 14]}, + "faces": { + "north": {"uv": [7, 0, 8, 16], "texture": "#1"}, + "east": {"uv": [9, 0, 10, 16], "texture": "#1"}, + "south": {"uv": [13, 0, 14, 16], "texture": "#1"}, + "west": {"uv": [3, 0, 4, 16], "texture": "#1"}, + "up": {"uv": [10, 14, 11, 15], "texture": "#1"}, + "down": {"uv": [1, 0, 2, 1], "texture": "#1"} + } + }, + { + "name": "Frame_L", + "from": [15, 0, 0], + "to": [16, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 0]}, + "faces": { + "north": {"uv": [7, 0, 8, 16], "texture": "#1"}, + "east": {"uv": [13, 0, 14, 16], "texture": "#1"}, + "south": {"uv": [11, 0, 12, 16], "texture": "#1"}, + "west": {"uv": [9, 0, 10, 16], "texture": "#1"}, + "up": {"uv": [15, 0, 16, 1], "texture": "#1"}, + "down": {"uv": [0, 15, 1, 16], "texture": "#1"} + } + }, + { + "name": "lower_level", + "from": [0.5, 3, 0.5], + "to": [15.5, 3, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [1.5, 3, 1.5]}, + "faces": { + "north": {"uv": [1, 2, 16, 2], "texture": "#1"}, + "east": {"uv": [1, 2, 16, 2], "texture": "#1"}, + "south": {"uv": [0, 2, 15, 2], "texture": "#1"}, + "west": {"uv": [0, 2, 15, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "name": "upper_level", + "from": [0.5, 11, 0.5], + "to": [15.5, 11, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [1.5, 11, 1.5]}, + "faces": { + "north": {"uv": [1, 2, 16, 2], "texture": "#1"}, + "east": {"uv": [1, 2, 16, 2], "texture": "#1"}, + "south": {"uv": [0, 2, 15, 2], "texture": "#1"}, + "west": {"uv": [0, 2, 15, 2], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "name": "head", + "from": [7.5, 3.1, 5], + "to": [10.5, 6.1, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 3.85, 9]}, + "faces": { + "north": {"uv": [3, 9, 6, 12], "texture": "#2"}, + "east": {"uv": [0, 9, 3, 12], "texture": "#2"}, + "south": {"uv": [9, 9, 12, 12], "texture": "#2"}, + "west": {"uv": [6, 9, 9, 12], "texture": "#2"}, + "up": {"uv": [6, 9, 3, 6], "texture": "#2"}, + "down": {"uv": [9, 6, 6, 9], "texture": "#2"} + } + }, + { + "name": "left_hind_leg", + "from": [5, 3.1, 11], + "to": [7, 3.1, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 3.85, 9]}, + "faces": { + "north": {"uv": [0, 2, 2, 2], "texture": "#2"}, + "east": {"uv": [-1, 2, 0, 2], "texture": "#2"}, + "south": {"uv": [3, 2, 5, 2], "texture": "#2"}, + "west": {"uv": [2, 2, 3, 2], "texture": "#2"}, + "up": {"uv": [2, 2, 0, 1], "texture": "#2"}, + "down": {"uv": [4, 1, 2, 2], "texture": "#2"} + } + }, + { + "name": "right_hind_leg", + "from": [11, 3.1, 11], + "to": [13, 3.1, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 3.85, 9]}, + "faces": { + "north": {"uv": [0, 1, 2, 1], "texture": "#2"}, + "east": {"uv": [-1, 1, 0, 1], "texture": "#2"}, + "south": {"uv": [3, 1, 5, 1], "texture": "#2"}, + "west": {"uv": [2, 1, 3, 1], "texture": "#2"}, + "up": {"uv": [2, 1, 0, 0], "texture": "#2"}, + "down": {"uv": [4, 0, 2, 1], "texture": "#2"} + } + }, + { + "name": "left_front_leg", + "from": [5, 3.1, 8], + "to": [7, 3.1, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 3.85, 9]}, + "faces": { + "north": {"uv": [9, 8, 11, 8], "texture": "#2"}, + "east": {"uv": [8, 8, 9, 8], "texture": "#2"}, + "south": {"uv": [12, 8, 14, 8], "texture": "#2"}, + "west": {"uv": [11, 8, 12, 8], "texture": "#2"}, + "up": {"uv": [11, 8, 9, 7], "texture": "#2"}, + "down": {"uv": [13, 7, 11, 8], "texture": "#2"} + } + }, + { + "name": "right_front_leg", + "from": [11, 3.1, 8], + "to": [13, 3.1, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 3.85, 9]}, + "faces": { + "north": {"uv": [9, 7, 11, 7], "texture": "#2"}, + "east": {"uv": [8, 7, 9, 7], "texture": "#2"}, + "south": {"uv": [12, 7, 14, 7], "texture": "#2"}, + "west": {"uv": [11, 7, 12, 7], "texture": "#2"}, + "up": {"uv": [11, 7, 9, 6], "texture": "#2"}, + "down": {"uv": [13, 6, 11, 7], "texture": "#2"} + } + }, + { + "name": "body", + "from": [7, 3.1, 8], + "to": [11, 5.1, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 3.85, 9]}, + "faces": { + "north": {"uv": [4, 4, 8, 6], "texture": "#2"}, + "east": {"uv": [0, 4, 4, 6], "texture": "#2"}, + "south": {"uv": [12, 4, 16, 6], "texture": "#2"}, + "west": {"uv": [8, 4, 12, 6], "texture": "#2"}, + "up": {"uv": [8, 4, 4, 0], "texture": "#2"}, + "down": {"uv": [12, 0, 8, 4], "texture": "#2"} + } + } + ], + "groups": [ + { + "name": "iron_shelf", + "origin": [8, 8, 8], + "scope": 0, + "color": 0, + "children": [ + { + "name": "frame", + "origin": [0, 0, 0], + "scope": 0, + "color": 0, + "children": [0, 1, 2, 3] + }, + { + "name": "levels", + "origin": [8, 8, 8], + "scope": 0, + "color": 0, + "children": [ + 4, + 5, + { + "name": "things", + "origin": [8, 8, 8], + "scope": 0, + "color": 0, + "children": [ + { + "name": "baby_turtle", + "origin": [0, 0, 0], + "scope": 0, + "color": 0, + "children": [ + { + "name": "head", + "origin": [0, 1.1, -1], + "scope": 0, + "color": 0, + "children": [6] + }, + { + "name": "left_hind_leg", + "origin": [-2, 0.1, 2.5], + "scope": 0, + "color": 0, + "children": [7] + }, + { + "name": "right_hind_leg", + "origin": [2, 0.1, 2.5], + "scope": 0, + "color": 0, + "children": [8] + }, + { + "name": "left_front_leg", + "origin": [-2, 0.1, -0.5], + "scope": 0, + "color": 0, + "children": [9] + }, + { + "name": "right_front_leg", + "origin": [2, 0.1, -0.5], + "scope": 0, + "color": 0, + "children": [10] + }, + { + "name": "body", + "origin": [0, 1.1, 1], + "scope": 0, + "color": 0, + "children": [11] + } + ] + } + ] + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ornamentum/textures/block/turtle_baby.png b/src/main/resources/assets/ornamentum/textures/block/turtle_baby.png new file mode 100644 index 0000000..52e3072 Binary files /dev/null and b/src/main/resources/assets/ornamentum/textures/block/turtle_baby.png differ