diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index eba70c441..62e6ae72c 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -453,6 +453,7 @@ public class AllBlocks { public static final BlockEntry ENCASED_CHAIN_DRIVE = REGISTRATE.block("encased_chain_drive", EncasedBeltBlock::new) + .addLayer(() -> RenderType::cutoutMipped) .initialProperties(SharedProperties::stone) .properties(BlockBehaviour.Properties::noOcclusion) .properties(p -> p.color(MaterialColor.PODZOL)) @@ -460,6 +461,7 @@ public class AllBlocks { .transform(axeOrPickaxe()) .blockstate((c, p) -> new EncasedBeltGenerator((state, suffix) -> p.models() .getExistingFile(p.modLoc("block/" + c.getName() + "/" + suffix))).generate(c, p)) + .addLayer(() -> RenderType::cutoutMipped) .item() .transform(customItemModel()) .register(); @@ -486,6 +488,7 @@ public class AllBlocks { public static final BlockEntry BELT = REGISTRATE.block("belt", BeltBlock::new) .initialProperties(SharedProperties.BELT_MATERIAL, MaterialColor.COLOR_GRAY) + .addLayer(() -> RenderType::cutoutMipped) .properties(p -> p.sound(SoundType.WOOL)) .properties(p -> p.strength(0.8F)) .properties(p -> p.color(MaterialColor.COLOR_GRAY)) diff --git a/src/main/resources/assets/create/models/block/belt/diagonal_end.json b/src/main/resources/assets/create/models/block/belt/diagonal_end.json index 02bd2d2d7..94513f0f5 100644 --- a/src/main/resources/assets/create/models/block/belt/diagonal_end.json +++ b/src/main/resources/assets/create/models/block/belt/diagonal_end.json @@ -10,7 +10,6 @@ "name": "Bottom", "from": [0.9, 3, 1], "to": [15.1, 5, 6.8], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 0]}, "faces": { "north": {"uv": [1, 6, 15, 7], "rotation": 180, "texture": "#0"}, "east": {"uv": [14, 0, 16, 6], "rotation": 270, "texture": "#0"}, @@ -23,7 +22,6 @@ "name": "Bottom", "from": [2.9, 5, 2], "to": [13.1, 6, 6.8], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 0]}, "faces": { "east": {"uv": [3, 0, 4, 5], "rotation": 270, "texture": "#0"}, "west": {"uv": [12, 0, 13, 5], "rotation": 90, "texture": "#0"}, @@ -34,7 +32,6 @@ "name": "Top", "from": [0.9, 11, 1], "to": [15.1, 13, 10.1], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 0]}, "faces": { "north": {"uv": [1, 5, 15, 6], "rotation": 180, "texture": "#0"}, "east": {"uv": [14, 6, 16, 15], "rotation": 90, "texture": "#0"}, @@ -47,7 +44,6 @@ "name": "Top", "from": [2.9, 10, 2], "to": [13.1, 11, 10.1], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 0]}, "faces": { "east": {"uv": [3, 7, 4, 15], "rotation": 90, "texture": "#0"}, "west": {"uv": [12, 7, 13, 15], "rotation": 270, "texture": "#0"}, @@ -56,9 +52,8 @@ }, { "name": "Side", - "from": [1, 4, 0], - "to": [15, 12, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 0]}, + "from": [1, 4, -0.05], + "to": [15, 12, 1.95], "faces": { "north": {"uv": [1, 8, 15, 16], "rotation": 180, "texture": "#0"}, "east": {"uv": [14, 8, 16, 16], "rotation": 180, "texture": "#0"}, @@ -72,7 +67,6 @@ "name": "Side", "from": [2.9, 6, 2], "to": [13.1, 10, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 0]}, "faces": { "east": {"uv": [3, 10, 4, 14], "rotation": 180, "texture": "#0"}, "south": {"uv": [3, 10, 13, 14], "rotation": 180, "texture": "#0"}, diff --git a/src/main/resources/assets/create/models/block/belt/diagonal_start.json b/src/main/resources/assets/create/models/block/belt/diagonal_start.json index 0ae5d7615..b9da31066 100644 --- a/src/main/resources/assets/create/models/block/belt/diagonal_start.json +++ b/src/main/resources/assets/create/models/block/belt/diagonal_start.json @@ -52,8 +52,8 @@ }, { "name": "Side", - "from": [1, 4, 14], - "to": [15, 12, 16], + "from": [1, 4, 14.05], + "to": [15, 12, 16.05], "faces": { "north": {"uv": [1, 8, 15, 16], "texture": "#0"}, "east": {"uv": [14, 8, 16, 16], "texture": "#0"}, diff --git a/src/main/resources/assets/create/models/block/belt/end.json b/src/main/resources/assets/create/models/block/belt/end.json index d8f167443..b96d53b9c 100644 --- a/src/main/resources/assets/create/models/block/belt/end.json +++ b/src/main/resources/assets/create/models/block/belt/end.json @@ -9,7 +9,6 @@ "name": "Top", "from": [1, 11, 0], "to": [15, 13, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 0]}, "faces": { "east": {"uv": [0, 1, 2, 16], "rotation": 270, "texture": "#0"}, "south": {"uv": [1, 0, 15, 1], "rotation": 180, "texture": "#0"}, @@ -22,7 +21,6 @@ "name": "Top", "from": [3, 10, 0], "to": [13, 11, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 0]}, "faces": { "east": {"uv": [3, 2, 4, 16], "rotation": 270, "texture": "#0"}, "west": {"uv": [12, 2, 13, 16], "rotation": 90, "texture": "#0"}, @@ -31,9 +29,8 @@ }, { "name": "Side", - "from": [1.1, 4, 14], - "to": [14.9, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 0]}, + "from": [1.1, 4, 14.05], + "to": [14.9, 12, 16.05], "faces": { "north": {"uv": [1, 8, 15, 16], "rotation": 180, "texture": "#0"}, "east": {"uv": [0, 8, 2, 16], "rotation": 180, "texture": "#0"}, @@ -47,7 +44,6 @@ "name": "Side", "from": [3, 6, 13], "to": [13, 10, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 0]}, "faces": { "north": {"uv": [3, 10, 13, 14], "rotation": 180, "texture": "#0"}, "east": {"uv": [12, 10, 13, 14], "rotation": 180, "texture": "#0"}, diff --git a/src/main/resources/assets/create/models/block/belt/start.json b/src/main/resources/assets/create/models/block/belt/start.json index c262e4bb5..c26c0cdd6 100644 --- a/src/main/resources/assets/create/models/block/belt/start.json +++ b/src/main/resources/assets/create/models/block/belt/start.json @@ -9,7 +9,6 @@ "name": "Top", "from": [3, 10, 2], "to": [13, 11, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 0]}, "faces": { "east": {"uv": [3, 0, 4, 14], "rotation": 270, "texture": "#0"}, "west": {"uv": [12, 0, 13, 14], "rotation": 90, "texture": "#0"}, @@ -20,7 +19,6 @@ "name": "Top", "from": [1, 11, 1], "to": [15, 13, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 0]}, "faces": { "north": {"uv": [1, 15, 15, 16], "texture": "#0"}, "east": {"uv": [0, 0, 2, 15], "rotation": 270, "texture": "#0"}, @@ -31,9 +29,8 @@ }, { "name": "Side", - "from": [1.1, 4, 0], - "to": [14.9, 12, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 0]}, + "from": [1.1, 4, -0.05], + "to": [14.9, 12, 1.95], "faces": { "north": {"uv": [1, 0, 15, 8], "texture": "#0"}, "east": {"uv": [0, 0, 2, 8], "texture": "#0"}, @@ -47,7 +44,6 @@ "name": "Side", "from": [3, 6, 2], "to": [13, 10, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 0]}, "faces": { "east": {"uv": [3, 6, 4, 10], "texture": "#0"}, "south": {"uv": [3, 2, 13, 6], "texture": "#0"}, diff --git a/src/main/resources/assets/create/models/block/belt_casing/diagonal_end.json b/src/main/resources/assets/create/models/block/belt_casing/diagonal_end.json index fba079751..e1f1fb6a9 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/diagonal_end.json +++ b/src/main/resources/assets/create/models/block/belt_casing/diagonal_end.json @@ -2,98 +2,78 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "4": "create:block/brass_casing_belt", + "3": "create:block/belt/belt_casing", + "5": "create:block/brass_casing_connected", + "6": "create:block/belt/belt_casing_2", + "7": "create:block/belt/belt_casing_3", "8": "create:block/gearbox", "particle": "create:block/brass_casing" }, "elements": [ { - "name": "Casing", - "from": [1.1, 4, 2], - "to": [14.9, 11, 12], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, + "from": [0, 0, 0], + "to": [16, 11, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, "faces": { - "east": {"uv": [4, 5, 14, 12], "texture": "#8"}, - "west": {"uv": [2, 5, 12, 12], "texture": "#8"} + "north": {"uv": [8, 0, 16, 5.5], "texture": "#7"}, + "east": {"uv": [3, 0, 8, 5.5], "texture": "#3"}, + "west": {"uv": [0, 0, 5, 5.5], "texture": "#3"}, + "up": {"uv": [0, 8, 8, 13], "texture": "#3"}, + "down": {"uv": [2, 0.75, 4, 2], "texture": "#5"} } }, { - "name": "Casing", - "from": [1.1, 11, 6], - "to": [14.9, 13, 10], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 8, 8]}, + "from": [1, 11, -0.01], + "to": [15, 3, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, "faces": { - "east": {"uv": [6, 3, 10, 5], "texture": "#8"}, - "west": {"uv": [6, 3, 10, 5], "texture": "#8"} + "east": {"uv": [0, 0, 5, 4], "rotation": 180, "texture": "#3"}, + "west": {"uv": [3, 0, 8, 4], "rotation": 180, "texture": "#3"}, + "up": {"uv": [12.125, 12.75, 13.875, 14], "texture": "#5"} + } + }, + { + "from": [0, 5, 12], + "to": [16, 11, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, + "faces": { + "south": {"uv": [8, 6, 16, 9.5], "rotation": 180, "texture": "#3"}, + "down": {"uv": [8, 6, 16, 10], "texture": "#3"} + } + }, + { + "from": [1, 5, 4], + "to": [15, 11, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, + "faces": { + "east": {"uv": [4, 5, 12, 11], "texture": "#8"}, + "west": {"uv": [4, 5, 12, 11], "texture": "#8"} } }, { "name": "Top Diagonal", "from": [-0.1, 2, 11.303], "to": [16.1, 11, 19.328], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, + "rotation": {"angle": 45, "axis": "x", "origin": [39, 8, 8]}, "faces": { - "north": {"uv": [8, 8, 16, 12.5], "texture": "#4"}, - "east": {"uv": [8, 8, 12.025, 12.5], "texture": "#4"}, - "south": {"uv": [8, 8, 16, 12.5], "texture": "#4"}, - "west": {"uv": [12, 8, 16, 12.5], "texture": "#4"}, - "up": {"uv": [12, 0, 16, 8], "rotation": 90, "texture": "#4"}, - "down": {"uv": [12, 0, 16, 8], "rotation": 90, "texture": "#4"} + "north": {"uv": [8, 5.5, 16, 10], "texture": "#3"}, + "east": {"uv": [11.975, 0, 16, 4.5], "texture": "#6"}, + "south": {"uv": [0, 4.5, 8, 9], "texture": "#6"}, + "west": {"uv": [0, 0, 4, 4.5], "texture": "#6"}, + "up": {"uv": [8, 5.5, 16, 9.5], "texture": "#3"}, + "down": {"uv": [6, 0, 8, 1], "texture": "#5"} } }, { - "name": "Left", - "from": [0, 0, 0], - "to": [16, 3, 4], + "name": "Top Diagonal", + "from": [13.05, 4, 11.303], + "to": [2.95, 11, 19.328], + "rotation": {"angle": 45, "axis": "x", "origin": [39, 8, 8]}, "faces": { - "north": {"uv": [0, 12, 8, 13.5], "texture": "#4"}, - "east": {"uv": [6, 12, 8, 13.5], "texture": "#4"}, - "west": {"uv": [0, 12, 2, 13.5], "texture": "#4"}, - "up": {"uv": [8, 3, 16, 5], "texture": "#4"}, - "down": {"uv": [6, 0, 8, 8], "rotation": 90, "texture": "#4"} + "east": {"uv": [12, 12, 12.875, 13], "rotation": 270, "texture": "#5"}, + "west": {"uv": [12, 12, 12.875, 13], "rotation": 90, "texture": "#5"}, + "down": {"uv": [6.375, 0, 7.625, 1], "texture": "#5"} } - }, - { - "name": "Left", - "from": [0, 3, 0], - "to": [1, 11, 4], - "faces": { - "north": {"uv": [7.5, 8, 8, 12], "texture": "#4"}, - "east": {"uv": [6, 8, 8, 12], "texture": "#4"}, - "south": {"uv": [0, 8, 0.5, 12], "texture": "#4"}, - "west": {"uv": [0, 8, 2, 12], "texture": "#4"}, - "up": {"uv": [0, 7.5, 2, 8], "rotation": 90, "texture": "#4"} - } - }, - { - "name": "Left", - "from": [15, 3, 0], - "to": [16, 11, 4], - "faces": { - "north": {"uv": [8, 8, 7.5, 12], "texture": "#4"}, - "east": {"uv": [2, 8, 0, 12], "texture": "#4"}, - "south": {"uv": [0.5, 8, 0, 12], "texture": "#4"}, - "west": {"uv": [8, 8, 6, 12], "texture": "#4"}, - "up": {"uv": [0, 8, 2, 7.5], "rotation": 90, "texture": "#4"} - } - }, - { - "name": "Down", - "from": [0, 0, 4], - "to": [16, 5, 12], - "faces": { - "east": {"uv": [2, 11, 6, 13.5], "texture": "#4"}, - "west": {"uv": [2, 11, 6, 13.5], "texture": "#4"}, - "up": {"uv": [8, 2, 16, 6], "texture": "#4"}, - "down": {"uv": [10, 0, 14, 8], "rotation": 90, "texture": "#4"} - } - } - ], - "groups": [0, 1, 2, - { - "name": "horizontal_start", - "origin": [8, 8, 8], - "children": [3, 4, 5, 6] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_casing/diagonal_middle.json b/src/main/resources/assets/create/models/block/belt_casing/diagonal_middle.json index 30eacb4eb..3831da8db 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/diagonal_middle.json +++ b/src/main/resources/assets/create/models/block/belt_casing/diagonal_middle.json @@ -2,34 +2,58 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "4": "create:block/brass_casing_belt", + "3": "create:block/belt/belt_casing_2", + "5": "create:block/belt/belt_casing", + "6": "create:block/brass_casing_connected", "particle": "create:block/brass_casing" }, "elements": [ { "name": "Top Diagonal", "from": [-0.1, 2, -3.325], - "to": [16.1, 11, 10], + "to": [16.1, 11, 7.9875], "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [8, 8, 16, 12.5], "texture": "#4"}, - "east": {"uv": [9.5, 8, 16, 12.5], "texture": "#4"}, - "west": {"uv": [8, 8, 14.5, 12.5], "texture": "#4"}, - "up": {"uv": [9.5, 0, 16, 8], "rotation": 270, "texture": "#4"}, - "down": {"uv": [9.5, 0, 16, 8], "rotation": 270, "texture": "#4"} + "north": {"uv": [0, 4.5, 8, 9], "texture": "#3"}, + "east": {"uv": [8, 11.5, 13.5, 16], "texture": "#3"}, + "west": {"uv": [2.5, 11.5, 8, 16], "texture": "#3"}, + "up": {"uv": [8, 5.5, 16, 11], "texture": "#5"}, + "down": {"uv": [6, 0, 8, 1.375], "texture": "#6"} } }, { "name": "Top Diagonal", - "from": [-0.1, 2, 10], - "to": [16.1, 11, 19.3], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, + "from": [-0.1, 7.43588, 10.23912], + "to": [16.1, 16.43588, 21.55162], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 13.43588, 2.56412]}, "faces": { - "east": {"uv": [8, 8, 13, 12.5], "texture": "#4"}, - "south": {"uv": [8, 8, 16, 12.5], "texture": "#4"}, - "west": {"uv": [11, 8, 16, 12.5], "texture": "#4"}, - "up": {"uv": [8, 0, 12.5, 8], "rotation": 270, "texture": "#4"}, - "down": {"uv": [8, 0, 12.5, 8], "rotation": 270, "texture": "#4"} + "east": {"uv": [2.5, 11.5, 8, 16], "texture": "#3"}, + "south": {"uv": [0, 4.5, 8, 9], "texture": "#3"}, + "west": {"uv": [8, 11.5, 13.5, 16], "texture": "#3"}, + "up": {"uv": [8, 5.5, 16, 11], "rotation": 180, "texture": "#5"}, + "down": {"uv": [6, 0.25, 8, 1.625], "texture": "#6"} + } + }, + { + "name": "Top Diagonal", + "from": [2.9, 14.16466, 23.51034], + "to": [13.1, 21.16466, 12.19784], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 18.16466, -2.16466]}, + "faces": { + "east": {"uv": [12, 12.375, 12.875, 13.75], "rotation": 270, "texture": "#6"}, + "west": {"uv": [12, 12.375, 12.875, 13.75], "rotation": 90, "texture": "#6"}, + "down": {"uv": [12.25, 12.375, 13.5, 13.75], "texture": "#6"} + } + }, + { + "name": "Top Diagonal", + "from": [2.9, 9.43588, 10.23912], + "to": [13.1, 16.43588, -1.07338], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 13.43588, 2.56412]}, + "faces": { + "east": {"uv": [12, 12.25, 12.875, 13.625], "rotation": 270, "texture": "#6"}, + "west": {"uv": [12.125, 12.25, 13, 13.625], "rotation": 90, "texture": "#6"}, + "down": {"uv": [12.375, 12.25, 13.625, 13.625], "texture": "#6"} } } ] diff --git a/src/main/resources/assets/create/models/block/belt_casing/diagonal_pulley.json b/src/main/resources/assets/create/models/block/belt_casing/diagonal_pulley.json index 51ce62cfd..3952aa129 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/diagonal_pulley.json +++ b/src/main/resources/assets/create/models/block/belt_casing/diagonal_pulley.json @@ -2,80 +2,91 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "4": "create:block/brass_casing_belt", + "3": "create:block/belt/belt_casing_2", + "5": "create:block/belt/belt_casing", + "6": "create:block/brass_casing_connected", + "7": "create:block/belt/belt_casing_3", "8": "create:block/gearbox", "particle": "create:block/brass_casing" }, "elements": [ - { - "name": "Casing", - "from": [1.1, 5, 2], - "to": [14.9, 11, 14], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [2, 5, 14, 11], "texture": "#8"}, - "west": {"uv": [2, 5, 14, 11], "texture": "#8"} - } - }, - { - "name": "Casing", - "from": [1.1, 11, 6], - "to": [14.9, 13, 10], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [6, 3, 10, 5], "texture": "#8"}, - "west": {"uv": [6, 3, 10, 5], "texture": "#8"} - } - }, - { - "name": "Left", - "from": [0, 0, 0], - "to": [16, 10, 5], - "faces": { - "north": {"uv": [8, 0, 13, 8], "rotation": 90, "texture": "#4"}, - "east": {"uv": [5.5, 3, 8, 8], "texture": "#4"}, - "south": {"uv": [8, 1.5, 16, 6.5], "texture": "#4"}, - "west": {"uv": [0, 3, 2.5, 8], "texture": "#4"}, - "down": {"uv": [13.5, 0, 16, 8], "rotation": 90, "texture": "#4"} - } - }, - { - "name": "Down", - "from": [0, 0, 5], - "to": [16, 5, 11], - "faces": { - "east": {"uv": [2.5, 5.5, 5.5, 8], "texture": "#4"}, - "west": {"uv": [2.5, 5.5, 5.5, 8], "texture": "#4"}, - "up": {"uv": [8, 2.5, 16, 5.5], "texture": "#4"}, - "down": {"uv": [10.5, 0, 13.5, 8], "rotation": 90, "texture": "#4"} - } - }, { "name": "Top Diagonal", "from": [-0.1, 2, -3.325], - "to": [16.1, 11, 4.7], + "to": [16.1, 11, 7.9875], "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [8, 8, 16, 12.5], "texture": "#4"}, - "east": {"uv": [12, 8, 16, 12.5], "texture": "#4"}, - "south": {"uv": [8, 8, 16, 12.5], "texture": "#4"}, - "west": {"uv": [8, 8, 12, 12.5], "texture": "#4"}, - "up": {"uv": [12, 0, 16, 8], "rotation": 270, "texture": "#4"}, - "down": {"uv": [12, 0, 16, 8], "rotation": 270, "texture": "#4"} + "north": {"uv": [0, 4.5, 8, 9], "texture": "#3"}, + "east": {"uv": [8, 0, 13.5, 4.5], "texture": "#3"}, + "west": {"uv": [2.5, 0, 8, 4.5], "texture": "#3"}, + "up": {"uv": [8, 4.5, 16, 10], "texture": "#3"}, + "down": {"uv": [6, 0, 8, 1.375], "texture": "#6"} } }, { "name": "Top Diagonal", - "from": [-0.1, 2, 11.275], - "to": [16.1, 11, 19.3], + "from": [-0.1, 7.43588, 10.23912], + "to": [16.1, 16.43588, 21.55162], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 13.43588, 2.56412]}, + "faces": { + "east": {"uv": [2.5, 0, 8, 4.5], "texture": "#3"}, + "south": {"uv": [0, 4.5, 8, 9], "texture": "#3"}, + "west": {"uv": [8, 0, 13.5, 4.5], "texture": "#3"}, + "up": {"uv": [8, 4.5, 16, 10], "rotation": 180, "texture": "#3"}, + "down": {"uv": [6, 0.25, 8, 1.625], "texture": "#6"} + } + }, + { + "name": "Top Diagonal", + "from": [-0.1, 11, 3.85], + "to": [16.1, 5, 12.15], "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [8, 8, 16, 12.5], "texture": "#4"}, - "east": {"uv": [8, 8, 12, 12.5], "texture": "#4"}, - "south": {"uv": [8, 8, 16, 12.5], "texture": "#4"}, - "west": {"uv": [12, 8, 16, 12.5], "texture": "#4"}, - "up": {"uv": [8, 0, 12, 8], "rotation": 270, "texture": "#4"}, - "down": {"uv": [8, 0, 12, 8], "rotation": 270, "texture": "#4"} + "north": {"uv": [8, 4.5, 16, 7.5], "texture": "#3"}, + "south": {"uv": [8, 4.5, 16, 7.5], "texture": "#3"}, + "up": {"uv": [8, 5.5, 16, 9.5], "texture": "#5"} + } + }, + { + "name": "Top Diagonal", + "from": [0.9, 5, 3.85], + "to": [15.1, 11, 12.15], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [4, 5, 12, 11], "texture": "#8"}, + "west": {"uv": [4, 5, 12, 11], "texture": "#8"} + } + }, + { + "name": "Top Diagonal", + "from": [2.9, 9.43588, 10.23912], + "to": [13.1, 16.43588, -1.07338], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 13.43588, 2.56412]}, + "faces": { + "east": {"uv": [11.875, 12.375, 12.75, 13.75], "rotation": 270, "texture": "#6"}, + "west": {"uv": [12.125, 12.375, 13, 13.75], "rotation": 90, "texture": "#6"}, + "down": {"uv": [12.375, 12.375, 13.625, 13.75], "texture": "#6"} + } + }, + { + "name": "Top Diagonal", + "from": [2.9, 14.16466, 23.51034], + "to": [13.1, 21.16466, 12.19784], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 18.16466, -2.16466]}, + "faces": { + "east": {"uv": [12, 12.5, 12.875, 13.875], "rotation": 270, "texture": "#6"}, + "west": {"uv": [12, 12.5, 12.875, 13.875], "rotation": 90, "texture": "#6"}, + "down": {"uv": [12.375, 12.5, 13.625, 13.875], "texture": "#6"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 8, 8], + "faces": { + "north": {"uv": [6, 0.25, 8, 1.25], "texture": "#6"}, + "east": {"uv": [4, 0, 8, 4], "texture": "#7"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#7"}, + "down": {"uv": [6, 0, 8, 1], "texture": "#6"} } } ] diff --git a/src/main/resources/assets/create/models/block/belt_casing/diagonal_start.json b/src/main/resources/assets/create/models/block/belt_casing/diagonal_start.json index bbc8e8963..d28da5434 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/diagonal_start.json +++ b/src/main/resources/assets/create/models/block/belt_casing/diagonal_start.json @@ -2,111 +2,81 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "4": "create:block/brass_casing_belt", + "3": "create:block/belt/belt_casing", + "5": "create:block/brass_casing_connected", + "6": "create:block/belt/belt_casing_2", + "7": "create:block/belt/belt_casing_3", "8": "create:block/gearbox", "particle": "create:block/brass_casing" }, "elements": [ { - "name": "Casing", - "from": [1.1, 5, 2], - "to": [14.9, 11, 14], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, + "from": [0, 0, 0], + "to": [16, 11, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-15, 0, 0]}, "faces": { - "east": {"uv": [2, 5, 14, 11], "texture": "#8"}, - "west": {"uv": [2, 5, 14, 11], "texture": "#8"} + "north": {"uv": [6, 0, 8, 1.375], "texture": "#5"}, + "east": {"uv": [0, 0, 8, 5.5], "texture": "#3"}, + "south": {"uv": [8, 0, 16, 5.5], "texture": "#7"}, + "west": {"uv": [0, 0, 8, 5.5], "texture": "#3"}, + "up": {"uv": [0, 8, 8, 16], "texture": "#3"}, + "down": {"uv": [4, 0, 6, 2], "texture": "#5"} } }, { - "name": "Casing", - "from": [1.1, 11, 6], - "to": [14.9, 13, 10], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, + "from": [1, 11, 0], + "to": [15, 3, 16.01], + "rotation": {"angle": 0, "axis": "y", "origin": [-15, 0, 0]}, "faces": { - "east": {"uv": [6, 3, 10, 5], "texture": "#8"}, - "west": {"uv": [6, 3, 10, 5], "texture": "#8"} + "east": {"uv": [0, 0, 8, 4], "rotation": 180, "texture": "#3"}, + "west": {"uv": [0, 0, 8, 4], "rotation": 180, "texture": "#3"}, + "up": {"uv": [12.125, 12, 13.875, 14], "texture": "#5"} + } + }, + { + "from": [0, 5, 12], + "to": [16, 11, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [-15, 0, 0]}, + "faces": { + "north": {"uv": [8, 5.5, 16, 8.5], "texture": "#3"}, + "south": {"uv": [8, 5.5, 16, 8.5], "texture": "#3"}, + "down": {"uv": [8, 5.5, 16, 10], "texture": "#3"} + } + }, + { + "from": [1, 5, 4], + "to": [15, 11, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [-15, 0, 0]}, + "faces": { + "east": {"uv": [4, 5, 12, 11], "texture": "#8"}, + "west": {"uv": [4, 5, 12, 11], "texture": "#8"}, + "up": {"uv": [8.5, 4.5, 15.5, 8], "texture": "#6"} } }, { "name": "Top Diagonal", "from": [-0.1, 2, -3.325], "to": [16.1, 11, 4.7], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]}, + "rotation": {"angle": 45, "axis": "x", "origin": [-22, 8, 8]}, "faces": { - "north": {"uv": [8, 8, 16, 12.5], "texture": "#4"}, - "east": {"uv": [12, 8, 16, 12.5], "texture": "#4"}, - "south": {"uv": [8, 8, 16, 12.5], "texture": "#4"}, - "west": {"uv": [8, 8, 12, 12.5], "texture": "#4"}, - "up": {"uv": [12, 0, 16, 8], "rotation": 270, "texture": "#4"}, - "down": {"uv": [12, 0, 16, 8], "rotation": 270, "texture": "#4"} + "north": {"uv": [0, 4.5, 8, 9], "texture": "#6"}, + "east": {"uv": [0, 0, 4, 4.5], "texture": "#6"}, + "south": {"uv": [8, 5.5, 16, 10], "texture": "#3"}, + "west": {"uv": [12, 0, 16, 4.5], "texture": "#6"}, + "up": {"uv": [8, 5.5, 16, 9.5], "rotation": 180, "texture": "#3"}, + "down": {"uv": [6, 0, 8, 1], "texture": "#5"} } }, { - "name": "Left", - "from": [0, 0, 12], - "to": [16, 3, 16], + "name": "Top Diagonal", + "from": [13.05, 4, -3.325], + "to": [2.95, 11, 4.7], + "rotation": {"angle": 45, "axis": "x", "origin": [24, 8, 8]}, "faces": { - "east": {"uv": [0, 12, 2, 13.5], "texture": "#4"}, - "south": {"uv": [0, 12, 8, 13.5], "texture": "#4"}, - "west": {"uv": [6, 12, 8, 13.5], "texture": "#4"}, - "up": {"uv": [8, 3, 16, 5], "rotation": 180, "texture": "#4"}, - "down": {"uv": [6, 0, 8, 8], "rotation": 270, "texture": "#4"} + "east": {"uv": [12.125, 12.25, 13, 13.25], "rotation": 270, "texture": "#5"}, + "west": {"uv": [12, 12.25, 12.875, 13.25], "rotation": 90, "texture": "#5"}, + "down": {"uv": [6.375, 0.25, 7.625, 1.25], "texture": "#5"} } - }, - { - "name": "Left", - "from": [15, 3, 12], - "to": [16, 11, 16], - "faces": { - "north": {"uv": [0, 8, 0.5, 12], "texture": "#4"}, - "east": {"uv": [0, 8, 2, 12], "texture": "#4"}, - "south": {"uv": [7.5, 8, 8, 12], "texture": "#4"}, - "west": {"uv": [6, 8, 8, 12], "texture": "#4"}, - "up": {"uv": [0, 7.5, 2, 8], "rotation": 270, "texture": "#4"} - } - }, - { - "name": "Left", - "from": [0, 3, 12], - "to": [1, 11, 16], - "faces": { - "north": {"uv": [0.5, 8, 0, 12], "texture": "#4"}, - "east": {"uv": [8, 8, 6, 12], "texture": "#4"}, - "south": {"uv": [8, 8, 7.5, 12], "texture": "#4"}, - "west": {"uv": [2, 8, 0, 12], "texture": "#4"}, - "up": {"uv": [0, 8, 2, 7.5], "rotation": 270, "texture": "#4"} - } - }, - { - "name": "Right", - "from": [0, 0, 0], - "to": [16, 11, 5], - "faces": { - "north": {"uv": [8, 0, 13.5, 8], "rotation": 90, "texture": "#4"}, - "east": {"uv": [5.5, 2.5, 8, 8], "texture": "#4"}, - "south": {"uv": [0, 8, 8, 13.5], "texture": "#4"}, - "west": {"uv": [0, 8, 2.5, 13.5], "texture": "#4"}, - "up": {"uv": [6, 0, 8, 8], "rotation": 270, "texture": "#4"}, - "down": {"uv": [8, 0, 10, 8], "rotation": 270, "texture": "#4"} - } - }, - { - "name": "Down", - "from": [0, 0, 5], - "to": [16, 5, 12], - "faces": { - "east": {"uv": [2, 11, 5.5, 13.5], "texture": "#4"}, - "west": {"uv": [2.5, 11, 6, 13.5], "texture": "#4"}, - "up": {"uv": [8, 2, 16, 5.5], "rotation": 180, "texture": "#4"}, - "down": {"uv": [10, 0, 14, 8], "rotation": 270, "texture": "#4"} - } - } - ], - "groups": [0, 1, 2, - { - "name": "horizontal_start", - "origin": [8, 8, 8], - "children": [3, 4, 5, 6, 7] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_casing/horizontal_end.json b/src/main/resources/assets/create/models/block/belt_casing/horizontal_end.json index 9e1bd4f0e..6d0dbfb51 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/horizontal_end.json +++ b/src/main/resources/assets/create/models/block/belt_casing/horizontal_end.json @@ -2,78 +2,57 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "4": "create:block/brass_casing_belt", + "3": "create:block/belt/belt_casing", + "4": "create:block/belt/belt_casing_3", + "5": "create:block/brass_casing_connected", "8": "create:block/gearbox", "particle": "create:block/brass_casing" }, "elements": [ { - "name": "Casing", - "from": [1, 5, 2], - "to": [15, 11, 14], - "faces": { - "east": {"uv": [2, 5, 14, 11], "texture": "#8"}, - "west": {"uv": [2, 5, 14, 11], "texture": "#8"} - } - }, - { - "name": "Left", - "from": [0, 0, 12], - "to": [16, 3, 16], - "faces": { - "east": {"uv": [0, 12, 2, 13.5], "texture": "#4"}, - "south": {"uv": [0, 12, 8, 13.5], "texture": "#4"}, - "west": {"uv": [6, 12, 8, 13.5], "texture": "#4"}, - "up": {"uv": [8, 3, 16, 5], "rotation": 180, "texture": "#4"}, - "down": {"uv": [6, 0, 8, 8], "rotation": 270, "texture": "#4"} - } - }, - { - "name": "Left", - "from": [15, 3, 12], + "from": [0, 0, 0], "to": [16, 11, 16], "faces": { - "north": {"uv": [0, 8, 0.5, 12], "texture": "#4"}, - "east": {"uv": [0, 8, 2, 12], "texture": "#4"}, - "south": {"uv": [7.5, 8, 8, 12], "texture": "#4"}, - "west": {"uv": [6, 8, 8, 12], "texture": "#4"}, - "up": {"uv": [0, 7.5, 2, 8], "rotation": 270, "texture": "#4"} + "north": {"uv": [8, 0, 16, 5.5], "texture": "#4"}, + "east": {"uv": [0, 0, 8, 5.5], "texture": "#3"}, + "south": {"uv": [8, 0, 16, 5.5], "texture": "#4"}, + "west": {"uv": [0, 0, 8, 5.5], "texture": "#3"}, + "up": {"uv": [0, 8, 8, 16], "texture": "#3"}, + "down": {"uv": [2, 0, 4, 2], "rotation": 180, "texture": "#5"} } }, { - "name": "Left", - "from": [0, 3, 12], - "to": [1, 11, 16], - "faces": { - "north": {"uv": [0.5, 8, 0, 12], "texture": "#4"}, - "east": {"uv": [8, 8, 6, 12], "texture": "#4"}, - "south": {"uv": [8, 8, 7.5, 12], "texture": "#4"}, - "west": {"uv": [2, 8, 0, 12], "texture": "#4"}, - "up": {"uv": [0, 8, 2, 7.5], "rotation": 270, "texture": "#4"} - } - }, - { - "name": "Right", - "from": [0, 0, 0], + "from": [0, 5, 12], "to": [16, 11, 4], "faces": { - "north": {"uv": [0, 8, 8, 13.5], "texture": "#4"}, - "east": {"uv": [6, 8, 8, 13.5], "texture": "#4"}, - "south": {"uv": [0, 8, 8, 13.5], "texture": "#4"}, - "west": {"uv": [0, 8, 2, 13.5], "texture": "#4"}, - "up": {"uv": [6, 0, 8, 8], "rotation": 270, "texture": "#4"}, - "down": {"uv": [8, 0, 10, 8], "rotation": 270, "texture": "#4"} + "north": {"uv": [8, 13, 16, 16], "rotation": 180, "texture": "#3"}, + "south": {"uv": [8, 13, 16, 16], "rotation": 180, "texture": "#3"}, + "down": {"uv": [8, 8, 16, 12], "texture": "#3"} } }, { - "name": "Down", - "from": [0, 0, 4], - "to": [16, 4, 12], + "from": [1, 5, 4], + "to": [15, 11, 12], "faces": { - "east": {"uv": [2, 11.5, 6, 13.5], "texture": "#4"}, - "west": {"uv": [2, 11.5, 6, 13.5], "texture": "#4"}, - "up": {"uv": [8, 2, 16, 6], "rotation": 180, "texture": "#4"}, - "down": {"uv": [10, 0, 14, 8], "rotation": 270, "texture": "#4"} + "east": {"uv": [4, 5, 12, 11], "texture": "#8"}, + "west": {"uv": [4, 5, 12, 11], "texture": "#8"} + } + }, + { + "from": [3, 5, 15.99], + "to": [13, 11, -0.03], + "faces": { + "east": {"uv": [8, 1.5, 16, 4.5], "texture": "#3"}, + "west": {"uv": [8, 1.5, 16, 4.5], "texture": "#3"} + } + }, + { + "from": [1, 11, -0.01], + "to": [15, 3, 16.01], + "faces": { + "east": {"uv": [8, 0, 16, 4], "rotation": 180, "texture": "#3"}, + "west": {"uv": [8, 0, 16, 4], "rotation": 180, "texture": "#3"}, + "up": {"uv": [12.125, 12, 13.875, 14], "texture": "#5"} } } ] diff --git a/src/main/resources/assets/create/models/block/belt_casing/horizontal_middle.json b/src/main/resources/assets/create/models/block/belt_casing/horizontal_middle.json index d72517e08..c9b86e512 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/horizontal_middle.json +++ b/src/main/resources/assets/create/models/block/belt_casing/horizontal_middle.json @@ -2,21 +2,39 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "3": "create:block/brass_casing_belt", + "2": "create:block/belt/belt_casing", + "4": "create:block/brass_casing_connected", + "5": "create:block/belt/belt_casing_3", "particle": "create:block/brass_casing" }, "elements": [ { - "name": "Casing", "from": [0, 0, 0], "to": [16, 11, 16], "faces": { - "north": {"uv": [0, 8, 8, 13.5], "texture": "#3"}, - "east": {"uv": [0, 8, 8, 13.5], "texture": "#3"}, - "south": {"uv": [0, 8, 8, 13.5], "texture": "#3"}, - "west": {"uv": [0, 8, 8, 13.5], "texture": "#3"}, - "up": {"uv": [0, 0, 8, 8], "rotation": 90, "texture": "#3"}, - "down": {"uv": [8, 0, 16, 8], "rotation": 90, "texture": "#3"} + "north": {"uv": [8, 0, 16, 5.5], "texture": "#5"}, + "east": {"uv": [8, 0, 16, 5.5], "texture": "#2"}, + "south": {"uv": [8, 0, 16, 5.5], "texture": "#5"}, + "west": {"uv": [8, 0, 16, 5.5], "texture": "#2"}, + "up": {"uv": [8, 6, 16, 14], "texture": "#2"}, + "down": {"uv": [2, 0, 4, 2], "rotation": 180, "texture": "#4"} + } + }, + { + "from": [1, 11, -0.01], + "to": [15, 3, 16.01], + "faces": { + "east": {"uv": [8, 0, 16, 4], "rotation": 180, "texture": "#2"}, + "west": {"uv": [8, 0, 16, 4], "rotation": 180, "texture": "#2"}, + "up": {"uv": [12.125, 12, 13.875, 14], "texture": "#4"} + } + }, + { + "from": [3, 5, 15.99], + "to": [13, 11, -0.03], + "faces": { + "east": {"uv": [8, 1.5, 16, 4.5], "texture": "#2"}, + "west": {"uv": [8, 1.5, 16, 4.5], "texture": "#2"} } } ] diff --git a/src/main/resources/assets/create/models/block/belt_casing/horizontal_pulley.json b/src/main/resources/assets/create/models/block/belt_casing/horizontal_pulley.json index a0d43fd8c..774cacce3 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/horizontal_pulley.json +++ b/src/main/resources/assets/create/models/block/belt_casing/horizontal_pulley.json @@ -2,55 +2,57 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "4": "create:block/brass_casing_belt", + "3": "create:block/belt/belt_casing", + "4": "create:block/belt/belt_casing_3", + "5": "create:block/brass_casing_connected", "8": "create:block/gearbox", "particle": "create:block/brass_casing" }, "elements": [ { - "name": "Casing", - "from": [1, 5, 2], - "to": [15, 11, 14], - "faces": { - "east": {"uv": [2, 5, 14, 11], "texture": "#8"}, - "west": {"uv": [2, 5, 14, 11], "texture": "#8"} - } - }, - { - "name": "Right", "from": [0, 0, 0], - "to": [16, 11, 4], - "faces": { - "north": {"uv": [0, 8, 8, 13.5], "texture": "#4"}, - "east": {"uv": [6, 8, 8, 13.5], "texture": "#4"}, - "south": {"uv": [0, 8, 8, 13.5], "texture": "#4"}, - "west": {"uv": [0, 8, 2, 13.5], "texture": "#4"}, - "up": {"uv": [6, 0, 8, 8], "rotation": 270, "texture": "#4"}, - "down": {"uv": [8, 0, 10, 8], "rotation": 270, "texture": "#4"} - } - }, - { - "name": "Right", - "from": [0, 0, 12], "to": [16, 11, 16], "faces": { - "north": {"uv": [8, 8, 0, 13.5], "texture": "#4"}, - "east": {"uv": [8, 8, 6, 13.5], "texture": "#4"}, - "south": {"uv": [8, 8, 0, 13.5], "texture": "#4"}, - "west": {"uv": [2, 8, 0, 13.5], "texture": "#4"}, - "up": {"uv": [8, 0, 6, 8], "rotation": 270, "texture": "#4"}, - "down": {"uv": [10, 0, 8, 8], "rotation": 270, "texture": "#4"} + "north": {"uv": [8, 0, 16, 5.5], "texture": "#4"}, + "east": {"uv": [0, 0, 8, 5.5], "texture": "#3"}, + "south": {"uv": [8, 0, 16, 5.5], "texture": "#4"}, + "west": {"uv": [0, 0, 8, 5.5], "texture": "#3"}, + "up": {"uv": [0, 8, 8, 16], "texture": "#3"}, + "down": {"uv": [2, 0, 4, 2], "rotation": 180, "texture": "#5"} } }, { - "name": "Down", - "from": [0, 0, 4], - "to": [16, 4, 12], + "from": [0, 5, 12], + "to": [16, 11, 4], "faces": { - "east": {"uv": [2, 11.5, 6, 13.5], "texture": "#4"}, - "west": {"uv": [2, 11.5, 6, 13.5], "texture": "#4"}, - "up": {"uv": [8, 2, 16, 6], "rotation": 180, "texture": "#4"}, - "down": {"uv": [10, 0, 14, 8], "rotation": 270, "texture": "#4"} + "north": {"uv": [8, 6, 16, 9], "rotation": 180, "texture": "#3"}, + "south": {"uv": [8, 6, 16, 9], "rotation": 180, "texture": "#3"}, + "down": {"uv": [8, 6, 16, 10], "texture": "#3"} + } + }, + { + "from": [1, 5, 4], + "to": [15, 11, 12], + "faces": { + "east": {"uv": [4, 5, 12, 11], "texture": "#8"}, + "west": {"uv": [4, 5, 12, 11], "texture": "#8"} + } + }, + { + "from": [3, 5, 15.99], + "to": [13, 11, -0.03], + "faces": { + "east": {"uv": [8, 1.5, 16, 4.5], "texture": "#3"}, + "west": {"uv": [8, 1.5, 16, 4.5], "texture": "#3"} + } + }, + { + "from": [1, 11, -0.01], + "to": [15, 3, 16.01], + "faces": { + "east": {"uv": [8, 0, 16, 4], "rotation": 180, "texture": "#3"}, + "west": {"uv": [8, 0, 16, 4], "rotation": 180, "texture": "#3"}, + "up": {"uv": [12.125, 12, 13.875, 14], "texture": "#5"} } } ] diff --git a/src/main/resources/assets/create/models/block/belt_casing/horizontal_start.json b/src/main/resources/assets/create/models/block/belt_casing/horizontal_start.json index 042448aab..774cacce3 100644 --- a/src/main/resources/assets/create/models/block/belt_casing/horizontal_start.json +++ b/src/main/resources/assets/create/models/block/belt_casing/horizontal_start.json @@ -2,78 +2,57 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "4": "create:block/brass_casing_belt", + "3": "create:block/belt/belt_casing", + "4": "create:block/belt/belt_casing_3", + "5": "create:block/brass_casing_connected", "8": "create:block/gearbox", "particle": "create:block/brass_casing" }, "elements": [ { - "name": "Casing", - "from": [1, 5, 2], - "to": [15, 11, 14], - "faces": { - "east": {"uv": [2, 5, 14, 11], "texture": "#8"}, - "west": {"uv": [2, 5, 14, 11], "texture": "#8"} - } - }, - { - "name": "Left", "from": [0, 0, 0], - "to": [16, 3, 4], - "faces": { - "north": {"uv": [0, 12, 8, 13.5], "texture": "#4"}, - "east": {"uv": [6, 12, 8, 13.5], "texture": "#4"}, - "west": {"uv": [0, 12, 2, 13.5], "texture": "#4"}, - "up": {"uv": [8, 3, 16, 5], "texture": "#4"}, - "down": {"uv": [6, 0, 8, 8], "rotation": 90, "texture": "#4"} - } - }, - { - "name": "Left", - "from": [0, 3, 0], - "to": [1, 11, 4], - "faces": { - "north": {"uv": [7.5, 8, 8, 12], "texture": "#4"}, - "east": {"uv": [6, 8, 8, 12], "texture": "#4"}, - "south": {"uv": [0, 8, 0.5, 12], "texture": "#4"}, - "west": {"uv": [0, 8, 2, 12], "texture": "#4"}, - "up": {"uv": [0, 7.5, 2, 8], "rotation": 90, "texture": "#4"} - } - }, - { - "name": "Left", - "from": [15, 3, 0], - "to": [16, 11, 4], - "faces": { - "north": {"uv": [8, 8, 7.5, 12], "texture": "#4"}, - "east": {"uv": [2, 8, 0, 12], "texture": "#4"}, - "south": {"uv": [0.5, 8, 0, 12], "texture": "#4"}, - "west": {"uv": [8, 8, 6, 12], "texture": "#4"}, - "up": {"uv": [0, 8, 2, 7.5], "rotation": 90, "texture": "#4"} - } - }, - { - "name": "Right", - "from": [0, 0, 12], "to": [16, 11, 16], "faces": { - "north": {"uv": [0, 8, 8, 13.5], "texture": "#4"}, - "east": {"uv": [0, 8, 2, 13.5], "texture": "#4"}, - "south": {"uv": [0, 8, 8, 13.5], "texture": "#4"}, - "west": {"uv": [6, 8, 8, 13.5], "texture": "#4"}, - "up": {"uv": [6, 0, 8, 8], "rotation": 90, "texture": "#4"}, - "down": {"uv": [8, 0, 10, 8], "rotation": 90, "texture": "#4"} + "north": {"uv": [8, 0, 16, 5.5], "texture": "#4"}, + "east": {"uv": [0, 0, 8, 5.5], "texture": "#3"}, + "south": {"uv": [8, 0, 16, 5.5], "texture": "#4"}, + "west": {"uv": [0, 0, 8, 5.5], "texture": "#3"}, + "up": {"uv": [0, 8, 8, 16], "texture": "#3"}, + "down": {"uv": [2, 0, 4, 2], "rotation": 180, "texture": "#5"} } }, { - "name": "Down", - "from": [0, 0, 4], - "to": [16, 4, 12], + "from": [0, 5, 12], + "to": [16, 11, 4], "faces": { - "east": {"uv": [2, 11.5, 6, 13.5], "texture": "#4"}, - "west": {"uv": [2, 11.5, 6, 13.5], "texture": "#4"}, - "up": {"uv": [8, 2, 16, 6], "texture": "#4"}, - "down": {"uv": [10, 0, 14, 8], "rotation": 90, "texture": "#4"} + "north": {"uv": [8, 6, 16, 9], "rotation": 180, "texture": "#3"}, + "south": {"uv": [8, 6, 16, 9], "rotation": 180, "texture": "#3"}, + "down": {"uv": [8, 6, 16, 10], "texture": "#3"} + } + }, + { + "from": [1, 5, 4], + "to": [15, 11, 12], + "faces": { + "east": {"uv": [4, 5, 12, 11], "texture": "#8"}, + "west": {"uv": [4, 5, 12, 11], "texture": "#8"} + } + }, + { + "from": [3, 5, 15.99], + "to": [13, 11, -0.03], + "faces": { + "east": {"uv": [8, 1.5, 16, 4.5], "texture": "#3"}, + "west": {"uv": [8, 1.5, 16, 4.5], "texture": "#3"} + } + }, + { + "from": [1, 11, -0.01], + "to": [15, 3, 16.01], + "faces": { + "east": {"uv": [8, 0, 16, 4], "rotation": 180, "texture": "#3"}, + "west": {"uv": [8, 0, 16, 4], "rotation": 180, "texture": "#3"}, + "up": {"uv": [12.125, 12, 13.875, 14], "texture": "#5"} } } ] diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_extended.json b/src/main/resources/assets/create/models/block/belt_funnel/block_extended.json index adca94f7c..e83a80ba4 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_extended.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/block_extended.json @@ -18,7 +18,7 @@ "faces": { "north": {"uv": [8, 8, 9, 8.5], "rotation": 90, "texture": "#base"}, "east": {"uv": [8, 8, 9, 11], "rotation": 90, "texture": "#base"}, - "west": {"uv": [8, 8, 9, 11], "rotation": 90, "texture": "#base"}, + "west": {"uv": [8, 13, 9, 16], "rotation": 90, "texture": "#base"}, "down": {"uv": [0, 0, 1, 6], "rotation": 180, "texture": "#block"} } }, @@ -30,7 +30,7 @@ "faces": { "north": {"uv": [8, 8, 9, 8.5], "rotation": 90, "texture": "#base"}, "east": {"uv": [8, 8, 9, 11], "rotation": 90, "texture": "#base"}, - "west": {"uv": [8, 8, 9, 11], "rotation": 90, "texture": "#base"}, + "west": {"uv": [8, 13, 9, 16], "rotation": 90, "texture": "#base"}, "down": {"uv": [15, 0, 16, 6], "rotation": 180, "texture": "#block"} } }, @@ -42,7 +42,7 @@ "east": {"uv": [11, 0, 8, 9.5], "texture": "#direction"}, "south": {"uv": [0, 6.5, 8, 16], "rotation": 180, "texture": "#direction"}, "west": {"uv": [8, 0, 11, 9.5], "texture": "#direction"}, - "up": {"uv": [11, 8, 14, 16], "rotation": 90, "texture": "#direction"}, + "up": {"uv": [8, 10, 16, 13], "texture": "#direction"}, "down": {"uv": [0, 6.5, 8, 9.5], "texture": "#direction"} } }, @@ -50,9 +50,9 @@ "from": [2, -3, 6], "to": [14, 10, 0], "faces": { - "east": {"uv": [11, 12.5, 14, 6], "texture": "#base"}, + "east": {"uv": [13, 6, 16, 12.5], "rotation": 180, "texture": "#base"}, "west": {"uv": [13, 8.5, 16, 16], "texture": "#base"}, - "up": {"uv": [14, 8.5, 11, 14.5], "rotation": 90, "texture": "#base"} + "up": {"uv": [16, 8, 13, 14], "rotation": 270, "texture": "#base"} } }, { @@ -61,9 +61,9 @@ "to": [13, 13, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 6]}, "faces": { - "east": {"uv": [8.5, 8, 16, 6], "rotation": 90, "texture": "#back"}, - "west": {"uv": [8.5, 6, 16, 8], "rotation": 90, "texture": "#back"}, - "up": {"uv": [0.5, 8.5, 5.5, 10.5], "rotation": 180, "texture": "#back"} + "east": {"uv": [0, 0, 7.5, 2], "rotation": 90, "texture": "#back"}, + "west": {"uv": [0, 2, 7.5, 0], "rotation": 90, "texture": "#back"}, + "up": {"uv": [10.5, 3.5, 15.5, 5.5], "rotation": 180, "texture": "#back"} } }, { @@ -73,10 +73,10 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 6]}, "faces": { "north": {"uv": [0, 0, 8, 6], "rotation": 270, "texture": "#base"}, - "east": {"uv": [0.5, 8, 8.5, 6], "rotation": 90, "texture": "#back"}, - "south": {"uv": [8, 0, 16, 6], "rotation": 90, "texture": "#back"}, - "west": {"uv": [0.5, 6, 8.5, 8], "rotation": 90, "texture": "#back"}, - "up": {"uv": [6, 0, 8, 6], "rotation": 90, "texture": "#back"} + "east": {"uv": [8, 0, 16, 2], "rotation": 90, "texture": "#back"}, + "south": {"uv": [10, 7.5, 16, 15.5], "texture": "#back"}, + "west": {"uv": [8, 2, 16, 0], "rotation": 90, "texture": "#back"}, + "up": {"uv": [10, 5.5, 16, 7.5], "rotation": 180, "texture": "#back"} } }, { @@ -102,7 +102,7 @@ "north": {"uv": [0, 3, 16, 6], "texture": "#block"}, "east": {"uv": [7.5, 11, 9, 16], "rotation": 90, "texture": "#base"}, "south": {"uv": [7.5, 8, 9, 16], "rotation": 90, "texture": "#base"}, - "west": {"uv": [7.5, 10.5, 9, 16], "rotation": 90, "texture": "#base"}, + "west": {"uv": [7.5, 8, 9, 13.5], "rotation": 90, "texture": "#base"}, "up": {"uv": [0, 6, 16, 16], "texture": "#block"}, "down": {"uv": [0, 6, 16, 16], "rotation": 180, "texture": "#block"} } diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json b/src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json index 9f8699599..ac2f7d8d3 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json @@ -29,12 +29,12 @@ "to": [15.9, -2, 16], "rotation": {"angle": 0, "axis": "y", "origin": [7, -8, 8]}, "faces": { - "north": {"uv": [7.5, 8, 9, 16], "rotation": 90, "texture": "#base"}, - "east": {"uv": [7.5, 8, 9, 9.5], "rotation": 90, "texture": "#base"}, + "north": {"uv": [0, 10, 16, 13], "texture": "#particle"}, + "east": {"uv": [7.5, 14.5, 9, 16], "rotation": 90, "texture": "#base"}, "south": {"uv": [7.5, 8, 9, 16], "rotation": 90, "texture": "#base"}, "west": {"uv": [7.5, 8, 9, 9.5], "rotation": 90, "texture": "#base"}, - "up": {"uv": [6, 8, 7.5, 16], "texture": "#base"}, - "down": {"uv": [6, 8, 7.5, 16], "rotation": 90, "texture": "#base"} + "up": {"uv": [0, 7, 16, 10], "texture": "#particle"}, + "down": {"uv": [0, 13, 16, 16], "rotation": 180, "texture": "#particle"} } }, { @@ -43,7 +43,7 @@ "to": [14, 11.9, 14], "rotation": {"angle": 0, "axis": "y", "origin": [7, 6.9, 8]}, "faces": { - "down": {"uv": [12, 9, 14, 15], "rotation": 90, "texture": "#base"} + "down": {"uv": [13, 8, 15, 14], "rotation": 90, "texture": "#base"} } }, { @@ -51,10 +51,10 @@ "to": [15.05, 14.95, 14], "rotation": {"angle": 0, "axis": "y", "origin": [9, 6, 21]}, "faces": { - "east": {"uv": [0.5, 6.5, 4, 8], "rotation": 90, "texture": "#back"}, - "south": {"uv": [8, 0, 11.5, 6], "rotation": 90, "texture": "#back"}, - "west": {"uv": [0.5, 6, 4, 7.5], "rotation": 90, "texture": "#back"}, - "up": {"uv": [6.5, 0, 8, 6], "rotation": 90, "texture": "#back"} + "east": {"uv": [0, 0.5, 3.5, 2], "rotation": 90, "texture": "#back"}, + "south": {"uv": [0, 7.5, 7, 11], "texture": "#back"}, + "west": {"uv": [0, 2, 3.5, 0.5], "rotation": 90, "texture": "#back"}, + "up": {"uv": [0, 5.5, 7, 7], "rotation": 180, "texture": "#back"} } }, { @@ -77,9 +77,9 @@ "to": [14.05, 10, 13], "rotation": {"angle": -22.5, "axis": "x", "origin": [0, -3, 13]}, "faces": { - "east": {"uv": [11, 9.5, 14, 16], "texture": "#base"}, + "east": {"uv": [13, 16, 16, 9.5], "rotation": 180, "texture": "#base"}, "west": {"uv": [13, 12.5, 16, 6], "texture": "#base"}, - "up": {"uv": [11, 9.5, 14, 15.5], "rotation": 270, "texture": "#base"} + "up": {"uv": [13, 8, 16, 14], "rotation": 90, "texture": "#base"} } } ], diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json b/src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json index 5c82f50f3..b57d9857a 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json @@ -29,12 +29,12 @@ "to": [15.9, -2, 16], "rotation": {"angle": 0, "axis": "y", "origin": [7, -8, 8]}, "faces": { - "north": {"uv": [7.5, 8, 9, 16], "rotation": 90, "texture": "#base"}, + "north": {"uv": [0, 10, 16, 13], "texture": "#particle"}, "east": {"uv": [7.5, 8, 9, 9.5], "rotation": 90, "texture": "#base"}, "south": {"uv": [7.5, 8, 9, 16], "rotation": 90, "texture": "#base"}, - "west": {"uv": [7.5, 8, 9, 9.5], "rotation": 90, "texture": "#base"}, - "up": {"uv": [6, 8, 7.5, 16], "texture": "#base"}, - "down": {"uv": [6, 8, 7.5, 16], "rotation": 90, "texture": "#base"} + "west": {"uv": [7.5, 14.5, 9, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 7, 16, 10], "texture": "#particle"}, + "down": {"uv": [0, 13, 16, 16], "rotation": 180, "texture": "#particle"} } }, { @@ -43,7 +43,7 @@ "to": [14, 11.9, 14], "rotation": {"angle": 0, "axis": "y", "origin": [7, 6.9, 8]}, "faces": { - "down": {"uv": [12, 9.5, 14, 15.5], "rotation": 90, "texture": "#base"} + "down": {"uv": [13, 8.5, 15, 14.5], "rotation": 90, "texture": "#base"} } }, { @@ -51,10 +51,10 @@ "to": [15.05, 14.95, 14], "rotation": {"angle": 0, "axis": "y", "origin": [9, 6, 21]}, "faces": { - "east": {"uv": [0.5, 6.5, 4, 8], "rotation": 90, "texture": "#back"}, - "south": {"uv": [8, 0, 11.5, 6], "rotation": 90, "texture": "#back"}, - "west": {"uv": [0.5, 6, 4, 7.5], "rotation": 90, "texture": "#back"}, - "up": {"uv": [6.5, 0, 8, 6], "rotation": 90, "texture": "#back"} + "east": {"uv": [0, 0.5, 3.5, 2], "rotation": 90, "texture": "#back"}, + "south": {"uv": [0, 7.5, 7, 11], "texture": "#back"}, + "west": {"uv": [0, 2, 3.5, 0.5], "rotation": 90, "texture": "#back"}, + "up": {"uv": [0, 5.5, 7, 7], "rotation": 180, "texture": "#back"} } }, { @@ -77,9 +77,9 @@ "to": [14.05, 10, 13], "rotation": {"angle": -22.5, "axis": "x", "origin": [0, -3, 13]}, "faces": { - "east": {"uv": [11, 9.5, 14, 16], "texture": "#base"}, + "east": {"uv": [13, 6, 16, 12.5], "rotation": 180, "texture": "#base"}, "west": {"uv": [13, 9.5, 16, 16], "texture": "#base"}, - "up": {"uv": [11, 9.5, 14, 15.5], "rotation": 270, "texture": "#base"} + "up": {"uv": [13, 7.5, 16, 13.5], "rotation": 90, "texture": "#base"} } } ], diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json b/src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json index 06f4d7e7a..c8f445ce4 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json @@ -50,9 +50,9 @@ "from": [2, -3, 14], "to": [14, 10, 8], "faces": { - "east": {"uv": [11, 9.5, 14, 16], "texture": "#base"}, + "east": {"uv": [13, 16, 16, 9.5], "rotation": 180, "texture": "#base"}, "west": {"uv": [13, 12.5, 16, 6], "texture": "#base"}, - "up": {"uv": [14, 9, 11, 15], "rotation": 90, "texture": "#base"} + "up": {"uv": [16, 7.5, 13, 13.5], "rotation": 270, "texture": "#base"} } }, { @@ -66,7 +66,7 @@ "south": {"uv": [0, 8, 6, 16], "texture": "#base"}, "west": {"uv": [0, 0, 6, 16], "rotation": 180, "texture": "#redstone"}, "up": {"uv": [8, 2, 14, 14], "rotation": 270, "texture": "#redstone"}, - "down": {"uv": [8, 2, 14, 14], "rotation": 90, "texture": "#redstone"} + "down": {"uv": [0, 2, 6, 14], "rotation": 90, "texture": "#redstone"} } }, { @@ -97,10 +97,10 @@ "to": [15, 15, 15], "rotation": {"angle": 0, "axis": "y", "origin": [9, 6, 22]}, "faces": { - "east": {"uv": [7.5, 0, 16, 0.5], "rotation": 90, "texture": "#back"}, - "south": {"uv": [7.5, 0, 16, 6], "rotation": 90, "texture": "#back"}, - "west": {"uv": [7.5, 5.5, 16, 6], "rotation": 90, "texture": "#back"}, - "up": {"uv": [7.5, 0, 8, 6], "rotation": 90, "texture": "#back"} + "east": {"uv": [7, 7.5, 7.5, 16], "texture": "#back"}, + "south": {"uv": [0, 7.5, 7, 16], "texture": "#back"}, + "west": {"uv": [7, 7.5, 7.5, 16], "texture": "#back"}, + "up": {"uv": [0, 5.5, 7, 6], "rotation": 180, "texture": "#back"} } } ], diff --git a/src/main/resources/assets/create/models/block/belt_funnel/flap.json b/src/main/resources/assets/create/models/block/belt_funnel/flap.json index 04fc536bb..5d4a2a5e7 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/flap.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/flap.json @@ -1,7 +1,7 @@ { "credit": "Made with Blockbench", "textures": { - "4": "create:block/funnel/funnel_back" + "4": "create:block/funnel/brass_funnel" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [14, 10, 10], "rotation": {"angle": 0, "axis": "y", "origin": [-24.5, -7.5, 9]}, "faces": { - "north": {"uv": [14, 8.5, 12.5, 15], "texture": "#4"}, - "east": {"uv": [13.5, 8.5, 14, 15], "texture": "#4"}, - "south": {"uv": [12.5, 8.5, 14, 15], "texture": "#4"}, - "west": {"uv": [12.5, 8.5, 13, 15], "texture": "#4"}, - "up": {"uv": [12.5, 8.5, 14, 9], "texture": "#4"}, - "down": {"uv": [12.5, 14.5, 14, 15], "texture": "#4"} + "north": {"uv": [6, 8, 7.5, 14.5], "texture": "#4"}, + "east": {"uv": [6, 8, 6.5, 14.5], "texture": "#4"}, + "south": {"uv": [7.5, 8, 6, 14.5], "texture": "#4"}, + "west": {"uv": [7, 8, 7.5, 14.5], "texture": "#4"}, + "up": {"uv": [6, 8, 7.5, 8.5], "rotation": 180, "texture": "#4"}, + "down": {"uv": [6, 14, 7.5, 14.5], "rotation": 180, "texture": "#4"} } } ] diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/flap.json b/src/main/resources/assets/create/models/block/belt_tunnel/flap.json index a6ff6c281..fe713b69a 100644 --- a/src/main/resources/assets/create/models/block/belt_tunnel/flap.json +++ b/src/main/resources/assets/create/models/block/belt_tunnel/flap.json @@ -1,7 +1,7 @@ { "credit": "Made with Blockbench", "textures": { - "4": "create:block/funnel/funnel_back" + "4": "create:block/funnel/brass_funnel" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [14, 10, 2], "rotation": {"angle": 0, "axis": "y", "origin": [-24.5, -7.5, 9]}, "faces": { - "north": {"uv": [12.5, 8.5, 14, 15], "texture": "#4"}, - "east": {"uv": [12.5, 8.5, 13, 15], "texture": "#4"}, - "south": {"uv": [14, 8.5, 12.5, 15], "texture": "#4"}, - "west": {"uv": [13.5, 8.5, 14, 15], "texture": "#4"}, - "up": {"uv": [12.5, 8.5, 14, 9], "rotation": 180, "texture": "#4"}, - "down": {"uv": [12.5, 14.5, 14, 15], "rotation": 180, "texture": "#4"} + "north": {"uv": [6, 8, 7.5, 14.5], "texture": "#4"}, + "east": {"uv": [6, 8, 6.5, 14.5], "texture": "#4"}, + "south": {"uv": [7.5, 8, 6, 14.5], "texture": "#4"}, + "west": {"uv": [7, 8, 7.5, 14.5], "texture": "#4"}, + "up": {"uv": [6, 8, 7.5, 8.5], "rotation": 180, "texture": "#4"}, + "down": {"uv": [6, 14, 7.5, 14.5], "rotation": 180, "texture": "#4"} } } ] diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/item.json b/src/main/resources/assets/create/models/block/belt_tunnel/item.json index fb9e9fb5b..2b74d31ec 100644 --- a/src/main/resources/assets/create/models/block/belt_tunnel/item.json +++ b/src/main/resources/assets/create/models/block/belt_tunnel/item.json @@ -6,7 +6,7 @@ "top": "create:block/tunnel/brass_tunnel_top", "direction": "create:block/funnel/brass_funnel_neutral", "frame": "create:block/funnel/brass_funnel_frame", - "back": "create:block/funnel/funnel_back", + "back": "create:block/funnel/brass_funnel", "particle": "create:block/brass_block" }, "elements": [ @@ -63,12 +63,12 @@ "to": [1.5, 10.5, 5], "rotation": {"angle": 0, "axis": "y", "origin": [-38.5, -5.5, 2]}, "faces": { - "north": {"uv": [12.5, 8.5, 13, 15], "texture": "#back"}, - "east": {"uv": [12.5, 8.5, 14, 15], "rotation": 180, "texture": "#back"}, - "south": {"uv": [13.5, 8.5, 14, 15], "texture": "#back"}, - "west": {"uv": [12.5, 8.5, 14, 15], "texture": "#back"}, - "up": {"uv": [12.5, 9, 14, 8.5], "rotation": 90, "texture": "#back"}, - "down": {"uv": [12.5, 14.5, 14, 15], "rotation": 270, "texture": "#back"} + "north": {"uv": [6, 8, 6.5, 14.5], "texture": "#back"}, + "east": {"uv": [6, 8, 7.5, 14.5], "rotation": 180, "texture": "#back"}, + "south": {"uv": [7, 8, 7.5, 14.5], "texture": "#back"}, + "west": {"uv": [6, 8, 7.5, 14.5], "texture": "#back"}, + "up": {"uv": [6, 8.5, 7.5, 8], "rotation": 90, "texture": "#back"}, + "down": {"uv": [6, 14, 7.5, 14.5], "rotation": 270, "texture": "#back"} } }, { @@ -77,12 +77,12 @@ "to": [1.5, 10.5, 8], "rotation": {"angle": 0, "axis": "y", "origin": [-38.5, -5.5, 2]}, "faces": { - "north": {"uv": [12.5, 8.5, 13, 15], "texture": "#back"}, - "east": {"uv": [12.5, 8.5, 14, 15], "rotation": 180, "texture": "#back"}, - "south": {"uv": [13.5, 8.5, 14, 15], "texture": "#back"}, - "west": {"uv": [12.5, 8.5, 14, 15], "texture": "#back"}, - "up": {"uv": [12.5, 9, 14, 8.5], "rotation": 90, "texture": "#back"}, - "down": {"uv": [12.5, 14.5, 14, 15], "rotation": 270, "texture": "#back"} + "north": {"uv": [6, 8, 6.5, 14.5], "texture": "#back"}, + "east": {"uv": [6, 8, 7.5, 14.5], "rotation": 180, "texture": "#back"}, + "south": {"uv": [7, 8, 7.5, 14.5], "texture": "#back"}, + "west": {"uv": [6, 8, 7.5, 14.5], "texture": "#back"}, + "up": {"uv": [6, 8.5, 7.5, 8], "rotation": 90, "texture": "#back"}, + "down": {"uv": [6, 14, 7.5, 14.5], "rotation": 270, "texture": "#back"} } }, { @@ -91,82 +91,82 @@ "to": [1.5, 10.5, 11], "rotation": {"angle": 0, "axis": "y", "origin": [-38.5, -5.5, 2]}, "faces": { - "north": {"uv": [12.5, 8.5, 13, 15], "texture": "#back"}, - "east": {"uv": [12.5, 8.5, 14, 15], "rotation": 180, "texture": "#back"}, - "south": {"uv": [13.5, 8.5, 14, 15], "texture": "#back"}, - "west": {"uv": [12.5, 8.5, 14, 15], "texture": "#back"}, - "up": {"uv": [12.5, 9, 14, 8.5], "rotation": 90, "texture": "#back"}, - "down": {"uv": [12.5, 14.5, 14, 15], "rotation": 270, "texture": "#back"} + "north": {"uv": [6, 8, 6.5, 14.5], "texture": "#back"}, + "east": {"uv": [6, 8, 7.5, 14.5], "rotation": 180, "texture": "#back"}, + "south": {"uv": [7, 8, 7.5, 14.5], "texture": "#back"}, + "west": {"uv": [6, 8, 7.5, 14.5], "texture": "#back"}, + "up": {"uv": [6, 8.5, 7.5, 8], "rotation": 90, "texture": "#back"}, + "down": {"uv": [6, 14, 7.5, 14.5], "rotation": 270, "texture": "#back"} } }, { "name": "F4", "from": [0.5, -2.5, 11], "to": [1.5, 10.5, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [12.5, 8.5, 13, 15], "texture": "#back"}, - "east": {"uv": [12.5, 8.5, 14, 15], "rotation": 180, "texture": "#back"}, - "south": {"uv": [13.5, 8.5, 14, 15], "texture": "#back"}, - "west": {"uv": [12.5, 8.5, 14, 15], "texture": "#back"}, - "up": {"uv": [12.5, 9, 14, 8.5], "rotation": 90, "texture": "#back"}, - "down": {"uv": [12.5, 14.5, 14, 15], "rotation": 270, "texture": "#back"} + "north": {"uv": [6, 8, 6.5, 14.5], "texture": "#back"}, + "east": {"uv": [6, 8, 7.5, 14.5], "rotation": 180, "texture": "#back"}, + "south": {"uv": [7, 8, 7.5, 14.5], "texture": "#back"}, + "west": {"uv": [6, 8, 7.5, 14.5], "texture": "#back"}, + "up": {"uv": [6, 8.5, 7.5, 8], "rotation": 90, "texture": "#back"}, + "down": {"uv": [6, 14, 7.5, 14.5], "rotation": 270, "texture": "#back"} } }, { "name": "F2", - "from": [14.5, -2.5, 2], - "to": [15.5, 10.5, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 4, 3.5]}, + "from": [14.5, -2.5, 11], + "to": [15.5, 10.5, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [13.5, 8.5, 14, 15], "texture": "#back"}, - "east": {"uv": [12.5, 8.5, 14, 15], "texture": "#back"}, - "south": {"uv": [12.5, 8.5, 13, 15], "texture": "#back"}, - "west": {"uv": [12.5, 8.5, 14, 15], "rotation": 180, "texture": "#back"}, - "up": {"uv": [12.5, 9, 14, 8.5], "rotation": 270, "texture": "#back"}, - "down": {"uv": [12.5, 14.5, 14, 15], "rotation": 90, "texture": "#back"} + "north": {"uv": [7, 8, 7.5, 14.5], "texture": "#back"}, + "east": {"uv": [6, 8, 7.5, 14.5], "texture": "#back"}, + "south": {"uv": [6, 8, 6.5, 14.5], "texture": "#back"}, + "west": {"uv": [6, 8, 7.5, 14.5], "rotation": 180, "texture": "#back"}, + "up": {"uv": [6, 8.5, 7.5, 8], "rotation": 270, "texture": "#back"}, + "down": {"uv": [6, 14, 7.5, 14.5], "rotation": 90, "texture": "#back"} } }, { "name": "F3", - "from": [14.5, -2.5, 5], - "to": [15.5, 10.5, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 4, 6.5]}, + "from": [14.5, -2.5, 8], + "to": [15.5, 10.5, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [13.5, 8.5, 14, 15], "texture": "#back"}, - "east": {"uv": [12.5, 8.5, 14, 15], "texture": "#back"}, - "south": {"uv": [12.5, 8.5, 13, 15], "texture": "#back"}, - "west": {"uv": [12.5, 8.5, 14, 15], "rotation": 180, "texture": "#back"}, - "up": {"uv": [12.5, 9, 14, 8.5], "rotation": 270, "texture": "#back"}, - "down": {"uv": [12.5, 14.5, 14, 15], "rotation": 90, "texture": "#back"} + "north": {"uv": [7, 8, 7.5, 14.5], "texture": "#back"}, + "east": {"uv": [6, 8, 7.5, 14.5], "texture": "#back"}, + "south": {"uv": [6, 8, 6.5, 14.5], "texture": "#back"}, + "west": {"uv": [6, 8, 7.5, 14.5], "rotation": 180, "texture": "#back"}, + "up": {"uv": [6, 8.5, 7.5, 8], "rotation": 270, "texture": "#back"}, + "down": {"uv": [6, 14, 7.5, 14.5], "rotation": 90, "texture": "#back"} } }, { "name": "F4", - "from": [14.5, -2.5, 8], - "to": [15.5, 10.5, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 4, 9.5]}, + "from": [14.5, -2.5, 5], + "to": [15.5, 10.5, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [13.5, 8.5, 14, 15], "texture": "#back"}, - "east": {"uv": [12.5, 8.5, 14, 15], "texture": "#back"}, - "south": {"uv": [12.5, 8.5, 13, 15], "texture": "#back"}, - "west": {"uv": [12.5, 8.5, 14, 15], "rotation": 180, "texture": "#back"}, - "up": {"uv": [12.5, 9, 14, 8.5], "rotation": 270, "texture": "#back"}, - "down": {"uv": [12.5, 14.5, 14, 15], "rotation": 90, "texture": "#back"} + "north": {"uv": [7, 8, 7.5, 14.5], "texture": "#back"}, + "east": {"uv": [6, 8, 7.5, 14.5], "texture": "#back"}, + "south": {"uv": [6, 8, 6.5, 14.5], "texture": "#back"}, + "west": {"uv": [6, 8, 7.5, 14.5], "rotation": 180, "texture": "#back"}, + "up": {"uv": [6, 8.5, 7.5, 8], "rotation": 270, "texture": "#back"}, + "down": {"uv": [6, 14, 7.5, 14.5], "rotation": 90, "texture": "#back"} } }, { "name": "F5", - "from": [14.5, -2.5, 11], - "to": [15.5, 10.5, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 4, 12.5]}, + "from": [14.5, -2.5, 2], + "to": [15.5, 10.5, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [13.5, 8.5, 14, 15], "texture": "#back"}, - "east": {"uv": [12.5, 8.5, 14, 15], "texture": "#back"}, - "south": {"uv": [12.5, 8.5, 13, 15], "texture": "#back"}, - "west": {"uv": [12.5, 8.5, 14, 15], "rotation": 180, "texture": "#back"}, - "up": {"uv": [12.5, 9, 14, 8.5], "rotation": 270, "texture": "#back"}, - "down": {"uv": [12.5, 14.5, 14, 15], "rotation": 90, "texture": "#back"} + "north": {"uv": [7, 8, 7.5, 14.5], "texture": "#back"}, + "east": {"uv": [6, 8, 7.5, 14.5], "texture": "#back"}, + "south": {"uv": [6, 8, 6.5, 14.5], "texture": "#back"}, + "west": {"uv": [6, 8, 7.5, 14.5], "rotation": 180, "texture": "#back"}, + "up": {"uv": [6, 8.5, 7.5, 8], "rotation": 270, "texture": "#back"}, + "down": {"uv": [6, 14, 7.5, 14.5], "rotation": 90, "texture": "#back"} } } ], diff --git a/src/main/resources/assets/create/models/block/funnel/block_horizontal.json b/src/main/resources/assets/create/models/block/funnel/block_horizontal.json index 8c6703f09..384ee32de 100644 --- a/src/main/resources/assets/create/models/block/funnel/block_horizontal.json +++ b/src/main/resources/assets/create/models/block/funnel/block_horizontal.json @@ -17,9 +17,9 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 4]}, "faces": { "north": {"uv": [0, 9, 16, 12], "texture": "#block"}, - "east": {"uv": [9, 8, 7.5, 10], "rotation": 270, "texture": "#base"}, + "east": {"uv": [9, 16, 7.5, 14], "rotation": 270, "texture": "#base"}, "south": {"uv": [7.5, 8, 9, 16], "rotation": 90, "texture": "#base"}, - "west": {"uv": [9, 8, 7.5, 10], "rotation": 270, "texture": "#base"}, + "west": {"uv": [9, 10, 7.5, 8], "rotation": 270, "texture": "#base"}, "up": {"uv": [0, 5, 16, 9], "rotation": 180, "texture": "#block"}, "down": {"uv": [0, 12, 16, 16], "rotation": 180, "texture": "#block"} } @@ -29,10 +29,10 @@ "to": [15.05, 14.95, 14], "rotation": {"angle": 0, "axis": "y", "origin": [9, 6, 21]}, "faces": { - "east": {"uv": [0.5, 7.5, 4, 6], "rotation": 90, "texture": "#back"}, - "south": {"uv": [8, 0, 11.5, 6], "rotation": 90, "texture": "#back"}, - "west": {"uv": [0.5, 6, 4, 7.5], "rotation": 90, "texture": "#back"}, - "up": {"uv": [6, 0, 7.5, 6], "rotation": 270, "texture": "#back"} + "east": {"uv": [0, 0.5, 3.5, 2], "rotation": 90, "texture": "#back"}, + "south": {"uv": [0, 7.5, 7, 11], "texture": "#back"}, + "west": {"uv": [0, 2, 3.5, 0.5], "rotation": 90, "texture": "#back"}, + "up": {"uv": [0, 5.5, 7, 7], "rotation": 180, "texture": "#back"} } }, { @@ -64,9 +64,9 @@ "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0, 12]}, "faces": { "north": {"uv": [0, 0, 8, 8], "texture": "#direction"}, - "east": {"uv": [11, 8, 14, 0], "rotation": 180, "texture": "#direction"}, + "east": {"uv": [11, 16, 14, 8], "rotation": 180, "texture": "#direction"}, "south": {"uv": [0, 8, 8, 16], "rotation": 180, "texture": "#direction"}, - "west": {"uv": [11, 0, 14, 8], "texture": "#direction"}, + "west": {"uv": [11, 8, 14, 16], "texture": "#direction"}, "up": {"uv": [11, 0, 14, 8], "rotation": 90, "texture": "#direction"}, "down": {"uv": [0, 7, 8, 10], "texture": "#direction"} } @@ -76,9 +76,9 @@ "to": [14, 10, 12], "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0, 12]}, "faces": { - "east": {"uv": [11, 11, 14, 16], "texture": "#base"}, + "east": {"uv": [13, 6, 16, 11], "rotation": 180, "texture": "#base"}, "west": {"uv": [13, 11, 16, 16], "texture": "#base"}, - "up": {"uv": [11, 9, 14, 15], "rotation": 270, "texture": "#base"} + "up": {"uv": [13, 8, 16, 14], "rotation": 90, "texture": "#base"} } } ], diff --git a/src/main/resources/assets/create/models/block/funnel/block_vertical.json b/src/main/resources/assets/create/models/block/funnel/block_vertical.json index 482c84903..00e28abdb 100644 --- a/src/main/resources/assets/create/models/block/funnel/block_vertical.json +++ b/src/main/resources/assets/create/models/block/funnel/block_vertical.json @@ -92,9 +92,9 @@ "to": [15.95, 4, 11], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 3, 8, 5.5], "texture": "#direction"}, + "north": {"uv": [0, 7, 8, 9.5], "texture": "#direction"}, "east": {"uv": [2.5, 0.5, 5.5, 3], "texture": "#direction"}, - "south": {"uv": [0, 3, 8, 5.5], "texture": "#direction"}, + "south": {"uv": [0, 7, 8, 9.5], "texture": "#direction"}, "west": {"uv": [2.5, 0.5, 5.5, 3], "texture": "#direction"}, "down": {"uv": [8, 6.5, 0, 9.5], "texture": "#direction"} } @@ -105,9 +105,9 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { "north": {"uv": [2.5, 0.5, 5.5, 3], "texture": "#direction"}, - "east": {"uv": [0, 3, 8, 5.5], "texture": "#direction"}, + "east": {"uv": [0, 7, 8, 9.5], "texture": "#direction"}, "south": {"uv": [2.5, 0.5, 5.5, 3], "texture": "#direction"}, - "west": {"uv": [0, 3, 8, 5.5], "texture": "#direction"}, + "west": {"uv": [0, 7, 8, 9.5], "texture": "#direction"}, "down": {"uv": [8, 6.5, 0, 9.5], "rotation": 90, "texture": "#direction"} } } diff --git a/src/main/resources/assets/create/models/block/funnel/block_vertical_filterless.json b/src/main/resources/assets/create/models/block/funnel/block_vertical_filterless.json index c2289d3ae..613405f69 100644 --- a/src/main/resources/assets/create/models/block/funnel/block_vertical_filterless.json +++ b/src/main/resources/assets/create/models/block/funnel/block_vertical_filterless.json @@ -6,8 +6,8 @@ "direction": "create:block/funnel/brass_funnel_pull", "redstone": "create:block/funnel/brass_funnel_unpowered", "open": "create:block/funnel/funnel_closed", - "particle": "create:block/brass_block", - "frame": "create:block/funnel/brass_funnel_frame" + "frame": "create:block/funnel/brass_funnel_frame", + "particle": "create:block/brass_block" }, "elements": [ { @@ -66,10 +66,10 @@ "from": [0, 4, 0], "to": [16, 10, 16], "faces": { - "north": {"uv": [11, 0, 14, 8], "rotation": 90, "texture": "#direction"}, - "east": {"uv": [11, 0, 14, 8], "rotation": 90, "texture": "#direction"}, - "south": {"uv": [11, 0, 14, 8], "rotation": 90, "texture": "#direction"}, - "west": {"uv": [11, 0, 14, 8], "rotation": 90, "texture": "#direction"}, + "north": {"uv": [11, 8, 14, 16], "rotation": 90, "texture": "#direction"}, + "east": {"uv": [11, 8, 14, 16], "rotation": 90, "texture": "#direction"}, + "south": {"uv": [11, 8, 14, 16], "rotation": 90, "texture": "#direction"}, + "west": {"uv": [11, 8, 14, 16], "rotation": 90, "texture": "#direction"}, "up": {"uv": [0, 0, 16, 16], "texture": "#frame"}, "down": {"uv": [0, 0, 16, 16], "texture": "#frame"} } diff --git a/src/main/resources/assets/create/models/block/funnel/flap.json b/src/main/resources/assets/create/models/block/funnel/flap.json index 7af138154..3179cbdac 100644 --- a/src/main/resources/assets/create/models/block/funnel/flap.json +++ b/src/main/resources/assets/create/models/block/funnel/flap.json @@ -1,7 +1,7 @@ { "credit": "Made with Blockbench", "textures": { - "4": "create:block/funnel/funnel_back" + "4": "create:block/funnel/brass_funnel" }, "elements": [ { @@ -10,12 +10,12 @@ "to": [14, 10, 10], "rotation": {"angle": 0, "axis": "y", "origin": [-24.5, -7.5, 9]}, "faces": { - "north": {"uv": [14, 8.5, 12.5, 13.5], "texture": "#4"}, - "east": {"uv": [13.5, 8.5, 14, 13.5], "texture": "#4"}, - "south": {"uv": [12.5, 8.5, 14, 13.5], "texture": "#4"}, - "west": {"uv": [12.5, 8.5, 13, 13.5], "texture": "#4"}, - "up": {"uv": [12.5, 8.5, 14, 9], "texture": "#4"}, - "down": {"uv": [12.5, 14.5, 14, 15], "texture": "#4"} + "north": {"uv": [6, 9.5, 7.5, 14.5], "texture": "#4"}, + "east": {"uv": [6, 9.5, 6.5, 14.5], "texture": "#4"}, + "south": {"uv": [7.5, 9.5, 6, 14.5], "texture": "#4"}, + "west": {"uv": [7, 9.5, 7.5, 14.5], "texture": "#4"}, + "up": {"uv": [6, 8, 7.5, 8.5], "rotation": 180, "texture": "#4"}, + "down": {"uv": [6, 14, 7.5, 14.5], "rotation": 180, "texture": "#4"} } } ] diff --git a/src/main/resources/assets/create/models/block/funnel/item.json b/src/main/resources/assets/create/models/block/funnel/item.json index 48bac7242..efae6bf87 100644 --- a/src/main/resources/assets/create/models/block/funnel/item.json +++ b/src/main/resources/assets/create/models/block/funnel/item.json @@ -112,7 +112,7 @@ "faces": { "east": {"uv": [8, 14.5, 7, 16], "texture": "#missing"}, "south": {"uv": [7.5, 15.5, 9, 16], "rotation": 90, "texture": "#base"}, - "west": {"uv": [7.5, 9, 9, 8], "rotation": 90, "texture": "#base"}, + "west": {"uv": [7.5, 8, 9, 9], "rotation": 90, "texture": "#base"}, "up": {"uv": [1, 14, 0, 16], "texture": "#block"}, "down": {"uv": [15, 14, 16, 16], "rotation": 180, "texture": "#block"} } @@ -122,10 +122,10 @@ "to": [15, 15, 15], "rotation": {"angle": 0, "axis": "y", "origin": [9, 6, 22]}, "faces": { - "east": {"uv": [7.5, 0, 16, 0.5], "rotation": 90, "texture": "#back"}, - "south": {"uv": [7.5, 0, 16, 6], "rotation": 90, "texture": "#back"}, - "west": {"uv": [7.5, 0, 16, 0.5], "rotation": 90, "texture": "#back"}, - "up": {"uv": [6, 0, 6.5, 6], "rotation": 90, "texture": "#back"} + "east": {"uv": [7, 7.5, 7.5, 16], "texture": "#back"}, + "south": {"uv": [0, 7.5, 7, 16], "texture": "#back"}, + "west": {"uv": [7, 7.5, 7.5, 16], "texture": "#back"}, + "up": {"uv": [0, 7, 7, 7.5], "rotation": 180, "texture": "#back"} } }, { @@ -134,54 +134,54 @@ "to": [14, 10, 10], "rotation": {"angle": 0, "axis": "y", "origin": [-24.5, -7.5, 9]}, "faces": { - "north": {"uv": [14, 8.5, 12.5, 15], "texture": "#back"}, - "east": {"uv": [13.5, 8.5, 14, 15], "texture": "#back"}, - "south": {"uv": [12.5, 8.5, 14, 15], "texture": "#back"}, - "west": {"uv": [12.5, 8.5, 13, 15], "texture": "#back"}, - "up": {"uv": [12.5, 8.5, 14, 9], "texture": "#back"}, - "down": {"uv": [12.5, 14.5, 14, 15], "texture": "#back"} + "north": {"uv": [6, 8, 7.5, 14.5], "texture": "#base"}, + "east": {"uv": [6, 8, 6.5, 14.5], "texture": "#base"}, + "south": {"uv": [7.5, 8, 6, 14.5], "texture": "#base"}, + "west": {"uv": [7, 8, 7.5, 14.5], "texture": "#base"}, + "up": {"uv": [6, 8, 7.5, 8.5], "rotation": 180, "texture": "#base"}, + "down": {"uv": [6, 14, 7.5, 14.5], "rotation": 180, "texture": "#base"} } }, { "name": "F5", "from": [8, -3, 9], "to": [11, 10, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [-27.5, -7.5, 9]}, + "rotation": {"angle": 0, "axis": "y", "origin": [-24.5, -7.5, 9]}, "faces": { - "north": {"uv": [14, 8.5, 12.5, 15], "texture": "#back"}, - "east": {"uv": [13.5, 8.5, 14, 15], "texture": "#back"}, - "south": {"uv": [12.5, 8.5, 14, 15], "texture": "#back"}, - "west": {"uv": [12.5, 8.5, 13, 15], "texture": "#back"}, - "up": {"uv": [12.5, 8.5, 14, 9], "texture": "#back"}, - "down": {"uv": [12.5, 14.5, 14, 15], "texture": "#back"} + "north": {"uv": [6, 8, 7.5, 14.5], "texture": "#base"}, + "east": {"uv": [6, 8, 6.5, 14.5], "texture": "#base"}, + "south": {"uv": [7.5, 8, 6, 14.5], "texture": "#base"}, + "west": {"uv": [7, 8, 7.5, 14.5], "texture": "#base"}, + "up": {"uv": [6, 8, 7.5, 8.5], "rotation": 180, "texture": "#base"}, + "down": {"uv": [6, 14, 7.5, 14.5], "rotation": 180, "texture": "#base"} } }, { "name": "F6", "from": [5, -3, 9], "to": [8, 10, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [-30.5, -7.5, 9]}, + "rotation": {"angle": 0, "axis": "y", "origin": [-24.5, -7.5, 9]}, "faces": { - "north": {"uv": [14, 8.5, 12.5, 15], "texture": "#back"}, - "east": {"uv": [13.5, 8.5, 14, 15], "texture": "#back"}, - "south": {"uv": [12.5, 8.5, 14, 15], "texture": "#back"}, - "west": {"uv": [12.5, 8.5, 13, 15], "texture": "#back"}, - "up": {"uv": [12.5, 8.5, 14, 9], "texture": "#back"}, - "down": {"uv": [12.5, 14.5, 14, 15], "texture": "#back"} + "north": {"uv": [6, 8, 7.5, 14.5], "texture": "#base"}, + "east": {"uv": [6, 8, 6.5, 14.5], "texture": "#base"}, + "south": {"uv": [7.5, 8, 6, 14.5], "texture": "#base"}, + "west": {"uv": [7, 8, 7.5, 14.5], "texture": "#base"}, + "up": {"uv": [6, 8, 7.5, 8.5], "rotation": 180, "texture": "#base"}, + "down": {"uv": [6, 14, 7.5, 14.5], "rotation": 180, "texture": "#base"} } }, { "name": "F7", "from": [2, -3, 9], "to": [5, 10, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [-33.5, -7.5, 9]}, + "rotation": {"angle": 0, "axis": "y", "origin": [-24.5, -7.5, 9]}, "faces": { - "north": {"uv": [14, 8.5, 12.5, 15], "texture": "#back"}, - "east": {"uv": [13.5, 8.5, 14, 15], "texture": "#back"}, - "south": {"uv": [12.5, 8.5, 14, 15], "texture": "#back"}, - "west": {"uv": [12.5, 8.5, 13, 15], "texture": "#back"}, - "up": {"uv": [12.5, 8.5, 14, 9], "texture": "#back"}, - "down": {"uv": [12.5, 14.5, 14, 15], "texture": "#back"} + "north": {"uv": [6, 8, 7.5, 14.5], "texture": "#base"}, + "east": {"uv": [6, 8, 6.5, 14.5], "texture": "#base"}, + "south": {"uv": [7.5, 8, 6, 14.5], "texture": "#base"}, + "west": {"uv": [7, 8, 7.5, 14.5], "texture": "#base"}, + "up": {"uv": [6, 8, 7.5, 8.5], "rotation": 180, "texture": "#base"}, + "down": {"uv": [6, 14, 7.5, 14.5], "rotation": 180, "texture": "#base"} } } ], @@ -246,25 +246,7 @@ "name": "flap", "origin": [8, 8, 8], "color": 0, - "children": [10] - }, - { - "name": "flap", - "origin": [8, 8, 8], - "color": 0, - "children": [11] - }, - { - "name": "flap", - "origin": [8, 8, 8], - "color": 0, - "children": [12] - }, - { - "name": "flap", - "origin": [8, 8, 8], - "color": 0, - "children": [13] + "children": [10, 11, 12, 13] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/smart_chute/block.json b/src/main/resources/assets/create/models/block/smart_chute/block.json index 6960b24d3..42a168fe6 100644 --- a/src/main/resources/assets/create/models/block/smart_chute/block.json +++ b/src/main/resources/assets/create/models/block/smart_chute/block.json @@ -7,7 +7,7 @@ "redstone": "create:block/funnel/brass_funnel_unpowered", "particle": "create:block/funnel/brass_funnel_frame", "frame": "create:block/funnel/brass_funnel_frame", - "direction": "create:block/funnel/brass_funnel_pull" + "direction": "create:block/funnel/brass_funnel_neutral" }, "elements": [ { @@ -135,10 +135,10 @@ "from": [0, 9, 0], "to": [16, 15, 16], "faces": { - "north": {"uv": [0, 0, 8, 3], "texture": "#direction"}, - "east": {"uv": [0, 0, 8, 3], "texture": "#direction"}, - "south": {"uv": [0, 0, 8, 3], "texture": "#direction"}, - "west": {"uv": [0, 0, 8, 3], "texture": "#direction"}, + "north": {"uv": [8, 13, 16, 16], "texture": "#direction"}, + "east": {"uv": [8, 13, 16, 16], "texture": "#direction"}, + "south": {"uv": [8, 13, 16, 16], "texture": "#direction"}, + "west": {"uv": [8, 13, 16, 16], "texture": "#direction"}, "up": {"uv": [0, 0, 16, 16], "texture": "#frame"}, "down": {"uv": [0, 0, 16, 16], "texture": "#frame"} } 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 0b7636780..40d01e0af 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/belt/belt_casing.png b/src/main/resources/assets/create/textures/block/belt/belt_casing.png new file mode 100644 index 000000000..26bfbb10e Binary files /dev/null and b/src/main/resources/assets/create/textures/block/belt/belt_casing.png differ diff --git a/src/main/resources/assets/create/textures/block/belt/belt_casing_2.png b/src/main/resources/assets/create/textures/block/belt/belt_casing_2.png new file mode 100644 index 000000000..49630287a Binary files /dev/null and b/src/main/resources/assets/create/textures/block/belt/belt_casing_2.png differ diff --git a/src/main/resources/assets/create/textures/block/belt/belt_casing_3.png b/src/main/resources/assets/create/textures/block/belt/belt_casing_3.png new file mode 100644 index 000000000..914327bdb Binary files /dev/null and b/src/main/resources/assets/create/textures/block/belt/belt_casing_3.png differ diff --git a/src/main/resources/assets/create/textures/block/brass_block.png b/src/main/resources/assets/create/textures/block/brass_block.png index e441608c6..f69ab618d 100644 Binary files a/src/main/resources/assets/create/textures/block/brass_block.png and b/src/main/resources/assets/create/textures/block/brass_block.png differ diff --git a/src/main/resources/assets/create/textures/block/brass_casing_connected.png b/src/main/resources/assets/create/textures/block/brass_casing_connected.png index f7b9f17c3..2fe2f0189 100644 Binary files a/src/main/resources/assets/create/textures/block/brass_casing_connected.png and b/src/main/resources/assets/create/textures/block/brass_casing_connected.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/brass_funnel.png b/src/main/resources/assets/create/textures/block/funnel/brass_funnel.png index 9a5ad5cc7..67f4636cf 100644 Binary files a/src/main/resources/assets/create/textures/block/funnel/brass_funnel.png and b/src/main/resources/assets/create/textures/block/funnel/brass_funnel.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_frame.png b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_frame.png index a1b175f8f..6db9b8850 100644 Binary files a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_frame.png and b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_frame.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_neutral.png b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_neutral.png index ce048d8bf..33ebb92e1 100644 Binary files a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_neutral.png and b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_neutral.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_powered.png b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_powered.png index 7abb6fcc9..0c55e9ce9 100644 Binary files a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_powered.png and b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_powered.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_pull.png b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_pull.png index 3c120d38a..bf202962a 100644 Binary files a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_pull.png and b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_pull.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_push.png b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_push.png index 4f5c43a68..eff9359dd 100644 Binary files a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_push.png and b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_push.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_unpowered.png b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_unpowered.png index c339a5794..a7d372db0 100644 Binary files a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_unpowered.png and b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_unpowered.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/funnel_back.png b/src/main/resources/assets/create/textures/block/funnel/funnel_back.png index 7ee7092df..50ee51cf8 100644 Binary files a/src/main/resources/assets/create/textures/block/funnel/funnel_back.png and b/src/main/resources/assets/create/textures/block/funnel/funnel_back.png differ diff --git a/src/main/resources/assets/create/textures/block/tunnel/brass_tunnel.png b/src/main/resources/assets/create/textures/block/tunnel/brass_tunnel.png index 2bb1b3cb4..1c4c696ea 100644 Binary files a/src/main/resources/assets/create/textures/block/tunnel/brass_tunnel.png and b/src/main/resources/assets/create/textures/block/tunnel/brass_tunnel.png differ diff --git a/src/main/resources/assets/create/textures/block/tunnel/brass_tunnel_top.png b/src/main/resources/assets/create/textures/block/tunnel/brass_tunnel_top.png index 8287ad0d8..3aac74153 100644 Binary files a/src/main/resources/assets/create/textures/block/tunnel/brass_tunnel_top.png and b/src/main/resources/assets/create/textures/block/tunnel/brass_tunnel_top.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 f6cd2b856..24cd50247 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/tunnel/brass_tunnel_top_window.png b/src/main/resources/assets/create/textures/block/tunnel/brass_tunnel_top_window.png index e46874914..4348be99b 100644 Binary files a/src/main/resources/assets/create/textures/block/tunnel/brass_tunnel_top_window.png and b/src/main/resources/assets/create/textures/block/tunnel/brass_tunnel_top_window.png differ diff --git a/src/main/resources/assets/create/textures/block/vault_bottom.png b/src/main/resources/assets/create/textures/block/vault_bottom.png deleted file mode 100644 index 41c730c7e..000000000 Binary files a/src/main/resources/assets/create/textures/block/vault_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/vault_bottom_connected.png b/src/main/resources/assets/create/textures/block/vault_bottom_connected.png deleted file mode 100644 index 8c9cc78e2..000000000 Binary files a/src/main/resources/assets/create/textures/block/vault_bottom_connected.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/vault_bottom_large_connected.png b/src/main/resources/assets/create/textures/block/vault_bottom_large_connected.png deleted file mode 100644 index 5f08ee073..000000000 Binary files a/src/main/resources/assets/create/textures/block/vault_bottom_large_connected.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/vault_front.png b/src/main/resources/assets/create/textures/block/vault_front.png deleted file mode 100644 index 17e9186fc..000000000 Binary files a/src/main/resources/assets/create/textures/block/vault_front.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/vault_front_connected.png b/src/main/resources/assets/create/textures/block/vault_front_connected.png deleted file mode 100644 index 09ec991e8..000000000 Binary files a/src/main/resources/assets/create/textures/block/vault_front_connected.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/vault_front_large_connected.png b/src/main/resources/assets/create/textures/block/vault_front_large_connected.png deleted file mode 100644 index d47ae123a..000000000 Binary files a/src/main/resources/assets/create/textures/block/vault_front_large_connected.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/vault_side.png b/src/main/resources/assets/create/textures/block/vault_side.png deleted file mode 100644 index 9e3965bbb..000000000 Binary files a/src/main/resources/assets/create/textures/block/vault_side.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/vault_side_connected.png b/src/main/resources/assets/create/textures/block/vault_side_connected.png deleted file mode 100644 index 4ac32ca6b..000000000 Binary files a/src/main/resources/assets/create/textures/block/vault_side_connected.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/vault_side_large_connected.png b/src/main/resources/assets/create/textures/block/vault_side_large_connected.png deleted file mode 100644 index 49f32419c..000000000 Binary files a/src/main/resources/assets/create/textures/block/vault_side_large_connected.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/vault_top.png b/src/main/resources/assets/create/textures/block/vault_top.png deleted file mode 100644 index f51d89b71..000000000 Binary files a/src/main/resources/assets/create/textures/block/vault_top.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/vault_top_connected.png b/src/main/resources/assets/create/textures/block/vault_top_connected.png deleted file mode 100644 index 10918e1b3..000000000 Binary files a/src/main/resources/assets/create/textures/block/vault_top_connected.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/vault_top_large_connected.png b/src/main/resources/assets/create/textures/block/vault_top_large_connected.png deleted file mode 100644 index a761efa15..000000000 Binary files a/src/main/resources/assets/create/textures/block/vault_top_large_connected.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/item/crushed_aluminum_ore.png b/src/main/resources/assets/create/textures/item/crushed_aluminum_ore.png index ba0c07ece..d3f8fb1f9 100644 Binary files a/src/main/resources/assets/create/textures/item/crushed_aluminum_ore.png and b/src/main/resources/assets/create/textures/item/crushed_aluminum_ore.png differ