diff --git a/src/main/resources/assets/create/models/block/belt_casing/sideways_end.json b/src/main/resources/assets/create/models/block/belt_casing/sideways_end.json index c35d0e2ec..7ebfb16a3 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/sideways_end.json +++ b/src/main/resources/assets/create/models/block/belt_casing/sideways_end.json @@ -2,122 +2,102 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "3": "create:block/brass_casing_belt", - "8": "create:block/gearbox", + "top": "create:block/belt/brass_belt_casing_sideways", + "side": "create:block/funnel/brass_funnel_frame", "particle": "create:block/brass_casing" }, "elements": [ { - "name": "Casing", "from": [5, 0, 0], "to": [11, 16, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 1]}, "faces": { - "north": {"uv": [8, 12.5, 16, 15.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [6, 0, 8, 8], "texture": "#3"}, - "south": {"uv": [8, 12.5, 16, 15.5], "rotation": 90, "texture": "#3"}, - "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, - "up": {"uv": [8, 12.5, 10, 15.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [8, 12.5, 10, 15.5], "rotation": 270, "texture": "#3"} + "north": {"uv": [0, 10.5, 8, 13.5], "rotation": 90, "texture": "#top"}, + "east": {"uv": [12, 0, 16, 16], "texture": "#side"}, + "south": {"uv": [5, 0, 10, 16], "texture": "#side"}, + "west": {"uv": [0, 0, 4, 16], "texture": "#side"}, + "up": {"uv": [8, 10.5, 10, 13.5], "rotation": 90, "texture": "#top"}, + "down": {"uv": [14, 10.5, 16, 13.5], "rotation": 90, "texture": "#top"} } }, { - "name": "Casing", - "from": [5, 15, 12], + "from": [5, 0, 12], "to": [11, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 15]}, "faces": { - "north": {"uv": [8, 12.5, 8.5, 15.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 2, 0.5], "texture": "#3"}, - "south": {"uv": [8, 12.5, 8.5, 15.5], "rotation": 90, "texture": "#3"}, - "west": {"uv": [6, 0, 8, 0.5], "texture": "#3"}, - "up": {"uv": [8, 12.5, 10, 15.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [8, 12.5, 10, 15.5], "rotation": 270, "texture": "#3"} + "north": {"uv": [5, 0, 10, 16], "texture": "#side"}, + "east": {"uv": [0, 0, 4, 16], "texture": "#side"}, + "south": {"uv": [0, 10.5, 8, 13.5], "rotation": 90, "texture": "#top"}, + "west": {"uv": [12, 0, 16, 16], "texture": "#side"}, + "up": {"uv": [14, 10.5, 16, 13.5], "rotation": 90, "texture": "#top"}, + "down": {"uv": [8, 10.5, 10, 13.5], "rotation": 90, "texture": "#top"} } }, { - "name": "Casing", "from": [2, 14, 2], "to": [5, 16, 14], "faces": { - "north": {"uv": [6.5, 12.5, 8, 13.5], "texture": "#3"}, - "east": {"uv": [0, 13.5, 6, 14.5], "texture": "#3"}, - "south": {"uv": [0, 12.5, 1.5, 13.5], "texture": "#3"}, - "west": {"uv": [1, 12.5, 7, 13.5], "texture": "#3"}, - "up": {"uv": [0, 13.5, 6, 15], "rotation": 90, "texture": "#3"}, - "down": {"uv": [0, 13.5, 6, 15], "rotation": 90, "texture": "#3"} + "north": {"uv": [1, 0, 4, 2], "texture": "#side"}, + "east": {"uv": [9, 13.5, 15, 14], "texture": "#top"}, + "south": {"uv": [12, 0, 15, 2], "texture": "#side"}, + "west": {"uv": [2, 0, 14, 2], "texture": "#side"}, + "up": {"uv": [9, 13.5, 15, 15], "rotation": 90, "texture": "#top"}, + "down": {"uv": [1, 14, 7, 15.5], "rotation": 90, "texture": "#top"} + } + }, + { + "from": [11, 14, 2], + "to": [14, 16, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 15, 8]}, + "faces": { + "north": {"uv": [12, 0, 15, 2], "texture": "#side"}, + "east": {"uv": [2, 0, 14, 2], "texture": "#side"}, + "south": {"uv": [1, 0, 4, 2], "texture": "#side"}, + "west": {"uv": [9, 10, 15, 10.5], "texture": "#top"}, + "up": {"uv": [9, 9, 15, 10.5], "rotation": 90, "texture": "#top"}, + "down": {"uv": [1, 14, 7, 15.5], "rotation": 90, "texture": "#top"} } }, { - "name": "Casing", "from": [2, 0, 2], "to": [5, 2, 14], "faces": { - "north": {"uv": [6.5, 13.5, 8, 12.5], "texture": "#3"}, - "east": {"uv": [0, 14.5, 6, 13.5], "texture": "#3"}, - "south": {"uv": [0, 13.5, 1.5, 12.5], "texture": "#3"}, - "west": {"uv": [1, 13.5, 7, 12.5], "texture": "#3"}, - "up": {"uv": [6, 13.5, 0, 15], "rotation": 90, "texture": "#3"}, - "down": {"uv": [6, 13.5, 0, 15], "rotation": 90, "texture": "#3"} + "north": {"uv": [1, 14, 4, 16], "texture": "#side"}, + "east": {"uv": [9, 13.5, 15, 14], "texture": "#top"}, + "south": {"uv": [12, 14, 15, 16], "texture": "#side"}, + "west": {"uv": [2, 14, 14, 16], "texture": "#side"}, + "up": {"uv": [1, 14, 7, 15.5], "rotation": 90, "texture": "#top"}, + "down": {"uv": [9, 13.5, 15, 15], "rotation": 90, "texture": "#top"} } }, { - "name": "Casing", - "from": [11, 14, 2], - "to": [14, 16, 14], - "faces": { - "north": {"uv": [8, 12.5, 6.5, 13.5], "texture": "#3"}, - "east": {"uv": [7, 12.5, 1, 13.5], "texture": "#3"}, - "south": {"uv": [1.5, 12.5, 0, 13.5], "texture": "#3"}, - "west": {"uv": [6, 13.5, 0, 14.5], "texture": "#3"}, - "up": {"uv": [0, 15, 6, 13.5], "rotation": 90, "texture": "#3"}, - "down": {"uv": [0, 15, 6, 13.5], "rotation": 90, "texture": "#3"} - } - }, - { - "name": "Casing", "from": [11, 0, 2], "to": [14, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 15, 8]}, "faces": { - "north": {"uv": [8, 13.5, 6.5, 12.5], "texture": "#3"}, - "east": {"uv": [7, 13.5, 1, 12.5], "texture": "#3"}, - "south": {"uv": [1.5, 13.5, 0, 12.5], "texture": "#3"}, - "west": {"uv": [6, 14.5, 0, 13.5], "texture": "#3"}, - "up": {"uv": [6, 15, 0, 13.5], "rotation": 90, "texture": "#3"}, - "down": {"uv": [6, 15, 0, 13.5], "rotation": 90, "texture": "#3"} + "north": {"uv": [12, 14, 15, 16], "texture": "#side"}, + "east": {"uv": [2, 14, 14, 16], "texture": "#side"}, + "south": {"uv": [1, 14, 4, 16], "texture": "#side"}, + "west": {"uv": [9, 10, 15, 10.5], "texture": "#top"}, + "up": {"uv": [1, 14, 7, 15.5], "rotation": 90, "texture": "#top"}, + "down": {"uv": [9, 9, 15, 10.5], "rotation": 90, "texture": "#top"} } }, { - "name": "Casing", - "from": [5, 0, 12], - "to": [11, 1, 16], + "from": [5, 1, 4], + "to": [11, 15, 12], "faces": { - "north": {"uv": [8.5, 12.5, 8, 15.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0.5, 2, 0], "texture": "#3"}, - "south": {"uv": [8.5, 12.5, 8, 15.5], "rotation": 90, "texture": "#3"}, - "west": {"uv": [6, 0.5, 8, 0], "texture": "#3"}, - "up": {"uv": [10, 12.5, 8, 15.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [10, 12.5, 8, 15.5], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "Casing", - "from": [5, 1, 2], - "to": [11, 15, 14], - "faces": { - "up": {"uv": [2, 5, 14, 11], "rotation": 90, "texture": "#8"}, - "down": {"uv": [2, 5, 14, 11], "rotation": 90, "texture": "#8"} + "up": {"uv": [10, 10.5, 14, 13.5], "rotation": 90, "texture": "#top"}, + "down": {"uv": [10, 10.5, 14, 13.5], "rotation": 90, "texture": "#top"} } } ], "groups": [ { - "name": "horizontal_middle", - "origin": [8, 8, 8], + "name": "group", + "origin": [8, 8, 15], + "color": 0, "children": [0, 1, 2, 3, 4, 5, 6] - }, - { - "name": "horizontal_start", - "origin": [8, 8, 8], - "children": [7] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_casing/sideways_middle.json b/src/main/resources/assets/create/models/block/belt_casing/sideways_middle.json index 9886764c4..ff0348005 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/sideways_middle.json +++ b/src/main/resources/assets/create/models/block/belt_casing/sideways_middle.json @@ -2,7 +2,8 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "3": "create:block/brass_casing_belt", + "top": "create:block/belt/brass_belt_casing_sideways", + "side": "create:block/funnel/brass_funnel_frame", "particle": "create:block/brass_casing" }, "elements": [ @@ -11,12 +12,12 @@ "from": [5, 0, 0], "to": [11, 16, 16], "faces": { - "north": {"uv": [8, 12.5, 16, 15.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 8, 8], "rotation": 270, "texture": "#3"}, - "south": {"uv": [8, 12.5, 16, 15.5], "rotation": 90, "texture": "#3"}, - "west": {"uv": [0, 0, 8, 8], "texture": "#3"}, - "up": {"uv": [8, 12.5, 16, 15.5], "rotation": 90, "texture": "#3"}, - "down": {"uv": [8, 12.5, 16, 15.5], "rotation": 90, "texture": "#3"} + "north": {"uv": [0, 10.5, 8, 13.5], "rotation": 90, "texture": "#top"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "south": {"uv": [0, 10.5, 8, 13.5], "rotation": 90, "texture": "#top"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "up": {"uv": [0, 6.5, 8, 9.5], "rotation": 90, "texture": "#top"}, + "down": {"uv": [0, 6.5, 8, 9.5], "rotation": 90, "texture": "#top"} } } ], @@ -24,6 +25,7 @@ { "name": "horizontal_middle", "origin": [8, 8, 8], + "color": 0, "children": [0] } ] diff --git a/src/main/resources/assets/create/models/block/belt_casing/sideways_pulley.json b/src/main/resources/assets/create/models/block/belt_casing/sideways_pulley.json index 0f8653d94..7ebfb16a3 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/sideways_pulley.json +++ b/src/main/resources/assets/create/models/block/belt_casing/sideways_pulley.json @@ -2,109 +2,102 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "3": "create:block/brass_casing_belt", - "8": "create:block/gearbox", + "top": "create:block/belt/brass_belt_casing_sideways", + "side": "create:block/funnel/brass_funnel_frame", "particle": "create:block/brass_casing" }, "elements": [ { - "name": "Casing", "from": [5, 0, 0], "to": [11, 16, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 1]}, "faces": { - "north": {"uv": [8, 12.5, 16, 15.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [6, 0, 8, 8], "texture": "#3"}, - "south": {"uv": [8, 12.5, 16, 15.5], "rotation": 90, "texture": "#3"}, - "west": {"uv": [0, 0, 2, 8], "texture": "#3"}, - "up": {"uv": [8, 12.5, 10, 15.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [8, 12.5, 10, 15.5], "rotation": 270, "texture": "#3"} + "north": {"uv": [0, 10.5, 8, 13.5], "rotation": 90, "texture": "#top"}, + "east": {"uv": [12, 0, 16, 16], "texture": "#side"}, + "south": {"uv": [5, 0, 10, 16], "texture": "#side"}, + "west": {"uv": [0, 0, 4, 16], "texture": "#side"}, + "up": {"uv": [8, 10.5, 10, 13.5], "rotation": 90, "texture": "#top"}, + "down": {"uv": [14, 10.5, 16, 13.5], "rotation": 90, "texture": "#top"} } }, { - "name": "Casing", "from": [5, 0, 12], "to": [11, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 15]}, "faces": { - "north": {"uv": [8, 15.5, 16, 12.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [8, 0, 6, 8], "texture": "#3"}, - "south": {"uv": [8, 15.5, 16, 12.5], "rotation": 90, "texture": "#3"}, - "west": {"uv": [2, 0, 0, 8], "texture": "#3"}, - "up": {"uv": [10, 12.5, 8, 15.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [10, 12.5, 8, 15.5], "rotation": 270, "texture": "#3"} + "north": {"uv": [5, 0, 10, 16], "texture": "#side"}, + "east": {"uv": [0, 0, 4, 16], "texture": "#side"}, + "south": {"uv": [0, 10.5, 8, 13.5], "rotation": 90, "texture": "#top"}, + "west": {"uv": [12, 0, 16, 16], "texture": "#side"}, + "up": {"uv": [14, 10.5, 16, 13.5], "rotation": 90, "texture": "#top"}, + "down": {"uv": [8, 10.5, 10, 13.5], "rotation": 90, "texture": "#top"} } }, { - "name": "Casing", "from": [2, 14, 2], "to": [5, 16, 14], "faces": { - "north": {"uv": [6.5, 12.5, 8, 13.5], "texture": "#3"}, - "east": {"uv": [0, 13.5, 6, 14.5], "texture": "#3"}, - "south": {"uv": [0, 12.5, 1.5, 13.5], "texture": "#3"}, - "west": {"uv": [1, 12.5, 7, 13.5], "texture": "#3"}, - "up": {"uv": [0, 13.5, 6, 15], "rotation": 90, "texture": "#3"}, - "down": {"uv": [0, 13.5, 6, 15], "rotation": 90, "texture": "#3"} + "north": {"uv": [1, 0, 4, 2], "texture": "#side"}, + "east": {"uv": [9, 13.5, 15, 14], "texture": "#top"}, + "south": {"uv": [12, 0, 15, 2], "texture": "#side"}, + "west": {"uv": [2, 0, 14, 2], "texture": "#side"}, + "up": {"uv": [9, 13.5, 15, 15], "rotation": 90, "texture": "#top"}, + "down": {"uv": [1, 14, 7, 15.5], "rotation": 90, "texture": "#top"} + } + }, + { + "from": [11, 14, 2], + "to": [14, 16, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 15, 8]}, + "faces": { + "north": {"uv": [12, 0, 15, 2], "texture": "#side"}, + "east": {"uv": [2, 0, 14, 2], "texture": "#side"}, + "south": {"uv": [1, 0, 4, 2], "texture": "#side"}, + "west": {"uv": [9, 10, 15, 10.5], "texture": "#top"}, + "up": {"uv": [9, 9, 15, 10.5], "rotation": 90, "texture": "#top"}, + "down": {"uv": [1, 14, 7, 15.5], "rotation": 90, "texture": "#top"} } }, { - "name": "Casing", "from": [2, 0, 2], "to": [5, 2, 14], "faces": { - "north": {"uv": [6.5, 13.5, 8, 12.5], "texture": "#3"}, - "east": {"uv": [0, 14.5, 6, 13.5], "texture": "#3"}, - "south": {"uv": [0, 13.5, 1.5, 12.5], "texture": "#3"}, - "west": {"uv": [1, 13.5, 7, 12.5], "texture": "#3"}, - "up": {"uv": [6, 13.5, 0, 15], "rotation": 90, "texture": "#3"}, - "down": {"uv": [6, 13.5, 0, 15], "rotation": 90, "texture": "#3"} + "north": {"uv": [1, 14, 4, 16], "texture": "#side"}, + "east": {"uv": [9, 13.5, 15, 14], "texture": "#top"}, + "south": {"uv": [12, 14, 15, 16], "texture": "#side"}, + "west": {"uv": [2, 14, 14, 16], "texture": "#side"}, + "up": {"uv": [1, 14, 7, 15.5], "rotation": 90, "texture": "#top"}, + "down": {"uv": [9, 13.5, 15, 15], "rotation": 90, "texture": "#top"} } }, { - "name": "Casing", - "from": [11, 14, 2], - "to": [14, 16, 14], - "faces": { - "north": {"uv": [8, 12.5, 6.5, 13.5], "texture": "#3"}, - "east": {"uv": [7, 12.5, 1, 13.5], "texture": "#3"}, - "south": {"uv": [1.5, 12.5, 0, 13.5], "texture": "#3"}, - "west": {"uv": [6, 13.5, 0, 14.5], "texture": "#3"}, - "up": {"uv": [0, 15, 6, 13.5], "rotation": 90, "texture": "#3"}, - "down": {"uv": [0, 15, 6, 13.5], "rotation": 90, "texture": "#3"} - } - }, - { - "name": "Casing", "from": [11, 0, 2], "to": [14, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 15, 8]}, "faces": { - "north": {"uv": [8, 13.5, 6.5, 12.5], "texture": "#3"}, - "east": {"uv": [7, 13.5, 1, 12.5], "texture": "#3"}, - "south": {"uv": [1.5, 13.5, 0, 12.5], "texture": "#3"}, - "west": {"uv": [6, 14.5, 0, 13.5], "texture": "#3"}, - "up": {"uv": [6, 15, 0, 13.5], "rotation": 90, "texture": "#3"}, - "down": {"uv": [6, 15, 0, 13.5], "rotation": 90, "texture": "#3"} + "north": {"uv": [12, 14, 15, 16], "texture": "#side"}, + "east": {"uv": [2, 14, 14, 16], "texture": "#side"}, + "south": {"uv": [1, 14, 4, 16], "texture": "#side"}, + "west": {"uv": [9, 10, 15, 10.5], "texture": "#top"}, + "up": {"uv": [1, 14, 7, 15.5], "rotation": 90, "texture": "#top"}, + "down": {"uv": [9, 9, 15, 10.5], "rotation": 90, "texture": "#top"} } }, { - "name": "Casing", - "from": [5, 1, 2], - "to": [11, 15, 14], + "from": [5, 1, 4], + "to": [11, 15, 12], "faces": { - "up": {"uv": [2, 5, 14, 11], "rotation": 90, "texture": "#8"}, - "down": {"uv": [2, 5, 14, 11], "rotation": 90, "texture": "#8"} + "up": {"uv": [10, 10.5, 14, 13.5], "rotation": 90, "texture": "#top"}, + "down": {"uv": [10, 10.5, 14, 13.5], "rotation": 90, "texture": "#top"} } } ], "groups": [ { - "name": "horizontal_middle", - "origin": [8, 8, 8], - "children": [0, 1, 2, 3, 4, 5] - }, - { - "name": "horizontal_start", - "origin": [8, 8, 8], - "children": [6] + "name": "group", + "origin": [8, 8, 15], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_casing/sideways_start.json b/src/main/resources/assets/create/models/block/belt_casing/sideways_start.json index b4409d0bb..7ebfb16a3 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/sideways_start.json +++ b/src/main/resources/assets/create/models/block/belt_casing/sideways_start.json @@ -2,122 +2,102 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "3": "create:block/brass_casing_belt", - "8": "create:block/gearbox", + "top": "create:block/belt/brass_belt_casing_sideways", + "side": "create:block/funnel/brass_funnel_frame", "particle": "create:block/brass_casing" }, "elements": [ { - "name": "Casing", + "from": [5, 0, 0], + "to": [11, 16, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 1]}, + "faces": { + "north": {"uv": [0, 10.5, 8, 13.5], "rotation": 90, "texture": "#top"}, + "east": {"uv": [12, 0, 16, 16], "texture": "#side"}, + "south": {"uv": [5, 0, 10, 16], "texture": "#side"}, + "west": {"uv": [0, 0, 4, 16], "texture": "#side"}, + "up": {"uv": [8, 10.5, 10, 13.5], "rotation": 90, "texture": "#top"}, + "down": {"uv": [14, 10.5, 16, 13.5], "rotation": 90, "texture": "#top"} + } + }, + { "from": [5, 0, 12], "to": [11, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 15]}, "faces": { - "north": {"uv": [8, 12.5, 16, 15.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [0, 0, 2, 8], "texture": "#3"}, - "south": {"uv": [8, 12.5, 16, 15.5], "rotation": 90, "texture": "#3"}, - "west": {"uv": [6, 0, 8, 8], "texture": "#3"}, - "up": {"uv": [8, 12.5, 10, 15.5], "rotation": 90, "texture": "#3"}, - "down": {"uv": [8, 12.5, 10, 15.5], "rotation": 90, "texture": "#3"} + "north": {"uv": [5, 0, 10, 16], "texture": "#side"}, + "east": {"uv": [0, 0, 4, 16], "texture": "#side"}, + "south": {"uv": [0, 10.5, 8, 13.5], "rotation": 90, "texture": "#top"}, + "west": {"uv": [12, 0, 16, 16], "texture": "#side"}, + "up": {"uv": [14, 10.5, 16, 13.5], "rotation": 90, "texture": "#top"}, + "down": {"uv": [8, 10.5, 10, 13.5], "rotation": 90, "texture": "#top"} } }, { - "name": "Casing", - "from": [5, 15, 0], - "to": [11, 16, 4], - "faces": { - "north": {"uv": [8, 12.5, 8.5, 15.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [6, 0, 8, 0.5], "texture": "#3"}, - "south": {"uv": [8, 12.5, 8.5, 15.5], "rotation": 90, "texture": "#3"}, - "west": {"uv": [0, 0, 2, 0.5], "texture": "#3"}, - "up": {"uv": [8, 12.5, 10, 15.5], "rotation": 90, "texture": "#3"}, - "down": {"uv": [8, 12.5, 10, 15.5], "rotation": 90, "texture": "#3"} - } - }, - { - "name": "Casing", - "from": [11, 14, 2], - "to": [14, 16, 14], - "faces": { - "north": {"uv": [0, 12.5, 1.5, 13.5], "texture": "#3"}, - "east": {"uv": [1, 12.5, 7, 13.5], "texture": "#3"}, - "south": {"uv": [6.5, 12.5, 8, 13.5], "texture": "#3"}, - "west": {"uv": [0, 13.5, 6, 14.5], "texture": "#3"}, - "up": {"uv": [0, 13.5, 6, 15], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 13.5, 6, 15], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "Casing", - "from": [11, 0, 2], - "to": [14, 2, 14], - "faces": { - "north": {"uv": [0, 13.5, 1.5, 12.5], "texture": "#3"}, - "east": {"uv": [1, 13.5, 7, 12.5], "texture": "#3"}, - "south": {"uv": [6.5, 13.5, 8, 12.5], "texture": "#3"}, - "west": {"uv": [0, 14.5, 6, 13.5], "texture": "#3"}, - "up": {"uv": [6, 13.5, 0, 15], "rotation": 270, "texture": "#3"}, - "down": {"uv": [6, 13.5, 0, 15], "rotation": 270, "texture": "#3"} - } - }, - { - "name": "Casing", "from": [2, 14, 2], "to": [5, 16, 14], "faces": { - "north": {"uv": [1.5, 12.5, 0, 13.5], "texture": "#3"}, - "east": {"uv": [6, 13.5, 0, 14.5], "texture": "#3"}, - "south": {"uv": [8, 12.5, 6.5, 13.5], "texture": "#3"}, - "west": {"uv": [7, 12.5, 1, 13.5], "texture": "#3"}, - "up": {"uv": [0, 15, 6, 13.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 15, 6, 13.5], "rotation": 270, "texture": "#3"} + "north": {"uv": [1, 0, 4, 2], "texture": "#side"}, + "east": {"uv": [9, 13.5, 15, 14], "texture": "#top"}, + "south": {"uv": [12, 0, 15, 2], "texture": "#side"}, + "west": {"uv": [2, 0, 14, 2], "texture": "#side"}, + "up": {"uv": [9, 13.5, 15, 15], "rotation": 90, "texture": "#top"}, + "down": {"uv": [1, 14, 7, 15.5], "rotation": 90, "texture": "#top"} + } + }, + { + "from": [11, 14, 2], + "to": [14, 16, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 15, 8]}, + "faces": { + "north": {"uv": [12, 0, 15, 2], "texture": "#side"}, + "east": {"uv": [2, 0, 14, 2], "texture": "#side"}, + "south": {"uv": [1, 0, 4, 2], "texture": "#side"}, + "west": {"uv": [9, 10, 15, 10.5], "texture": "#top"}, + "up": {"uv": [9, 9, 15, 10.5], "rotation": 90, "texture": "#top"}, + "down": {"uv": [1, 14, 7, 15.5], "rotation": 90, "texture": "#top"} } }, { - "name": "Casing", "from": [2, 0, 2], "to": [5, 2, 14], "faces": { - "north": {"uv": [1.5, 13.5, 0, 12.5], "texture": "#3"}, - "east": {"uv": [6, 14.5, 0, 13.5], "texture": "#3"}, - "south": {"uv": [8, 13.5, 6.5, 12.5], "texture": "#3"}, - "west": {"uv": [7, 13.5, 1, 12.5], "texture": "#3"}, - "up": {"uv": [6, 15, 0, 13.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [6, 15, 0, 13.5], "rotation": 270, "texture": "#3"} + "north": {"uv": [1, 14, 4, 16], "texture": "#side"}, + "east": {"uv": [9, 13.5, 15, 14], "texture": "#top"}, + "south": {"uv": [12, 14, 15, 16], "texture": "#side"}, + "west": {"uv": [2, 14, 14, 16], "texture": "#side"}, + "up": {"uv": [1, 14, 7, 15.5], "rotation": 90, "texture": "#top"}, + "down": {"uv": [9, 13.5, 15, 15], "rotation": 90, "texture": "#top"} } }, { - "name": "Casing", - "from": [5, 0, 0], - "to": [11, 1, 4], + "from": [11, 0, 2], + "to": [14, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [12.5, 15, 8]}, "faces": { - "north": {"uv": [8.5, 12.5, 8, 15.5], "rotation": 90, "texture": "#3"}, - "east": {"uv": [6, 0.5, 8, 0], "texture": "#3"}, - "south": {"uv": [8.5, 12.5, 8, 15.5], "rotation": 90, "texture": "#3"}, - "west": {"uv": [0, 0.5, 2, 0], "texture": "#3"}, - "up": {"uv": [10, 12.5, 8, 15.5], "rotation": 90, "texture": "#3"}, - "down": {"uv": [10, 12.5, 8, 15.5], "rotation": 90, "texture": "#3"} + "north": {"uv": [12, 14, 15, 16], "texture": "#side"}, + "east": {"uv": [2, 14, 14, 16], "texture": "#side"}, + "south": {"uv": [1, 14, 4, 16], "texture": "#side"}, + "west": {"uv": [9, 10, 15, 10.5], "texture": "#top"}, + "up": {"uv": [1, 14, 7, 15.5], "rotation": 90, "texture": "#top"}, + "down": {"uv": [9, 9, 15, 10.5], "rotation": 90, "texture": "#top"} } }, { - "name": "Casing", - "from": [5, 1, 2], - "to": [11, 15, 14], + "from": [5, 1, 4], + "to": [11, 15, 12], "faces": { - "up": {"uv": [2, 5, 14, 11], "rotation": 270, "texture": "#8"}, - "down": {"uv": [2, 5, 14, 11], "rotation": 270, "texture": "#8"} + "up": {"uv": [10, 10.5, 14, 13.5], "rotation": 90, "texture": "#top"}, + "down": {"uv": [10, 10.5, 14, 13.5], "rotation": 90, "texture": "#top"} } } ], "groups": [ { - "name": "horizontal_middle", - "origin": [8, 8, 8], + "name": "group", + "origin": [8, 8, 15], + "color": 0, "children": [0, 1, 2, 3, 4, 5, 6] - }, - { - "name": "horizontal_start", - "origin": [8, 8, 8], - "children": [7] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/mechanical_arm/block.json b/src/main/resources/assets/create/models/block/mechanical_arm/block.json index 0031d075b..f993e6e31 100644 --- a/src/main/resources/assets/create/models/block/mechanical_arm/block.json +++ b/src/main/resources/assets/create/models/block/mechanical_arm/block.json @@ -2,8 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "2": "create:block/brass_casing_belt", - "6": "create:block/crafter_top", + "3": "create:block/belt/brass_belt_casing_sideways", "7": "create:block/brass_block", "particle": "create:block/crafter_top" }, @@ -13,12 +12,12 @@ "from": [0, 0, 0], "to": [16, 6, 16], "faces": { - "north": {"uv": [8, 12.5, 16, 15.5], "texture": "#2"}, - "east": {"uv": [8, 12.5, 16, 15.5], "texture": "#2"}, - "south": {"uv": [8, 12.5, 16, 15.5], "texture": "#2"}, - "west": {"uv": [8, 12.5, 16, 15.5], "texture": "#2"}, + "north": {"uv": [0, 6.5, 8, 9.5], "texture": "#3"}, + "east": {"uv": [0, 6.5, 8, 9.5], "texture": "#3"}, + "south": {"uv": [0, 6.5, 8, 9.5], "texture": "#3"}, + "west": {"uv": [0, 6.5, 8, 9.5], "texture": "#3"}, "up": {"uv": [0, 0, 16, 16], "texture": "#7"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#6"} + "down": {"uv": [0, 0, 16, 16], "texture": "#7"} } } ], diff --git a/src/main/resources/assets/create/models/block/mechanical_arm/item.json b/src/main/resources/assets/create/models/block/mechanical_arm/item.json index d02438478..6e7626c7f 100644 --- a/src/main/resources/assets/create/models/block/mechanical_arm/item.json +++ b/src/main/resources/assets/create/models/block/mechanical_arm/item.json @@ -2,9 +2,8 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "3": "create:block/brass_casing_belt", + "4": "create:block/belt/brass_belt_casing_sideways", "5": "create:block/mechanical_arm", - "6": "create:block/crafter_top", "7": "create:block/brass_block", "particle": "create:block/crafter_top" }, @@ -111,12 +110,12 @@ "to": [16, -10, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, "faces": { - "north": {"uv": [8, 12.5, 16, 15.5], "texture": "#3"}, - "east": {"uv": [8, 12.5, 16, 15.5], "texture": "#3"}, - "south": {"uv": [8, 12.5, 16, 15.5], "texture": "#3"}, - "west": {"uv": [8, 12.5, 16, 15.5], "texture": "#3"}, + "north": {"uv": [0, 6.5, 8, 9.5], "texture": "#4"}, + "east": {"uv": [0, 6.5, 8, 9.5], "texture": "#4"}, + "south": {"uv": [0, 6.5, 8, 9.5], "texture": "#4"}, + "west": {"uv": [0, 6.5, 8, 9.5], "texture": "#4"}, "up": {"uv": [0, 0, 16, 16], "texture": "#7"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#6"} + "down": {"uv": [0, 0, 16, 16], "texture": "#7"} } }, { @@ -300,10 +299,24 @@ { "name": "inserter", "origin": [8, 8, 8], - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, + "color": 0, + "children": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, { "name": "cogwheel", "origin": [8, 8, 8], + "color": 0, "children": [12, 13, 14, 15, 16, 17] } ] diff --git a/src/main/resources/assets/create/models/block/mechanical_crafter/block.json b/src/main/resources/assets/create/models/block/mechanical_crafter/block.json index 42aeb0cb3..7ccf96c25 100644 --- a/src/main/resources/assets/create/models/block/mechanical_crafter/block.json +++ b/src/main/resources/assets/create/models/block/mechanical_crafter/block.json @@ -5,8 +5,7 @@ "3": "create:block/crafter_thingies", "4": "create:block/crafter_side", "5": "create:block/brass_casing", - "6": "create:block/crafter_top", - "7": "create:block/crafter_topunderside", + "7": "create:block/brass_block", "8": "create:block/smooth_dark_log_top", "particle": "create:block/brass_casing" }, @@ -16,7 +15,7 @@ "from": [0, 0, 0], "to": [16, 16, 6], "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#6"}, + "north": {"uv": [0, 0, 16, 16], "texture": "#5"}, "east": {"uv": [0, 0, 16, 6], "rotation": 90, "texture": "#4"}, "south": {"uv": [0, 0, 16, 16], "texture": "#7"}, "west": {"uv": [16, 0, 0, 6], "rotation": 270, "texture": "#4"}, @@ -31,7 +30,7 @@ "faces": { "north": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#8"}, "east": {"uv": [0, 10, 16, 16], "rotation": 90, "texture": "#4"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#6"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#5"}, "west": {"uv": [16, 10, 0, 16], "rotation": 270, "texture": "#4"}, "up": {"uv": [0, 10, 16, 16], "texture": "#4"}, "down": {"uv": [0, 10, 16, 16], "rotation": 180, "texture": "#4"} diff --git a/src/main/resources/assets/create/models/block/mechanical_crafter/item.json b/src/main/resources/assets/create/models/block/mechanical_crafter/item.json index 428d2e7ee..f99b84d7b 100644 --- a/src/main/resources/assets/create/models/block/mechanical_crafter/item.json +++ b/src/main/resources/assets/create/models/block/mechanical_crafter/item.json @@ -6,8 +6,7 @@ "3": "create:block/crafter_thingies", "4": "create:block/crafter_side", "5": "create:block/brass_casing", - "6": "create:block/crafter_top", - "7": "create:block/crafter_topunderside", + "7": "create:block/brass_block", "8": "create:block/smooth_dark_log_top", "9": "create:block/cogwheel", "particle": "create:block/brass_casing" @@ -22,7 +21,7 @@ "east": {"uv": [0, 0, 16, 6], "texture": "#4"}, "south": {"uv": [0, 0, 16, 6], "texture": "#4"}, "west": {"uv": [0, 0, 16, 6], "texture": "#4"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#6"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#5"}, "down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#7"} } }, @@ -36,7 +35,7 @@ "south": {"uv": [0, 10, 16, 16], "texture": "#4"}, "west": {"uv": [0, 10, 16, 16], "texture": "#4"}, "up": {"uv": [0, 0, 16, 16], "texture": "#8"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#6"} + "down": {"uv": [0, 0, 16, 16], "texture": "#5"} } }, { diff --git a/src/main/resources/assets/create/models/block/scaffold/block.json b/src/main/resources/assets/create/models/block/scaffold/block.json index 35696e5b7..c32ef31ab 100644 --- a/src/main/resources/assets/create/models/block/scaffold/block.json +++ b/src/main/resources/assets/create/models/block/scaffold/block.json @@ -2,12 +2,14 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { + "2": "create:block/scaffold/brass_scaffold_inside", "particle": "create:block/scaffold/brass_scaffold", "side": "create:block/scaffold/brass_scaffold", "top": "create:block/funnel/brass_funnel_frame" }, "elements": [ { + "name": "outside", "from": [0, 0, 0], "to": [16, 16, 16], "faces": { @@ -19,13 +21,14 @@ } }, { + "name": "inside", "from": [0, 0, 16], "to": [16, 16, 0], "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#side"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#side"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#side"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "north": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#2"}, "up": {"uv": [0, 0, 16, 16], "texture": "#top"} } } diff --git a/src/main/resources/assets/create/models/block/scaffold/block_horizontal.json b/src/main/resources/assets/create/models/block/scaffold/block_horizontal.json index 8eda58fdb..63e73678f 100644 --- a/src/main/resources/assets/create/models/block/scaffold/block_horizontal.json +++ b/src/main/resources/assets/create/models/block/scaffold/block_horizontal.json @@ -1,11 +1,13 @@ { "credit": "Made with Blockbench", "textures": { + "2": "create:block/scaffold/brass_scaffold_inside", "side": "create:block/scaffold/brass_scaffold", "particle": "create:block/brass_casing" }, "elements": [ { + "name": "outside", "from": [0, 8, 0], "to": [16, 16, 16], "faces": { @@ -17,13 +19,14 @@ } }, { + "name": "inside", "from": [16, 8, 0], - "to": [0, 16, 16], + "to": [0, 13, 16], "faces": { - "north": {"uv": [16, 0, 0, 8], "texture": "#side", "cullface": "north"}, - "east": {"uv": [16, 0, 0, 8], "texture": "#side", "cullface": "west"}, - "south": {"uv": [16, 0, 0, 8], "texture": "#side", "cullface": "south"}, - "west": {"uv": [16, 0, 0, 8], "texture": "#side", "cullface": "east"}, + "north": {"uv": [16, 3, 0, 8], "texture": "#2", "cullface": "north"}, + "east": {"uv": [16, 3, 0, 8], "texture": "#2", "cullface": "north"}, + "south": {"uv": [16, 3, 0, 8], "texture": "#2", "cullface": "north"}, + "west": {"uv": [16, 3, 0, 8], "texture": "#2", "cullface": "north"}, "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#particle"} } } diff --git a/src/main/resources/assets/create/models/block/sequenced_gearshift/idle.json b/src/main/resources/assets/create/models/block/sequenced_gearshift/idle.json index d1ea1860b..90300e12b 100644 --- a/src/main/resources/assets/create/models/block/sequenced_gearshift/idle.json +++ b/src/main/resources/assets/create/models/block/sequenced_gearshift/idle.json @@ -12,9 +12,9 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#1"}, + "north": {"uv": [0, 0, 16, 2], "texture": "#1"}, "east": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#4"}, - "south": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#1"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#1"}, "west": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#4"}, "up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#4"}, "down": {"uv": [0, 0, 16, 16], "texture": "#1"} @@ -25,8 +25,8 @@ "from": [1, 2, 1], "to": [15, 14, 15], "faces": { - "north": {"uv": [1, 2, 15, 14], "rotation": 180, "texture": "#1"}, - "south": {"uv": [1, 2, 15, 14], "rotation": 180, "texture": "#1"} + "north": {"uv": [1, 2, 15, 14], "texture": "#1"}, + "south": {"uv": [1, 2, 15, 14], "texture": "#1"} } }, { @@ -34,9 +34,9 @@ "from": [0, 0, 0], "to": [16, 2, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#1"}, + "north": {"uv": [0, 14, 16, 16], "texture": "#1"}, "east": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#4"}, - "south": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#1"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#1"}, "west": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#4"}, "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, "down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#4"} @@ -47,9 +47,9 @@ "from": [0, 2, 0], "to": [2, 14, 16], "faces": { - "north": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#1"}, + "north": {"uv": [14, 2, 16, 14], "texture": "#1"}, "east": {"uv": [0, 2, 16, 14], "rotation": 180, "texture": "#1"}, - "south": {"uv": [14, 2, 16, 14], "rotation": 180, "texture": "#1"}, + "south": {"uv": [0, 2, 2, 14], "texture": "#1"}, "west": {"uv": [0, 2, 16, 14], "rotation": 180, "texture": "#4"} } }, @@ -58,9 +58,9 @@ "from": [14, 2, 0], "to": [16, 14, 16], "faces": { - "north": {"uv": [14, 2, 16, 14], "rotation": 180, "texture": "#1"}, + "north": {"uv": [0, 2, 2, 14], "texture": "#1"}, "east": {"uv": [0, 2, 16, 14], "rotation": 180, "texture": "#4"}, - "south": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#1"}, + "south": {"uv": [14, 2, 16, 14], "texture": "#1"}, "west": {"uv": [0, 2, 16, 14], "rotation": 180, "texture": "#1"} } } @@ -69,6 +69,7 @@ { "name": "block", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3, 4] } ] diff --git a/src/main/resources/assets/create/models/item/filter.json b/src/main/resources/assets/create/models/item/filter.json index 40fb9ed09..2ceff938f 100644 --- a/src/main/resources/assets/create/models/item/filter.json +++ b/src/main/resources/assets/create/models/item/filter.json @@ -14,7 +14,7 @@ "north": {"uv": [14, 0, 16, 2], "texture": "#0"}, "east": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#0"}, "south": {"uv": [14, 0, 16, 2], "rotation": 180, "texture": "#0"}, - "west": {"uv": [14, 0, 16, 10], "rotation": 270, "texture": "#0"}, + "west": {"uv": [14, 10, 16, 0], "rotation": 270, "texture": "#0"}, "up": {"uv": [14, 0, 16, 10], "rotation": 180, "texture": "#0"}, "down": {"uv": [14, 0, 16, 10], "rotation": 180, "texture": "#0"} } @@ -25,7 +25,7 @@ "to": [3, 2, 13], "faces": { "north": {"uv": [16, 0, 14, 2], "texture": "#0"}, - "east": {"uv": [14, 10, 16, 0], "rotation": 270, "texture": "#0"}, + "east": {"uv": [14, 0, 16, 10], "rotation": 270, "texture": "#0"}, "south": {"uv": [16, 0, 14, 2], "rotation": 180, "texture": "#0"}, "west": {"uv": [0, 10, 2, 0], "rotation": 90, "texture": "#0"}, "up": {"uv": [16, 0, 14, 10], "rotation": 180, "texture": "#0"}, @@ -52,10 +52,10 @@ "faces": { "north": {"uv": [3, 9, 13, 10], "texture": "#0"}, "east": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "south": {"uv": [3, 9, 13, 10], "texture": "#0"}, + "south": {"uv": [3, 9, 13, 10], "rotation": 180, "texture": "#0"}, "west": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "up": {"uv": [3, 9, 13, 10], "texture": "#0"}, - "down": {"uv": [3, 9, 13, 10], "texture": "#0"} + "up": {"uv": [3, 9, 13, 10], "rotation": 180, "texture": "#0"}, + "down": {"uv": [3, 9, 13, 10], "rotation": 180, "texture": "#0"} } }, { @@ -65,10 +65,10 @@ "faces": { "north": {"uv": [3, 9, 13, 10], "texture": "#0"}, "east": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "south": {"uv": [3, 9, 13, 10], "texture": "#0"}, + "south": {"uv": [3, 9, 13, 10], "rotation": 180, "texture": "#0"}, "west": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "up": {"uv": [3, 9, 13, 10], "texture": "#0"}, - "down": {"uv": [3, 9, 13, 10], "texture": "#0"} + "up": {"uv": [3, 9, 13, 10], "rotation": 180, "texture": "#0"}, + "down": {"uv": [3, 9, 13, 10], "rotation": 180, "texture": "#0"} } } ], diff --git a/src/main/resources/assets/create/reference/palettes.png b/src/main/resources/assets/create/reference/palettes.png new file mode 100644 index 000000000..81618deb8 Binary files /dev/null and b/src/main/resources/assets/create/reference/palettes.png differ diff --git a/src/main/resources/assets/create/textures/block/belt/belt_casing.png b/src/main/resources/assets/create/textures/block/belt/belt_casing.png deleted file mode 100644 index 3048721d5..000000000 Binary files a/src/main/resources/assets/create/textures/block/belt/belt_casing.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/belt/belt_casing_2.png b/src/main/resources/assets/create/textures/block/belt/belt_casing_2.png deleted file mode 100644 index ba6b12ec3..000000000 Binary files a/src/main/resources/assets/create/textures/block/belt/belt_casing_2.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/belt/belt_casing_3.png b/src/main/resources/assets/create/textures/block/belt/belt_casing_3.png deleted file mode 100644 index 7496e6bb7..000000000 Binary files a/src/main/resources/assets/create/textures/block/belt/belt_casing_3.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/belt/brass_belt_casing_diagonal.png b/src/main/resources/assets/create/textures/block/belt/brass_belt_casing_diagonal.png index 369117819..fdc59c6ee 100644 Binary files a/src/main/resources/assets/create/textures/block/belt/brass_belt_casing_diagonal.png and b/src/main/resources/assets/create/textures/block/belt/brass_belt_casing_diagonal.png differ diff --git a/src/main/resources/assets/create/textures/block/belt/brass_belt_casing_horizontal.png b/src/main/resources/assets/create/textures/block/belt/brass_belt_casing_horizontal.png index a1c4fd622..364b89c90 100644 Binary files a/src/main/resources/assets/create/textures/block/belt/brass_belt_casing_horizontal.png and b/src/main/resources/assets/create/textures/block/belt/brass_belt_casing_horizontal.png differ diff --git a/src/main/resources/assets/create/textures/block/belt/brass_belt_casing_sideways.png b/src/main/resources/assets/create/textures/block/belt/brass_belt_casing_sideways.png index 9e7fb06ee..72e3ffe4b 100644 Binary files a/src/main/resources/assets/create/textures/block/belt/brass_belt_casing_sideways.png and b/src/main/resources/assets/create/textures/block/belt/brass_belt_casing_sideways.png differ diff --git a/src/main/resources/assets/create/textures/block/brass_casing_belt.png b/src/main/resources/assets/create/textures/block/brass_casing_belt.png deleted file mode 100644 index e661604e7..000000000 Binary files a/src/main/resources/assets/create/textures/block/brass_casing_belt.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/brass_gearbox.png b/src/main/resources/assets/create/textures/block/brass_gearbox.png index ba351911b..830bfa2a7 100644 Binary files a/src/main/resources/assets/create/textures/block/brass_gearbox.png and b/src/main/resources/assets/create/textures/block/brass_gearbox.png differ diff --git a/src/main/resources/assets/create/textures/block/crafter_side.png b/src/main/resources/assets/create/textures/block/crafter_side.png index 78941704b..1c2b78f54 100644 Binary files a/src/main/resources/assets/create/textures/block/crafter_side.png and b/src/main/resources/assets/create/textures/block/crafter_side.png differ diff --git a/src/main/resources/assets/create/textures/block/crafter_side_connected.png b/src/main/resources/assets/create/textures/block/crafter_side_connected.png index c1e9fb05c..59f55d7fe 100644 Binary files a/src/main/resources/assets/create/textures/block/crafter_side_connected.png and b/src/main/resources/assets/create/textures/block/crafter_side_connected.png differ diff --git a/src/main/resources/assets/create/textures/block/crafter_thingies.png b/src/main/resources/assets/create/textures/block/crafter_thingies.png index 29e5d69db..e0e3b09b7 100644 Binary files a/src/main/resources/assets/create/textures/block/crafter_thingies.png and b/src/main/resources/assets/create/textures/block/crafter_thingies.png differ diff --git a/src/main/resources/assets/create/textures/block/crafter_topunderside.png b/src/main/resources/assets/create/textures/block/crafter_topunderside.png deleted file mode 100644 index 3876b47cf..000000000 Binary files a/src/main/resources/assets/create/textures/block/crafter_topunderside.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/elevator_pulley.png b/src/main/resources/assets/create/textures/block/elevator_pulley.png index 8cf2dd45f..a9d81564e 100644 Binary files a/src/main/resources/assets/create/textures/block/elevator_pulley.png and b/src/main/resources/assets/create/textures/block/elevator_pulley.png differ diff --git a/src/main/resources/assets/create/textures/block/ladder_brass.png b/src/main/resources/assets/create/textures/block/ladder_brass.png index d2f3b7ead..c7ffd58aa 100644 Binary files a/src/main/resources/assets/create/textures/block/ladder_brass.png and b/src/main/resources/assets/create/textures/block/ladder_brass.png differ diff --git a/src/main/resources/assets/create/textures/block/ladder_copper.png b/src/main/resources/assets/create/textures/block/ladder_copper.png index 8bcd66111..359570864 100644 Binary files a/src/main/resources/assets/create/textures/block/ladder_copper.png and b/src/main/resources/assets/create/textures/block/ladder_copper.png differ diff --git a/src/main/resources/assets/create/textures/block/ladder_copper_hoop.png b/src/main/resources/assets/create/textures/block/ladder_copper_hoop.png index 1659f4270..93d3597f0 100644 Binary files a/src/main/resources/assets/create/textures/block/ladder_copper_hoop.png and b/src/main/resources/assets/create/textures/block/ladder_copper_hoop.png differ diff --git a/src/main/resources/assets/create/textures/block/scaffold/andesite_scaffold_connected_inside.png b/src/main/resources/assets/create/textures/block/scaffold/andesite_scaffold_connected_inside.png new file mode 100644 index 000000000..14db56800 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/scaffold/andesite_scaffold_connected_inside.png differ diff --git a/src/main/resources/assets/create/textures/block/scaffold/andesite_scaffold_inside.png b/src/main/resources/assets/create/textures/block/scaffold/andesite_scaffold_inside.png new file mode 100644 index 000000000..c3dff5e01 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/scaffold/andesite_scaffold_inside.png differ diff --git a/src/main/resources/assets/create/textures/block/scaffold/brass_scaffold.png b/src/main/resources/assets/create/textures/block/scaffold/brass_scaffold.png index 0ccfad7be..947835f53 100644 Binary files a/src/main/resources/assets/create/textures/block/scaffold/brass_scaffold.png and b/src/main/resources/assets/create/textures/block/scaffold/brass_scaffold.png differ diff --git a/src/main/resources/assets/create/textures/block/scaffold/brass_scaffold_connected.png b/src/main/resources/assets/create/textures/block/scaffold/brass_scaffold_connected.png index 8420bbe89..ced30d981 100644 Binary files a/src/main/resources/assets/create/textures/block/scaffold/brass_scaffold_connected.png and b/src/main/resources/assets/create/textures/block/scaffold/brass_scaffold_connected.png differ diff --git a/src/main/resources/assets/create/textures/block/scaffold/brass_scaffold_connected_inside.png b/src/main/resources/assets/create/textures/block/scaffold/brass_scaffold_connected_inside.png new file mode 100644 index 000000000..2028a2e31 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/scaffold/brass_scaffold_connected_inside.png differ diff --git a/src/main/resources/assets/create/textures/block/scaffold/brass_scaffold_inside.png b/src/main/resources/assets/create/textures/block/scaffold/brass_scaffold_inside.png new file mode 100644 index 000000000..0cfaee26d Binary files /dev/null and b/src/main/resources/assets/create/textures/block/scaffold/brass_scaffold_inside.png differ diff --git a/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold.png b/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold.png index cbe20ae4a..c13d91c12 100644 Binary files a/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold.png and b/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold.png differ diff --git a/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_connected.png b/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_connected.png index 9b7e52ba8..dcf655a3a 100644 Binary files a/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_connected.png and b/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_connected.png differ diff --git a/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_connected_inside.png b/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_connected_inside.png new file mode 100644 index 000000000..76d1d5b22 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_connected_inside.png differ diff --git a/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_inside.png b/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_inside.png new file mode 100644 index 000000000..fba275b19 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/scaffold/copper_scaffold_inside.png differ diff --git a/src/main/resources/assets/create/textures/block/sequenced_gearshift.png b/src/main/resources/assets/create/textures/block/sequenced_gearshift.png index 5ef3f47fc..fea4cc02d 100644 Binary files a/src/main/resources/assets/create/textures/block/sequenced_gearshift.png and b/src/main/resources/assets/create/textures/block/sequenced_gearshift.png differ diff --git a/src/main/resources/assets/create/textures/block/sequenced_gearshift_1.png b/src/main/resources/assets/create/textures/block/sequenced_gearshift_1.png index 1e589cdd2..411e7772c 100644 Binary files a/src/main/resources/assets/create/textures/block/sequenced_gearshift_1.png and b/src/main/resources/assets/create/textures/block/sequenced_gearshift_1.png differ diff --git a/src/main/resources/assets/create/textures/block/sequenced_gearshift_2.png b/src/main/resources/assets/create/textures/block/sequenced_gearshift_2.png index 89dd9f67b..dd631968c 100644 Binary files a/src/main/resources/assets/create/textures/block/sequenced_gearshift_2.png and b/src/main/resources/assets/create/textures/block/sequenced_gearshift_2.png differ diff --git a/src/main/resources/assets/create/textures/block/sequenced_gearshift_3.png b/src/main/resources/assets/create/textures/block/sequenced_gearshift_3.png index 11c4bf0fb..3ccff5f68 100644 Binary files a/src/main/resources/assets/create/textures/block/sequenced_gearshift_3.png and b/src/main/resources/assets/create/textures/block/sequenced_gearshift_3.png differ diff --git a/src/main/resources/assets/create/textures/block/sequenced_gearshift_4.png b/src/main/resources/assets/create/textures/block/sequenced_gearshift_4.png index 3333e7c80..5f5074188 100644 Binary files a/src/main/resources/assets/create/textures/block/sequenced_gearshift_4.png and b/src/main/resources/assets/create/textures/block/sequenced_gearshift_4.png differ diff --git a/src/main/resources/assets/create/textures/block/sequenced_gearshift_5.png b/src/main/resources/assets/create/textures/block/sequenced_gearshift_5.png index 6cffb4af1..f076cd87c 100644 Binary files a/src/main/resources/assets/create/textures/block/sequenced_gearshift_5.png and b/src/main/resources/assets/create/textures/block/sequenced_gearshift_5.png differ diff --git a/src/main/resources/assets/create/textures/block/smart_pipe_1.png b/src/main/resources/assets/create/textures/block/smart_pipe_1.png index 8ad7e38f1..9a9dd4874 100644 Binary files a/src/main/resources/assets/create/textures/block/smart_pipe_1.png and b/src/main/resources/assets/create/textures/block/smart_pipe_1.png differ diff --git a/src/main/resources/assets/create/textures/block/smart_pipe_2.png b/src/main/resources/assets/create/textures/block/smart_pipe_2.png index 32dda6b74..91de5b350 100644 Binary files a/src/main/resources/assets/create/textures/block/smart_pipe_2.png and b/src/main/resources/assets/create/textures/block/smart_pipe_2.png differ diff --git a/src/main/resources/assets/create/textures/item/linked_controller.png b/src/main/resources/assets/create/textures/item/linked_controller.png index 7d059e2c1..1728225f1 100644 Binary files a/src/main/resources/assets/create/textures/item/linked_controller.png and b/src/main/resources/assets/create/textures/item/linked_controller.png differ diff --git a/src/main/resources/assets/create/textures/item/linked_controller_powered.png b/src/main/resources/assets/create/textures/item/linked_controller_powered.png index 1c87a1094..bf94c0ac1 100644 Binary files a/src/main/resources/assets/create/textures/item/linked_controller_powered.png and b/src/main/resources/assets/create/textures/item/linked_controller_powered.png differ diff --git a/src/main/resources/assets/create/textures/item/property_filter.png b/src/main/resources/assets/create/textures/item/property_filter.png index 664a6210f..56f533110 100644 Binary files a/src/main/resources/assets/create/textures/item/property_filter.png and b/src/main/resources/assets/create/textures/item/property_filter.png differ diff --git a/src/main/resources/assets/create/textures/models/armor/netherite_diving_layer_1.png b/src/main/resources/assets/create/textures/models/armor/netherite_diving_layer_1.png index 850bcece6..1d7470e5e 100644 Binary files a/src/main/resources/assets/create/textures/models/armor/netherite_diving_layer_1.png and b/src/main/resources/assets/create/textures/models/armor/netherite_diving_layer_1.png differ diff --git a/src/main/resources/assets/create/textures/models/armor/netherite_diving_layer_2.png b/src/main/resources/assets/create/textures/models/armor/netherite_diving_layer_2.png index 515a9a12d..0f0443a95 100644 Binary files a/src/main/resources/assets/create/textures/models/armor/netherite_diving_layer_2.png and b/src/main/resources/assets/create/textures/models/armor/netherite_diving_layer_2.png differ