diff --git a/src/main/resources/assets/create/models/block/bell_base/block_ceiling.json b/src/main/resources/assets/create/models/block/bell_base/block_ceiling.json index 97d3b5e92..33e494968 100644 --- a/src/main/resources/assets/create/models/block/bell_base/block_ceiling.json +++ b/src/main/resources/assets/create/models/block/bell_base/block_ceiling.json @@ -1,69 +1,34 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "textures": { - "1": "create:block/bell_frame_side", - "2": "create:block/bell_frame", + "2": "create:block/bell_frame_side", "particle": "create:block/bell" }, "elements": [ { - "from": [15, 4, 4], - "to": [16, 12, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "from": [0, 5, 5], + "to": [2, 16, 11], "faces": { - "north": {"uv": [16, 8, 15, 0], "texture": "#2"}, - "east": {"uv": [0, 8, 8, 0], "texture": "#2"}, - "south": {"uv": [1, 8, 0, 0], "texture": "#2"}, - "west": {"uv": [16, 8, 8, 0], "texture": "#2"}, - "up": {"uv": [4, 11, 12, 12], "rotation": 270, "texture": "#1"}, - "down": {"uv": [4, 4, 12, 5], "rotation": 90, "texture": "#1"} + "north": {"uv": [14, 5, 12, 16], "texture": "#2"}, + "east": {"uv": [12, 5, 6, 16], "texture": "#2"}, + "south": {"uv": [14, 5, 16, 16], "texture": "#2"}, + "west": {"uv": [0, 5, 6, 16], "texture": "#2"}, + "up": {"uv": [6, 0, 0, 2], "rotation": 270, "texture": "#2"}, + "down": {"uv": [12, 2, 6, 0], "rotation": 90, "texture": "#2"} } }, { - "from": [0, 4, 4], - "to": [1, 12, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "from": [14, 5, 5], + "to": [16, 16, 11], "faces": { - "north": {"uv": [16, 8, 15, 0], "texture": "#2"}, - "east": {"uv": [8, 8, 16, 0], "texture": "#2"}, - "south": {"uv": [1, 8, 0, 0], "texture": "#2"}, - "west": {"uv": [8, 8, 0, 0], "texture": "#2"}, - "up": {"uv": [4, 11, 12, 12], "rotation": 270, "texture": "#1"}, - "down": {"uv": [4, 4, 12, 5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [0, 12, 2], - "to": [2, 16, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, - "faces": { - "north": {"uv": [14, 16, 16, 12], "texture": "#2"}, - "east": {"uv": [0, 16, 12, 12], "texture": "#2"}, - "south": {"uv": [14, 16, 12, 12], "texture": "#2"}, - "west": {"uv": [12, 12, 0, 8], "texture": "#2"}, - "up": {"uv": [11, 14, 0, 12], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 14, 0, 16], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [14, 12, 2], - "to": [16, 16, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, - "faces": { - "north": {"uv": [16, 16, 14, 12], "texture": "#2"}, - "east": {"uv": [0, 12, 12, 8], "texture": "#2"}, - "south": {"uv": [12, 16, 14, 12], "texture": "#2"}, - "west": {"uv": [12, 16, 0, 12], "texture": "#2"}, - "up": {"uv": [11, 12, 0, 14], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 16, 0, 14], "rotation": 270, "texture": "#1"} + "north": {"uv": [14, 5, 16, 16], "texture": "#2"}, + "east": {"uv": [0, 5, 6, 16], "texture": "#2"}, + "south": {"uv": [14, 5, 12, 16], "texture": "#2"}, + "west": {"uv": [12, 5, 6, 16], "texture": "#2"}, + "up": {"uv": [6, 0, 0, 2], "rotation": 90, "texture": "#2"}, + "down": {"uv": [12, 2, 6, 0], "rotation": 270, "texture": "#2"} } } - ], - "groups": [ - { - "name": "block_double_wall", - "origin": [8, 8, 8], - "color": 0, - "children": [0, 1] - }, 2, 3] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/bell_base/block_double_wall.json b/src/main/resources/assets/create/models/block/bell_base/block_double_wall.json index 623a83eb7..1e0510948 100644 --- a/src/main/resources/assets/create/models/block/bell_base/block_double_wall.json +++ b/src/main/resources/assets/create/models/block/bell_base/block_double_wall.json @@ -6,27 +6,27 @@ }, "elements": [ { - "from": [4, 4, 0], - "to": [12, 12, 1], + "from": [5, 5, 0], + "to": [11, 11, 2], "faces": { - "north": {"uv": [4, 4, 12, 12], "texture": "#1"}, - "east": {"uv": [5, 4, 4, 12], "texture": "#1"}, - "south": {"uv": [12, 4, 4, 12], "texture": "#1"}, - "west": {"uv": [12, 4, 11, 12], "texture": "#1"}, - "up": {"uv": [12, 4, 4, 5], "texture": "#1"}, - "down": {"uv": [12, 11, 4, 12], "texture": "#1"} + "north": {"uv": [0, 10, 6, 16], "texture": "#1"}, + "east": {"uv": [14, 5, 12, 11], "texture": "#1"}, + "south": {"uv": [12, 10, 6, 16], "texture": "#1"}, + "west": {"uv": [14, 5, 16, 11], "texture": "#1"}, + "up": {"uv": [6, 0, 0, 2], "texture": "#1"}, + "down": {"uv": [12, 0, 6, 2], "rotation": 180, "texture": "#1"} } }, { - "from": [4, 4, 15], - "to": [12, 12, 16], + "from": [5, 5, 14], + "to": [11, 11, 16], "faces": { - "north": {"uv": [4, 4, 12, 12], "texture": "#1"}, - "east": {"uv": [5, 4, 4, 12], "texture": "#1"}, - "south": {"uv": [12, 4, 4, 12], "texture": "#1"}, - "west": {"uv": [12, 4, 11, 12], "texture": "#1"}, - "up": {"uv": [12, 4, 4, 5], "texture": "#1"}, - "down": {"uv": [12, 11, 4, 12], "texture": "#1"} + "north": {"uv": [12, 10, 6, 16], "texture": "#1"}, + "east": {"uv": [14, 5, 16, 11], "texture": "#1"}, + "south": {"uv": [0, 10, 6, 16], "texture": "#1"}, + "west": {"uv": [14, 5, 12, 11], "texture": "#1"}, + "up": {"uv": [6, 0, 0, 2], "rotation": 180, "texture": "#1"}, + "down": {"uv": [12, 0, 6, 2], "texture": "#1"} } } ], diff --git a/src/main/resources/assets/create/models/block/bell_base/block_floor.json b/src/main/resources/assets/create/models/block/bell_base/block_floor.json index 63cc96caa..9714a848e 100644 --- a/src/main/resources/assets/create/models/block/bell_base/block_floor.json +++ b/src/main/resources/assets/create/models/block/bell_base/block_floor.json @@ -1,65 +1,34 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "textures": { - "1": "create:block/bell_frame_side", "2": "create:block/bell_frame", "particle": "create:block/bell" }, "elements": [ { - "from": [15, 4, 4], - "to": [16, 12, 12], + "from": [0, 0, 5], + "to": [2, 11, 11], "faces": { - "north": {"uv": [16, 0, 15, 8], "texture": "#2"}, - "east": {"uv": [0, 0, 8, 8], "texture": "#2"}, - "south": {"uv": [1, 0, 0, 8], "texture": "#2"}, - "west": {"uv": [16, 0, 8, 8], "texture": "#2"}, - "up": {"uv": [12, 4, 4, 5], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 11, 4, 12], "rotation": 270, "texture": "#1"} + "north": {"uv": [14, 5, 12, 16], "texture": "#2"}, + "east": {"uv": [12, 5, 6, 16], "texture": "#2"}, + "south": {"uv": [14, 5, 16, 16], "texture": "#2"}, + "west": {"uv": [0, 5, 6, 16], "texture": "#2"}, + "up": {"uv": [6, 0, 0, 2], "rotation": 270, "texture": "#2"}, + "down": {"uv": [12, 2, 6, 0], "rotation": 90, "texture": "#2"} } }, { - "from": [0, 4, 4], - "to": [1, 12, 12], + "from": [14, 0, 5], + "to": [16, 11, 11], "faces": { - "north": {"uv": [16, 0, 15, 8], "texture": "#2"}, - "east": {"uv": [8, 0, 16, 8], "texture": "#2"}, - "south": {"uv": [1, 0, 0, 8], "texture": "#2"}, - "west": {"uv": [8, 0, 0, 8], "texture": "#2"}, - "up": {"uv": [12, 4, 4, 5], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 11, 4, 12], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [0, 0, 2], - "to": [2, 4, 14], - "faces": { - "north": {"uv": [14, 12, 16, 16], "texture": "#2"}, - "east": {"uv": [0, 12, 12, 16], "texture": "#2"}, - "south": {"uv": [14, 12, 12, 16], "texture": "#2"}, - "west": {"uv": [12, 8, 0, 12], "texture": "#2"}, - "up": {"uv": [0, 14, 12, 16], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 14, 11, 12], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [14, 0, 2], - "to": [16, 4, 14], - "faces": { - "north": {"uv": [16, 12, 14, 16], "texture": "#2"}, - "east": {"uv": [0, 8, 12, 12], "texture": "#2"}, - "south": {"uv": [12, 12, 14, 16], "texture": "#2"}, - "west": {"uv": [12, 12, 0, 16], "texture": "#2"}, - "up": {"uv": [0, 16, 12, 14], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 12, 11, 14], "rotation": 90, "texture": "#1"} + "north": {"uv": [14, 5, 16, 16], "texture": "#2"}, + "east": {"uv": [0, 5, 6, 16], "texture": "#2"}, + "south": {"uv": [14, 5, 12, 16], "texture": "#2"}, + "west": {"uv": [12, 5, 6, 16], "texture": "#2"}, + "up": {"uv": [6, 0, 0, 2], "rotation": 90, "texture": "#2"}, + "down": {"uv": [12, 2, 6, 0], "rotation": 270, "texture": "#2"} } } - ], - "groups": [ - { - "name": "block_double_wall", - "origin": [8, 8, 8], - "color": 0, - "children": [0, 1] - }, 2, 3] + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/bell_base/block_single_wall.json b/src/main/resources/assets/create/models/block/bell_base/block_single_wall.json index 605614397..bccf3bff3 100644 --- a/src/main/resources/assets/create/models/block/bell_base/block_single_wall.json +++ b/src/main/resources/assets/create/models/block/bell_base/block_single_wall.json @@ -6,15 +6,15 @@ }, "elements": [ { - "from": [4, 4, 0], - "to": [12, 12, 1], + "from": [5, 5, 0], + "to": [11, 11, 2], "faces": { - "north": {"uv": [4, 4, 12, 12], "texture": "#1"}, - "east": {"uv": [4, 4, 5, 12], "texture": "#1"}, - "south": {"uv": [12, 4, 4, 12], "texture": "#1"}, - "west": {"uv": [11, 4, 12, 12], "texture": "#1"}, - "up": {"uv": [12, 4, 4, 5], "texture": "#1"}, - "down": {"uv": [12, 11, 4, 12], "texture": "#1"} + "north": {"uv": [0, 10, 6, 16], "texture": "#1"}, + "east": {"uv": [14, 5, 12, 11], "texture": "#1"}, + "south": {"uv": [12, 10, 6, 16], "texture": "#1"}, + "west": {"uv": [14, 5, 16, 11], "texture": "#1"}, + "up": {"uv": [6, 0, 0, 2], "texture": "#1"}, + "down": {"uv": [12, 0, 6, 2], "rotation": 180, "texture": "#1"} } } ], @@ -23,7 +23,6 @@ "name": "Frame", "origin": [8, 8, 8], "color": 0, - "children": [0] - } - ] + "children": [] + }, 0] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/haunted_bell.json b/src/main/resources/assets/create/models/block/haunted_bell.json index ede25ad47..7acde1c60 100644 --- a/src/main/resources/assets/create/models/block/haunted_bell.json +++ b/src/main/resources/assets/create/models/block/haunted_bell.json @@ -2,34 +2,33 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/bell_anim", - "particle": "create:block/bell" + "0": "create:block/bell_anim" }, "elements": [ { - "from": [13, 7, 7], - "to": [15, 9, 9], + "from": [12.99, 6.99, 6.99], + "to": [16.01, 9.01, 9.01], "rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 8]}, "faces": { - "north": {"uv": [10.5, 6, 9.5, 7], "texture": "#0"}, - "east": {"uv": [9.5, 7, 10.5, 8], "rotation": 90, "texture": "#0"}, - "south": {"uv": [9.5, 6, 10.5, 7], "texture": "#0"}, + "north": {"uv": [11, 6, 9.5, 7], "texture": "#0"}, + "east": {"uv": [11, 7, 12, 8], "texture": "#0"}, + "south": {"uv": [9.5, 6, 11, 7], "texture": "#0"}, "west": {"uv": [10, 7, 10.5, 7.5], "texture": "#0"}, - "up": {"uv": [9.5, 5, 10.5, 6], "texture": "#0"}, - "down": {"uv": [9.5, 7, 10.5, 8], "texture": "#0"} + "up": {"uv": [9.5, 5, 11, 6], "texture": "#0"}, + "down": {"uv": [9.5, 7, 11, 8], "texture": "#0"} } }, { - "from": [1, 7, 7], - "to": [3, 9, 9], + "from": [-0.01, 6.99, 6.99], + "to": [3.01, 9.01, 9.01], "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, "faces": { - "north": {"uv": [9.5, 6, 10.5, 7], "texture": "#0"}, + "north": {"uv": [9.5, 6, 11, 7], "texture": "#0"}, "east": {"uv": [10, 7, 10.5, 7.5], "texture": "#0"}, - "south": {"uv": [10.5, 6, 9.5, 7], "texture": "#0"}, - "west": {"uv": [9.5, 7, 10.5, 8], "rotation": 90, "texture": "#0"}, - "up": {"uv": [9.5, 5, 10.5, 6], "rotation": 180, "texture": "#0"}, - "down": {"uv": [9.5, 7, 10.5, 8], "rotation": 180, "texture": "#0"} + "south": {"uv": [11, 6, 9.5, 7], "texture": "#0"}, + "west": {"uv": [11, 7, 12, 8], "texture": "#0"}, + "up": {"uv": [9.5, 5, 11, 6], "rotation": 180, "texture": "#0"}, + "down": {"uv": [9.5, 7, 11, 8], "rotation": 180, "texture": "#0"} } }, { @@ -51,15 +50,15 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, "faces": { "north": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, - "east": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, + "east": {"uv": [12, 4, 16, 8.5], "texture": "#0"}, "south": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, - "west": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, + "west": {"uv": [12, 4, 16, 8.5], "texture": "#0"}, "up": {"uv": [12, 0, 16, 4], "texture": "#0"} } }, { - "from": [7, 12, 7], - "to": [9, 16, 9], + "from": [7, 11, 7], + "to": [9, 15, 9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, "faces": { "north": {"uv": [8, 6, 9, 8], "texture": "#0"}, @@ -90,6 +89,7 @@ { "name": "Bell", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3, 4, 5, 6] } ] diff --git a/src/main/resources/assets/create/models/block/peculiar_bell.json b/src/main/resources/assets/create/models/block/peculiar_bell.json index d4d7060da..1c828adf2 100644 --- a/src/main/resources/assets/create/models/block/peculiar_bell.json +++ b/src/main/resources/assets/create/models/block/peculiar_bell.json @@ -7,29 +7,29 @@ }, "elements": [ { - "from": [13, 7, 7], - "to": [15, 9, 9], + "from": [12.99, 6.99, 6.99], + "to": [16.01, 9.01, 9.01], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [10.5, 6, 9.5, 7], "texture": "#0"}, - "east": {"uv": [9.5, 7, 10.5, 8], "rotation": 90, "texture": "#0"}, - "south": {"uv": [9.5, 6, 10.5, 7], "texture": "#0"}, + "north": {"uv": [11, 6, 9.5, 7], "texture": "#0"}, + "east": {"uv": [11, 7, 12, 8], "texture": "#0"}, + "south": {"uv": [9.5, 6, 11, 7], "texture": "#0"}, "west": {"uv": [10, 7, 10.5, 7.5], "texture": "#0"}, - "up": {"uv": [9.5, 5, 10.5, 6], "texture": "#0"}, - "down": {"uv": [9.5, 7, 10.5, 8], "texture": "#0"} + "up": {"uv": [9.5, 5, 11, 6], "texture": "#0"}, + "down": {"uv": [9.5, 7, 11, 8], "texture": "#0"} } }, { - "from": [1, 7, 7], - "to": [3, 9, 9], + "from": [-0.01, 6.99, 6.99], + "to": [3.01, 9.01, 9.01], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [9.5, 6, 10.5, 7], "texture": "#0"}, + "north": {"uv": [9.5, 6, 11, 7], "texture": "#0"}, "east": {"uv": [10, 7, 10.5, 7.5], "texture": "#0"}, - "south": {"uv": [10.5, 6, 9.5, 7], "texture": "#0"}, - "west": {"uv": [9.5, 7, 10.5, 8], "rotation": 90, "texture": "#0"}, - "up": {"uv": [9.5, 5, 10.5, 6], "rotation": 180, "texture": "#0"}, - "down": {"uv": [9.5, 7, 10.5, 8], "rotation": 180, "texture": "#0"} + "south": {"uv": [11, 6, 9.5, 7], "texture": "#0"}, + "west": {"uv": [11, 7, 12, 8], "texture": "#0"}, + "up": {"uv": [9.5, 5, 11, 6], "rotation": 180, "texture": "#0"}, + "down": {"uv": [9.5, 7, 11, 8], "rotation": 180, "texture": "#0"} } }, { @@ -56,8 +56,8 @@ } }, { - "from": [7, 12, 7], - "to": [9, 16, 9], + "from": [7, 11, 7], + "to": [9, 15, 9], "faces": { "north": {"uv": [8, 6, 9, 8], "texture": "#0"}, "east": {"uv": [8, 6, 9, 8], "texture": "#0"}, diff --git a/src/main/resources/assets/create/textures/block/bell.png b/src/main/resources/assets/create/textures/block/bell.png index df12de390..fedafba91 100644 Binary files a/src/main/resources/assets/create/textures/block/bell.png and b/src/main/resources/assets/create/textures/block/bell.png differ diff --git a/src/main/resources/assets/create/textures/block/bell_anim.png b/src/main/resources/assets/create/textures/block/bell_anim.png index 7ed660e49..8feae441b 100644 Binary files a/src/main/resources/assets/create/textures/block/bell_anim.png and b/src/main/resources/assets/create/textures/block/bell_anim.png differ diff --git a/src/main/resources/assets/create/textures/block/bell_frame.png b/src/main/resources/assets/create/textures/block/bell_frame.png index 959d0d165..c624f8e08 100644 Binary files a/src/main/resources/assets/create/textures/block/bell_frame.png and b/src/main/resources/assets/create/textures/block/bell_frame.png differ diff --git a/src/main/resources/assets/create/textures/block/bell_frame_side.png b/src/main/resources/assets/create/textures/block/bell_frame_side.png index 6f3817ee0..5dd3a79b4 100644 Binary files a/src/main/resources/assets/create/textures/block/bell_frame_side.png and b/src/main/resources/assets/create/textures/block/bell_frame_side.png differ