From 29a777653c6c93985e2fb8c1d64f48ec481df809 Mon Sep 17 00:00:00 2001 From: Kryppers <65094918+Kryppers@users.noreply.github.com> Date: Sat, 29 Oct 2022 00:41:39 +0100 Subject: [PATCH] Spit and Shine part 3: the curious case of encased curios. Continued work on brass assets Removed surplus Vault textures Adjusted the crushed aluminium compat asset to match xycraft set. --- .../java/com/simibubi/create/AllBlocks.java | 3 + .../models/block/belt/diagonal_end.json | 10 +- .../models/block/belt/diagonal_start.json | 4 +- .../assets/create/models/block/belt/end.json | 8 +- .../create/models/block/belt/start.json | 8 +- .../block/belt_casing/diagonal_end.json | 120 +++++++--------- .../block/belt_casing/diagonal_middle.json | 54 +++++-- .../block/belt_casing/diagonal_pulley.json | 129 +++++++++-------- .../block/belt_casing/diagonal_start.json | 136 +++++++----------- .../block/belt_casing/horizontal_end.json | 91 +++++------- .../block/belt_casing/horizontal_middle.json | 34 +++-- .../block/belt_casing/horizontal_pulley.json | 76 +++++----- .../block/belt_casing/horizontal_start.json | 99 +++++-------- .../block/belt_funnel/block_extended.json | 26 ++-- .../block/belt_funnel/block_pulling.json | 22 +-- .../block/belt_funnel/block_pushing.json | 22 +-- .../block/belt_funnel/block_retracted.json | 14 +- .../create/models/block/belt_funnel/flap.json | 14 +- .../create/models/block/belt_tunnel/flap.json | 14 +- .../create/models/block/belt_tunnel/item.json | 124 ++++++++-------- .../models/block/funnel/block_horizontal.json | 20 +-- .../models/block/funnel/block_vertical.json | 8 +- .../funnel/block_vertical_filterless.json | 12 +- .../create/models/block/funnel/flap.json | 14 +- .../create/models/block/funnel/item.json | 84 +++++------ .../models/block/smart_chute/block.json | 10 +- .../block/andesite_casing_connected.png | Bin 1891 -> 3986 bytes .../textures/block/belt/belt_casing.png | Bin 0 -> 3616 bytes .../textures/block/belt/belt_casing_2.png | Bin 0 -> 846 bytes .../textures/block/belt/belt_casing_3.png | Bin 0 -> 585 bytes .../create/textures/block/brass_block.png | Bin 6407 -> 6948 bytes .../textures/block/brass_casing_connected.png | Bin 1385 -> 4059 bytes .../textures/block/funnel/brass_funnel.png | Bin 8718 -> 9606 bytes .../block/funnel/brass_funnel_frame.png | Bin 6050 -> 6615 bytes .../block/funnel/brass_funnel_neutral.png | Bin 8315 -> 9090 bytes .../block/funnel/brass_funnel_powered.png | Bin 6250 -> 7126 bytes .../block/funnel/brass_funnel_pull.png | Bin 8236 -> 9247 bytes .../block/funnel/brass_funnel_push.png | Bin 7884 -> 8952 bytes .../block/funnel/brass_funnel_unpowered.png | Bin 725 -> 6783 bytes .../textures/block/funnel/funnel_back.png | Bin 7679 -> 8126 bytes .../textures/block/tunnel/brass_tunnel.png | Bin 7255 -> 3350 bytes .../block/tunnel/brass_tunnel_top.png | Bin 5398 -> 1801 bytes .../tunnel/brass_tunnel_top_connected.png | Bin 5643 -> 3531 bytes .../block/tunnel/brass_tunnel_top_window.png | Bin 5820 -> 6717 bytes .../create/textures/block/vault_bottom.png | Bin 152 -> 0 bytes .../textures/block/vault_bottom_connected.png | Bin 466 -> 0 bytes .../block/vault_bottom_large_connected.png | Bin 645 -> 0 bytes .../create/textures/block/vault_front.png | Bin 262 -> 0 bytes .../textures/block/vault_front_connected.png | Bin 739 -> 0 bytes .../block/vault_front_large_connected.png | Bin 963 -> 0 bytes .../create/textures/block/vault_side.png | Bin 191 -> 0 bytes .../textures/block/vault_side_connected.png | Bin 716 -> 0 bytes .../block/vault_side_large_connected.png | Bin 684 -> 0 bytes .../create/textures/block/vault_top.png | Bin 201 -> 0 bytes .../textures/block/vault_top_connected.png | Bin 575 -> 0 bytes .../block/vault_top_large_connected.png | Bin 612 -> 0 bytes .../textures/item/crushed_aluminum_ore.png | Bin 208 -> 1641 bytes 57 files changed, 545 insertions(+), 611 deletions(-) create mode 100644 src/main/resources/assets/create/textures/block/belt/belt_casing.png create mode 100644 src/main/resources/assets/create/textures/block/belt/belt_casing_2.png create mode 100644 src/main/resources/assets/create/textures/block/belt/belt_casing_3.png delete mode 100644 src/main/resources/assets/create/textures/block/vault_bottom.png delete mode 100644 src/main/resources/assets/create/textures/block/vault_bottom_connected.png delete mode 100644 src/main/resources/assets/create/textures/block/vault_bottom_large_connected.png delete mode 100644 src/main/resources/assets/create/textures/block/vault_front.png delete mode 100644 src/main/resources/assets/create/textures/block/vault_front_connected.png delete mode 100644 src/main/resources/assets/create/textures/block/vault_front_large_connected.png delete mode 100644 src/main/resources/assets/create/textures/block/vault_side.png delete mode 100644 src/main/resources/assets/create/textures/block/vault_side_connected.png delete mode 100644 src/main/resources/assets/create/textures/block/vault_side_large_connected.png delete mode 100644 src/main/resources/assets/create/textures/block/vault_top.png delete mode 100644 src/main/resources/assets/create/textures/block/vault_top_connected.png delete mode 100644 src/main/resources/assets/create/textures/block/vault_top_large_connected.png 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 0b763678038b5bfebe5e077556686a6568bd0f96..40d01e0af0e453f556ef393549daca50d8f74e1f 100644 GIT binary patch literal 3986 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 literal 1891 zcmZuxX;f2Z8onV!7*mASVNsTZb&w@t-z6kKV^Hob9&D6J@5BE-*e8p{P-@0 zvFJLx_wNP(K!b?UuSXk;^5%TaHX1a)pdO(DKzkK_CkY1t7@II=WH72%R99cD zswyonD=8}#mX#KlmIzCV`NgGtp)j8>;O294dAT`xITyG&**V$er@YHfdI^(!gh}2- z9Pbk;Cj^OJ`~=U!cu!uedtQti_qc2BF^}A1E;%ToT`ojB$Hd2+k8;jpld{;3nQT&K zxI;!bDI?r5BiueMl#~|gn8tEUMRCO8B$JeK_&`z!=@i5Ey(Bi1Z~K^&v#~n1y+nvb;^hJWY;xnXo)en4TybGu%w*t|p(mm@u4;7*0lk zWCI%6fa<7EIk4B?_Ol(y$^^P8%%9k-2q0i_Dg^*=(~KZ$WbT``NlfL0lhLkud+Ogm zWf~g~FejN2`{H@0^(9fR;4htLL7iN6~Cw8^}~NwU+^2^)uc0vzSa!sp+IqF___Xotv?#k={Q;6LcOF#k^|h zXx*UWw}eM4j9DP>GyLRsPgm6BZAe^sSVy*i^*X;lKfbv#_sVE$K>1fCkv1mq4?2^N zlVNM!rnQi@$NBj{Bx$zz9RKP%x7F}(OwQ2q9Bp5E6V|ZBzI_jIxu>*TkUj2uXQXqy z=+?B~;)~Qx9pdb{%g~ohGL1~B5@U{i@AhMD-os*Rj&{_immB?g_d+^dra%AP3A>g;%Zm&5 z?T-iTegE@h`;+nEG-HfGW&A^??9sceH{*DhnvCGfyZ%d|AMzK#g7-TPE%)D zNZYh>^?uJ3@J~*7%L=VPt#q~jW>n}|N4aYH=*KYw4M6+m0#HEI6zE(l>EW)w;OG8S zk<7uH5-*wdcFq!vjqGk3p5x~U`$wqAGz}1{J5zVYZymY`UEe(=kb-^S z>z?Drd0>m+)w3Bekt{Z8l6G`YjqxP7#?eq$G36TM`2Ju+>y|VE+#i$QZyaGxlNd(t_TcScDo)Szmtf9 z5c*RnS>dg}u5^YF9J1vwj?}yrvC=(cDVpl4oqtUy-e^KB7kKqb$591$9+rNguDS#c zM4lbOHxu5;i$<}PSLfkaxX5u8G4|1QI8y5KYN>~uLgUl&-(ig_LxFaznjtfBpu!)j`J;s=4xPDST=QXtijcGcH|RDWi&KN|aO zKj?fTo4Y9_q7p+vvS?ox^tGFJK+)QD5QYE_w(I_pJovMSxo}t2XTY7)%AYld=0aQ@ z1Ti17^}Q+!*|_w}MUu#v7bU(xFHUFUg7sb+#+&feFuW2f7jEh$}naDKtmTZvh-mb4M3EWY>eQ&FCEqb|x&2&NgK zlO)(SgnmzgMeiSZbg^htL~PLd0TQN}9g^bjbBP7yL0Qp`h8GY)<$QJ;L~*ix~Y0TyPRIbOL;P0(J%sO$j0UQCioqp`Jkl44-c+OR8(UEX8ZDyhu?OTI*K%sQY&k0=(p~9DKF0ARYm6#RHLF zi>1Rm2)0^9aL^7@{uFma&ji6lfU#w^<_pZb*q6VX2(U<9**?$J2H Fe*>i^pu_+G 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 0000000000000000000000000000000000000000..26bfbb10e1187f9faf8143bee8f170d0a6da3c7e GIT binary patch literal 3616 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..914327bdba2da1fa6e2c0f1abf2c0fa05fdfcc9c GIT binary patch literal 585 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 A7ytkO 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 f7b9f17c3f97c547e28ff95f6e00ec1955aa2de0..2fe2f01898772508a247376bd870fb943febde20 100644 GIT binary patch literal 4059 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 M4=>kZm*9*41H)+q(*OVf delta 1377 zcmYk6X;70_6o!)t5G6ve6aumYt+I*_M=6a|LZK{1vjgmDRbKq`yD1RWrQ0X`%fNl4O<&UD&8&w1}T?>+b4^W%!K^OjYP z00IVsDW`8~pAp(k{?31rq}P$*Aqn~KpR$1B8+{cS zGOr}f$O=X*p_|6)?Y55sBAFTxN5;X)hB zk+cTyr7xQvcAglYoj6+GR8HGd)uF67^SPmJ3UUc|6JL=wf5P49G;q%~b6(m{t*}yF zhpZlWI5%pwrU16}bTAC^TSvakTX^%Zm$P}A6&5{7m5E?q8q+(qRmpj`V|TYmD8wW= zZ_1)iCFy5h3zok`SP|d-BB`l*tFNQ?n&mnXrBR^W?uq^b(9VHm>4A2sprl82+OL?$ zJ!1U#e?6h ztj&uM9M@SLDcf>T09nw}WkQXK`(-z}e_}ic7E}W!py{J~ z%<1#x1sj_AgIGbd-^ORM%h{Ol+6r(zwf8uqyv+#vSia+=$}2{T zh@|r9Z%8Cy17U?e(~H*A?yBeVGHQur=Ik6@h|>vt9FFAeC!*1pqc_F0g>Nt|$LQ zLkx7dX!5Akz#)n>@bmxbuIK1lHC(|EEJG;LFuN6u#;0fp5YdOMlIe@o@EI+kkpU~< zqt9ZA4Itt@vWmvPw_^0o{{$e$WHSw5lXJB1q_!wIbVt5!^Vg<56IX!rmJY&EH zNs#|%#hO6C5U9*uu2V?UYPcAaA3#NO%eI^fH2j$#>oa z>XmT1gwZ{1z$b@6tv_I#t*>YpIv4=}`O{hWgKQN&Pfs*RkcCm#wVCSTC0n!-UK{Tx z9V8s_VidE$bnGMU0?Jz<#V7-s#r(!y`jS@eXOzDWPG2IVkcNTM3nY9G_THq)d=X{F z)-z4qp*x0cXGv}xW35m`{fNpLV{|FDBr@BLOk!5_RVmW5Vt!el414Y8GDL$w>&i?IEn#5B8 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 9a5ad5cc7e8e674c7ec32acb167710f0d5c4897d..67f4636cf3968736c000194f627106303203189d 100644 GIT binary patch delta 4835 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 Q4*&oF07*qoM6N<$f)yv;SpWb4 delta 4282 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 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 7abb6fcc960b5da976dbd1b9d7671616c01cd6d7..0c55e9ce90d4f56bd414b3099f8ea4de5136b9c8 100644 GIT binary patch delta 2790 zcmV_`$@I7v z76DZyAx!`4&td++AA4(!^BO}6!Q#&)mpJ1k+WnW;ovd5;^I@--mvVDgFp30E*`G0- z_E$OC7fY1!=AR73dMe6mMRLb}{9@<~By&cLmv#)LV@P;c&@qtrvTR6yQJkPJv$YC=}){Bo=oT-V>1dVx&2j47+pGKB?kNi>|`Bv8p$n!Twi)M_zSC?G? zq~R>;TFQDu!ve@t4b)q~PP5e(T$K_r&>!TeQKmtCJu6jA(Q#+R zlex02vM9=lt5~ym!bO8sk~E3nuYz7dDc^IUHEvqNRf-t65n3|A7;XCb|G7RI8e>YH z$i^Eh%!{W8F^$RGyrUHep>gTRFMzM>>)+&6z@T3+M=UVgvP~3!Pe)r*N3w_(H1v3G zw;*lD03gEH9+M#f12&L&3S^a8iGX7SKN*H1i{kB|DJ-a-bZHjXp}NEqmU@ zh*==QOArM$Niw){2yD=gx(E$rFW!0YgI6DY@;OLw!G{nu%;1+*)T!5?s!@~XDA7e9 zL(~{eOfe@;g5c*uV|#TqZBW<$MM zLs!+y1kG^bCud-c9f5J33_#F4IkS79noY}4pzPzI>e3CH!%bB5BR~=%F}Lz zM$JiwBKIdm&uK%%A>II0cLr{nOoxOI9K-R(qcin?mihq_j@1+O(;rTN{3P4cQX}Go zpY)@lPs4Y2V1}xXIg2=xuX#YW3DewPa}>Vm=!1@-SRr`L`Lq%U>(<-deDJY9JiIF3 z%WHNE%)r&O1WjQ#b679IP1Z+FgDw2*jDWqS(?P}4$TmF*&^#+pvm6TqNBZZbJXS*O zxCo+umDYZM&Gjqs^)Lx46Whk_qbhAuaQ6TA3OO{s@+p^g;gxL(%;SG3LSuSl;7sOfYnK&#tNO7mm& z5b4##o)7eK#47E`d?0f}Zgho<;b@9sQ(4)6A17leaX8&hTO0rZBwBXmgwEZdwtfs# zL{J*;gs58CVVgLxIRI=NRIsFKs=$ozPJ zL2^`|zmB7%CyW%QJ-D~PaK(iq=!E^y(oBmN4PZ>`Q-Cuw!aYJm2+!+yRz^P|h~b3K zvHA+tX2oiaM`uCWgzj3BO+ew)HGU@PjU)3*lHNEnza;66BlCeINcwcaj51E~t12S3 zibo|a!E(5bnYU2)%SdP5LftPTox#q3cUmPRe^}P3Oj8TN-Ks&vj>oMPo6DQ*%&ohf z!#GToCFeakp&T!b^lW?GkYwrJ#Nm&ItKLc7l~v&o!v`w0xAAYE=2OKF zp76d)+&Hh{{pdd7m~y+$gU5Mr-T4LId9BoZ(hN6n9&u|%oNbH$mX3eT#_bgoa1h$# zn6R>dN#M=jO&CrZ$@~qrm(4GKl>YEF0001GdQ@0+Qek%>aB^>EX>4U6ba`-PAZc)P zV*mhn+C54!5`Zua+VcvZkU*;TIlb1w&B6blTn6C+9K`PDowgNnH=c>?xje-mKuiY@ z#X-<@z+%v)V5@a%z0@TKn<>cH>#Zt=efAj_XCp37rvLx}g=s@WP)S3R5C$86J6LhZ zP@OD@iaJUai(sL&6gO1v*A zw21M+<$av@&f&iM0HIM~s@XLTsG4P@;xRFsTNQg=5kQz~24RVrdLq4;f#>?VhmY@f zQJ&>}@6Xkzk+gL!Qw&2_3_#Ib|~k`N)I zhB7L!5T#us#YBqEV;=q?$DbsZOs+B*ITlcb3d!+<|H1FsnuW;;Hz^o@1G-;q`(p&? z*#(+)+x|Yb?dA#Ke+I6!w!hi{WoO54hX`2A_1vkQ~WRB@_z4 z`x$*x4j8xv0&DKvTIV=@05UYI=3GT z5n5?fSaeuTOgdw4Z7yN6rw8!@Bw;pWFfuu1FfA})IWR3WWMpP7I5lE6EiyG@G%`6b zHeoa}IFq~zkqb94H90XkH#IjoII~y_i~^Gd4O}EQHaBB4V=*)>W-~H5Ei^e}WG!K4 zH!&?TVm3E9F)=Y^W@9*$g$+#%G*mJ%Iy5#qG&CYFlm852BxN)*VKz8nH!WdeVl*u@ zFlI6>VqrBjEi*JSVq!NnFl1vgFq4H1O$s$sF*G_gF*-Flv)m0{2^RadRnGtb00v@9 zM??U;0JZ?G+{scWlTa5Re;ExkJ0{Rg%m4rZVM#ld($zaTLct#wkgh2`3%8 z=uqI`VndF$g_HOP)FMc8n}e+`K}!$~{R1r`4bHVmkYf%G>QGpBU>tGb4Zjvo?tXb? zec{LB_ul)x_kG_VFLYeUiSvtn08GQ?;obnC(`-`&vcL#Pdu$g-f7Z(YDCyJ&reR}Q z4qlYz31c86*`znISt*F8nG6mFgkGe zlLix@AE1Gjh_ctIa@wf|GjKaxNsk`~udHV>=sPL&os=)u1wzeAK^)d{i&^`A!z(ubkQbsM6X|(Pov#@?twl!H@P}rScnKM zt)YZH|BxGf(_|8Q{-Q|Aev$7lqTBlAMbS1y!y}7M-HPH?M0UL}TR~dO(jf|eUzd>E zYU{BQS+^Pw;;H*o@;Y{m=v5CPS=-2v#?z8r4$!!*qBLIMX^HF-Cvp^~gtsRM$h$b{ zi&yFum9u9aXHix zY1oT8mNI*om=SWCp9Nfu+oR8a^NP4cfxQLjR9$q&RZKJ%(eK8YYLe-u&9;~V7oBaE z(OO$9O_>neXbWit%-pz4w@i^L3D7ElmmsyLFJ{_}(_AqE!_{D>HBe?2{PxdWkBWL9 zls87p87uf@2MOWEKyExS3xJq@@W{^qAJ^+|;7UNy&oB!Xm~>t$vNxN5TZ2b5fhJ7! zXjfVou3G^@1lu0Y7y<%181g0<&DOFph@$|X1Vv)W*$fDb_qM`I>xcrt5j$+-8#Z&U z^>&F-vjBug8Zn@Wlz^2(VFQ2I2{@EIdFQ5{xEjPWU=uLQ2_Y$}amHGH1y#rvmyES9}SDi>MMy zsBnhE} zK2gJ`%!djy%84JC0Ws?g5a)pa2yF*uT8wj64d@1DI-;_XxA4+`4{)j(hyg*@jP>1| z*nJ^)!%aE&zi_h$a%w>LCy-MEx(DRG=qdc8}oqAsZ=?A9G$^dOb?z;)JmdgBHF3D5PyBQTkk+%X%UmZCb4DHUSl zqp2nE>Q~FsI0Zj{M@?qEoS%<9Z?&PXxvG?)zrECcD+=wH_-@{{RZlP8wO0dgJz_~~ z2AmJg?;tXjxVoaLwzOj0Bd`p-rsUFSPf=q|_zb2VW1HR9Ny;frVRRM5nzHWNFU`~h zOvwkb*p{xkyO9&nTqVbiQZWuYd07hqyhH$fTxRpox4 z)rzvg?XLqDgoh3SgIYf+cIquex3j<{bo_M&yX{4N{Nwk-z3Aycpx&Mce) zjw*&7?kgkGalqimq)|_Yf}frV)GW|`2T^xX9Iqzh&}{L9 zZ2$lPgp)7_A%6>sbjVPhEEE-Slqwd%LTM|s>R|HHKWNgBq_{W=t_25w7OM^}&bm6d z3WDGdh@+E}qKlMxUs7lhiFjW{a ziJ5vbvzUeF`nrdY?{`t2<$dqZHJ}ts2KYqcIi?#H@qY&K%%-Jt-X{*RvZN576Hge_ zAn_yDWtZPLmmC&&X2{5<=ZQnaVyTPeE@ovzC7vdZD5^&JLe6D{^A=~dT4(J(`3r*u zZ6(8XsxT5*LJ}#6kWohkRal79u90FQP3LhB|ES|nkxM351&kaEs6mC~_`(0+_iWAL z)TEmfjDG{YFSh+L2K4O$t%hxXAKP~81n@rtS6atkYXY;Mq>RG z?f@fCx@1U>H92KvW@R=lHaTTEEi^eb zG%aBdH1WMVm!;|q}sH8nIdI5#pgI5#r0e+-NQv&j%v2^M8r+r0n) z00v@9M??UJ08s!pFGeff>eya7M{QZFu@6l8JL2S3d&TGQX;76QE2RNL`Ot~#Ba_%+y9;|U$S+s&5D$$ zYjp?UEJ6tsKm*KGJOVfez!XDSk+KpGKpk>AW~x|caB~|@VZ0L0+HDemdp=>z@5Q%g zk(WUVEJOTOrM`l`Yi(@Sg!;@RPV_@riiBE?HqftZsQ~g`Za#**7KpX)J P00000NkvXXu0mjf|Ar^) 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 3c120d38a2fb4424f953911840cbac1332e26289..bf202962a79765eab4b3ca1f495ed91f553c451c 100644 GIT binary patch delta 4920 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 KMNUMnLSTZ%PkcTA 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 c339a57942194b2321e842cdd3426e0fd2de1f91..a7d372db0440c26f3ea3e4cb85a5175ba091496e 100644 GIT binary patch literal 6783 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 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 7ee7092dfaaa2280cde858e5b228d030939665fc..50ee51cf8327fee6e4c2af17de2748ad89dea456 100644 GIT binary patch delta 3365 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 delta 3255 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 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 2bb1b3cb4de511619d1d2eb4f5cb72643cba305c..1c4c696eaf5b0892ee6fe44a9484e574e7e4d355 100644 GIT binary patch delta 3319 zcmV*B7|LT)k0sn|8Vs2vr~6vrtNaPqdcTct z_1({q{qmCq2iGmcko*ZbEEjq>VTZ*y!^FoNcT~n0XH55AO&VLA$)}LAeZz^GT3V^5 zm}cB5rR-9C`+pMdy6vtvLuKU^FpYu90a3&-| z;7dpnO7I$^hLBUN1gPVAOgRoB5Jcj_$(U0r#HPX{)_>+54c9hGeB38hh>xU_l-RV? z30BSme>7J()Fnw4ks>NpnsirE$wf*jS}fDMwE|?eurlo>BeN_a8(pJfjwGq|8p=QRA+vO?0OSrZZwO zBVsWJBCZwz2puhEzJ{EmMb2X8TO=za;-pw?R`A`0LJ0E?QBHWr?kjS?9XAKozlvM@ zoya*0-TxtS(e3mtZa<0IG9{chVvj5|OnoBzc7Kk2GoPrFC7aFmHAh+g6hN5T#tO36 zVT1Uz$2e;d!7xVHD7fe%afCtB8NKLU$xT*WyY{2A$M$$MPHi%$R`gB|2utc|kM@`@ zchxk#z0)I^*MV*hr>pU>bJ^-4jB)H*`z$@|6xS)r&G*ADvip!(7j7kX0Y<)T;@Vv8 z1Ak;imP(K~AjN=D&}Emy9)^Nx=eq9$CTjDR{oyP+aAcnCc57$k6Vq13opoaEk4O9L zD4M=dk-RGt>apoUY-=8$UR!XVdw_s(7h)ZM-2Y?y@%6Ab(cYKFBrD`SG~t^Iqppc3 zQpSWui>Fo?kYj!%F>FGPLjCX9#p-Y}QfQ@AA|N@LNSX8a zH`@SCxsyx-c(LmVKJDW2!lxr#y*X+Tu$ah(J8EsalGz&xISWh+m`)@BW6Dh#21=}% z8H2QCjD+w7h3xbXEMLps-j=sV&3_z=<4)2H+0N<}V4?x?0%qhH5A}=J_H^=cGnY8J z&-27)6YstUbT~*MA_n|$C3ao?G#}=MBIHhxwAYv{A@1=`?P(1)la50ekV1Q@nV_3@ zR%YupAHvFZL1JB^*f^DlxoqUn0Zl4zG6vqOAsMNwIg(&l@~ak;Iy9`H-+!T1NJ54q zIZA%^Hr>7+EEz0&_FQKl-N7>5=N-?c;oGQZx_3}S^KW!Z?A6e_eP*H|tjC=p=b%~D znw(@M#HNh(`=sd_Qsu7cRo<6zZ}}Vw+U{g0jm?S>)^9C0Ad&&Y)oZ9W3Ubj0&a?83P zH5nx|K4?7I7mqrsRuo|fwFYDMGO|gE?XnI{yLm`mTXZhSutyL-)3BOPzLF#l6>B12 zF@5>8NWuyDBqJUXMAHOB_K>ZVwbW!ZMN+MEUgV|)wv=cWS!f%+jeiu$A#R(xQ=t=x zo<x|Om#q@@hITvz7D4;(1L<9joibkhz-Eq>9+|00)gY;G8Xdc zjDfT~`8q@`g`1bqVnR41R}5(&kVe4Yq!^eDMC(-v0c(ski+`)!^859ue!9`=>RMZO zBrbYY?c$|>#>GWAC(~SfgL0!-7xp^Zp50q9 z>W5sg@fHOtROydxQU@uXhSnqdoYV`D0XHpNG>gWhKCar1azQfA#V#ZsA%$K z|1xLXeus+ip??QI#EvHD%MltBT1Fe_FylN!pV`Sl^b8m7eox)ET=hLu@^%q9S-;0K zs8=2BvyG)d}oG_!($>C!g$#qf4TRk%|UH>SjhCQ6Yqm zOr>SOllAwI-Fz-2hoNXibNZ4vg>+a7b%Q0}ch7X8c6@)ZnbN*nc-5_|dKlKlffV z%IaVEQg%JIk>alzs3+$}!8N2|1f|IB1xrF7BNJ zHg1_{cN)!qB@NM!lV)sLDnF#eGFq%mRVJij8DdVn6{!6PX?rwmD6KU~rqJ=`&CMWM zR1<8P2TI_e!}Z3DliSr^_i_eZu~SB=A3e9R?SI$4m@6KIylqup*7?rcIWFrQpFJK7 zL*k8hR4tytuvRl=UwP%VbK`w>#oXSPX?R3iz!DpaiS9w(SKrd+*8zq0m^|xatF?}YQr`sv|uS4yjL9Ne8((AeVmBH^mcTWRL2#!r0d4*_N1^Z!&kschKf!<SUt{R;h~_QN#w^)Kq&-;C~`zVPov|0PcJmlMIxgF8;0n**N)wk zW?;#guFmy$|KsETT+h9Hwl!Qb=DA5U{2l<)@Z#a!W$r&Nv%XP(LRc2UGyxd6E&#$b z8MrROH0joA=&P%AYc=-19`o&U6JRP{0IYA6c>k_Wamm3fWyu+Wz#jnM9`~bVe{yIw zdOY7=2@9Bp7XZStLU{GgEquQ})~=i(04Nl)9MDEsR=76}ugNw^7{K#J2eg_!&Vq{& zwrv9dvy_b-J`FE_)CzsSAAtdi<@pFK_mkf6CcKb_sqVUo2mkpQ08k~m|KQ2xdKzA+ z$+ayrG>>eX3^ku7w)^ze=sO#^#C^{n6|?p6b*uv?Cu1VgFlyU!h6r<#QPQkfHj2yEXChsk@yBugPkp=JPoVDA&e z#2<}1Vmp=n@GV!&JaYYE?^pNjZgp69JJ@Ljs3uGjzv^EA@WOb5$Xk#fjb`9p`bJom z4&b#Le2EuOUd(Yodt%$wNr;>9fHuve0PjaT@kTX9{6Qigny}UAMckeyeimHNYV^iT z80X{Hc^WU&YHHs**EUts7~Yhh#Vlqqi&^~F_zUVD@36py=(_*_002ovPDHLkV1l?_ BYN7xD literal 7255 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 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 8287ad0d8679fe6d1b770f6e64f87b0e523fc379..3aac741537174f0e0dc82ef84747928c341184d8 100644 GIT binary patch delta 1775 zcmVaB^>EX>4U6ba`-PAZ2)IW&i+q+O1bvlIu1M z{O2ih1OniC9IjQlL5`p1CdnR8-n=AI*_0`O0J;H?R_(7pyZQqcYjMh0A6#@!<1*1i zPIw6VzSDadkwv}6gX57@-OOz@>SPC~0F-rLIg{Iv&?G*~J zTnVB~Sd5_ZkAJuNmB3H#-iroCM2Ma?R`82?@IV7b8Q%~CA=Ec-b^?6v>rxM51q|8= zb3lMe=e0z(bmx}L1Q5tsj4Qv$*TEXkEHSWc;S32V(2m5CBkh?zkr56cD8X|U!x;>a zwOrvO8xaR?0`ds9q2p=FvgI|8QUO0!oOo~(C4nqsEPwLHn}8fjR;;nsI_qt)(I(}@ z8E2hy-i?||UcB+vJMVq)(WfB61RGrNA%qxG9)J> zd+4#Ji+{Dv>X-XBSfkAvPo{>PzgWYp_hX^C1dTpp2WMc64S{h#7(hbv;7kWHh6i(l zGaVUKVHr-^!A&Kd6gg068nNwkad$KKW8M_7{uOWh6Xw*Q?tfs8Rg*W~KCo6tCoGe( zRfPjnEvUYRC=v%~snT7je*741pXckprvlOmRMR~ zICT8HqBm$HE2@f3)2@Y4CZ+B2fcll$-G9^Od(?H~vR6ZNN5~jxOJCy=2S8=q6jqFL+WXpNA98WjP zX;*`}q;5`628MEzu+u^zFGQBHYINI9H1iJT#?tM8i^mx!%HoXPAesED2t>=U4JZwH{5pA z>QNMTY?t1r+PQ*zK~a5%v9#@B!@l;pZ@d+PdQ`%O4XB~{?W}lYgG&ebN0T^d;M9-N z`~>C}kEj~;qk@oh60Oo9;&LFkNq_%LaC;&N$LT=WOy^_?A|)qM&}F5&LOn-t69u(^B)hMW&?ZE;9YhyBM0mAz_?k_cms~t%%ITz>-|Z;k#u$LA}_s&-h0vexU^oB;(vq<)n7y^ zUrDDw?mcxwSjNA@e(=8cn!0-S=yS=Q-2;CLcKVrb{n|$WR7dA=I-^y2=hyOZ$yU@dW$0;(ZzX1?<(=>LtXqNy000v@9M??U;0JZ?G+{scW z00009a7bBm000XU000XU0h7BF4}Tj05h6w!lEVN10YXVcK~yNujgql$gD?<=|3*g? zkf_15A|o9UOSe2npQ>-uxv#*+f-=TZm!Jj&K{6<2=x~vtN``nl-{-sk|K+F8k6pYC z@Yt!2Eydg5eHW#fq%b5Q08Cv6fP|R3j)WMM+9b)S)V^$r90VZE9`&Z zdIHcjhNlYYxQ8=iMP3sC3PYxow`Z-*QiJOe0N;1|{(8US?MwsUMq6Jj9mgJkK~ME* zxIW;X)~2fTUApg0*O=(V1wibQbz3@!)~p0TRcY?>23jiS#x2d;_z-)rnJnqPH%xOm zo95teb+`4!^~jq3m(pE2h-B8b1i+?O07j*RbS%xfEzM=unA!9uN!-KP_Z_XxQnxKx z%pB{el(lHxTaItq-^-lRzHHJ=a?)ugd9|Hdp9Y@2FB|KU)nEkE R5Rd=>002ovPDHLkV1kDQXKMfe literal 5398 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 literal 5643 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 delta 1855 zcmV-F2f+BfG`ua4BYy-*dQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+O=0(mg^`C z{AU%j1SIhg%fUR(xjUHUPhqe-anhZ1_ni=1SYT0931ge~@1Jh|!H+4haXxBDAz1ue za)~o4YUeNSXR>ZTuM2xr?)>I#V7LTU=B0+!|L~K&i$obUe}5B5%WBx}8k5=sAmQ0SD?pypvLR`_ox;|pt;bAs9%h`J-ot*lj$p5Pj3dlVNG#4QJORi! z*hn4?IO75x2{wxtx1WzGfskiB*&9^ms>)fTPy82ABuu}7i7)0w@h@QpZ&G8ai&ET=v@nO2pw&k9$cdYLLAJl2=>o zhEgaIgZ)m9DrM@_c3Y?bqT|L9mbtL(K9$Ici&z7l+$hvJN|GuH-3sItc=^Oa`?zTz zu8?BjO6bXiU^M0Dzf(R9)cZ(zBC97?z{Mj80b?jP&VT3yL8u>j1+tMj5`jmBJ{f_O#qkCS z$a}6p$xb9d9OW@K?uoSbWzW-%XBLF;5+p*JBpF&cJlK#w(J68$d-2YDAAI!clg~kd z3qFJp!+&`Ar=u=2BX-X+)44M%+vTsy6e7& z9=rC`^Qjt{DeFUdUo|>Z<6WuIF`la7))IWwgD8_Jm>-6zUD>h?snI(D04 z#q0`=WjIK+g5?Le8UNzCE3-Oww^!D@+wq%$Y9E%jgbnz6!OYK56gvmau9g$g&yoBB z(SJRX1BiKzq-|lZ_28gsE%OdSQrosSRNP!mJ^gba?03sbsVf3@r|=4(xgh);;61Re zE$^4jV+%tpa}S~wzX;HQV6DrH-dJk7PR#<*h3#7+ z&$%o@zv9z;gU~Q%-=pm*<59KfRYgWj`QKO5~TK<5zUVtKOa!b0bA7! ztSciod)O&;^Mfxh}i>#yRh> zz%zqJDltzSBo^~6EVnQ#7%K5JaY#`$$`{fuE1b7DtECES+>^gBkkwX_T&FpND3%aI z93o^?P(%q9!nA6nm`Komq>X>j@yE#}ldA|ujs=vVLUR1ze}C}1TQfH`=_UmtKO0<$*{RtbNh>usL^000JJOGiWij{ueck+fs`tN;K2 z32;bRa{vGf6951U69E94oEQKA00(qQO+^Rh3Kk1CHxB=qMgRZ+yGcYrR5;6HoR*XG zpMe6v!oa}5AgaMfmgd(tJ~1#cPzYGC3I4T-XHb{qXSn(NBZG#N09^d`s)>XR_-lU? z&k$jt&IseLxN!47jDO+P%m3(xVDkb>phg&|GhTT05@$eT81VSx7Ys!PV&XUrAvzEZ z#KajXGJt3=P;7uKKM%z&V8o^P#=|&w^Ju_@)`Ol0 tPI$UTG8`!=3JP2}rO`kjk9FBw28IH`!-sq2t^&0(c)I$ztaD0e0s!^tDC__L 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 8c9cc78e285ac337e7fd819c0a1924f4b798a1fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 466 zcmV;@0WJQCP)g}^jMgAn5WDa6CjH~Z}ap@O@J(dHIRQ62FfwY z@o>ULez)ULIMZ2*&f#G6|NaYG3@!{;jVs5;GX7qOQ5&?D?Ns)Pxe0tS!RJuc59as1 zE~FQjMJTzuHMm#7WfioskO`JSSUHi;d8(os(xJ2 zi!@>mRsWt|$fsitYJOj&v0!#W$3n{=8j_2jDpaz)Y8e}1Si(Ib#j>CNB1Hq z4Z*x49<)U%%T1^&FPnPhkodjJ3c07*qo IM6N<$f~{-9rT_o{ 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 5f08ee07315494c73e6292ae977edc247f5b42a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 645 zcmV;00($+4P)ZEN~98%hon`=)g5GCSr8cLJ`<|)tPiATh@Za)3v56d2#JddRe=ir&fnjT!{EVO8} zQ0B$q_+!2P{@{!6Qi1r-dj0X>y`Kc)zi_|e1YRdW^MF+rD7?tTh+Ybodzdi&5% zVQ|}7tF6UnP!c}T%`Yo6>{JMEG!u|nu?p2`65xHB<16(Iu`BZ;%nCP@dBIoNd zx8LItKG7s8e)0Pht5&848!%-mPZY(gm# zDNP7|zI5i-D|n+Fvp8OpSVvl;j3QjTa_`AnJ#R5qi33)4S(z$~t+H?Jx{GW6nYma_ zqh%UnAy__XHX$@pxV4sR&C{bj9xh(r1F>#)@4GR*2Vy-Q;k9o*K{?C!p*f?A0)^Cj z`95G5g+X(VvB8`EHybH1LIvT_r+nA^BwT`A4j>bN=9xgDQuejJhftlEO)$zHx|9=5 zD3?y$JPBlUq4Jq0vSS)=808%(YqCZe<-4%=Mr(C$@fkFJBdmnAyoY5m+)jki3+u@L f1n6cVtRw#crvS6z?NvZ}00000NkvXXu0mjf?G6zY 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 17e9186fcd7879cb02f654a023e626fa8896c350..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHVEbxddW?WJgF^MMG0UK~F$I zOg} zpakajPYEt1i16fU0&ovbMZ|buye~kHzft_{9q$VS+pX$YAU zB-^%e-gm~5*q|~@oF}zD2%S^Xf&2Zw+{@wS0iH|1yX@Rba2y3lB?!=*0CZzH5-f?k z%d$+)i(EHr-`9Qb3F9#+q5D(`Oq@V^uHSbY0(NmWbDt3G2Ys;bBY~=du#hJcCG;Qc z0_ecqja1wAmLPKgk_jHgd1_CVPzVn}8VbrMGXf?qz(;%QNxM}Ex0eF>#ae=bv`r-- z-p04vxvs9M0l=s;a$fM2Tm(;eFtJZ;t!dt!2q0_tftk$+T$S6mKqAbR;4pMst?lVT$mBC?BAr|+-Z-=FuC0`xFEh&f}0jof>nNTcIQjMhYue<{0F8e VFTnnXOLhPN002ovPDHLkV1oTuJdXeX 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 d47ae123a75814797c6b4f69dd74c6aa1c61418f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 963 zcmV;!13dhRP)B0BFNKwYjr6wEBFb=UyLW@ zK!6gPAk+o?oCM?vqF_3zFNA3#A`qxTfB^3JUI=`WEbtCo%|tqAJ~At)8@$6wz%;G` z#W(YADj;9q3i)mnfi7B{1soLy7d9}6VbOo0GsH#;wySV0$OFNg!Wp36c0s+u2SKH+ za0+M&FxCMom>C3f70v=WAUNVcFhiM05W?=AAy9Qeca{lUV52gDLM~8=1EF7c0RoK@ z>jd*KNb=e(!i8HVu&9t7Rsyamn7BY7P}N7lRGb7A9l%Kt(_mieYGGIls2(?_0AW*c zyVNZlC&6AB5K~ZSUi-Q2fMS+35jzX^`alUm5lIEjHJA;IPJ&{19K`c#@F!0r%XwJ>?DZwz`@JUWQau#G{WG)%`CP+nZ$>o*c zcp~O}az==g^<9E-kBxEPAQA*=>EOKp#GHRk^2)sNvBK?xlL&Y#c=_Q=n#rW&OBUxr lePVksv~9B(MhXG8{RhqkU^oo$a902T002ovPDHLkV1jSfl@0&^ 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 9e3965bbb07a3fe9599eb0bc85c146724a1a7ab5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHVEbxddW?}1 zdxWJ32nYn3IUAfh?W}DTw)WoH0I63(arX?1O`TV2b0v$l1Tu=RZ0Kk?bajEzDd&T` g1e6N24RYBT)MF0Q*o|BM+d~3GBzh7D=9BBCLJj!FDWN2BO)pu9VQzbB^VhZ z6c!!1cU}qr0004WQchCK{DDtt-+){di{CTQdaa6fbpV+K9IA{O|sOMoK@Mr}p#Lq`pRoDYew7=&HW zn_dj?Ukvpngxp|G3341lrNo&MU{Zn%OJquru%0m{${Ysv=zt%{c`=kqkpNZh2?CW^ zikz1i8zmMKP^ny^$n#yuF%*LHZ57-|kl{ZG)4}2;P~`g2rX`dk}6YqBZ z%m9-FEncA$FP99$Eh3Oh1Wp*@{mu)Qcy&A=Kat$UY~W9^W8Uw$ZNN(;UU4bFiLI81 zA%o6*JfBw*IGJy097g@y_wSX+GQP;G3;XW5M3-T8x3rTI-KpT30Y$7uW?pgRi%Y=o yhGXn6pVsVFbV*h9=bE#`?;+E0000v% 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 49f32419c5746dda5492add03a0c08495f0e8e6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 684 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