diff --git a/src/main/resources/assets/create/models/block/bearing/top_wooden.json b/src/main/resources/assets/create/models/block/bearing/top_wooden.json index 05a0397c7..33dddb511 100644 --- a/src/main/resources/assets/create/models/block/bearing/top_wooden.json +++ b/src/main/resources/assets/create/models/block/bearing/top_wooden.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "parent": "create:block/bearing/top", "textures": { - "bearing_top": "create:block/bearing_top_wooden", + "bearing_top": "create:block/bearing_top", "particle": "create:block/windmill_bearing_side", "bearing_side": "create:block/windmill_bearing_side", "brass_casing": "create:block/andesite_casing" diff --git a/src/main/resources/assets/create/models/block/clutch/item.json b/src/main/resources/assets/create/models/block/clutch/item.json index 102f2202d..f548e51c1 100644 --- a/src/main/resources/assets/create/models/block/clutch/item.json +++ b/src/main/resources/assets/create/models/block/clutch/item.json @@ -4,66 +4,47 @@ "textures": { "0": "create:block/clutch_off", "1": "create:block/gearbox", + "4": "create:block/funnel/andesite_funnel_frame", "particle": "create:block/axis", "1_0": "create:block/axis", "1_1": "create:block/axis_top" }, "elements": [ { - "name": "Bottom", "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 14, 16, 16], "texture": "#0"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 14, 16, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#0"} - } - }, - { - "name": "Core", - "from": [1, 2, 1], - "to": [15, 14, 15], - "faces": { - "north": {"uv": [1, 2, 15, 14], "texture": "#1"}, - "south": {"uv": [1, 2, 15, 14], "texture": "#1"} - } - }, - { - "name": "Top", - "from": [0, 14, 0], "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -8]}, "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + "north": {"uv": [0, 0, 16, 16], "texture": "#4"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#4"}, + "west": {"uv": [0, 16, 16, 0], "rotation": 180, "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#0"} } }, { - "name": "SideWest", - "from": [0, 2, 0], - "to": [2, 14, 16], + "from": [1.95, 1.95, 16], + "to": [14.05, 14.05, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -8]}, "faces": { - "north": {"uv": [14, 2, 16, 14], "texture": "#0"}, - "east": {"uv": [0, 2, 16, 14], "texture": "#0"}, - "south": {"uv": [0, 2, 2, 14], "texture": "#0"}, - "west": {"uv": [0, 2, 16, 14], "texture": "#0"} + "east": {"uv": [15, 2, 16, 14], "texture": "#1"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#1"}, + "west": {"uv": [0, 2, 1, 14], "texture": "#1"}, + "up": {"uv": [2, 0, 14, 1], "texture": "#1"}, + "down": {"uv": [2, 15, 14, 16], "texture": "#1"} } }, { - "name": "SideEast", - "from": [14, 2, 0], - "to": [16, 14, 16], + "from": [1.95, 1.95, 1], + "to": [14.05, 14.05, 0], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -8]}, "faces": { - "north": {"uv": [0, 2, 2, 14], "texture": "#0"}, - "east": {"uv": [0, 2, 16, 14], "texture": "#0"}, - "south": {"uv": [14, 2, 16, 14], "texture": "#0"}, - "west": {"uv": [0, 2, 16, 14], "texture": "#0"} + "north": {"uv": [2, 2, 14, 14], "texture": "#1"}, + "east": {"uv": [0, 2, 1, 14], "texture": "#1"}, + "west": {"uv": [15, 2, 16, 14], "texture": "#1"}, + "up": {"uv": [2, 0, 14, 1], "rotation": 180, "texture": "#1"}, + "down": {"uv": [2, 15, 14, 16], "rotation": 180, "texture": "#1"} } }, { @@ -80,11 +61,15 @@ } } ], - "groups": [0, 1, 2, 3, 4, + "groups": [ + 0, + 1, + 2, { "name": "shaft", "origin": [8, 8, 8], - "children": [5] + "color": 0, + "children": [3] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/contraption_controls/item.json b/src/main/resources/assets/create/models/block/contraption_controls/item.json index ae87b0f88..fd7139419 100644 --- a/src/main/resources/assets/create/models/block/contraption_controls/item.json +++ b/src/main/resources/assets/create/models/block/contraption_controls/item.json @@ -22,7 +22,7 @@ "from": [2, 5, 14], "to": [14, 14, 16], "faces": { - "north": {"uv": [1, 0, 7, 4.5], "texture": "#1_7"}, + "north": {"uv": [1, 9, 7, 13.5], "texture": "#4"}, "south": {"uv": [1, 0, 7, 4.5], "texture": "#4"}, "up": {"uv": [1, 0, 7, 1], "rotation": 180, "texture": "#4"} } diff --git a/src/main/resources/assets/create/models/block/deployer/horizontal.json b/src/main/resources/assets/create/models/block/deployer/horizontal.json index 7b8184d80..984109aa5 100644 --- a/src/main/resources/assets/create/models/block/deployer/horizontal.json +++ b/src/main/resources/assets/create/models/block/deployer/horizontal.json @@ -16,7 +16,7 @@ "from": [0, 0, 0], "to": [16, 16, 2], "faces": { - "north": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#6"}, + "north": {"uv": [0, 16, 16, 0], "rotation": 90, "texture": "#6"}, "east": {"uv": [0, 14, 16, 16], "rotation": 270, "texture": "#gearbox_top"}, "south": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#gearbox_top"}, "west": {"uv": [0, 14, 16, 16], "rotation": 90, "texture": "#gearbox_top"}, @@ -40,7 +40,7 @@ "from": [0, 0, 2], "to": [16, 2, 12], "faces": { - "east": {"uv": [0, 2, 2, 12], "rotation": 270, "texture": "#gearbox_top"}, + "east": {"uv": [16, 0, 14, 10], "rotation": 270, "texture": "#gearbox_top"}, "south": {"uv": [0, 0, 16, 2], "texture": "#andesite_casing_short"}, "west": {"uv": [14, 0, 16, 10], "rotation": 90, "texture": "#gearbox_top"}, "up": {"uv": [0, 0, 16, 10], "rotation": 180, "texture": "#gearbox_top"}, @@ -52,9 +52,9 @@ "from": [0, 14, 2], "to": [16, 16, 12], "faces": { - "east": {"uv": [14, 2, 16, 12], "rotation": 270, "texture": "#gearbox_top"}, + "east": {"uv": [14, 0, 16, 10], "rotation": 270, "texture": "#gearbox_top"}, "south": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#andesite_casing_short"}, - "west": {"uv": [0, 0, 2, 10], "rotation": 90, "texture": "#gearbox_top"}, + "west": {"uv": [16, 0, 14, 10], "rotation": 90, "texture": "#gearbox_top"}, "up": {"uv": [0, 4, 16, 14], "rotation": 180, "texture": "#andesite_casing_short"}, "down": {"uv": [0, 0, 16, 10], "texture": "#gearbox_top"} } @@ -64,6 +64,7 @@ { "name": "body", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3] } ] diff --git a/src/main/resources/assets/create/models/block/deployer/item.json b/src/main/resources/assets/create/models/block/deployer/item.json index 5162106d4..970a99f3f 100644 --- a/src/main/resources/assets/create/models/block/deployer/item.json +++ b/src/main/resources/assets/create/models/block/deployer/item.json @@ -8,12 +8,12 @@ "6": "create:block/piston_bottom", "7": "create:block/piston_inner", "18": "create:block/deployer", + "particle": "create:block/axis", "gearbox_top": "create:block/gearbox_top", "gearbox": "create:block/gearbox", "andesite_casing_short": "create:block/andesite_casing_short", "mechanical_press_pole": "create:block/mechanical_press_pole", - "mechanical_press_head": "create:block/mechanical_press_head", - "particle": "create:block/axis" + "mechanical_press_head": "create:block/mechanical_press_head" }, "elements": [ { @@ -21,7 +21,7 @@ "from": [0, 0, 0], "to": [16, 16, 2], "faces": { - "north": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#6"}, + "north": {"uv": [0, 16, 16, 0], "rotation": 90, "texture": "#6"}, "east": {"uv": [0, 14, 16, 16], "rotation": 270, "texture": "#andesite_casing_short"}, "south": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#gearbox_top"}, "west": {"uv": [0, 14, 16, 16], "rotation": 90, "texture": "#andesite_casing_short"}, @@ -48,7 +48,7 @@ "east": {"uv": [0, 4, 16, 14], "rotation": 270, "texture": "#andesite_casing_short"}, "south": {"uv": [0, 0, 16, 2], "rotation": 270, "texture": "#andesite_casing_short"}, "west": {"uv": [0, 0, 16, 10], "rotation": 90, "texture": "#gearbox_top"}, - "up": {"uv": [0, 2, 2, 12], "rotation": 180, "texture": "#gearbox_top"}, + "up": {"uv": [16, 0, 14, 10], "rotation": 180, "texture": "#gearbox_top"}, "down": {"uv": [14, 0, 16, 10], "texture": "#gearbox_top"} } }, @@ -60,8 +60,8 @@ "east": {"uv": [0, 0, 16, 10], "rotation": 270, "texture": "#gearbox_top"}, "south": {"uv": [0, 0, 16, 2], "rotation": 90, "texture": "#andesite_casing_short"}, "west": {"uv": [0, 4, 16, 14], "rotation": 90, "texture": "#andesite_casing_short"}, - "up": {"uv": [14, 2, 16, 12], "rotation": 180, "texture": "#gearbox_top"}, - "down": {"uv": [0, 0, 2, 10], "texture": "#gearbox_top"} + "up": {"uv": [14, 0, 16, 10], "rotation": 180, "texture": "#gearbox_top"}, + "down": {"uv": [16, 0, 14, 10], "texture": "#gearbox_top"} } }, { @@ -231,15 +231,18 @@ { "name": "body", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3] }, { "name": "pole", "origin": [8, 8, 8], + "color": 0, "children": [ { "name": "head", "origin": [8, 8, 8], + "color": 0, "children": [4, 5] } ] @@ -247,14 +250,18 @@ { "name": "hand_pointing", "origin": [8, 8, 8], + "color": 0, "children": [ { "name": "head", "origin": [8, 8, 8], - "children": [6, + "color": 0, + "children": [ + 6, { "name": "Pointing", "origin": [8, 8, 8], + "color": 0, "children": [7, 8, 9, 10, 11, 12] } ] @@ -264,6 +271,7 @@ { "name": "shaft", "origin": [8, 8, 8], + "color": 0, "children": [13] } ] diff --git a/src/main/resources/assets/create/models/block/deployer/vertical.json b/src/main/resources/assets/create/models/block/deployer/vertical.json index 3dda75643..4b56aaece 100644 --- a/src/main/resources/assets/create/models/block/deployer/vertical.json +++ b/src/main/resources/assets/create/models/block/deployer/vertical.json @@ -5,10 +5,10 @@ "textures": { "6": "create:block/piston_bottom", "7": "create:block/piston_inner", + "particle": "create:block/gearbox_top", "gearbox_top": "create:block/gearbox_top", "gearbox": "create:block/gearbox", - "andesite_casing_short": "create:block/andesite_casing_short", - "particle": "create:block/gearbox_top" + "andesite_casing_short": "create:block/andesite_casing_short" }, "elements": [ { @@ -16,7 +16,7 @@ "from": [0, 0, 0], "to": [16, 16, 2], "faces": { - "north": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#6"}, + "north": {"uv": [0, 16, 16, 0], "rotation": 90, "texture": "#6"}, "east": {"uv": [0, 14, 16, 16], "rotation": 270, "texture": "#andesite_casing_short"}, "south": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#gearbox_top"}, "west": {"uv": [0, 14, 16, 16], "rotation": 90, "texture": "#andesite_casing_short"}, @@ -31,8 +31,8 @@ "faces": { "north": {"uv": [0, 0, 12, 14], "texture": "#gearbox"}, "south": {"uv": [2, 1, 14, 15], "texture": "#7"}, - "up": {"uv": [2, 4, 14, 14], "rotation": 180, "texture": "#gearbox"}, - "down": {"uv": [2, 4, 14, 14], "texture": "#gearbox"} + "up": {"uv": [2, 12, 14, 2], "rotation": 180, "texture": "#gearbox"}, + "down": {"uv": [2, 12, 14, 2], "texture": "#gearbox"} } }, { @@ -43,7 +43,7 @@ "east": {"uv": [0, 4, 16, 14], "rotation": 270, "texture": "#andesite_casing_short"}, "south": {"uv": [0, 0, 16, 2], "rotation": 270, "texture": "#andesite_casing_short"}, "west": {"uv": [0, 0, 16, 10], "rotation": 90, "texture": "#gearbox_top"}, - "up": {"uv": [0, 2, 2, 12], "rotation": 180, "texture": "#gearbox_top"}, + "up": {"uv": [16, 0, 14, 10], "rotation": 180, "texture": "#gearbox_top"}, "down": {"uv": [14, 0, 16, 10], "texture": "#gearbox_top"} } }, @@ -56,7 +56,7 @@ "south": {"uv": [0, 0, 16, 2], "rotation": 90, "texture": "#andesite_casing_short"}, "west": {"uv": [0, 4, 16, 14], "rotation": 90, "texture": "#andesite_casing_short"}, "up": {"uv": [14, 2, 16, 12], "rotation": 180, "texture": "#gearbox_top"}, - "down": {"uv": [0, 0, 2, 10], "texture": "#gearbox_top"} + "down": {"uv": [16, 0, 14, 10], "texture": "#gearbox_top"} } } ], @@ -64,6 +64,7 @@ { "name": "body", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3] } ] diff --git a/src/main/resources/assets/create/models/block/encased_cogwheel/item.json b/src/main/resources/assets/create/models/block/encased_cogwheel/item.json index 283a50741..300a02405 100644 --- a/src/main/resources/assets/create/models/block/encased_cogwheel/item.json +++ b/src/main/resources/assets/create/models/block/encased_cogwheel/item.json @@ -2,11 +2,11 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "casing": "create:block/andesite_casing", "1": "block/stripped_spruce_log_top", + "particle": "create:block/andesite_casing", + "casing": "create:block/andesite_casing", "side": "create:block/andesite_encased_cogwheel_side", - "1_2": "create:block/cogwheel", - "particle": "#casing" + "1_2": "create:block/cogwheel" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/encased_fan/block.json b/src/main/resources/assets/create/models/block/encased_fan/block.json index 1dce214f0..f29406b6c 100644 --- a/src/main/resources/assets/create/models/block/encased_fan/block.json +++ b/src/main/resources/assets/create/models/block/encased_fan/block.json @@ -2,6 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { + "3": "create:block/funnel/andesite_funnel_frame", "back": "create:block/gearbox", "fan_casing": "create:block/fan_casing", "particle": "create:block/fan_side", @@ -9,70 +10,50 @@ }, "elements": [ { - "name": "Bottom", "from": [0, 0, 0], - "to": [16, 16, 2], - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#fan_side"}, - "east": {"uv": [14, 0, 16, 16], "texture": "#fan_side"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#fan_side"}, - "west": {"uv": [14, 0, 16, 16], "rotation": 180, "texture": "#fan_side"}, - "up": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#fan_casing"}, - "down": {"uv": [0, 14, 16, 16], "texture": "#fan_casing"} - } - }, - { - "name": "Top", - "from": [0, 0, 14], "to": [16, 16, 16], "faces": { "north": {"uv": [0, 0, 16, 16], "texture": "#fan_side"}, - "east": {"uv": [0, 0, 2, 16], "texture": "#fan_side"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#fan_side"}, "south": {"uv": [0, 0, 16, 16], "texture": "#fan_side"}, - "west": {"uv": [14, 0, 16, 16], "texture": "#fan_side"}, - "up": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#fan_casing"}, - "down": {"uv": [0, 0, 16, 2], "texture": "#fan_casing"} + "west": {"uv": [0, 0, 16, 16], "texture": "#fan_side"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#3"} } }, { - "name": "Side", - "from": [0, 0, 2], - "to": [2, 16, 14], + "from": [1.9, 16, 1.9], + "to": [14.1, 0, 14.1], "faces": { - "east": {"uv": [2, 0, 14, 16], "texture": "#fan_side"}, - "west": {"uv": [14, 0, 2, 16], "texture": "#fan_side"}, - "up": {"uv": [14, 2, 16, 14], "rotation": 180, "texture": "#fan_casing"}, - "down": {"uv": [0, 2, 2, 14], "texture": "#fan_casing"} + "north": {"uv": [2, 0, 14, 16], "rotation": 180, "texture": "#fan_side"}, + "east": {"uv": [2, 0, 14, 16], "rotation": 180, "texture": "#fan_side"}, + "south": {"uv": [2, 0, 14, 16], "rotation": 180, "texture": "#fan_side"}, + "west": {"uv": [2, 0, 14, 16], "rotation": 180, "texture": "#fan_side"} } }, { - "name": "Side", - "from": [14, 0, 2], - "to": [16, 16, 14], + "from": [2, 1, 2], + "to": [14, 8, 14], "faces": { - "east": {"uv": [2, 0, 14, 16], "texture": "#fan_side"}, - "west": {"uv": [14, 0, 2, 16], "texture": "#fan_side"}, - "up": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#fan_casing"}, - "down": {"uv": [14, 2, 16, 14], "texture": "#fan_casing"} + "up": {"uv": [2, 2, 14, 14], "texture": "#back"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#back"} } }, { - "name": "Lattice", "from": [2, 15, 2], "to": [14, 15, 14], "faces": { - "up": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#fan_casing"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#fan_casing"}, "down": {"uv": [2, 2, 14, 14], "texture": "#fan_casing"} } - }, + } + ], + "groups": [ { - "name": "Back", - "from": [2, 1, 2], - "to": [14, 7, 14], - "faces": { - "up": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#back"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#back"} - } + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "children": [0, 1, 2, 3] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/gantry_carriage/horizontal.json b/src/main/resources/assets/create/models/block/gantry_carriage/horizontal.json index a35a3b443..fe91b31c6 100644 --- a/src/main/resources/assets/create/models/block/gantry_carriage/horizontal.json +++ b/src/main/resources/assets/create/models/block/gantry_carriage/horizontal.json @@ -3,11 +3,12 @@ "parent": "block/block", "textures": { "0": "create:block/axis", + "6": "create:block/pinion_bottom", "8": "create:block/bearing_top_wooden", "9": "create:block/windmill_bearing_side", "10": "create:block/pinion", - "particle": "create:block/andesite_casing", - "opening": "create:block/gearbox" + "opening": "create:block/gearbox", + "particle": "create:block/andesite_casing" }, "elements": [ { @@ -15,7 +16,7 @@ "from": [0, 0, 0], "to": [16, 16, 4], "faces": { - "north": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#8"}, + "north": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#6"}, "east": {"uv": [0, 0, 16, 4], "rotation": 270, "texture": "#9"}, "south": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#8"}, "west": {"uv": [0, 0, 16, 4], "rotation": 90, "texture": "#9"}, @@ -136,15 +137,25 @@ { "name": "item_andesite", "origin": [8, 8, 8], + "color": 0, "children": [] }, { "name": "item", "origin": [8, 8, 8], - "children": [0, 1, 2, 3, 4, 5, 6, + "color": 0, + "children": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, { "name": "shaft", "origin": [8, 8, 8], + "color": 0, "children": [] } ] diff --git a/src/main/resources/assets/create/models/block/gantry_carriage/item.json b/src/main/resources/assets/create/models/block/gantry_carriage/item.json index 8d33abbc3..fb29e3cc0 100644 --- a/src/main/resources/assets/create/models/block/gantry_carriage/item.json +++ b/src/main/resources/assets/create/models/block/gantry_carriage/item.json @@ -9,8 +9,9 @@ "9": "create:block/windmill_bearing_side", "10": "create:block/pinion", "11": "create:block/axis_top", - "particle": "create:block/andesite_casing", - "opening": "create:block/gearbox" + "12": "create:block/pinion_bottom", + "opening": "create:block/gearbox", + "particle": "create:block/andesite_casing" }, "elements": [ { @@ -191,7 +192,7 @@ "south": {"uv": [0, 8, 16, 12], "texture": "#10"}, "west": {"uv": [0, 0, 16, 4], "texture": "#9"}, "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#8"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#8"} + "down": {"uv": [0, 0, 16, 16], "texture": "#12"} } }, { diff --git a/src/main/resources/assets/create/models/block/gantry_carriage/vertical.json b/src/main/resources/assets/create/models/block/gantry_carriage/vertical.json index 9c7ed51bf..e578ea0e0 100644 --- a/src/main/resources/assets/create/models/block/gantry_carriage/vertical.json +++ b/src/main/resources/assets/create/models/block/gantry_carriage/vertical.json @@ -3,11 +3,12 @@ "parent": "block/block", "textures": { "0": "create:block/axis", + "6": "create:block/pinion_bottom", "8": "create:block/bearing_top_wooden", "9": "create:block/windmill_bearing_side", "10": "create:block/pinion", - "particle": "create:block/andesite_casing", - "opening": "create:block/gearbox" + "opening": "create:block/gearbox", + "particle": "create:block/andesite_casing" }, "elements": [ { @@ -15,7 +16,7 @@ "from": [0, 0, 0], "to": [16, 16, 4], "faces": { - "north": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#8"}, + "north": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#6"}, "east": {"uv": [0, 8, 16, 12], "rotation": 270, "texture": "#10"}, "south": {"uv": [0, 0, 16, 16], "texture": "#8"}, "west": {"uv": [0, 8, 16, 12], "rotation": 90, "texture": "#10"}, @@ -136,15 +137,25 @@ { "name": "item_andesite", "origin": [8, 8, 8], + "color": 0, "children": [] }, { "name": "item", "origin": [8, 8, 8], - "children": [0, 1, 2, 3, 4, 5, 6, + "color": 0, + "children": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, { "name": "shaft", "origin": [8, 8, 8], + "color": 0, "children": [] } ] diff --git a/src/main/resources/assets/create/models/block/gauge/stressometer/head.json b/src/main/resources/assets/create/models/block/gauge/stressometer/head.json index 1d6329f81..86acb0d2a 100644 --- a/src/main/resources/assets/create/models/block/gauge/stressometer/head.json +++ b/src/main/resources/assets/create/models/block/gauge/stressometer/head.json @@ -1,4 +1,5 @@ { + "credit": "Made with Blockbench", "textures": { "2": "create:block/gauge" }, @@ -32,12 +33,12 @@ "to": [16, 13, 13], "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, "faces": { - "north": {"uv": [13, 5, 14, 10], "texture": "#2"}, + "north": {"uv": [14, 5, 13, 10], "texture": "#2"}, "east": {"uv": [9, 5, 14, 10], "texture": "#2"}, - "south": {"uv": [13, 5, 14, 10], "texture": "#2"}, + "south": {"uv": [10, 5, 9, 10], "texture": "#2"}, "west": {"uv": [9, 5, 14, 10], "texture": "#2"}, - "up": {"uv": [9, 5, 10, 10], "texture": "#2"}, - "down": {"uv": [9, 5, 10, 10], "texture": "#2"} + "up": {"uv": [14, 5, 9, 6], "rotation": 90, "texture": "#2"}, + "down": {"uv": [9, 10, 14, 9], "rotation": 90, "texture": "#2"} } } ] diff --git a/src/main/resources/assets/create/models/block/gauge/stressometer/item.json b/src/main/resources/assets/create/models/block/gauge/stressometer/item.json index 38582a770..7df82d7b9 100644 --- a/src/main/resources/assets/create/models/block/gauge/stressometer/item.json +++ b/src/main/resources/assets/create/models/block/gauge/stressometer/item.json @@ -18,7 +18,7 @@ "south": {"uv": [0, 10, 6, 16], "texture": "#2"}, "west": {"uv": [9, 10, 16, 16], "texture": "#2"}, "up": {"uv": [9, 10, 16, 16], "rotation": 90, "texture": "#2"}, - "down": {"uv": [5, 5, 12, 10], "rotation": 270, "texture": "#2"} + "down": {"uv": [9, 10.5, 16, 15.5], "rotation": 270, "texture": "#2"} } }, { @@ -77,25 +77,12 @@ "to": [16, 13, 13], "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, "faces": { - "north": {"uv": [13, 5, 14, 10], "texture": "#2"}, + "north": {"uv": [14, 5, 13, 10], "texture": "#2"}, "east": {"uv": [9, 5, 14, 10], "texture": "#2"}, - "south": {"uv": [13, 5, 14, 10], "texture": "#2"}, + "south": {"uv": [10, 5, 9, 10], "texture": "#2"}, "west": {"uv": [9, 5, 14, 10], "texture": "#2"}, - "up": {"uv": [9, 5, 10, 10], "texture": "#2"}, - "down": {"uv": [9, 5, 10, 10], "texture": "#2"} - } - }, - { - "name": "GaugeColorBar", - "from": [14.5, 2.9, 2.9], - "to": [15.5, 13.1, 13.1], - "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, - "faces": { - "north": {"uv": [0, 8.5, 5, 9], "rotation": 90, "texture": "#2"}, - "south": {"uv": [0, 8.5, 5, 9], "rotation": 90, "texture": "#2"}, - "west": {"uv": [9, 5, 14, 10], "texture": "#2"}, - "up": {"uv": [0, 8, 5, 8.5], "rotation": 90, "texture": "#2"}, - "down": {"uv": [0, 8, 5, 8.5], "rotation": 90, "texture": "#2"} + "up": {"uv": [14, 5, 9, 6], "rotation": 90, "texture": "#2"}, + "down": {"uv": [9, 10, 14, 9], "rotation": 90, "texture": "#2"} } }, { @@ -148,12 +135,14 @@ { "name": "Gauge", "origin": [8, 8, 8], - "children": [0, 1, 2, 3, 4, 5, 6] + "color": 0, + "children": [0, 1, 2, 3, 4, 5] }, { "name": "shaft", "origin": [8, 8, 8], - "children": [7] + "color": 0, + "children": [6] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/gearshift/block.json b/src/main/resources/assets/create/models/block/gearshift/block.json index 4c1464215..3f47d4486 100644 --- a/src/main/resources/assets/create/models/block/gearshift/block.json +++ b/src/main/resources/assets/create/models/block/gearshift/block.json @@ -4,64 +4,45 @@ "textures": { "0": "create:block/gearshift_off", "1": "create:block/gearbox", + "2": "create:block/funnel/andesite_funnel_frame", "particle": "create:block/gearshift_off" }, "elements": [ { - "name": "Bottom", + "from": [1.95, 16, 1.95], + "to": [14.05, 15, 14.05], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [2, 15, 14, 16], "texture": "#1"}, + "east": {"uv": [0, 2, 1, 14], "rotation": 270, "texture": "#1"}, + "south": {"uv": [2, 0, 14, 1], "rotation": 180, "texture": "#1"}, + "west": {"uv": [15, 2, 16, 14], "rotation": 90, "texture": "#1"}, + "up": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [1.95, 1, 1.95], + "to": [14.05, 0, 14.05], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [2, 15, 14, 16], "rotation": 180, "texture": "#1"}, + "east": {"uv": [15, 2, 16, 14], "rotation": 270, "texture": "#1"}, + "south": {"uv": [2, 0, 14, 1], "texture": "#1"}, + "west": {"uv": [0, 2, 1, 14], "rotation": 90, "texture": "#1"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#1"} + } + }, + { "from": [0, 0, 0], - "to": [16, 16, 2], - "faces": { - "north": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 14, 16, 16], "rotation": 270, "texture": "#0"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 14, 16, 16], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 14, 16, 16], "texture": "#1"} - } - }, - { - "name": "Core", - "from": [1, 0.95, 2], - "to": [15, 15.05, 14], - "faces": { - "up": {"uv": [1, 2, 15, 14], "rotation": 180, "texture": "#1"}, - "down": {"uv": [1, 2, 15, 14], "texture": "#1"} - } - }, - { - "name": "Top", - "from": [0, 0, 14], "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"}, - "east": {"uv": [0, 0, 16, 2], "rotation": 270, "texture": "#0"}, - "south": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 0, 16, 2], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 16, 2], "texture": "#1"} - } - }, - { - "name": "SideWest", - "from": [0, 0, 2], - "to": [2, 16, 14], - "faces": { - "east": {"uv": [0, 2, 16, 14], "rotation": 270, "texture": "#1"}, - "west": {"uv": [0, 2, 16, 14], "rotation": 90, "texture": "#0"}, - "up": {"uv": [14, 2, 16, 14], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 2, 2, 14], "texture": "#0"} - } - }, - { - "name": "SideEast", - "from": [14, 0, 2], - "to": [16, 16, 14], - "faces": { - "east": {"uv": [0, 2, 16, 14], "rotation": 270, "texture": "#0"}, - "west": {"uv": [0, 2, 16, 14], "rotation": 90, "texture": "#1"}, - "up": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#0"}, - "down": {"uv": [14, 2, 16, 14], "texture": "#0"} + "north": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#2"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#2"} } } ] diff --git a/src/main/resources/assets/create/models/block/mechanical_drill/block.json b/src/main/resources/assets/create/models/block/mechanical_drill/block.json index 3a4cf2dec..3308bbdd7 100644 --- a/src/main/resources/assets/create/models/block/mechanical_drill/block.json +++ b/src/main/resources/assets/create/models/block/mechanical_drill/block.json @@ -2,11 +2,11 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { + "4": "create:block/mechanical_drill_top", "10": "create:block/andesite_casing_very_short", "gearbox_top": "create:block/gearbox_top", "particle": "create:block/gearbox", - "gearbox": "create:block/gearbox", - "andesite_casing_short": "create:block/andesite_casing_short" + "gearbox": "create:block/gearbox" }, "elements": [ { @@ -14,7 +14,7 @@ "from": [2, 1, 2], "to": [14, 9, 14], "faces": { - "up": {"uv": [2, 2, 14, 14], "texture": "#gearbox"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#4"}, "down": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#gearbox"} } }, @@ -23,11 +23,11 @@ "from": [0, 0, 14], "to": [16, 10, 16], "faces": { - "north": {"uv": [0, 4, 16, 16], "rotation": 180, "texture": "#andesite_casing_short"}, - "east": {"uv": [14, 6, 16, 16], "rotation": 180, "texture": "#10"}, + "north": {"uv": [0, 6, 16, 16], "texture": "#10"}, + "east": {"uv": [0, 6, 2, 16], "texture": "#10"}, "south": {"uv": [0, 6, 16, 16], "texture": "#10"}, "west": {"uv": [14, 6, 16, 16], "texture": "#10"}, - "up": {"uv": [0, 14, 16, 16], "texture": "#gearbox_top"}, + "up": {"uv": [0, 14, 16, 16], "texture": "#4"}, "down": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#gearbox_top"} } }, @@ -36,11 +36,11 @@ "from": [0, 0, 0], "to": [16, 10, 2], "faces": { - "north": {"uv": [0, 6, 16, 16], "rotation": 180, "texture": "#10"}, - "east": {"uv": [0, 6, 2, 16], "rotation": 180, "texture": "#10"}, - "south": {"uv": [0, 4, 16, 16], "texture": "#andesite_casing_short"}, + "north": {"uv": [0, 6, 16, 16], "texture": "#10"}, + "east": {"uv": [2, 6, 0, 16], "texture": "#10"}, + "south": {"uv": [0, 6, 16, 16], "texture": "#10"}, "west": {"uv": [0, 6, 2, 16], "texture": "#10"}, - "up": {"uv": [0, 0, 16, 2], "texture": "#gearbox_top"}, + "up": {"uv": [0, 0, 16, 2], "texture": "#4"}, "down": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#gearbox_top"} } }, @@ -49,9 +49,9 @@ "from": [0, 0, 2], "to": [2, 10, 14], "faces": { - "east": {"uv": [2, 4, 14, 16], "rotation": 180, "texture": "#andesite_casing_short"}, + "east": {"uv": [2, 6, 14, 16], "texture": "#10"}, "west": {"uv": [2, 6, 14, 16], "texture": "#10"}, - "up": {"uv": [0, 2, 2, 14], "texture": "#gearbox_top"}, + "up": {"uv": [0, 2, 2, 14], "texture": "#4"}, "down": {"uv": [14, 2, 16, 14], "rotation": 180, "texture": "#gearbox_top"} } }, @@ -60,9 +60,9 @@ "from": [14, 0, 2], "to": [16, 10, 14], "faces": { - "east": {"uv": [2, 6, 14, 16], "rotation": 180, "texture": "#10"}, - "west": {"uv": [2, 4, 14, 16], "rotation": 180, "texture": "#andesite_casing_short"}, - "up": {"uv": [14, 2, 16, 14], "texture": "#gearbox_top"}, + "east": {"uv": [2, 6, 14, 16], "texture": "#10"}, + "west": {"uv": [2, 6, 14, 16], "texture": "#10"}, + "up": {"uv": [14, 2, 16, 14], "texture": "#4"}, "down": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#gearbox_top"} } } @@ -71,6 +71,7 @@ { "name": "casing", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3, 4] } ] diff --git a/src/main/resources/assets/create/models/block/mechanical_drill/head.json b/src/main/resources/assets/create/models/block/mechanical_drill/head.json index 72d61cc98..a29a6203f 100644 --- a/src/main/resources/assets/create/models/block/mechanical_drill/head.json +++ b/src/main/resources/assets/create/models/block/mechanical_drill/head.json @@ -5,7 +5,6 @@ "0": "create:block/axis_top", "1": "create:block/axis", "2": "block/anvil", - "7": "block/polished_andesite", "10": "create:block/andesite_casing_very_short", "particle": "block/anvil" }, @@ -28,12 +27,11 @@ "to": [11, 11, 12], "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#7"}, - "east": {"uv": [0, 2, 6, 5], "rotation": 270, "texture": "#10"}, + "east": {"uv": [0, 0, 6, 3], "rotation": 270, "texture": "#10"}, "south": {"uv": [5, 0, 11, 6], "texture": "#2"}, - "west": {"uv": [0, 2, 6, 5], "rotation": 90, "texture": "#10"}, - "up": {"uv": [0, 2, 6, 5], "rotation": 180, "texture": "#10"}, - "down": {"uv": [0, 2, 6, 5], "texture": "#10"} + "west": {"uv": [0, 0, 6, 3], "rotation": 90, "texture": "#10"}, + "up": {"uv": [0, 0, 6, 3], "rotation": 180, "texture": "#10"}, + "down": {"uv": [0, 0, 6, 3], "texture": "#10"} } }, { @@ -149,11 +147,11 @@ } } ], - "display": {}, "groups": [ { "name": "head", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] } ] diff --git a/src/main/resources/assets/create/models/block/mechanical_drill/item.json b/src/main/resources/assets/create/models/block/mechanical_drill/item.json index 725b4ed4a..156dfc7e5 100644 --- a/src/main/resources/assets/create/models/block/mechanical_drill/item.json +++ b/src/main/resources/assets/create/models/block/mechanical_drill/item.json @@ -6,11 +6,10 @@ "1": "create:block/axis", "2": "block/anvil", "7": "block/polished_andesite", + "8": "create:block/mechanical_drill_top", "10": "create:block/andesite_casing_very_short", "particle": "block/anvil", - "gearbox_top": "create:block/gearbox_top", - "gearbox": "create:block/gearbox", - "andesite_casing_short": "create:block/andesite_casing_short" + "gearbox": "create:block/gearbox" }, "elements": [ { @@ -32,11 +31,11 @@ "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 8]}, "faces": { "north": {"uv": [0, 0, 6, 6], "texture": "#7"}, - "east": {"uv": [0, 2, 6, 5], "rotation": 270, "texture": "#10"}, + "east": {"uv": [0, 0, 6, 3], "rotation": 270, "texture": "#10"}, "south": {"uv": [5, 0, 11, 6], "texture": "#2"}, - "west": {"uv": [0, 2, 6, 5], "rotation": 90, "texture": "#10"}, - "up": {"uv": [0, 2, 6, 5], "rotation": 180, "texture": "#10"}, - "down": {"uv": [0, 2, 6, 5], "texture": "#10"} + "west": {"uv": [0, 0, 6, 3], "rotation": 90, "texture": "#10"}, + "up": {"uv": [0, 0, 6, 3], "rotation": 180, "texture": "#10"}, + "down": {"uv": [0, 0, 6, 3], "texture": "#10"} } }, { @@ -157,7 +156,7 @@ "to": [14, 14, 9], "faces": { "north": {"uv": [2, 2, 14, 14], "texture": "#gearbox"}, - "south": {"uv": [2, 2, 14, 14], "texture": "#gearbox"} + "south": {"uv": [2, 2, 14, 14], "texture": "#8"} } }, { @@ -165,11 +164,11 @@ "from": [0, 0, 0], "to": [16, 2, 10], "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#gearbox_top"}, - "east": {"uv": [14, 6, 16, 16], "rotation": 90, "texture": "#10"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#gearbox_top"}, + "north": {"uv": [0, 14, 16, 16], "texture": "#gearbox"}, + "east": {"uv": [0, 6, 2, 16], "rotation": 270, "texture": "#10"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#8"}, "west": {"uv": [14, 6, 16, 16], "rotation": 90, "texture": "#10"}, - "up": {"uv": [0, 4, 16, 16], "texture": "#andesite_casing_short"}, + "up": {"uv": [0, 6, 16, 16], "rotation": 180, "texture": "#10"}, "down": {"uv": [0, 6, 16, 16], "texture": "#10"} } }, @@ -178,12 +177,12 @@ "from": [0, 14, 0], "to": [16, 16, 10], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#gearbox_top"}, - "east": {"uv": [0, 6, 2, 16], "rotation": 90, "texture": "#10"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#gearbox_top"}, + "north": {"uv": [0, 0, 16, 2], "texture": "#gearbox"}, + "east": {"uv": [2, 6, 0, 16], "rotation": 270, "texture": "#10"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#8"}, "west": {"uv": [0, 6, 2, 16], "rotation": 90, "texture": "#10"}, - "up": {"uv": [0, 6, 16, 16], "texture": "#10"}, - "down": {"uv": [0, 4, 16, 16], "texture": "#andesite_casing_short"} + "up": {"uv": [0, 6, 16, 16], "rotation": 180, "texture": "#10"}, + "down": {"uv": [0, 6, 16, 16], "texture": "#10"} } }, { @@ -191,9 +190,9 @@ "from": [0, 2, 0], "to": [2, 14, 10], "faces": { - "north": {"uv": [14, 2, 16, 14], "texture": "#gearbox_top"}, - "east": {"uv": [2, 4, 14, 16], "rotation": 90, "texture": "#andesite_casing_short"}, - "south": {"uv": [0, 2, 2, 14], "texture": "#gearbox_top"}, + "north": {"uv": [14, 2, 16, 14], "texture": "#gearbox"}, + "east": {"uv": [2, 6, 14, 16], "rotation": 270, "texture": "#10"}, + "south": {"uv": [0, 2, 2, 14], "texture": "#8"}, "west": {"uv": [2, 6, 14, 16], "rotation": 90, "texture": "#10"} } }, @@ -202,10 +201,10 @@ "from": [14, 2, 0], "to": [16, 14, 10], "faces": { - "north": {"uv": [0, 2, 2, 14], "texture": "#gearbox_top"}, - "east": {"uv": [2, 6, 14, 16], "rotation": 90, "texture": "#10"}, - "south": {"uv": [14, 2, 16, 14], "texture": "#gearbox_top"}, - "west": {"uv": [2, 4, 14, 16], "rotation": 270, "texture": "#andesite_casing_short"} + "north": {"uv": [0, 2, 2, 14], "texture": "#gearbox"}, + "east": {"uv": [2, 6, 14, 16], "rotation": 270, "texture": "#10"}, + "south": {"uv": [14, 2, 16, 14], "texture": "#8"}, + "west": {"uv": [2, 6, 14, 16], "rotation": 90, "texture": "#10"} } } ], diff --git a/src/main/resources/assets/create/models/block/mechanical_harvester/item.json b/src/main/resources/assets/create/models/block/mechanical_harvester/item.json index d81d76a75..9bb48da0b 100644 --- a/src/main/resources/assets/create/models/block/mechanical_harvester/item.json +++ b/src/main/resources/assets/create/models/block/mechanical_harvester/item.json @@ -138,7 +138,7 @@ "north": {"uv": [0, 0, 1.9, 3], "texture": "#andesite_casing_short"}, "east": {"uv": [0, 0, 8, 3], "texture": "#andesite_casing_short"}, "south": {"uv": [0.1, 8, 2, 11], "texture": "#andesite_casing_short"}, - "west": {"uv": [0, 0, 8, 3], "texture": "#andesite_casing_short"}, + "west": {"uv": [1, 0, 9, 3], "texture": "#andesite_casing_short"}, "up": {"uv": [0.1, 6, 2, 14], "texture": "#andesite_casing_short"}, "down": {"uv": [0.1, 6, 2, 14], "texture": "#andesite_casing_short"} } @@ -150,7 +150,7 @@ "rotation": {"angle": 22.5, "axis": "x", "origin": [0, 10, 3]}, "faces": { "north": {"uv": [0, 0, 1.9, 3], "texture": "#andesite_casing_short"}, - "east": {"uv": [0, 0, 8, 3], "texture": "#andesite_casing_short"}, + "east": {"uv": [1, 0, 9, 3], "texture": "#andesite_casing_short"}, "south": {"uv": [14, 8, 15.9, 11], "texture": "#andesite_casing_short"}, "west": {"uv": [0, 0, 8, 3], "texture": "#andesite_casing_short"}, "up": {"uv": [14, 6, 15.9, 14], "texture": "#andesite_casing_short"}, diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/extended/block.json b/src/main/resources/assets/create/models/block/mechanical_piston/extended/block.json index facc70252..2ddf55f1b 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston/extended/block.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/extended/block.json @@ -1,74 +1,74 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "credit": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "parent": "block/block", - "textures": { - "particle": "create:block/gearbox_top", - "0": "create:block/gearbox_top", - "1": "create:block/piston_bottom", - "2": "create:block/gearbox", - "3": "create:block/piston_inner", - "4": "block/piston_side", - "5": "create:block/pole_end" - }, - "elements": [ - { - "name": "Bottom", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 2.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "Inner", - "from": [ 2.0, 2.0, 1.0 ], - "to": [ 14.0, 12.0, 15.0 ], - "faces": { - "north": { "texture": "#2", "uv": [ 2.0, 4.0, 14.0, 14.0 ] }, - "south": { "texture": "#2", "uv": [ 2.0, 4.0, 14.0, 14.0 ] }, - "up": { "texture": "#3", "uv": [ 2.0, 1.0, 14.0, 15.0 ] } - } - }, - { - "name": "Side", - "from": [ 0.0, 2.0, 0.0 ], - "to": [ 2.0, 12.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 14.0, 0.0, 16.0, 10.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 10.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 2.0 ], "rotation": 270 } - } - }, - { - "name": "Side2", - "from": [ 14.0, 2.0, 0.0 ], - "to": [ 16.0, 12.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 10.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "south": { "texture": "#0", "uv": [ 14.0, 0.0, 16.0, 10.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ], "rotation": 270 } - } - }, - { - "name": "Extension", - "from": [ 6.0, 12.0, 6.0 ], - "to": [ 10.0, 16.0, 10.0 ], - "faces": { - "north": { "texture": "#4", "uv": [ 12.0, 0.0, 16.0, 4.0 ], "rotation": 270 }, - "east": { "texture": "#4", "uv": [ 12.0, 0.0, 16.0, 4.0 ], "rotation": 270 }, - "south": { "texture": "#4", "uv": [ 12.0, 0.0, 16.0, 4.0 ], "rotation": 270 }, - "west": { "texture": "#4", "uv": [ 12.0, 0.0, 16.0, 4.0 ], "rotation": 270 }, - "up": { "texture": "#5", "uv": [ 6.0, 6.0, 10.0, 10.0 ] } - } - } - ] + "textures": { + "0": "create:block/andesite_casing_piston", + "1": "create:block/piston_bottom", + "2": "create:block/gearbox", + "3": "create:block/piston_inner", + "4": "block/piston_side", + "5": "create:block/pole_end", + "particle": "create:block/andesite_casing_piston" + }, + "elements": [ + { + "name": "Bottom", + "from": [0, 0, 0], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "name": "Inner", + "from": [2, 2, 1], + "to": [14, 12, 15], + "faces": { + "north": {"uv": [2, 4, 14, 14], "texture": "#2"}, + "south": {"uv": [2, 4, 14, 14], "texture": "#2"}, + "up": {"uv": [2, 1, 14, 15], "texture": "#3"} + } + }, + { + "name": "Side", + "from": [0, 2, 0], + "to": [2, 12, 16], + "faces": { + "north": {"uv": [14, 4, 16, 14], "texture": "#0"}, + "east": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "south": {"uv": [16, 4, 14, 14], "texture": "#0"}, + "west": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 2, 16, 0], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "Side2", + "from": [14, 2, 0], + "to": [16, 12, 16], + "faces": { + "north": {"uv": [16, 4, 14, 14], "texture": "#0"}, + "east": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "south": {"uv": [14, 4, 16, 14], "texture": "#0"}, + "west": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 2], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "Extension", + "from": [6, 12, 6], + "to": [10, 16, 10], + "faces": { + "north": {"uv": [12, 0, 16, 4], "rotation": 270, "texture": "#4"}, + "east": {"uv": [12, 0, 16, 4], "rotation": 270, "texture": "#4"}, + "south": {"uv": [12, 0, 16, 4], "rotation": 270, "texture": "#4"}, + "west": {"uv": [12, 0, 16, 4], "rotation": 270, "texture": "#4"}, + "up": {"uv": [6, 6, 10, 10], "texture": "#5"} + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/extended/block_rotated.json b/src/main/resources/assets/create/models/block/mechanical_piston/extended/block_rotated.json index 93ef108ad..afc0e3f79 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston/extended/block_rotated.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/extended/block_rotated.json @@ -1,74 +1,74 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "credit": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "parent": "block/block", - "textures": { - "particle": "create:block/gearbox_top", - "0": "create:block/gearbox_top", - "1": "create:block/piston_bottom", - "2": "create:block/gearbox", - "3": "create:block/piston_inner", - "4": "block/piston_side", - "5": "create:block/pole_end" - }, - "elements": [ - { - "name": "Bottom", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 2.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, + "textures": { + "0": "create:block/andesite_casing_piston", + "1": "create:block/piston_bottom", + "2": "create:block/gearbox", + "3": "create:block/piston_inner", + "4": "block/piston_side", + "5": "create:block/pole_end", + "particle": "create:block/andesite_casing_piston" + }, + "elements": [ { - "name": "Inner", - "from": [ 1.0, 2.0, 2.0 ], - "to": [ 15.0, 12.0, 14.0 ], - "faces": { - "east": { "texture": "#2", "uv": [ 2.0, 4.0, 14.0, 14.0 ] }, - "west": { "texture": "#2", "uv": [ 2.0, 4.0, 14.0, 14.0 ] }, - "up": { "texture": "#3", "uv": [ 2.0, 1.0, 14.0, 15.0 ], "rotation": 90 } - } - }, + "name": "Bottom", + "from": [0, 0, 0], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, { - "name": "Side", - "from": [ 0.0, 2.0, 0.0 ], - "to": [ 16.0, 12.0, 2.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 9.0 ] }, - "east": { "texture": "#0", "uv": [ 14.0, 0.0, 16.0, 10.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 10.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 2.0 ], "rotation": 0 } - } - }, - { - "name": "Side2", - "from": [ 0.0, 2.0, 14.0 ], - "to": [ 16.0, 12.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 10.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "west": { "texture": "#0", "uv": [ 14.0, 0.0, 16.0, 10.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ], "rotation": 0 } - } - }, - { - "name": "Extension", - "from": [ 6.0, 12.0, 6.0 ], - "to": [ 10.0, 16.0, 10.0 ], - "faces": { - "north": { "texture": "#4", "uv": [ 12.0, 0.0, 16.0, 4.0 ], "rotation": 270 }, - "east": { "texture": "#4", "uv": [ 12.0, 0.0, 16.0, 4.0 ], "rotation": 270 }, - "south": { "texture": "#4", "uv": [ 12.0, 0.0, 16.0, 4.0 ], "rotation": 270 }, - "west": { "texture": "#4", "uv": [ 12.0, 0.0, 16.0, 4.0 ], "rotation": 270 }, - "up": { "texture": "#5", "uv": [ 6.0, 6.0, 10.0, 10.0 ] } - } - } - ] + "name": "Inner", + "from": [1, 2, 2], + "to": [15, 12, 14], + "faces": { + "east": {"uv": [2, 4, 14, 14], "texture": "#2"}, + "west": {"uv": [2, 4, 14, 14], "texture": "#2"}, + "up": {"uv": [2, 1, 14, 15], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "Side", + "from": [0, 2, 0], + "to": [16, 12, 2], + "faces": { + "north": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "east": {"uv": [14, 4, 16, 14], "texture": "#0"}, + "south": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "west": {"uv": [16, 4, 14, 14], "texture": "#0"}, + "up": {"uv": [0, 2, 16, 0], "texture": "#0"} + } + }, + { + "name": "Side2", + "from": [0, 2, 14], + "to": [16, 12, 16], + "faces": { + "north": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "east": {"uv": [16, 4, 14, 14], "texture": "#0"}, + "south": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "west": {"uv": [14, 4, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 2], "texture": "#0"} + } + }, + { + "name": "Extension", + "from": [6, 12, 6], + "to": [10, 16, 10], + "faces": { + "north": {"uv": [12, 0, 16, 4], "rotation": 270, "texture": "#4"}, + "east": {"uv": [12, 0, 16, 4], "rotation": 270, "texture": "#4"}, + "south": {"uv": [12, 0, 16, 4], "rotation": 270, "texture": "#4"}, + "west": {"uv": [12, 0, 16, 4], "rotation": 270, "texture": "#4"}, + "up": {"uv": [6, 6, 10, 10], "texture": "#5"} + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/moving/block.json b/src/main/resources/assets/create/models/block/mechanical_piston/moving/block.json index f0df0d203..25a49ee70 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston/moving/block.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/moving/block.json @@ -1,61 +1,61 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "credit": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "parent": "block/block", - "textures": { - "particle": "create:block/gearbox_top", - "0": "create:block/gearbox_top", - "1": "create:block/piston_bottom", - "2": "create:block/gearbox", - "3": "create:block/piston_inner" - }, - "elements": [ - { - "name": "Bottom", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 2.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "Inner", - "from": [ 2.0, 2.0, 1.0 ], - "to": [ 14.0, 12.0, 15.0 ], - "faces": { - "north": { "texture": "#2", "uv": [ 2.0, 4.0, 14.0, 14.0 ] }, - "south": { "texture": "#2", "uv": [ 2.0, 4.0, 14.0, 14.0 ] }, - "up": { "texture": "#3", "uv": [ 2.0, 1.0, 14.0, 15.0 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 12.0, 14.0 ] } - } - }, - { - "name": "Side", - "from": [ 0.0, 2.0, 0.0 ], - "to": [ 2.0, 12.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 14.0, 0.0, 16.0, 10.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 10.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 2.0 ], "rotation": 270 } - } - }, - { - "name": "Side2", - "from": [ 14.0, 2.0, 0.0 ], - "to": [ 16.0, 12.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 10.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "south": { "texture": "#0", "uv": [ 14.0, 0.0, 16.0, 10.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ], "rotation": 270 } - } - } - ] + "textures": { + "0": "create:block/andesite_casing_piston", + "1": "create:block/piston_bottom", + "2": "create:block/gearbox", + "3": "create:block/piston_inner", + "particle": "create:block/andesite_casing_piston" + }, + "elements": [ + { + "name": "Bottom", + "from": [0, 0, 0], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "name": "Inner", + "from": [2, 2, 1], + "to": [14, 12, 15], + "faces": { + "north": {"uv": [2, 4, 14, 14], "texture": "#2"}, + "south": {"uv": [2, 4, 14, 14], "texture": "#2"}, + "up": {"uv": [2, 1, 14, 15], "texture": "#3"}, + "down": {"uv": [0, 0, 12, 14], "texture": "#2"} + } + }, + { + "name": "Side", + "from": [0, 2, 0], + "to": [2, 12, 16], + "faces": { + "north": {"uv": [14, 4, 16, 14], "texture": "#0"}, + "east": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "south": {"uv": [16, 4, 14, 14], "texture": "#0"}, + "west": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 2, 16, 0], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "Side2", + "from": [14, 2, 0], + "to": [16, 12, 16], + "faces": { + "north": {"uv": [16, 4, 14, 14], "texture": "#0"}, + "east": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "south": {"uv": [14, 4, 16, 14], "texture": "#0"}, + "west": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 2], "rotation": 270, "texture": "#0"} + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/moving/block_rotated.json b/src/main/resources/assets/create/models/block/mechanical_piston/moving/block_rotated.json index 92d6298fd..0a32c01ec 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston/moving/block_rotated.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/moving/block_rotated.json @@ -1,60 +1,60 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "credit": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "parent": "block/block", - "textures": { - "particle": "create:block/gearbox_top", - "0": "create:block/gearbox_top", - "1": "create:block/piston_bottom", - "2": "create:block/gearbox", - "3": "create:block/piston_inner" - }, - "elements": [ - { - "name": "Bottom", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 2.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, + "textures": { + "0": "create:block/andesite_casing_piston", + "1": "create:block/piston_bottom", + "2": "create:block/gearbox", + "3": "create:block/piston_inner", + "particle": "create:block/andesite_casing_piston" + }, + "elements": [ { - "name": "Inner", - "from": [ 1.0, 2.0, 2.0 ], - "to": [ 15.0, 12.0, 14.0 ], - "faces": { - "east": { "texture": "#2", "uv": [ 2.0, 4.0, 14.0, 14.0 ] }, - "west": { "texture": "#2", "uv": [ 2.0, 4.0, 14.0, 14.0 ] }, - "up": { "texture": "#3", "uv": [ 2.0, 1.0, 14.0, 15.0 ], "rotation": 90 } - } - }, + "name": "Bottom", + "from": [0, 0, 0], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, { - "name": "Side", - "from": [ 0.0, 2.0, 0.0 ], - "to": [ 16.0, 12.0, 2.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 9.0 ] }, - "east": { "texture": "#0", "uv": [ 14.0, 0.0, 16.0, 10.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 10.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 2.0 ], "rotation": 0 } - } - }, - { - "name": "Side2", - "from": [ 0.0, 2.0, 14.0 ], - "to": [ 16.0, 12.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 10.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "west": { "texture": "#0", "uv": [ 14.0, 0.0, 16.0, 10.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ], "rotation": 0 } - } - } - ] + "name": "Inner", + "from": [1, 2, 2], + "to": [15, 12, 14], + "faces": { + "east": {"uv": [2, 4, 14, 14], "texture": "#2"}, + "west": {"uv": [2, 4, 14, 14], "texture": "#2"}, + "up": {"uv": [2, 1, 14, 15], "rotation": 90, "texture": "#3"} + } + }, + { + "name": "Side", + "from": [0, 2, 0], + "to": [16, 12, 2], + "faces": { + "north": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "east": {"uv": [14, 4, 16, 14], "texture": "#0"}, + "south": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "west": {"uv": [16, 4, 14, 14], "texture": "#0"}, + "up": {"uv": [0, 2, 16, 0], "texture": "#0"} + } + }, + { + "name": "Side2", + "from": [0, 2, 14], + "to": [16, 12, 16], + "faces": { + "north": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "east": {"uv": [16, 4, 14, 14], "texture": "#0"}, + "south": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "west": {"uv": [14, 4, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 2], "texture": "#0"} + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/normal/block.json b/src/main/resources/assets/create/models/block/mechanical_piston/normal/block.json index dfc0f6c17..d1196dda0 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston/normal/block.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/normal/block.json @@ -1,73 +1,73 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "credit": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "parent": "block/block", - "textures": { - "particle": "create:block/gearbox_top", - "0": "create:block/gearbox_top", - "1": "create:block/piston_bottom", - "2": "create:block/gearbox", - "3": "create:block/piston_inner", - "4": "block/piston_side", - "5": "block/piston_top" - }, - "elements": [ - { - "name": "Bottom", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 2.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "Inner", - "from": [ 2.0, 2.0, 1.0 ], - "to": [ 14.0, 12.0, 15.0 ], - "faces": { - "north": { "texture": "#2", "uv": [ 2.0, 4.0, 14.0, 14.0 ] }, - "south": { "texture": "#2", "uv": [ 2.0, 4.0, 14.0, 14.0 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 12.0, 14.0 ] } - } - }, - { - "name": "Side", - "from": [ 0.0, 2.0, 0.0 ], - "to": [ 2.0, 12.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 14.0, 0.0, 16.0, 10.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 10.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] } - } - }, - { - "name": "Side2", - "from": [ 14.0, 2.0, 0.0 ], - "to": [ 16.0, 12.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 10.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "south": { "texture": "#0", "uv": [ 14.0, 0.0, 16.0, 10.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] } - } - }, - { - "name": "Top", - "from": [ 0.0, 12.0, 0.0 ], - "to": [ 16.0, 16.0, 16.0 ], - "faces": { - "north": { "texture": "#4", "uv": [ 0.0, 0.0, 16.0, 4.0 ] }, - "east": { "texture": "#4", "uv": [ 0.0, 0.0, 16.0, 4.0 ] }, - "south": { "texture": "#4", "uv": [ 0.0, 0.0, 16.0, 4.0 ] }, - "west": { "texture": "#4", "uv": [ 0.0, 0.0, 16.0, 4.0 ] }, - "up": { "texture": "#5", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#3", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] + "textures": { + "0": "create:block/andesite_casing", + "1": "create:block/piston_bottom", + "2": "create:block/gearbox", + "4": "block/piston_side", + "5": "block/piston_top", + "6": "create:block/andesite_casing_piston", + "particle": "create:block/andesite_casing" + }, + "elements": [ + { + "name": "Bottom", + "from": [0, 0, 0], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "name": "Inner", + "from": [2, 2, 1], + "to": [14, 12, 15], + "faces": { + "north": {"uv": [2, 4, 14, 14], "texture": "#2"}, + "south": {"uv": [2, 4, 14, 14], "texture": "#2"}, + "down": {"uv": [0, 0, 12, 14], "texture": "#2"} + } + }, + { + "name": "Side", + "from": [0, 2, 0], + "to": [2, 12, 16], + "faces": { + "north": {"uv": [14, 0, 16, 10], "texture": "#0"}, + "east": {"uv": [0, 4, 16, 14], "texture": "#6"}, + "south": {"uv": [0, 0, 2, 10], "texture": "#0"}, + "west": {"uv": [0, 4, 16, 14], "texture": "#6"} + } + }, + { + "name": "Side2", + "from": [14, 2, 0], + "to": [16, 12, 16], + "faces": { + "north": {"uv": [0, 0, 2, 10], "texture": "#0"}, + "east": {"uv": [0, 4, 16, 14], "texture": "#6"}, + "south": {"uv": [14, 0, 16, 10], "texture": "#0"}, + "west": {"uv": [0, 4, 16, 14], "texture": "#6"} + } + }, + { + "name": "Top", + "from": [0, 12, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 4], "texture": "#4"}, + "east": {"uv": [0, 0, 16, 4], "texture": "#4"}, + "south": {"uv": [0, 0, 16, 4], "texture": "#4"}, + "west": {"uv": [0, 0, 16, 4], "texture": "#4"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#2"} + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/normal/block_rotated.json b/src/main/resources/assets/create/models/block/mechanical_piston/normal/block_rotated.json index 46e8de9a2..dfe772819 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston/normal/block_rotated.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/normal/block_rotated.json @@ -1,71 +1,70 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "particle": "create:block/gearbox_top", - "0": "create:block/gearbox_top", - "1": "create:block/piston_bottom", - "2": "create:block/gearbox", - "3": "create:block/piston_inner", - "4": "block/piston_side", - "5": "block/piston_top" - }, - "elements": [ - { - "name": "Bottom", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 2.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 14.0, 16.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "Inner", - "from": [ 1.0, 2.0, 2.0 ], - "to": [ 15.0, 12.0, 14.0 ], - "faces": { - "east": { "texture": "#2", "uv": [ 2.0, 4.0, 14.0, 14.0 ] }, - "west": { "texture": "#2", "uv": [ 2.0, 4.0, 14.0, 14.0 ] } - } - }, - { - "name": "Side", - "from": [ 0.0, 2.0, 0.0 ], - "to": [ 16.0, 12.0, 2.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 9.0 ] }, - "east": { "texture": "#0", "uv": [ 14.0, 0.0, 16.0, 10.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 10.0 ] } - } - }, - { - "name": "Side2", - "from": [ 0.0, 2.0, 14.0 ], - "to": [ 16.0, 12.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 10.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 10.0 ] }, - "west": { "texture": "#0", "uv": [ 14.0, 0.0, 16.0, 10.0 ] } - } - }, - { - "name": "Top", - "from": [ 0.0, 12.0, 0.0 ], - "to": [ 16.0, 16.0, 16.0 ], - "faces": { - "north": { "texture": "#4", "uv": [ 0.0, 0.0, 16.0, 4.0 ] }, - "east": { "texture": "#4", "uv": [ 0.0, 0.0, 16.0, 4.0 ] }, - "south": { "texture": "#4", "uv": [ 0.0, 0.0, 16.0, 4.0 ] }, - "west": { "texture": "#4", "uv": [ 0.0, 0.0, 16.0, 4.0 ] }, - "up": { "texture": "#5", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#3", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] + "credit": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "0": "create:block/andesite_casing_piston", + "1": "create:block/piston_bottom", + "2": "create:block/gearbox", + "4": "block/piston_side", + "5": "block/piston_top", + "particle": "create:block/andesite_casing_piston" + }, + "elements": [ + { + "name": "Bottom", + "from": [0, 0, 0], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "name": "Inner", + "from": [1, 2, 2], + "to": [15, 12, 14], + "faces": { + "east": {"uv": [2, 4, 14, 14], "texture": "#2"}, + "west": {"uv": [2, 4, 14, 14], "texture": "#2"} + } + }, + { + "name": "Side", + "from": [0, 2, 0], + "to": [16, 12, 2], + "faces": { + "north": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "east": {"uv": [14, 4, 16, 14], "texture": "#0"}, + "south": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "west": {"uv": [0, 4, 2, 14], "texture": "#0"} + } + }, + { + "name": "Side2", + "from": [0, 2, 14], + "to": [16, 12, 16], + "faces": { + "north": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "east": {"uv": [16, 4, 14, 14], "texture": "#0"}, + "south": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "west": {"uv": [14, 4, 16, 14], "texture": "#0"} + } + }, + { + "name": "Top", + "from": [0, 12, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 4], "texture": "#4"}, + "east": {"uv": [0, 0, 16, 4], "texture": "#4"}, + "south": {"uv": [0, 0, 16, 4], "texture": "#4"}, + "west": {"uv": [0, 0, 16, 4], "texture": "#4"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#2"} + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/normal/item.json b/src/main/resources/assets/create/models/block/mechanical_piston/normal/item.json index 590db2785..cd76185dc 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston/normal/item.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/normal/item.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/gearbox_top", + "0": "create:block/andesite_casing_piston", "1": "create:block/piston_bottom", "2": "create:block/gearbox", "3": "create:block/piston_inner", @@ -22,7 +22,7 @@ "east": {"uv": [0, 14, 16, 16], "texture": "#0"}, "south": {"uv": [0, 14, 16, 16], "texture": "#0"}, "west": {"uv": [0, 14, 16, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#2"}, "down": {"uv": [0, 0, 16, 16], "texture": "#1"} } }, @@ -41,10 +41,10 @@ "from": [0, 2, 0], "to": [2, 12, 16], "faces": { - "north": {"uv": [14, 0, 16, 10], "texture": "#0"}, - "east": {"uv": [0, 0, 16, 10], "texture": "#0"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#0"}, - "west": {"uv": [0, 0, 16, 10], "texture": "#0"} + "north": {"uv": [14, 4, 16, 14], "texture": "#0"}, + "east": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "south": {"uv": [16, 4, 14, 14], "texture": "#0"}, + "west": {"uv": [0, 4, 16, 14], "texture": "#0"} } }, { @@ -52,10 +52,10 @@ "from": [14, 2, 0], "to": [16, 12, 16], "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#0"}, - "east": {"uv": [0, 0, 16, 10], "texture": "#0"}, - "south": {"uv": [14, 0, 16, 10], "texture": "#0"}, - "west": {"uv": [0, 0, 16, 10], "texture": "#0"} + "north": {"uv": [16, 4, 14, 14], "texture": "#0"}, + "east": {"uv": [0, 4, 16, 14], "texture": "#0"}, + "south": {"uv": [14, 4, 16, 14], "texture": "#0"}, + "west": {"uv": [0, 4, 16, 14], "texture": "#0"} } }, { @@ -85,10 +85,16 @@ } } ], - "groups": [0, 1, 2, 3, 4, + "groups": [ + 0, + 1, + 2, + 3, + 4, { "name": "shaft", "origin": [8, 8, 8], + "color": 0, "children": [5] } ] diff --git a/src/main/resources/assets/create/models/block/mechanical_press/item.json b/src/main/resources/assets/create/models/block/mechanical_press/item.json index 28d22b00d..751c66047 100644 --- a/src/main/resources/assets/create/models/block/mechanical_press/item.json +++ b/src/main/resources/assets/create/models/block/mechanical_press/item.json @@ -5,13 +5,13 @@ "0": "create:block/axis", "1": "create:block/axis_top", "8": "create:block/mechanical_press_side", + "particle": "create:block/mechanical_press_side", "mechanical_press_head": "create:block/mechanical_press_head", "gearbox_top": "create:block/gearbox_top", "mechanical_press_pole": "create:block/mechanical_press_pole", "gearbox": "create:block/gearbox", "mechanical_press_top": "create:block/mechanical_press_top", - "mechanical_press_bottom": "create:block/mechanical_press_bottom", - "particle": "create:block/mechanical_press_side" + "mechanical_press_bottom": "create:block/mechanical_press_bottom" }, "elements": [ { @@ -44,7 +44,7 @@ "faces": { "north": {"uv": [0, 2, 2, 14], "texture": "#gearbox_top"}, "east": {"uv": [0, 2, 16, 14], "texture": "#8"}, - "south": {"uv": [14, 2, 16, 14], "texture": "#gearbox_top"}, + "south": {"uv": [14, 4, 16, 16], "texture": "#gearbox_top"}, "west": {"uv": [0, 2, 16, 14], "texture": "#8"}, "down": {"uv": [0, 0, 2, 16], "rotation": 180, "texture": "#gearbox_top"} } @@ -54,9 +54,9 @@ "from": [0, 6, 0], "to": [2, 18, 16], "faces": { - "north": {"uv": [14, 2, 16, 14], "texture": "#gearbox_top"}, + "north": {"uv": [14, 4, 16, 16], "texture": "#gearbox_top"}, "east": {"uv": [0, 2, 16, 14], "texture": "#8"}, - "south": {"uv": [0, 2, 2, 14], "texture": "#gearbox_top"}, + "south": {"uv": [0, 4, 2, 16], "texture": "#gearbox_top"}, "west": {"uv": [0, 2, 16, 14], "texture": "#8"}, "down": {"uv": [14, 0, 16, 16], "rotation": 180, "texture": "#gearbox_top"} } @@ -164,10 +164,22 @@ "scale": [0.5, 0.5, 0.5] } }, - "groups": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, + "groups": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, { "name": "shaft", "origin": [8, 8, 8], + "color": 0, "children": [11] } ] diff --git a/src/main/resources/assets/create/models/block/nozzle/block.json b/src/main/resources/assets/create/models/block/nozzle/block.json index 4e7d9ddb4..f22e9c9d6 100644 --- a/src/main/resources/assets/create/models/block/nozzle/block.json +++ b/src/main/resources/assets/create/models/block/nozzle/block.json @@ -86,6 +86,7 @@ { "name": "ItemCollector", "origin": [8, 8, 24], + "color": 0, "children": [0, 1, 2, 3, 4, 5] } ] diff --git a/src/main/resources/assets/create/models/block/nozzle/item.json b/src/main/resources/assets/create/models/block/nozzle/item.json index c201740ba..c6c552707 100644 --- a/src/main/resources/assets/create/models/block/nozzle/item.json +++ b/src/main/resources/assets/create/models/block/nozzle/item.json @@ -3,10 +3,10 @@ "parent": "block/block", "textures": { "3": "create:block/net", + "particle": "create:block/net", "back": "create:block/gearbox", "fan_casing": "create:block/fan_casing", - "fan_side": "create:block/fan_side", - "particle": "create:block/net" + "fan_side": "create:block/fan_side" }, "elements": [ { @@ -16,9 +16,9 @@ "rotation": {"angle": 0, "axis": "x", "origin": [8, 9, 8]}, "faces": { "north": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#fan_side"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#fan_side"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#fan_side"}, - "west": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#fan_side"}, + "east": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#fan_side"}, + "south": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#fan_side"}, + "west": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#fan_side"}, "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#fan_casing"}, "down": {"uv": [0, 0, 16, 16], "texture": "#fan_casing"} } @@ -34,7 +34,7 @@ "south": {"uv": [0, 2, 14, 14], "rotation": 270, "texture": "#3"}, "west": {"uv": [0, 2, 14, 14], "rotation": 270, "texture": "#3"}, "up": {"uv": [0, 2, 12, 14], "rotation": 180, "texture": "#3"}, - "down": {"uv": [0, 0, 12, 12], "texture": "#3"} + "down": {"uv": [0, 2, 12, 14], "texture": "#3"} } }, { @@ -108,6 +108,7 @@ { "name": "ItemCollector", "origin": [8, 8, 24], + "color": 0, "children": [0, 1, 2, 3, 4, 5, 6] } ] diff --git a/src/main/resources/assets/create/models/block/portable_storage_interface/block_middle.json b/src/main/resources/assets/create/models/block/portable_storage_interface/block_middle.json index 33d29a3ef..a894bb948 100644 --- a/src/main/resources/assets/create/models/block/portable_storage_interface/block_middle.json +++ b/src/main/resources/assets/create/models/block/portable_storage_interface/block_middle.json @@ -14,7 +14,7 @@ "east": {"uv": [1, 3.5, 7, 8], "texture": "#0"}, "south": {"uv": [1, 3.5, 7, 8], "texture": "#0"}, "west": {"uv": [1, 3.5, 7, 8], "texture": "#0"}, - "up": {"uv": [1.5, 3.5, 2, 4], "texture": "#0"} + "up": {"uv": [1.5, 4.5, 2, 5], "texture": "#0"} } } ], @@ -22,6 +22,7 @@ { "name": "Middle", "origin": [10, 22, 10], + "color": 0, "children": [0] } ] diff --git a/src/main/resources/assets/create/models/block/portable_storage_interface/block_middle_powered.json b/src/main/resources/assets/create/models/block/portable_storage_interface/block_middle_powered.json index c64e3e1f3..244141fcb 100644 --- a/src/main/resources/assets/create/models/block/portable_storage_interface/block_middle_powered.json +++ b/src/main/resources/assets/create/models/block/portable_storage_interface/block_middle_powered.json @@ -14,7 +14,7 @@ "east": {"uv": [9, 3.5, 15, 8], "texture": "#0"}, "south": {"uv": [9, 3.5, 15, 8], "texture": "#0"}, "west": {"uv": [9, 3.5, 15, 8], "texture": "#0"}, - "up": {"uv": [1.5, 3.5, 2, 4], "texture": "#0"} + "up": {"uv": [1.5, 4.5, 2, 5], "texture": "#0"} } } ], @@ -22,6 +22,7 @@ { "name": "Middle", "origin": [10, 22, 10], + "color": 0, "children": [0] } ] diff --git a/src/main/resources/assets/create/models/block/portable_storage_interface/item.json b/src/main/resources/assets/create/models/block/portable_storage_interface/item.json index c4d1328a4..81d707160 100644 --- a/src/main/resources/assets/create/models/block/portable_storage_interface/item.json +++ b/src/main/resources/assets/create/models/block/portable_storage_interface/item.json @@ -15,7 +15,7 @@ "east": {"uv": [1, 3.5, 7, 8], "texture": "#0"}, "south": {"uv": [1, 3.5, 7, 8], "texture": "#0"}, "west": {"uv": [1, 3.5, 7, 8], "texture": "#0"}, - "up": {"uv": [1.5, 3.5, 2, 4], "texture": "#0"} + "up": {"uv": [1.5, 4.5, 2, 5], "texture": "#0"} } }, { diff --git a/src/main/resources/assets/create/models/block/rope_pulley/block.json b/src/main/resources/assets/create/models/block/rope_pulley/block.json index a7d302af7..44db60bdc 100644 --- a/src/main/resources/assets/create/models/block/rope_pulley/block.json +++ b/src/main/resources/assets/create/models/block/rope_pulley/block.json @@ -15,9 +15,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, "faces": { "north": {"uv": [2, 2, 14, 14], "texture": "#4"}, - "south": {"uv": [2, 2, 14, 14], "texture": "#4"}, - "up": {"uv": [0, 0, 1, 12], "rotation": 270, "texture": "#3"}, - "down": {"uv": [2, 11, 14, 12], "texture": "#4"} + "south": {"uv": [2, 2, 14, 14], "texture": "#4"} } }, { @@ -27,9 +25,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, "faces": { "north": {"uv": [14, 2, 2, 14], "texture": "#4"}, - "south": {"uv": [14, 2, 2, 14], "texture": "#4"}, - "up": {"uv": [1, 0, 0, 12], "rotation": 270, "texture": "#3"}, - "down": {"uv": [2, 12, 14, 11], "texture": "#4"} + "south": {"uv": [14, 2, 2, 14], "texture": "#4"} } }, { @@ -41,7 +37,7 @@ "north": {"uv": [14, 2, 16, 14], "texture": "#4"}, "east": {"uv": [0, 2, 2, 14], "texture": "#4"}, "south": {"uv": [0, 2, 2, 14], "texture": "#4"}, - "west": {"uv": [14, 2, 16, 14], "texture": "#4"}, + "west": {"uv": [2, 2, 0, 14], "texture": "#4"}, "up": {"uv": [0, 14, 2, 16], "texture": "#4"}, "down": {"uv": [0, 0, 2, 2], "texture": "#4"} } @@ -55,7 +51,7 @@ "north": {"uv": [2, 2, 0, 14], "texture": "#4"}, "east": {"uv": [2, 2, 0, 14], "texture": "#4"}, "south": {"uv": [16, 2, 14, 14], "texture": "#4"}, - "west": {"uv": [16, 2, 14, 14], "texture": "#4"}, + "west": {"uv": [0, 2, 2, 14], "texture": "#4"}, "up": {"uv": [0, 16, 2, 14], "texture": "#4"}, "down": {"uv": [0, 2, 2, 0], "texture": "#4"} } @@ -98,7 +94,7 @@ "east": {"uv": [0, 14, 2, 16], "texture": "#4"}, "south": {"uv": [0, 14, 16, 16], "texture": "#4"}, "west": {"uv": [14, 14, 16, 16], "texture": "#4"}, - "up": {"uv": [0, 0, 12, 2], "texture": "#4"}, + "up": {"uv": [0, 2, 16, 0], "texture": "#4"}, "down": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#3"} } }, @@ -109,11 +105,11 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]}, "faces": { "north": {"uv": [0, 16, 16, 14], "texture": "#4"}, - "east": {"uv": [0, 16, 2, 14], "texture": "#4"}, - "south": {"uv": [0, 16, 16, 14], "texture": "#4"}, - "west": {"uv": [14, 16, 16, 14], "texture": "#4"}, - "up": {"uv": [0, 16, 16, 14], "rotation": 180, "texture": "#3"}, - "down": {"uv": [0, 2, 12, 0], "texture": "#4"} + "east": {"uv": [0, 0, 2, 2], "texture": "#4"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#4"}, + "west": {"uv": [2, 0, 0, 2], "texture": "#4"}, + "up": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#3"}, + "down": {"uv": [0, 0, 16, 2], "texture": "#4"} } }, { @@ -126,7 +122,7 @@ "east": {"uv": [2, 14, 0, 16], "texture": "#4"}, "south": {"uv": [16, 14, 0, 16], "texture": "#4"}, "west": {"uv": [16, 14, 14, 16], "texture": "#4"}, - "up": {"uv": [0, 2, 12, 0], "texture": "#4"}, + "up": {"uv": [0, 0, 16, 2], "texture": "#4"}, "down": {"uv": [0, 14, 16, 16], "texture": "#3"} } }, @@ -136,12 +132,12 @@ "to": [16, 16, 2], "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]}, "faces": { - "north": {"uv": [16, 16, 0, 14], "texture": "#4"}, - "east": {"uv": [2, 16, 0, 14], "texture": "#4"}, + "north": {"uv": [16, 0, 0, 2], "texture": "#4"}, + "east": {"uv": [2, 0, 0, 2], "texture": "#4"}, "south": {"uv": [16, 16, 0, 14], "texture": "#4"}, - "west": {"uv": [16, 16, 14, 14], "texture": "#4"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#4"}, "up": {"uv": [0, 2, 16, 0], "rotation": 180, "texture": "#3"}, - "down": {"uv": [0, 0, 12, 2], "texture": "#4"} + "down": {"uv": [0, 2, 16, 0], "texture": "#4"} } }, { @@ -174,7 +170,7 @@ "to": [15, 15, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, "faces": { - "east": {"uv": [14, 16, 2, 14], "texture": "#3"}, + "east": {"uv": [14, 2, 2, 0], "texture": "#3"}, "west": {"uv": [14, 2, 2, 0], "texture": "#3"}, "up": {"uv": [14, 16, 2, 14], "rotation": 90, "texture": "#3"}, "down": {"uv": [14, 2, 2, 0], "rotation": 90, "texture": "#3"} @@ -187,7 +183,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, "faces": { "east": {"uv": [2, 2, 14, 0], "texture": "#3"}, - "west": {"uv": [2, 16, 14, 14], "texture": "#3"}, + "west": {"uv": [2, 2, 14, 0], "texture": "#3"}, "up": {"uv": [14, 14, 2, 16], "rotation": 90, "texture": "#3"}, "down": {"uv": [14, 0, 2, 2], "rotation": 90, "texture": "#3"} } diff --git a/src/main/resources/assets/create/models/block/rope_pulley/item.json b/src/main/resources/assets/create/models/block/rope_pulley/item.json index d0d9994c9..a2bf64f48 100644 --- a/src/main/resources/assets/create/models/block/rope_pulley/item.json +++ b/src/main/resources/assets/create/models/block/rope_pulley/item.json @@ -52,6 +52,47 @@ "down": {"uv": [0, 0, 4, 9], "rotation": 90, "texture": "#5"} } }, + { + "name": "Axis", + "from": [6, 6, 0], + "to": [10, 10, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [24, 1, -8]}, + "faces": { + "north": {"uv": [6, 6, 10, 10], "rotation": 180, "texture": "#1"}, + "east": {"uv": [6, 0, 10, 16], "rotation": 90, "texture": "#0"}, + "south": {"uv": [6, 6, 10, 10], "texture": "#1"}, + "west": {"uv": [6, 0, 10, 16], "rotation": 270, "texture": "#0"}, + "up": {"uv": [6, 0, 10, 16], "texture": "#0"}, + "down": {"uv": [6, 0, 10, 16], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "rope", + "from": [6.1, 2, 6], + "to": [10.1, 8, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [23.75, 0, -8]}, + "faces": { + "north": {"uv": [12, 8, 16, 14], "texture": "#6"}, + "east": {"uv": [12, 8, 16, 14], "texture": "#6"}, + "south": {"uv": [12, 8, 16, 14], "texture": "#6"}, + "west": {"uv": [12, 8, 16, 14], "texture": "#6"}, + "up": {"uv": [12, 0, 16, 4], "rotation": 90, "texture": "#6"} + } + }, + { + "name": "magnet", + "from": [3.1, 0, 3], + "to": [13.1, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [24, 23, -8]}, + "faces": { + "north": {"uv": [0, 10, 10, 12], "texture": "#6"}, + "east": {"uv": [0, 10, 10, 12], "texture": "#6"}, + "south": {"uv": [0, 10, 10, 12], "texture": "#6"}, + "west": {"uv": [0, 10, 10, 12], "texture": "#6"}, + "up": {"uv": [0, 0, 10, 10], "texture": "#6"}, + "down": {"uv": [0, 0, 10, 10], "texture": "#6"} + } + }, { "name": "side", "from": [2, 2, 14], @@ -59,9 +100,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, "faces": { "north": {"uv": [2, 2, 14, 14], "texture": "#4"}, - "south": {"uv": [2, 2, 14, 14], "texture": "#4"}, - "up": {"uv": [0, 0, 1, 12], "rotation": 270, "texture": "#3"}, - "down": {"uv": [2, 11, 14, 12], "texture": "#4"} + "south": {"uv": [2, 2, 14, 14], "texture": "#4"} } }, { @@ -71,9 +110,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, "faces": { "north": {"uv": [14, 2, 2, 14], "texture": "#4"}, - "south": {"uv": [14, 2, 2, 14], "texture": "#4"}, - "up": {"uv": [1, 0, 0, 12], "rotation": 270, "texture": "#3"}, - "down": {"uv": [2, 12, 14, 11], "texture": "#4"} + "south": {"uv": [14, 2, 2, 14], "texture": "#4"} } }, { @@ -82,12 +119,12 @@ "to": [2, 14, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, "faces": { - "north": {"uv": [14, 2, 16, 14], "texture": "#4"}, - "east": {"uv": [0, 2, 2, 14], "texture": "#4"}, - "south": {"uv": [0, 2, 2, 14], "texture": "#4"}, - "west": {"uv": [14, 2, 16, 14], "texture": "#4"}, - "up": {"uv": [0, 14, 2, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#4"} + "north": {"uv": [14, 2, 16, 14], "texture": "#3"}, + "east": {"uv": [0, 2, 2, 14], "texture": "#3"}, + "south": {"uv": [0, 2, 2, 14], "texture": "#3"}, + "west": {"uv": [2, 2, 0, 14], "texture": "#3"}, + "up": {"uv": [0, 14, 2, 16], "texture": "#3"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#3"} } }, { @@ -96,12 +133,12 @@ "to": [2, 14, 2], "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, "faces": { - "north": {"uv": [2, 2, 0, 14], "texture": "#4"}, - "east": {"uv": [2, 2, 0, 14], "texture": "#4"}, - "south": {"uv": [16, 2, 14, 14], "texture": "#4"}, - "west": {"uv": [16, 2, 14, 14], "texture": "#4"}, - "up": {"uv": [0, 16, 2, 14], "texture": "#4"}, - "down": {"uv": [0, 2, 2, 0], "texture": "#4"} + "north": {"uv": [2, 2, 0, 14], "texture": "#3"}, + "east": {"uv": [2, 2, 0, 14], "texture": "#3"}, + "south": {"uv": [16, 2, 14, 14], "texture": "#3"}, + "west": {"uv": [0, 2, 2, 14], "texture": "#3"}, + "up": {"uv": [0, 16, 2, 14], "texture": "#3"}, + "down": {"uv": [0, 2, 2, 0], "texture": "#3"} } }, { @@ -110,12 +147,12 @@ "to": [16, 14, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, "faces": { - "north": {"uv": [2, 2, 0, 14], "rotation": 180, "texture": "#4"}, + "north": {"uv": [2, 2, 0, 14], "rotation": 180, "texture": "#3"}, "east": {"uv": [2, 2, 0, 14], "rotation": 180, "texture": "#3"}, - "south": {"uv": [16, 2, 14, 14], "rotation": 180, "texture": "#4"}, - "west": {"uv": [2, 2, 0, 14], "texture": "#4"}, - "up": {"uv": [2, 14, 0, 16], "texture": "#4"}, - "down": {"uv": [2, 0, 0, 2], "texture": "#4"} + "south": {"uv": [16, 2, 14, 14], "rotation": 180, "texture": "#3"}, + "west": {"uv": [2, 2, 0, 14], "texture": "#3"}, + "up": {"uv": [2, 14, 0, 16], "texture": "#3"}, + "down": {"uv": [2, 0, 0, 2], "texture": "#3"} } }, { @@ -124,12 +161,12 @@ "to": [16, 14, 2], "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, "faces": { - "north": {"uv": [14, 2, 16, 14], "rotation": 180, "texture": "#4"}, + "north": {"uv": [14, 2, 16, 14], "rotation": 180, "texture": "#3"}, "east": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#3"}, - "south": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#4"}, - "west": {"uv": [0, 2, 2, 14], "texture": "#4"}, - "up": {"uv": [2, 16, 0, 14], "texture": "#4"}, - "down": {"uv": [2, 2, 0, 0], "texture": "#4"} + "south": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#3"}, + "west": {"uv": [0, 2, 2, 14], "texture": "#3"}, + "up": {"uv": [2, 16, 0, 14], "texture": "#3"}, + "down": {"uv": [2, 2, 0, 0], "texture": "#3"} } }, { @@ -138,11 +175,11 @@ "to": [16, 2, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#4"}, - "east": {"uv": [0, 14, 2, 16], "texture": "#4"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#4"}, - "west": {"uv": [14, 14, 16, 16], "texture": "#4"}, - "up": {"uv": [0, 0, 12, 2], "texture": "#4"}, + "north": {"uv": [0, 14, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 14, 2, 16], "texture": "#3"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#3"}, + "west": {"uv": [14, 14, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 2, 16, 0], "texture": "#3"}, "down": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#3"} } }, @@ -152,12 +189,12 @@ "to": [16, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]}, "faces": { - "north": {"uv": [0, 16, 16, 14], "texture": "#4"}, - "east": {"uv": [0, 16, 2, 14], "texture": "#4"}, - "south": {"uv": [0, 16, 16, 14], "texture": "#4"}, - "west": {"uv": [14, 16, 16, 14], "texture": "#4"}, - "up": {"uv": [0, 16, 16, 14], "rotation": 180, "texture": "#3"}, - "down": {"uv": [0, 2, 12, 0], "texture": "#4"} + "north": {"uv": [0, 16, 16, 14], "texture": "#3"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#3"}, + "west": {"uv": [2, 0, 0, 2], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#3"}, + "down": {"uv": [0, 0, 16, 2], "texture": "#3"} } }, { @@ -166,11 +203,11 @@ "to": [16, 2, 2], "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, "faces": { - "north": {"uv": [16, 14, 0, 16], "texture": "#4"}, - "east": {"uv": [2, 14, 0, 16], "texture": "#4"}, - "south": {"uv": [16, 14, 0, 16], "texture": "#4"}, - "west": {"uv": [16, 14, 14, 16], "texture": "#4"}, - "up": {"uv": [0, 2, 12, 0], "texture": "#4"}, + "north": {"uv": [16, 14, 0, 16], "texture": "#3"}, + "east": {"uv": [2, 14, 0, 16], "texture": "#3"}, + "south": {"uv": [16, 14, 0, 16], "texture": "#3"}, + "west": {"uv": [16, 14, 14, 16], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 2], "texture": "#3"}, "down": {"uv": [0, 14, 16, 16], "texture": "#3"} } }, @@ -180,12 +217,12 @@ "to": [16, 16, 2], "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]}, "faces": { - "north": {"uv": [16, 16, 0, 14], "texture": "#4"}, - "east": {"uv": [2, 16, 0, 14], "texture": "#4"}, - "south": {"uv": [16, 16, 0, 14], "texture": "#4"}, - "west": {"uv": [16, 16, 14, 14], "texture": "#4"}, + "north": {"uv": [16, 0, 0, 2], "texture": "#3"}, + "east": {"uv": [2, 0, 0, 2], "texture": "#3"}, + "south": {"uv": [16, 16, 0, 14], "texture": "#3"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#3"}, "up": {"uv": [0, 2, 16, 0], "rotation": 180, "texture": "#3"}, - "down": {"uv": [0, 0, 12, 2], "texture": "#4"} + "down": {"uv": [0, 2, 16, 0], "texture": "#3"} } }, { @@ -218,7 +255,7 @@ "to": [15, 15, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, "faces": { - "east": {"uv": [14, 16, 2, 14], "texture": "#3"}, + "east": {"uv": [14, 2, 2, 0], "texture": "#3"}, "west": {"uv": [14, 2, 2, 0], "texture": "#3"}, "up": {"uv": [14, 16, 2, 14], "rotation": 90, "texture": "#3"}, "down": {"uv": [14, 2, 2, 0], "rotation": 90, "texture": "#3"} @@ -231,52 +268,11 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, "faces": { "east": {"uv": [2, 2, 14, 0], "texture": "#3"}, - "west": {"uv": [2, 16, 14, 14], "texture": "#3"}, + "west": {"uv": [2, 2, 14, 0], "texture": "#3"}, "up": {"uv": [14, 14, 2, 16], "rotation": 90, "texture": "#3"}, "down": {"uv": [14, 0, 2, 2], "rotation": 90, "texture": "#3"} } }, - { - "name": "Axis", - "from": [6, 6, 0], - "to": [10, 10, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, - "faces": { - "north": {"uv": [6, 6, 10, 10], "rotation": 180, "texture": "#1"}, - "east": {"uv": [6, 0, 10, 16], "rotation": 90, "texture": "#0"}, - "south": {"uv": [6, 6, 10, 10], "texture": "#1"}, - "west": {"uv": [6, 0, 10, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [6, 0, 10, 16], "texture": "#0"}, - "down": {"uv": [6, 0, 10, 16], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "rope", - "from": [6, 2, 6], - "to": [10, 8, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [7.75, 0, 8]}, - "faces": { - "north": {"uv": [12, 8, 16, 14], "texture": "#6"}, - "east": {"uv": [12, 8, 16, 14], "texture": "#6"}, - "south": {"uv": [12, 8, 16, 14], "texture": "#6"}, - "west": {"uv": [12, 8, 16, 14], "texture": "#6"}, - "up": {"uv": [12, 0, 16, 4], "rotation": 90, "texture": "#6"} - } - }, - { - "name": "magnet", - "from": [3, 0, 3], - "to": [13, 2, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, - "faces": { - "north": {"uv": [0, 10, 10, 12], "texture": "#6"}, - "east": {"uv": [0, 10, 10, 12], "texture": "#6"}, - "south": {"uv": [0, 10, 10, 12], "texture": "#6"}, - "west": {"uv": [0, 10, 10, 12], "texture": "#6"}, - "up": {"uv": [0, 0, 10, 10], "texture": "#6"}, - "down": {"uv": [0, 0, 10, 10], "texture": "#6"} - } - }, { "name": "top", "from": [2, 14, 2], @@ -321,15 +317,36 @@ "scale": [0.5, 0.5, 0.5] } }, - "groups": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + "groups": [ + 0, + 1, + 2, { "name": "shaft", "origin": [8, 8, 8], - "children": [17] + "color": 0, + "children": [3] }, { "name": "rope_half_magnet", "origin": [8, 8, 8], - "children": [18, 19] - }, 20] + "color": 0, + "children": [4, 5] + }, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20 + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/turntable.json b/src/main/resources/assets/create/models/block/turntable.json index 1246264c6..683b4b8f9 100644 --- a/src/main/resources/assets/create/models/block/turntable.json +++ b/src/main/resources/assets/create/models/block/turntable.json @@ -4,7 +4,6 @@ "textures": { "0": "create:block/axis", "1": "block/stripped_spruce_log", - "2": "block/stripped_spruce_log_top", "3": "create:block/axis_top", "5": "create:block/gearbox_top", "6": "create:block/encased_chain_drive", @@ -25,29 +24,15 @@ }, { "name": "GearCaseInner", - "from": [1, 5.9, 1], + "from": [1, 3.9, 1], "to": [15, 7.9, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.9, 8]}, "faces": { - "north": {"uv": [1, 1, 15, 3], "texture": "#6"}, - "east": {"uv": [1, 1, 15, 3], "texture": "#6"}, - "south": {"uv": [1, 1, 15, 3], "texture": "#6"}, - "west": {"uv": [1, 1, 15, 3], "texture": "#6"}, + "north": {"uv": [1, 1, 15, 5], "texture": "#6"}, + "east": {"uv": [1, 1, 15, 5], "texture": "#6"}, + "south": {"uv": [1, 1, 15, 5], "texture": "#6"}, + "west": {"uv": [1, 1, 15, 5], "texture": "#6"}, "up": {"uv": [1, 1, 15, 15], "texture": "#5"}, - "down": {"uv": [1, 1, 15, 15], "texture": "#2"} - } - }, - { - "name": "GearCaseInner", - "from": [1, 3.9, 1], - "to": [15, 5.9, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.9, 8]}, - "faces": { - "north": {"uv": [1, 3, 15, 5], "texture": "#6"}, - "east": {"uv": [1, 3, 15, 5], "texture": "#6"}, - "south": {"uv": [1, 3, 15, 5], "texture": "#6"}, - "west": {"uv": [1, 3, 15, 5], "texture": "#6"}, - "up": {"uv": [1, 1, 15, 15], "texture": "#2"}, "down": {"uv": [1, 1, 15, 15], "texture": "#1"} } } diff --git a/src/main/resources/assets/create/models/block/weighted_ejector/block.json b/src/main/resources/assets/create/models/block/weighted_ejector/block.json index 962f1426d..e11dd6244 100644 --- a/src/main/resources/assets/create/models/block/weighted_ejector/block.json +++ b/src/main/resources/assets/create/models/block/weighted_ejector/block.json @@ -81,11 +81,11 @@ "from": [12, 9.5, -0.5], "to": [14, 12.5, 2.5], "faces": { - "north": {"uv": [8, 0, 9, 1.5], "texture": "#3"}, + "north": {"uv": [9, 0, 8, 1.5], "texture": "#3"}, "east": {"uv": [14, 0, 15.5, 1.5], "texture": "#3"}, - "south": {"uv": [8, 0, 9, 1.5], "rotation": 180, "texture": "#3"}, + "south": {"uv": [9, 0, 8, 1.5], "rotation": 180, "texture": "#3"}, "west": {"uv": [14, 0, 15.5, 1.5], "texture": "#3"}, - "up": {"uv": [8, 0, 9, 1.5], "rotation": 180, "texture": "#3"}, + "up": {"uv": [8, 0, 9, 1.5], "texture": "#3"}, "down": {"uv": [8, 0, 9, 1.5], "rotation": 180, "texture": "#3"} } }, @@ -106,6 +106,7 @@ { "name": "casing", "origin": [0, 0, 0], + "color": 0, "children": [0, 1, 2, 3, 4, 5, 6, 7] } ] diff --git a/src/main/resources/assets/create/models/block/weighted_ejector/item.json b/src/main/resources/assets/create/models/block/weighted_ejector/item.json index ac666180d..9a64f9ae5 100644 --- a/src/main/resources/assets/create/models/block/weighted_ejector/item.json +++ b/src/main/resources/assets/create/models/block/weighted_ejector/item.json @@ -231,16 +231,19 @@ { "name": "Axle", "origin": [0, 0, 0], + "color": 0, "children": [0] }, { "name": "Panel", "origin": [0, 0, 0], + "color": 0, "children": [1, 2, 3, 4, 5, 6, 7, 8, 9] }, { "name": "casing", "origin": [0, 0, 0], + "color": 0, "children": [10, 11, 12, 13, 14, 15, 16, 17] } ] diff --git a/src/main/resources/assets/create/models/block/weighted_ejector/top.json b/src/main/resources/assets/create/models/block/weighted_ejector/top.json index 4aad7bdc9..e17f41781 100644 --- a/src/main/resources/assets/create/models/block/weighted_ejector/top.json +++ b/src/main/resources/assets/create/models/block/weighted_ejector/top.json @@ -120,6 +120,7 @@ { "name": "Panel", "origin": [0, 0, 0], + "color": 0, "children": [0, 1, 2, 3, 4, 5, 6, 7, 8] } ] diff --git a/src/main/resources/assets/create/models/block/weighted_ejector/weighted depot.bbmodel b/src/main/resources/assets/create/models/block/weighted_ejector/weighted depot.bbmodel deleted file mode 100644 index 0305dd1ec..000000000 --- a/src/main/resources/assets/create/models/block/weighted_ejector/weighted depot.bbmodel +++ /dev/null @@ -1 +0,0 @@ -{"meta":{"format_version":"3.6","creation_time":1616422453,"model_format":"java_block","box_uv":false},"name":"block","parent":"","ambientocclusion":true,"front_gui_light":false,"visible_box":[1,1,0],"resolution":{"width":16,"height":16},"elements":[{"name":"cube","rescale":false,"from":[0,2,14],"to":[16,11,16],"autouv":0,"color":3,"locked":false,"origin":[8,7.25,8],"faces":{"north":{"uv":[0,10.5,8,15],"texture":3},"east":{"uv":[0,10.5,1,15],"texture":3},"south":{"uv":[0,10.5,8,15],"texture":3},"west":{"uv":[7,10.5,8,15],"texture":3},"up":{"uv":[0,7,8,8],"texture":3},"down":{"uv":[0,0,0,0],"rotation":180,"texture":null}},"uuid":"a674be97-1571-0e0b-9250-c02dc00a2797"},{"name":"cube","rescale":false,"from":[0,0,0],"to":[16,2,16],"autouv":0,"color":3,"locked":false,"origin":[8,7.25,8],"faces":{"north":{"uv":[0,15,8,16],"texture":3},"east":{"uv":[0,15,8,16],"texture":3},"south":{"uv":[0,15,8,16],"texture":3},"west":{"uv":[0,15,8,16],"texture":3},"up":{"uv":[0,0,16,16],"rotation":270,"texture":7},"down":{"uv":[0,0,16,16],"rotation":270,"texture":7}},"uuid":"c48d3cb9-83e0-0ec6-129d-3e6e43fb49ab"},{"name":"cube","rescale":false,"from":[1,2,2],"to":[15,11,14],"autouv":0,"color":3,"locked":false,"origin":[8,7.25,8],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[9,2.5,15,7],"texture":3},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[9,2.5,15,7],"texture":3},"up":{"uv":[0.5,1,7.5,7],"texture":3},"down":{"uv":[0,0,14,12],"rotation":180,"texture":null}},"uuid":"5e95266f-b869-61ca-589e-903db5b8aa74"},{"name":"cube","rescale":false,"from":[12,11,5],"to":[15,12,11],"autouv":0,"color":3,"locked":false,"origin":[8,7.25,8],"faces":{"north":{"uv":[6,2,7.5,2.5],"rotation":180,"texture":3},"east":{"uv":[10.5,2,13.5,2.5],"texture":3},"south":{"uv":[6,5.5,7.5,6],"texture":3},"west":{"uv":[6,2.5,6.5,5.5],"rotation":90,"texture":3},"up":{"uv":[6,2.5,7.5,5.5],"texture":3},"down":{"uv":[0,0,0,0],"rotation":180,"texture":null}},"uuid":"106c49a4-7dc1-3b19-2f15-62f1d86e5293"},{"name":"cube","rescale":false,"from":[1,11,5],"to":[4,12,11],"autouv":0,"color":3,"locked":false,"origin":[8,7.25,8],"faces":{"north":{"uv":[6,5.5,7.5,6],"texture":3},"east":{"uv":[6,2.5,6.5,5.5],"rotation":90,"texture":3},"south":{"uv":[6,2,7.5,2.5],"rotation":180,"texture":3},"west":{"uv":[10.5,2,13.5,2.5],"texture":3},"up":{"uv":[6,2.5,7.5,5.5],"rotation":180,"texture":3},"down":{"uv":[0,0,0,0],"texture":null}},"uuid":"a3bc1576-a101-cc4c-0845-f0392b61c6e3"},{"name":"cube","rescale":false,"from":[0,2,0],"to":[16,11,2],"autouv":0,"color":3,"locked":false,"origin":[8,7.25,8],"faces":{"north":{"uv":[8,10.5,16,15],"texture":3},"east":{"uv":[7,10.5,8,15],"texture":3},"south":{"uv":[0,10.5,8,15],"texture":3},"west":{"uv":[0,10.5,1,15],"texture":3},"up":{"uv":[0,0,8,1],"texture":3},"down":{"uv":[0,0,0,0],"rotation":180,"texture":null}},"uuid":"2152c06f-ea59-15eb-3822-e035c2f43d08"},{"name":"cube","rescale":false,"from":[12,9.5,-0.5],"to":[14,12.5,2.5],"autouv":0,"color":4,"locked":false,"origin":[0,0,0],"faces":{"north":{"uv":[8,0,9,1.5],"texture":3},"east":{"uv":[14,0,15.5,1.5],"texture":3},"south":{"uv":[8,0,9,1.5],"rotation":180,"texture":3},"west":{"uv":[14,0,15.5,1.5],"texture":3},"up":{"uv":[8,0,9,1.5],"rotation":180,"texture":3},"down":{"uv":[8,0,9,1.5],"rotation":180,"texture":3}},"uuid":"10f7f63f-0c8b-5146-0935-762444523f31"},{"name":"cube","rescale":false,"from":[2,9.5,-0.5],"to":[4,12.5,2.5],"autouv":0,"color":4,"locked":false,"origin":[0,0,0],"faces":{"north":{"uv":[8,0,9,1.5],"texture":3},"east":{"uv":[14,0,15.5,1.5],"texture":3},"south":{"uv":[8,0,9,1.5],"rotation":180,"texture":3},"west":{"uv":[14,0,15.5,1.5],"texture":3},"up":{"uv":[8,0,9,1.5],"rotation":180,"texture":3},"down":{"uv":[8,0,9,1.5],"rotation":180,"texture":3}},"uuid":"afe59684-f9f0-ed62-87b6-b62cd840f2fb"},{"name":"cube","rescale":false,"from":[4,9.5,-0.5],"to":[12,12.5,2.5],"autouv":0,"color":4,"locked":false,"origin":[0,0,0],"faces":{"north":{"uv":[9,0,13,1.5],"texture":3},"east":{"uv":[12.5,0,13,0.5],"texture":3},"south":{"uv":[9,0,13,1.5],"texture":3},"west":{"uv":[12.5,0,13,0.5],"texture":3},"up":{"uv":[9,0,13,1.5],"rotation":180,"texture":3},"down":{"uv":[9,0,13,1.5],"texture":3}},"uuid":"6bd86311-c10a-fa98-5fa9-5b33da4930ca"},{"name":"cube","rescale":false,"from":[6,7,1],"to":[10,11,5],"autouv":0,"color":4,"locked":false,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[4,8,8,12],"texture":0},"south":{"uv":[5,10,9,14],"texture":2},"west":{"uv":[8,8,12,12],"texture":0},"up":{"uv":[0,0,0,0],"rotation":180,"texture":null},"down":{"uv":[5,10,9,14],"texture":2}},"uuid":"ee6630af-053d-e4d1-1164-e79131171389"},{"name":"cube","rescale":false,"from":[7.5,5,1],"to":[8.5,11,7],"autouv":0,"color":4,"locked":false,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[2,8,8,14],"texture":0},"south":{"uv":[13,8,14,14],"texture":0},"west":{"uv":[8,8,14,14],"texture":0},"up":{"uv":[0,0,0,0],"rotation":180,"texture":null},"down":{"uv":[13,4,14,10],"texture":0}},"uuid":"eca3e169-faa6-13fc-967c-1405b4e66f21"},{"name":"cube","rescale":false,"from":[0.9000000000000004,11,1],"to":[15.1,13,15],"autouv":0,"color":6,"locked":false,"origin":[0,0,0],"faces":{"north":{"uv":[1,14,15,16],"texture":4},"east":{"uv":[1,14,15,16],"texture":4},"south":{"uv":[1,14,15,16],"texture":4},"west":{"uv":[1,14,15,16],"texture":4},"up":{"uv":[1,0,15,14],"rotation":180,"texture":4},"down":{"uv":[1,1,15,15],"texture":5}},"uuid":"c49fdf59-60cf-5b45-76be-2529faf56110"},{"name":"cube","rescale":false,"from":[7,2,1],"to":[9,11,2],"autouv":0,"color":7,"locked":false,"origin":[8,11,1],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[3,0,4,9],"texture":2},"south":{"uv":[3,0,5,9],"texture":2},"west":{"uv":[3,0,4,9],"texture":2},"up":{"uv":[0,0,0,0],"texture":null},"down":{"uv":[3,0,5,1],"texture":2}},"uuid":"bea540c0-ba6b-2d4a-bd04-86f425a0c680"},{"name":"cube","rescale":false,"from":[7,2,0],"to":[9,11,2],"autouv":0,"color":7,"locked":false,"rotation":[-22.5,0,0],"origin":[8,11,1],"faces":{"north":{"uv":[3,0,5,9],"texture":2},"east":{"uv":[3,0,5,9],"texture":2},"south":{"uv":[3,0,5,9],"texture":2},"west":{"uv":[3,0,5,9],"texture":2},"up":{"uv":[0,0,2,2],"texture":2},"down":{"uv":[3,0,5,2],"texture":2}},"uuid":"3a040566-653a-4930-d68a-97ef0a1d4154"},{"name":"cube","rescale":false,"from":[7,2,0],"to":[9,11,2],"autouv":0,"color":7,"locked":false,"rotation":[-45,0,0],"origin":[8,11,1],"faces":{"north":{"uv":[3,0,5,9],"texture":2},"east":{"uv":[3,0,5,9],"texture":2},"south":{"uv":[3,0,5,9],"texture":2},"west":{"uv":[3,0,5,9],"texture":2},"up":{"uv":[0,0,2,2],"texture":2},"down":{"uv":[3,0,5,2],"texture":2}},"uuid":"b82cb1ef-cd34-c8d4-d895-98a664fa405d"},{"name":"cube","rescale":false,"from":[7,10,1],"to":[9,12,10],"autouv":0,"color":7,"locked":false,"rotation":[22.5,0,0],"origin":[8,11,1],"faces":{"north":{"uv":[0,0,2,2],"rotation":180,"texture":2},"east":{"uv":[3,0,5,9],"rotation":90,"texture":2},"south":{"uv":[3,0,5,2],"texture":2},"west":{"uv":[3,0,5,9],"rotation":270,"texture":2},"up":{"uv":[3,0,5,9],"texture":2},"down":{"uv":[3,0,5,9],"rotation":180,"texture":2}},"uuid":"1ada72dc-e226-60ac-da09-66ce88d11b19"},{"name":"cube","rescale":false,"from":[7,10,1],"to":[9,11,10],"autouv":0,"color":7,"locked":false,"origin":[8,11,1],"faces":{"north":{"uv":[0,0,0,0],"rotation":180,"texture":null},"east":{"uv":[3,0,4,9],"rotation":90,"texture":2},"south":{"uv":[3,0,5,1],"texture":2},"west":{"uv":[3,0,4,9],"rotation":270,"texture":2},"up":{"uv":[0,0,2,9],"texture":2},"down":{"uv":[3,0,5,9],"rotation":180,"texture":2}},"uuid":"5befc358-0247-08e3-e6d1-dfa841cdda05"},{"name":"cube","rescale":false,"from":[0,6,6],"to":[16,10,10],"autouv":0,"color":3,"locked":false,"origin":[0,0,0],"faces":{"north":{"uv":[6,0,10,16],"rotation":90,"texture":1},"east":{"uv":[6,6,10,10],"texture":6},"south":{"uv":[6,0,10,16],"rotation":90,"texture":1},"west":{"uv":[6,6,10,10],"texture":6},"up":{"uv":[6,0,10,16],"rotation":90,"texture":1},"down":{"uv":[6,0,10,16],"rotation":90,"texture":1}},"uuid":"cf15d7da-6f45-fd25-9080-d0c90c10f76b"}],"outliner":[{"name":"Axle","origin":[0,0,0],"uuid":"7ab30dad-c865-a77f-95f8-b93d379e090e","export":true,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["cf15d7da-6f45-fd25-9080-d0c90c10f76b"]},{"name":"Panel","origin":[0,0,0],"uuid":"6a669390-7a59-afc7-3d32-bba3ee3187cd","export":true,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["6bd86311-c10a-fa98-5fa9-5b33da4930ca","ee6630af-053d-e4d1-1164-e79131171389","eca3e169-faa6-13fc-967c-1405b4e66f21","c49fdf59-60cf-5b45-76be-2529faf56110","bea540c0-ba6b-2d4a-bd04-86f425a0c680","3a040566-653a-4930-d68a-97ef0a1d4154","b82cb1ef-cd34-c8d4-d895-98a664fa405d","1ada72dc-e226-60ac-da09-66ce88d11b19","5befc358-0247-08e3-e6d1-dfa841cdda05"]},{"name":"casing","origin":[0,0,0],"uuid":"cc99560f-632d-2dff-7155-065b2a90e320","export":true,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["a674be97-1571-0e0b-9250-c02dc00a2797","c48d3cb9-83e0-0ec6-129d-3e6e43fb49ab","5e95266f-b869-61ca-589e-903db5b8aa74","106c49a4-7dc1-3b19-2f15-62f1d86e5293","a3bc1576-a101-cc4c-0845-f0392b61c6e3","2152c06f-ea59-15eb-3822-e035c2f43d08","10f7f63f-0c8b-5146-0935-762444523f31","afe59684-f9f0-ed62-87b6-b62cd840f2fb"]}],"textures":[{"path":"D:\\simon\\Minecraft\\Minecraft Assets\\minecraft\\textures\\block\\stripped_spruce_log_top.png","name":"stripped_spruce_log_top.png","folder":"block","namespace":"minecraft","id":"0","particle":false,"visible":true,"mode":"bitmap","saved":true,"uuid":"bbdca491-2930-e433-fa37-d0f3a0984b2e","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABd0lEQVQ4T4VTXUsCURCd69quaGREGQkLuxBYBD1VWFREVD87gnoI6lUwCBQEJRHJMHE3lxtnltG7m+m8zN2Ze8+eMx/q7szTRESTSUTZrIUjG77FLMsipWZ3tCbSOs6rm6qrL/fd6WUcxkFIOcdmv1ZYoa/vH84jZtpjvU3q+sTVVwcu1VtdzjlOnn3RIRoEsTcNMVilXKD7WocUJJxXygxw6G9xMpyouYwk2OgOyS+t0kOtRer21NPH/iZ1BiEHQXuRQUZ/MKR8zqbXZm8mAcGNYgwAMJEBL7R3ijbXAQxwngJUd7f5EYKwZveTvNJ6goiZF7YsAUUEwGgcJhgATJjgjDxomxJeGr1ZDZYBCIM/EqSI8wBMDcIAMQHjGqCNR16yC0I9CEY8FzILaQmJIpoMlrVRusA1kEmUNpqjnAays5qHTACe3z+SADK60vdFTBKTeLFXnt6VSZRlQuK/hXp6a8dFxHpGUUSytniUXm/5g7nmmQzRL1QsAdCcJPRPAAAAAElFTkSuQmCC"},{"path":"C:\\Users\\simon\\Desktop\\Forge 15\\Create\\src\\main\\resources\\assets\\create\\textures\\block\\axis.png","name":"axis.png","folder":"block","namespace":"create","id":"1","particle":false,"visible":true,"mode":"bitmap","saved":true,"uuid":"b948b196-c141-2578-3238-7176bb64ee97","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAo0lEQVQ4T6WTIQ4EIQxFO4IRIECAgLshMBwKO+fCggWDZVOSSVbMJjulkpTH/+X3gB/lvZ/WWhhjQO8drus6nlofD7ExhDCFEOsOGcAYA+cc5JzfK4gxTnxdKQW1VhrgPE/QWu8pQAulFEgpvRvit4XWGg2AFjjnQAJgDqSUawYkC3eQUAEJgEEyxiwLpBxsA/AXMERYW0FCCyTAvUxkwL/r/AGRGnYRGJZooQAAAABJRU5ErkJggg=="},{"path":"D:\\simon\\Minecraft\\Minecraft Assets\\minecraft\\textures\\block\\stripped_spruce_log.png","name":"stripped_spruce_log.png","folder":"block","namespace":"minecraft","id":"2","particle":false,"visible":true,"mode":"bitmap","saved":true,"uuid":"fdfd493e-f0b7-20a0-8910-4706acab87bd","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABiklEQVQ4T12Tu07DQBBFx69sHIgipQAkCsQHUPApNPRUfDaioKGIFJngrF9BZ8xN4mzjxLtz5u694+Tt5ekwK3Irs8yWeWZFlljdHixPzX9vYmesMs38uQyJff5E/81KANwtFlYPva1D7oVVHAHdYP6e4k3b2E2YWVkkvs//pu1GwOPqyrtCZ5MiqUFB3ffeDQBQIF+/cQS8vz4f7hfBAS61GGUDOO+2Lmau6js2xvkJgE1JlGzvWOa278za/uQJhZyv+s7aYRgVyJCH63C8H4dQABCA1AFgFWlqu9iMHpACBXjAVZDJQipLXQGyT/c8SdwbB6zmwZ3mAN2qrvdNQYntdh5snpsDdM0JgE7EyDrPXrkDkBcAjh5IgYZFKUgRzqOAyJgXJTHxgCuwJFumykSKPrY7k1caIp9EUmCMNW26NwMl03gKQFIoosY9EEAK5D5mCSBFl7Oy3ccTQPI5pPgEUYwC6CNzwOXXiMM4z/O8UNMK3I2sO5sowAM2NP+KT4Ue8/+w6Wvk3R8qiEVpS5vUkAAAAABJRU5ErkJggg=="},{"path":"C:\\Users\\simon\\Desktop\\Forge 15\\Create\\src\\main\\resources\\assets\\create\\textures\\block\\weighted_ejector_casing.png","name":"weighted_ejector_casing.png","folder":"block","namespace":"create","id":"3","particle":false,"visible":true,"mode":"bitmap","saved":true,"uuid":"69183538-6a6b-157f-362b-f5995cbfb50f","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAE40lEQVRYR+1XX0xbZRT/ldv2tpf+uwULV4uFTgcDZmC6xJiQLCYumULi9jgjPqDGRH1xMb4Yn/SFB1/EZBpn4oOJ0WhciBrJthhnpokbkIEEZLA2bFS6Qf9Q2t7eW2vOd73tvR0MaX3ceem9p+d836/nO7/z+2oZeXmkBADT579GXlbocVdz8DZ0PvE0nE4nOHBQFAWJRAJut5vlkt9o8XgcoihCVVVIkoRsNgtBEDA6OmqxEIB94Yfw+di7u25sDHjutbcx+8cMglKQuSORCAKBQDmkUCiwZ7vdDgJA39GmtLnVamVgxsbGagdwfORNLC//yQDQwrNzs+jt7mWb0iZk5GfVnZ5GMKgB1UGYKtDZfRBnP3rPVIHkpraIbj63tphuz7zwBpaWr+HMx2cseypdVTA7gunfJ5HL5dhXwwMiLlxZwc14whT6QEBEd7sfE3Naaemc+w4f2hbAo/39Ja/PB4/Xy2K3MhlsrK/jytTUHWD3BOCxrlZ8O5kpAzhy9EkkE8kyeAJFP4bneUSiUazF4yy2JRBAeygEWZYZaDL9BzMA1xeXkcloC5/os2L8l2vY7ggOH5BwaYVncS6XCx0Ph9lCvT0Hkc3JEJw8zv04gfn5eazGYqYK3i9J6OnpwVODg1DzWrWpiRmA9fg60uk0cx7dl9sRwP6whGiumcV5PB4IboEdRSjUgctnT4O3cVDu68f4+DiKxaIJAMdxGBoagpCYAVBC77GXNACn3jpVWlpY+k8AqAJXk3cCIBpPjZ+Gz+PELb7rrgDc6VmkMnk8fuLVSgWqj2CnJqQeOLeo9REdQWtQYhUgjkcvfgm/V8BkvJGd/05H0G67ga2sgr7jr2Nh7t8K/DRxodwUzx5y4fL8X9uyoLoJO3sPMADBYAg/f/UBRJ8X0Yx7xyb8u1RCM24incpi8JV3NADVNCQAkXgS7QEfSqUScrKCFr+AmchtdLUF8MWvGyYa0gv1wOL5T9HkFQBLAy5e5yA0NkL0+9HQ0IB0KoVUMomBjiJUtYRUZguhgWHEYisaADrD3775EA+2imzxyFoCkt+FvKzCwVshODgsraYQCvggKyqyuUoJdQDUhC1NlRzK1Y3WsFut7NVisWAjtYXwkWE2SS0nnz9ZCof34+oPn8DltIPjgOhqEsEWEZmczJK8LhvWkgqaXHYoxSLsVo51MU1CMklqY/nEAivHsZiCUkReBcuhTRVVhaxUmPHIsRcrAHQe64g9oo896nzV/cR1MuK7zmPqAaogmdXhxFpsBU2ixhR6pzXWE7fhdLjLefrMoB/AjoCC9clklFLdR9/rfqPP6DeR3vDiE31sWuqf1XvVJSQ7bboX/z0A9yrAWFDNAL1j79bxxhx6Xrj0/Z4vtWww0SAy6jk5iae5/Cbjs85l8hOfW6Q2k56Tn/K/++x95AvKriDoRu2w20BXuvJ9wKjnNK1oohmnlj7h9FFq1PPq+8Be88taoOt5o9NuorGTt5VnOInTjbWUSc/1SVhrPgNg1HOPi4eDtyObU5Ev5E1gBIcdtxIZk55TQD35DIBRz70eAbKchZKt/EuyCTbwvOZPb+ZNek4A6slnAIx63tqs/b2qtvSWBiidkU16Tr568ssAatVzYxPWdB+gCtSj5wSgnvwyC2rVc8r7X+4Dter5btK7233gH2OsXLxIyeUHAAAAAElFTkSuQmCC"},{"path":"C:\\Users\\simon\\Desktop\\Forge 15\\Create\\src\\main\\resources\\assets\\create\\textures\\block\\weighted_ejector_top.png","name":"weighted_ejector_top.png","folder":"block","namespace":"create","id":"4","particle":true,"visible":true,"mode":"bitmap","saved":true,"uuid":"ebcca8ed-240c-1b6e-7682-0179476a394c","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACLElEQVQ4T4VTTUwTURD+tt3av9dCcQsNYKCAxsTePHjw6o1E46kHb8bE2JOBGEMvhIQ0MQaIl149cOpREm5600TPcuCwQAlLLJTIT9/CrtvumnnlbWmJcS8zb2be975vdkYBgEKh4JGlLxqJSBfsii+D3LL8/NLysqJIgL29XyIRCoWEjUU7QHQ+v+hcdBwHd25n0Q2wu+8j284fqOoNBAk+oEBVA3BdwHU9NJtN3BxIYXJsFAulUpvB7MyMt1M14Ng2bo2N4OyUixd7WST7GHR9B4PpNIaGtA6D+WLR+7mpg/OGSL6+/wPhSFwwsi1T+INaCrOfRnDW4EgmWDcAMTg4OPJ1LjzSMf85C8dpXfYliNXiBl6uPIBpcsTjrFsCMdjaNQRAJqPhVe67AGi1PLgkHh7WPgJPXwTRl2RotfBvANJNEkpfc4hF4/h9fIyBVAqrH04FQCCgit5c60H95AQm5wL97cMNvPuWAzWNGkr2/fMveLZ4DyzOBNPs+Gh3E0mCvLD0ZB9swkBs/K7owXl1U/jEYHg4g1rt6DpA1TCgaRq2tqviFW5y3xIIxQ7rh5iamhAA1KtyudyZgwvLEmNM80BJXd/2i0kzsZMvy1p/Euk3UjDd3w/qBVkpiUDlhd4afxLpN9KSZNJp1Op139IysUQCvNEA5eVZ1ryZm2tLyOfzXiQc9nfhf45l26KkUqm0AaanH3vW5ZpGrqywjDWbDhhLoLdmfX1N+Qtlmygg+Q/yZwAAAABJRU5ErkJggg=="},{"path":"C:\\Users\\simon\\Desktop\\Forge 15\\Create\\src\\main\\resources\\assets\\create\\textures\\block\\weighted_ejector_inner.png","name":"weighted_ejector_inner.png","folder":"block","namespace":"create","id":"5","particle":false,"visible":true,"mode":"bitmap","saved":true,"uuid":"c9f14264-859c-957f-e9fd-615804f80729","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABrklEQVQ4T6WTu07DQBBFr71+xOaRB8IiQERDBX9AQ8MPpEuVgg+jSJUuP0BDQ01DB0WkoERBkCDZazvx2mjWWltWeBSZZqXdnaM7d2Y0bBka5Xe73UxxbNsukK5lbeD5alXcDYdDrQDM5x/ywTAMedbsanIUl4lJkqDTOcYGYL0uPzFmQie8BjCmI8uANM0ghEB9fw8nRx7uBoNcQa/Xy6bTOcKQ469E+pumAs1GA81Wo1Rw2+9nr+OJBJimCVJycy7Ao1yRW7Nw/8LAmCXV7LhOFUAKFp9L+H4A0zLAOcfVaYivGKjbkOfzuyPVmQaD4zjVEkjB22wOPwhgGDrCMMLlYSiTVTxOHJmYG1z7BeAHEGmKNE2kAhVlCSaEWKPZaG56QAqiOEKSiH89YIyh3faqJhKAh6E0SXlACqh+CuWBEAkcx90EUBc0TUOWJRUPlJHkgevugvNAAlqtOkajUTkH1IXFcgldZ9IDZSIB2vW8jXKqgJ8BNEhqfP2A4/qMyzlQgIexK8ecxpjC8w5KBbRMtES0PLQsdO77T0X91M6ZdVG8x3EM+l/swjYb/Q0cAwEgduvwJwAAAABJRU5ErkJggg=="},{"path":"C:\\Users\\simon\\Desktop\\Forge 15\\Create\\src\\main\\resources\\assets\\create\\textures\\block\\axis_top.png","name":"axis_top.png","folder":"block","namespace":"create","id":"6","particle":false,"visible":true,"mode":"bitmap","saved":true,"uuid":"69c7b327-9f59-d51a-b23f-e8c50e20fd12","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAaklEQVQ4T+2SMQ4AERBFv16h5W5atcohVGrXJBOhmL3A2rBa089L/ssTODxx+I8LwNyBc46VUui9g4iQc371NZXovWdjDFprqLUixrgHCCGwlBJjDJRSkFLaA1hrWWv9f8JqYDekj5BWJT4NbygR50R18wAAAABJRU5ErkJggg=="},{"path":"C:\\Users\\simon\\Desktop\\Forge 15\\Create\\src\\main\\resources\\assets\\create\\textures\\block\\andesite_casing.png","name":"andesite_casing.png","folder":"block","namespace":"create","id":"7","particle":false,"visible":true,"mode":"bitmap","saved":true,"uuid":"e651b58d-5e59-ec92-94cd-965bd6802735","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACeUlEQVQ4T32Tz2vTYBjHvzFpmqRpfnSuXec2x+qcuE30puBF8DLBw7wIAw8yNwTxNMF/QvAkCAqCV0EFQS+7O5QNWd1g4rZWZmfbuSVb2zdp0kXedySdDnwuyZP34ZPn/T7fh5ucngzwnyCERKeyLIPmh58cBeQGTqFBXIiiwIpbrX00mwRJVYMfBBA4jn23bAtyQgfP7UPgeXxdyiMCzL1+wop0VcRGdQ/ZlAbP9xETePB8gI1qDV1mEnXHBcDh3NgdrK19OwAMnR3F51ePYWgyEpKAH1sOuk0ZruchHoshCAIUKxayKRWKxKNUqeHC9btYXft+ADBMA6WPbyAIxzCc68RKqY6sLqLhNGFqCThuE792PehxIAhaWP9p4+KNe20A1WDh3VOYmoxcj4nF9SrO9KaxbdciQLFqoz9toE4I62Do6m0QZ+9vDXRVYh3ML5WQ68vAaTpQJBFJRcDC8iZOdOlRB4NXbsLasdoazL58hIzRBtDiMDIphQFUU4dP6rBrLrsCm8LMw5mgwzyO/PtnkQa0AwqQ4zEQ10MIONzB5YkH+DL/qS3i5txbJJRYpEFaU44ABvs7Iw3oFKIOZCmJldkXSKeS0JMSNu0mU5zenwbVIF/YikSs/CYYvTZ11Ei9GYMBChWLFdP5h1egADqZ8tYutu0Gui+Nt0WkY6RO7Osy2R8L5R1mGsf1IcUFZp7Vko2TaQOu56NBPJwfv4+V5Ty4iVsTwcDAaSx+eA5VFsHzQLFkoSdjokaobam9YyhbHjpUEV6rBVHgMTI2dWAkChgZHmXLFIZmGuzVd9qbSPOwRpHj7DxaJpqEa0tXNYx/V/lwXVjzB52xTSnD2+HhAAAAAElFTkSuQmCC"}]} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/weighted_ejector/weighted_ejector - Shortcut.lnk b/src/main/resources/assets/create/models/block/weighted_ejector/weighted_ejector - Shortcut.lnk deleted file mode 100644 index a8d4e04ec..000000000 Binary files a/src/main/resources/assets/create/models/block/weighted_ejector/weighted_ejector - Shortcut.lnk and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/adjustable_chain_gearshift.png b/src/main/resources/assets/create/textures/block/adjustable_chain_gearshift.png index b92be83b3..4a9c260c5 100644 Binary files a/src/main/resources/assets/create/textures/block/adjustable_chain_gearshift.png and b/src/main/resources/assets/create/textures/block/adjustable_chain_gearshift.png differ diff --git a/src/main/resources/assets/create/textures/block/adjustable_chain_gearshift_powered.png b/src/main/resources/assets/create/textures/block/adjustable_chain_gearshift_powered.png index 86345c11b..e8ed4fa37 100644 Binary files a/src/main/resources/assets/create/textures/block/adjustable_chain_gearshift_powered.png and b/src/main/resources/assets/create/textures/block/adjustable_chain_gearshift_powered.png differ diff --git a/src/main/resources/assets/create/textures/block/andesite_casing.png b/src/main/resources/assets/create/textures/block/andesite_casing.png index 0b6e88e04..fe90e1b87 100644 Binary files a/src/main/resources/assets/create/textures/block/andesite_casing.png and b/src/main/resources/assets/create/textures/block/andesite_casing.png differ diff --git a/src/main/resources/assets/create/textures/block/andesite_casing_belt.png b/src/main/resources/assets/create/textures/block/andesite_casing_belt.png deleted file mode 100644 index 04ae6efe8..000000000 Binary files a/src/main/resources/assets/create/textures/block/andesite_casing_belt.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/andesite_casing_connected.png b/src/main/resources/assets/create/textures/block/andesite_casing_connected.png index 40d01e0af..591c7cc4d 100644 Binary files a/src/main/resources/assets/create/textures/block/andesite_casing_connected.png and b/src/main/resources/assets/create/textures/block/andesite_casing_connected.png differ diff --git a/src/main/resources/assets/create/textures/block/andesite_casing_piston.png b/src/main/resources/assets/create/textures/block/andesite_casing_piston.png new file mode 100644 index 000000000..f20f5d7e4 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/andesite_casing_piston.png differ diff --git a/src/main/resources/assets/create/textures/block/andesite_casing_short.png b/src/main/resources/assets/create/textures/block/andesite_casing_short.png index 38cb5541c..181a21d53 100644 Binary files a/src/main/resources/assets/create/textures/block/andesite_casing_short.png and b/src/main/resources/assets/create/textures/block/andesite_casing_short.png differ diff --git a/src/main/resources/assets/create/textures/block/andesite_casing_very_short.png b/src/main/resources/assets/create/textures/block/andesite_casing_very_short.png index c3dc178cc..10f370ced 100644 Binary files a/src/main/resources/assets/create/textures/block/andesite_casing_very_short.png and b/src/main/resources/assets/create/textures/block/andesite_casing_very_short.png differ diff --git a/src/main/resources/assets/create/textures/block/andesite_encased_cogwheel_side.png b/src/main/resources/assets/create/textures/block/andesite_encased_cogwheel_side.png index 44a3591b9..fdd2f6d77 100644 Binary files a/src/main/resources/assets/create/textures/block/andesite_encased_cogwheel_side.png and b/src/main/resources/assets/create/textures/block/andesite_encased_cogwheel_side.png differ diff --git a/src/main/resources/assets/create/textures/block/andesite_encased_cogwheel_side_connected.png b/src/main/resources/assets/create/textures/block/andesite_encased_cogwheel_side_connected.png index a4adbfaa2..7f26c4ec7 100644 Binary files a/src/main/resources/assets/create/textures/block/andesite_encased_cogwheel_side_connected.png and b/src/main/resources/assets/create/textures/block/andesite_encased_cogwheel_side_connected.png differ diff --git a/src/main/resources/assets/create/textures/block/axis.png b/src/main/resources/assets/create/textures/block/axis.png index e4e49b69e..eff2ae778 100644 Binary files a/src/main/resources/assets/create/textures/block/axis.png and b/src/main/resources/assets/create/textures/block/axis.png differ diff --git a/src/main/resources/assets/create/textures/block/axis_top.png b/src/main/resources/assets/create/textures/block/axis_top.png index 66f5cfe16..df4df7832 100644 Binary files a/src/main/resources/assets/create/textures/block/axis_top.png and b/src/main/resources/assets/create/textures/block/axis_top.png differ diff --git a/src/main/resources/assets/create/textures/block/basin.png b/src/main/resources/assets/create/textures/block/basin.png index 4585062ff..bf3c51c29 100644 Binary files a/src/main/resources/assets/create/textures/block/basin.png and b/src/main/resources/assets/create/textures/block/basin.png differ diff --git a/src/main/resources/assets/create/textures/block/brass_encased_cogwheel_side.png b/src/main/resources/assets/create/textures/block/brass_encased_cogwheel_side.png index 58b194fe4..c302b3f0e 100644 Binary files a/src/main/resources/assets/create/textures/block/brass_encased_cogwheel_side.png and b/src/main/resources/assets/create/textures/block/brass_encased_cogwheel_side.png differ diff --git a/src/main/resources/assets/create/textures/block/brass_encased_cogwheel_side_connected.png b/src/main/resources/assets/create/textures/block/brass_encased_cogwheel_side_connected.png index 209daf9d9..86328ddb0 100644 Binary files a/src/main/resources/assets/create/textures/block/brass_encased_cogwheel_side_connected.png and b/src/main/resources/assets/create/textures/block/brass_encased_cogwheel_side_connected.png differ diff --git a/src/main/resources/assets/create/textures/block/brass_tiles.png b/src/main/resources/assets/create/textures/block/brass_tiles.png deleted file mode 100644 index 2b6b14f40..000000000 Binary files a/src/main/resources/assets/create/textures/block/brass_tiles.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/clockwork_bearing_side.png b/src/main/resources/assets/create/textures/block/clockwork_bearing_side.png index feaac4390..10185f67d 100644 Binary files a/src/main/resources/assets/create/textures/block/clockwork_bearing_side.png and b/src/main/resources/assets/create/textures/block/clockwork_bearing_side.png differ diff --git a/src/main/resources/assets/create/textures/block/clutch_off.png b/src/main/resources/assets/create/textures/block/clutch_off.png index 0e8c18888..c0f968ccb 100644 Binary files a/src/main/resources/assets/create/textures/block/clutch_off.png and b/src/main/resources/assets/create/textures/block/clutch_off.png differ diff --git a/src/main/resources/assets/create/textures/block/clutch_on.png b/src/main/resources/assets/create/textures/block/clutch_on.png index c3b7ea4f4..c72f65d90 100644 Binary files a/src/main/resources/assets/create/textures/block/clutch_on.png and b/src/main/resources/assets/create/textures/block/clutch_on.png differ diff --git a/src/main/resources/assets/create/textures/block/cogwheel_axis.png b/src/main/resources/assets/create/textures/block/cogwheel_axis.png index 440770bb3..8842243fe 100644 Binary files a/src/main/resources/assets/create/textures/block/cogwheel_axis.png and b/src/main/resources/assets/create/textures/block/cogwheel_axis.png differ diff --git a/src/main/resources/assets/create/textures/block/contraption_controls.png b/src/main/resources/assets/create/textures/block/contraption_controls.png index 49dd87902..c27f0d3b2 100644 Binary files a/src/main/resources/assets/create/textures/block/contraption_controls.png and b/src/main/resources/assets/create/textures/block/contraption_controls.png differ diff --git a/src/main/resources/assets/create/textures/block/contraption_controls_frame.png b/src/main/resources/assets/create/textures/block/contraption_controls_frame.png index e42877d82..c5a44c7fa 100644 Binary files a/src/main/resources/assets/create/textures/block/contraption_controls_frame.png and b/src/main/resources/assets/create/textures/block/contraption_controls_frame.png differ diff --git a/src/main/resources/assets/create/textures/block/depot_side.png b/src/main/resources/assets/create/textures/block/depot_side.png index 0b7f3e070..2cd239b79 100644 Binary files a/src/main/resources/assets/create/textures/block/depot_side.png and b/src/main/resources/assets/create/textures/block/depot_side.png differ diff --git a/src/main/resources/assets/create/textures/block/encased_chain_drive.png b/src/main/resources/assets/create/textures/block/encased_chain_drive.png index 92c237005..5e8d20a4d 100644 Binary files a/src/main/resources/assets/create/textures/block/encased_chain_drive.png and b/src/main/resources/assets/create/textures/block/encased_chain_drive.png differ diff --git a/src/main/resources/assets/create/textures/block/encased_chain_drive_end.png b/src/main/resources/assets/create/textures/block/encased_chain_drive_end.png index 97247c745..f00b074ea 100644 Binary files a/src/main/resources/assets/create/textures/block/encased_chain_drive_end.png and b/src/main/resources/assets/create/textures/block/encased_chain_drive_end.png differ diff --git a/src/main/resources/assets/create/textures/block/encased_chain_drive_middle.png b/src/main/resources/assets/create/textures/block/encased_chain_drive_middle.png index 93e749616..d21f5f310 100644 Binary files a/src/main/resources/assets/create/textures/block/encased_chain_drive_middle.png and b/src/main/resources/assets/create/textures/block/encased_chain_drive_middle.png differ diff --git a/src/main/resources/assets/create/textures/block/fan_casing.png b/src/main/resources/assets/create/textures/block/fan_casing.png index 084b4fae9..b943362cb 100644 Binary files a/src/main/resources/assets/create/textures/block/fan_casing.png and b/src/main/resources/assets/create/textures/block/fan_casing.png differ diff --git a/src/main/resources/assets/create/textures/block/fan_side.png b/src/main/resources/assets/create/textures/block/fan_side.png index e9a0a70a4..d1b4d66ae 100644 Binary files a/src/main/resources/assets/create/textures/block/fan_side.png and b/src/main/resources/assets/create/textures/block/fan_side.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_frame.png b/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_frame.png index 5cb1d5ebb..a26c0c65b 100644 Binary files a/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_frame.png and b/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_frame.png differ diff --git a/src/main/resources/assets/create/textures/block/gauge.png b/src/main/resources/assets/create/textures/block/gauge.png index ddc3f1507..1e97d07a8 100644 Binary files a/src/main/resources/assets/create/textures/block/gauge.png and b/src/main/resources/assets/create/textures/block/gauge.png differ diff --git a/src/main/resources/assets/create/textures/block/gearbox.png b/src/main/resources/assets/create/textures/block/gearbox.png index 78592dc71..533b41518 100644 Binary files a/src/main/resources/assets/create/textures/block/gearbox.png and b/src/main/resources/assets/create/textures/block/gearbox.png differ diff --git a/src/main/resources/assets/create/textures/block/gearbox_top.png b/src/main/resources/assets/create/textures/block/gearbox_top.png index 8f137064e..72cd138d1 100644 Binary files a/src/main/resources/assets/create/textures/block/gearbox_top.png and b/src/main/resources/assets/create/textures/block/gearbox_top.png differ diff --git a/src/main/resources/assets/create/textures/block/gearshift_off.png b/src/main/resources/assets/create/textures/block/gearshift_off.png index 28b2d4848..2fe8184ac 100644 Binary files a/src/main/resources/assets/create/textures/block/gearshift_off.png and b/src/main/resources/assets/create/textures/block/gearshift_off.png differ diff --git a/src/main/resources/assets/create/textures/block/gearshift_on.png b/src/main/resources/assets/create/textures/block/gearshift_on.png index 0b643ffd7..39fe253de 100644 Binary files a/src/main/resources/assets/create/textures/block/gearshift_on.png and b/src/main/resources/assets/create/textures/block/gearshift_on.png differ diff --git a/src/main/resources/assets/create/textures/block/linear_chassis_end.png b/src/main/resources/assets/create/textures/block/linear_chassis_end.png index fd30c3cda..b9caf7a6c 100644 Binary files a/src/main/resources/assets/create/textures/block/linear_chassis_end.png and b/src/main/resources/assets/create/textures/block/linear_chassis_end.png differ diff --git a/src/main/resources/assets/create/textures/block/linear_chassis_end_connected.png b/src/main/resources/assets/create/textures/block/linear_chassis_end_connected.png index abb3ce33d..16aee04b5 100644 Binary files a/src/main/resources/assets/create/textures/block/linear_chassis_end_connected.png and b/src/main/resources/assets/create/textures/block/linear_chassis_end_connected.png differ diff --git a/src/main/resources/assets/create/textures/block/linear_chassis_end_sticky.png b/src/main/resources/assets/create/textures/block/linear_chassis_end_sticky.png index 872b1a04d..4c308e51b 100644 Binary files a/src/main/resources/assets/create/textures/block/linear_chassis_end_sticky.png and b/src/main/resources/assets/create/textures/block/linear_chassis_end_sticky.png differ diff --git a/src/main/resources/assets/create/textures/block/linear_chassis_end_sticky_connected.png b/src/main/resources/assets/create/textures/block/linear_chassis_end_sticky_connected.png index fbfdf8870..8529b8691 100644 Binary files a/src/main/resources/assets/create/textures/block/linear_chassis_end_sticky_connected.png and b/src/main/resources/assets/create/textures/block/linear_chassis_end_sticky_connected.png differ diff --git a/src/main/resources/assets/create/textures/block/linear_chassis_side.png b/src/main/resources/assets/create/textures/block/linear_chassis_side.png index 983b52906..4f68ca29b 100644 Binary files a/src/main/resources/assets/create/textures/block/linear_chassis_side.png and b/src/main/resources/assets/create/textures/block/linear_chassis_side.png differ diff --git a/src/main/resources/assets/create/textures/block/linear_chassis_side_connected.png b/src/main/resources/assets/create/textures/block/linear_chassis_side_connected.png index c48d0d88a..3b4d1c9ed 100644 Binary files a/src/main/resources/assets/create/textures/block/linear_chassis_side_connected.png and b/src/main/resources/assets/create/textures/block/linear_chassis_side_connected.png differ diff --git a/src/main/resources/assets/create/textures/block/mechanical_bearing_side.png b/src/main/resources/assets/create/textures/block/mechanical_bearing_side.png index e414bc159..662660f6c 100644 Binary files a/src/main/resources/assets/create/textures/block/mechanical_bearing_side.png and b/src/main/resources/assets/create/textures/block/mechanical_bearing_side.png differ diff --git a/src/main/resources/assets/create/textures/block/mechanical_drill_top.png b/src/main/resources/assets/create/textures/block/mechanical_drill_top.png new file mode 100644 index 000000000..da0d94755 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/mechanical_drill_top.png differ diff --git a/src/main/resources/assets/create/textures/block/mechanical_press_bottom.png b/src/main/resources/assets/create/textures/block/mechanical_press_bottom.png index 3d401c6d3..b2746275a 100644 Binary files a/src/main/resources/assets/create/textures/block/mechanical_press_bottom.png and b/src/main/resources/assets/create/textures/block/mechanical_press_bottom.png differ diff --git a/src/main/resources/assets/create/textures/block/mechanical_press_side.png b/src/main/resources/assets/create/textures/block/mechanical_press_side.png index 5b90227d9..aeefb920d 100644 Binary files a/src/main/resources/assets/create/textures/block/mechanical_press_side.png and b/src/main/resources/assets/create/textures/block/mechanical_press_side.png differ diff --git a/src/main/resources/assets/create/textures/block/mechanical_press_top.png b/src/main/resources/assets/create/textures/block/mechanical_press_top.png index 9ea8f4686..cb16fdcb0 100644 Binary files a/src/main/resources/assets/create/textures/block/mechanical_press_top.png and b/src/main/resources/assets/create/textures/block/mechanical_press_top.png differ diff --git a/src/main/resources/assets/create/textures/block/mechanical_saw_top.png b/src/main/resources/assets/create/textures/block/mechanical_saw_top.png index 7ca9a7498..e231bcea4 100644 Binary files a/src/main/resources/assets/create/textures/block/mechanical_saw_top.png and b/src/main/resources/assets/create/textures/block/mechanical_saw_top.png differ diff --git a/src/main/resources/assets/create/textures/block/mixer_base_side.png b/src/main/resources/assets/create/textures/block/mixer_base_side.png index b26210823..5d5439f19 100644 Binary files a/src/main/resources/assets/create/textures/block/mixer_base_side.png and b/src/main/resources/assets/create/textures/block/mixer_base_side.png differ diff --git a/src/main/resources/assets/create/textures/block/pinion.png b/src/main/resources/assets/create/textures/block/pinion.png index 37b09ee0b..083500368 100644 Binary files a/src/main/resources/assets/create/textures/block/pinion.png and b/src/main/resources/assets/create/textures/block/pinion.png differ diff --git a/src/main/resources/assets/create/textures/block/pinion_bottom.png b/src/main/resources/assets/create/textures/block/pinion_bottom.png new file mode 100644 index 000000000..adceda564 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/pinion_bottom.png differ diff --git a/src/main/resources/assets/create/textures/block/piston_bottom.png b/src/main/resources/assets/create/textures/block/piston_bottom.png index f07863838..232aa1f30 100644 Binary files a/src/main/resources/assets/create/textures/block/piston_bottom.png and b/src/main/resources/assets/create/textures/block/piston_bottom.png differ diff --git a/src/main/resources/assets/create/textures/block/piston_inner.png b/src/main/resources/assets/create/textures/block/piston_inner.png index d084e4c53..958f0240d 100644 Binary files a/src/main/resources/assets/create/textures/block/piston_inner.png and b/src/main/resources/assets/create/textures/block/piston_inner.png differ diff --git a/src/main/resources/assets/create/textures/block/portable_storage_interface.png b/src/main/resources/assets/create/textures/block/portable_storage_interface.png index bf2b89545..330b5dfbf 100644 Binary files a/src/main/resources/assets/create/textures/block/portable_storage_interface.png and b/src/main/resources/assets/create/textures/block/portable_storage_interface.png differ diff --git a/src/main/resources/assets/create/textures/block/radial_chassis_end.png b/src/main/resources/assets/create/textures/block/radial_chassis_end.png index 1697b7cc7..f66c73f45 100644 Binary files a/src/main/resources/assets/create/textures/block/radial_chassis_end.png and b/src/main/resources/assets/create/textures/block/radial_chassis_end.png differ diff --git a/src/main/resources/assets/create/textures/block/radial_chassis_side.png b/src/main/resources/assets/create/textures/block/radial_chassis_side.png index 121abe819..b4bd59ab7 100644 Binary files a/src/main/resources/assets/create/textures/block/radial_chassis_side.png and b/src/main/resources/assets/create/textures/block/radial_chassis_side.png differ diff --git a/src/main/resources/assets/create/textures/block/radial_chassis_side_sticky.png b/src/main/resources/assets/create/textures/block/radial_chassis_side_sticky.png index 2cc0e8188..473e5d91d 100644 Binary files a/src/main/resources/assets/create/textures/block/radial_chassis_side_sticky.png and b/src/main/resources/assets/create/textures/block/radial_chassis_side_sticky.png differ diff --git a/src/main/resources/assets/create/textures/block/secondary_linear_chassis_side.png b/src/main/resources/assets/create/textures/block/secondary_linear_chassis_side.png index e45b0e925..27c59ee70 100644 Binary files a/src/main/resources/assets/create/textures/block/secondary_linear_chassis_side.png and b/src/main/resources/assets/create/textures/block/secondary_linear_chassis_side.png differ diff --git a/src/main/resources/assets/create/textures/block/secondary_linear_chassis_side_connected.png b/src/main/resources/assets/create/textures/block/secondary_linear_chassis_side_connected.png index cc0241a47..5ef998248 100644 Binary files a/src/main/resources/assets/create/textures/block/secondary_linear_chassis_side_connected.png and b/src/main/resources/assets/create/textures/block/secondary_linear_chassis_side_connected.png differ diff --git a/src/main/resources/assets/create/textures/block/spout.png b/src/main/resources/assets/create/textures/block/spout.png index b11464935..1a1de6dce 100644 Binary files a/src/main/resources/assets/create/textures/block/spout.png and b/src/main/resources/assets/create/textures/block/spout.png differ diff --git a/src/main/resources/assets/create/textures/block/tunnel/brass_tunnel_top_connected.png b/src/main/resources/assets/create/textures/block/tunnel/brass_tunnel_top_connected.png index 24cd50247..0bd78c326 100644 Binary files a/src/main/resources/assets/create/textures/block/tunnel/brass_tunnel_top_connected.png and b/src/main/resources/assets/create/textures/block/tunnel/brass_tunnel_top_connected.png differ diff --git a/src/main/resources/assets/create/textures/block/weighted_ejector_casing.png b/src/main/resources/assets/create/textures/block/weighted_ejector_casing.png index 4fd4419c6..d0a1859b3 100644 Binary files a/src/main/resources/assets/create/textures/block/weighted_ejector_casing.png and b/src/main/resources/assets/create/textures/block/weighted_ejector_casing.png differ diff --git a/src/main/resources/assets/create/textures/block/wheel.png b/src/main/resources/assets/create/textures/block/wheel.png deleted file mode 100644 index ebad32c85..000000000 Binary files a/src/main/resources/assets/create/textures/block/wheel.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/wheel_extras.png b/src/main/resources/assets/create/textures/block/wheel_extras.png deleted file mode 100644 index 97a6f6296..000000000 Binary files a/src/main/resources/assets/create/textures/block/wheel_extras.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/windmill_bearing_side.png b/src/main/resources/assets/create/textures/block/windmill_bearing_side.png index 5dd0ae2aa..c9aedb565 100644 Binary files a/src/main/resources/assets/create/textures/block/windmill_bearing_side.png and b/src/main/resources/assets/create/textures/block/windmill_bearing_side.png differ