From 20d3d32cc71003b3252702a2ebe69748ad37a2c5 Mon Sep 17 00:00:00 2001 From: Kryppers <65094918+Kryppers@users.noreply.github.com> Date: Sun, 23 Oct 2022 00:38:16 +0100 Subject: [PATCH] Spit and Shine part 3: The Purge Replaced textures on models referencing redundant assets First batch of redundant assets removed Minor model optimisations. --- .../java/com/simibubi/create/AllBlocks.java | 2 + .../models/block/content_observer/block.json | 30 ++- .../models/block/creative_motor/block.json | 104 +++++----- .../block/creative_motor/block_vertical.json | 140 +++++++------ .../models/block/creative_motor/item.json | 89 +++++---- .../models/block/funnel/block_horizontal.json | 2 +- .../create/models/block/funnel/flap.json | 2 +- .../models/block/reinforced_rail/block.json | 136 ------------- .../models/block/reinforced_rail/block_n.json | 160 --------------- .../models/block/reinforced_rail/block_s.json | 160 --------------- .../block/reinforced_rail/block_s_n.json | 184 ------------------ .../rotation_speed_controller/block.json | 6 +- .../rotation_speed_controller/bracket.json | 41 ++-- .../block/rotation_speed_controller/item.json | 10 +- .../models/block/smart_chute/block.json | 86 +++----- .../block/smart_chute/block_powered.json | 3 +- .../create/models/block/stockpile_switch.json | 52 +++-- .../textures/block/andesite_alloy_mesh.png | Bin 289 -> 0 bytes .../create/textures/block/andesite_bricks.png | Bin 651 -> 0 bytes .../create/textures/block/andesite_frame.png | Bin 224 -> 0 bytes .../create/textures/block/andesite_funnel.png | Bin 286 -> 0 bytes .../textures/block/andesite_funnel_back.png | Bin 744 -> 0 bytes .../block/andesite_funnel_neutral.png | Bin 296 -> 0 bytes .../block/andesite_funnel_plating.png | Bin 492 -> 0 bytes .../block/andesite_funnel_powered.png | Bin 290 -> 0 bytes .../textures/block/andesite_funnel_pull.png | Bin 290 -> 0 bytes .../textures/block/andesite_funnel_push.png | Bin 288 -> 0 bytes .../textures/block/andesite_funnel_slope.png | Bin 239 -> 0 bytes .../textures/block/andesite_funnel_tall.png | Bin 280 -> 0 bytes .../block/andesite_funnel_tall_powered.png | Bin 287 -> 0 bytes .../create/textures/block/andesite_tunnel.png | Bin 898 -> 0 bytes .../textures/block/andesite_tunnel_top.png | Bin 242 -> 0 bytes .../block/andesite_tunnel_top_window.png | Bin 297 -> 0 bytes .../textures/block/brass_casing_inner.png | Bin 222 -> 0 bytes .../textures/block/brass_casing_side.png | Bin 266 -> 0 bytes .../create/textures/block/brass_funnel.png | Bin 254 -> 0 bytes .../textures/block/brass_funnel_back.png | Bin 692 -> 0 bytes .../textures/block/brass_funnel_neutral.png | Bin 236 -> 0 bytes .../textures/block/brass_funnel_plating.png | Bin 460 -> 0 bytes .../textures/block/brass_funnel_powered.png | Bin 256 -> 0 bytes .../textures/block/brass_funnel_pull.png | Bin 231 -> 0 bytes .../textures/block/brass_funnel_push.png | Bin 230 -> 0 bytes .../textures/block/brass_funnel_slope.png | Bin 254 -> 0 bytes .../textures/block/brass_funnel_tall.png | Bin 244 -> 0 bytes .../block/brass_funnel_tall_powered.png | Bin 249 -> 0 bytes .../create/textures/block/brass_tunnel.png | Bin 653 -> 0 bytes .../textures/block/brass_tunnel_top.png | Bin 246 -> 0 bytes .../block/brass_tunnel_top_connected.png | Bin 436 -> 0 bytes .../block/brass_tunnel_top_window.png | Bin 281 -> 0 bytes .../create/textures/block/crate_andesite.png | Bin 661 -> 0 bytes .../textures/block/crate_andesite_side.png | Bin 599 -> 0 bytes .../create/textures/block/crate_copper.png | Bin 509 -> 0 bytes .../textures/block/crate_copper_side.png | Bin 502 -> 0 bytes .../textures/block/incomplete_netherrack.png | Bin 681 -> 0 bytes .../textures/block/mineral/cinnabar.png | Bin 276 -> 0 bytes .../block/mineral/cinnabar_connected.png | Bin 2372 -> 0 bytes .../textures/block/mineral/cinnabar_ore.png | Bin 626 -> 0 bytes .../mineral/deepslate_cinnabar_connected.png | Bin 2454 -> 0 bytes .../block/mineral/deepslate_cinnabar_ore.png | Bin 618 -> 0 bytes .../mineral/deepslate_magnetite_connected.png | Bin 2217 -> 0 bytes .../block/mineral/deepslate_magnetite_ore.png | Bin 596 -> 0 bytes .../mineral/deepslate_malachite_connected.png | Bin 2280 -> 0 bytes .../block/mineral/deepslate_malachite_ore.png | Bin 621 -> 0 bytes .../deepslate_ochrestone_connected.png | Bin 2317 -> 0 bytes .../mineral/deepslate_ochrestone_ore.png | Bin 503 -> 0 bytes .../textures/block/mineral/magnetite.png | Bin 207 -> 0 bytes .../block/mineral/magnetite_connected.png | Bin 2027 -> 0 bytes .../textures/block/mineral/magnetite_ore.png | Bin 585 -> 0 bytes .../textures/block/mineral/malachite.png | Bin 215 -> 0 bytes .../block/mineral/malachite_connected.png | Bin 2164 -> 0 bytes .../textures/block/mineral/malachite_ore.png | Bin 600 -> 0 bytes .../textures/block/mineral/ochrestone.png | Bin 221 -> 0 bytes .../block/mineral/ochrestone_connected.png | Bin 2149 -> 0 bytes .../textures/block/mineral/ochrestone_ore.png | Bin 460 -> 0 bytes .../textures/block/noisy_iron_block.png | Bin 480 -> 0 bytes .../textures/block/reinforced_rail_top.png | Bin 392 -> 0 bytes 76 files changed, 300 insertions(+), 907 deletions(-) delete mode 100644 src/main/resources/assets/create/models/block/reinforced_rail/block.json delete mode 100644 src/main/resources/assets/create/models/block/reinforced_rail/block_n.json delete mode 100644 src/main/resources/assets/create/models/block/reinforced_rail/block_s.json delete mode 100644 src/main/resources/assets/create/models/block/reinforced_rail/block_s_n.json delete mode 100644 src/main/resources/assets/create/textures/block/andesite_alloy_mesh.png delete mode 100644 src/main/resources/assets/create/textures/block/andesite_bricks.png delete mode 100644 src/main/resources/assets/create/textures/block/andesite_frame.png delete mode 100644 src/main/resources/assets/create/textures/block/andesite_funnel.png delete mode 100644 src/main/resources/assets/create/textures/block/andesite_funnel_back.png delete mode 100644 src/main/resources/assets/create/textures/block/andesite_funnel_neutral.png delete mode 100644 src/main/resources/assets/create/textures/block/andesite_funnel_plating.png delete mode 100644 src/main/resources/assets/create/textures/block/andesite_funnel_powered.png delete mode 100644 src/main/resources/assets/create/textures/block/andesite_funnel_pull.png delete mode 100644 src/main/resources/assets/create/textures/block/andesite_funnel_push.png delete mode 100644 src/main/resources/assets/create/textures/block/andesite_funnel_slope.png delete mode 100644 src/main/resources/assets/create/textures/block/andesite_funnel_tall.png delete mode 100644 src/main/resources/assets/create/textures/block/andesite_funnel_tall_powered.png delete mode 100644 src/main/resources/assets/create/textures/block/andesite_tunnel.png delete mode 100644 src/main/resources/assets/create/textures/block/andesite_tunnel_top.png delete mode 100644 src/main/resources/assets/create/textures/block/andesite_tunnel_top_window.png delete mode 100644 src/main/resources/assets/create/textures/block/brass_casing_inner.png delete mode 100644 src/main/resources/assets/create/textures/block/brass_casing_side.png delete mode 100644 src/main/resources/assets/create/textures/block/brass_funnel.png delete mode 100644 src/main/resources/assets/create/textures/block/brass_funnel_back.png delete mode 100644 src/main/resources/assets/create/textures/block/brass_funnel_neutral.png delete mode 100644 src/main/resources/assets/create/textures/block/brass_funnel_plating.png delete mode 100644 src/main/resources/assets/create/textures/block/brass_funnel_powered.png delete mode 100644 src/main/resources/assets/create/textures/block/brass_funnel_pull.png delete mode 100644 src/main/resources/assets/create/textures/block/brass_funnel_push.png delete mode 100644 src/main/resources/assets/create/textures/block/brass_funnel_slope.png delete mode 100644 src/main/resources/assets/create/textures/block/brass_funnel_tall.png delete mode 100644 src/main/resources/assets/create/textures/block/brass_funnel_tall_powered.png delete mode 100644 src/main/resources/assets/create/textures/block/brass_tunnel.png delete mode 100644 src/main/resources/assets/create/textures/block/brass_tunnel_top.png delete mode 100644 src/main/resources/assets/create/textures/block/brass_tunnel_top_connected.png delete mode 100644 src/main/resources/assets/create/textures/block/brass_tunnel_top_window.png delete mode 100644 src/main/resources/assets/create/textures/block/crate_andesite.png delete mode 100644 src/main/resources/assets/create/textures/block/crate_andesite_side.png delete mode 100644 src/main/resources/assets/create/textures/block/crate_copper.png delete mode 100644 src/main/resources/assets/create/textures/block/crate_copper_side.png delete mode 100644 src/main/resources/assets/create/textures/block/incomplete_netherrack.png delete mode 100644 src/main/resources/assets/create/textures/block/mineral/cinnabar.png delete mode 100644 src/main/resources/assets/create/textures/block/mineral/cinnabar_connected.png delete mode 100644 src/main/resources/assets/create/textures/block/mineral/cinnabar_ore.png delete mode 100644 src/main/resources/assets/create/textures/block/mineral/deepslate_cinnabar_connected.png delete mode 100644 src/main/resources/assets/create/textures/block/mineral/deepslate_cinnabar_ore.png delete mode 100644 src/main/resources/assets/create/textures/block/mineral/deepslate_magnetite_connected.png delete mode 100644 src/main/resources/assets/create/textures/block/mineral/deepslate_magnetite_ore.png delete mode 100644 src/main/resources/assets/create/textures/block/mineral/deepslate_malachite_connected.png delete mode 100644 src/main/resources/assets/create/textures/block/mineral/deepslate_malachite_ore.png delete mode 100644 src/main/resources/assets/create/textures/block/mineral/deepslate_ochrestone_connected.png delete mode 100644 src/main/resources/assets/create/textures/block/mineral/deepslate_ochrestone_ore.png delete mode 100644 src/main/resources/assets/create/textures/block/mineral/magnetite.png delete mode 100644 src/main/resources/assets/create/textures/block/mineral/magnetite_connected.png delete mode 100644 src/main/resources/assets/create/textures/block/mineral/magnetite_ore.png delete mode 100644 src/main/resources/assets/create/textures/block/mineral/malachite.png delete mode 100644 src/main/resources/assets/create/textures/block/mineral/malachite_connected.png delete mode 100644 src/main/resources/assets/create/textures/block/mineral/malachite_ore.png delete mode 100644 src/main/resources/assets/create/textures/block/mineral/ochrestone.png delete mode 100644 src/main/resources/assets/create/textures/block/mineral/ochrestone_connected.png delete mode 100644 src/main/resources/assets/create/textures/block/mineral/ochrestone_ore.png delete mode 100644 src/main/resources/assets/create/textures/block/noisy_iron_block.png delete mode 100644 src/main/resources/assets/create/textures/block/reinforced_rail_top.png diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 5ce68e72c..d86b9fbb4 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -716,6 +716,7 @@ public class AllBlocks { .register(); public static final BlockEntry CHUTE = REGISTRATE.block("chute", ChuteBlock::new) + .addLayer(() -> RenderType::cutoutMipped) .initialProperties(SharedProperties::softMetal) .properties(p -> p.color(MaterialColor.COLOR_GRAY)) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) @@ -727,6 +728,7 @@ public class AllBlocks { .register(); public static final BlockEntry SMART_CHUTE = REGISTRATE.block("smart_chute", SmartChuteBlock::new) + .addLayer(() -> RenderType::cutoutMipped) .initialProperties(SharedProperties::softMetal) .properties(p -> p.color(MaterialColor.COLOR_GRAY)) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) diff --git a/src/main/resources/assets/create/models/block/content_observer/block.json b/src/main/resources/assets/create/models/block/content_observer/block.json index 4e3ce8d38..8bfd5a621 100644 --- a/src/main/resources/assets/create/models/block/content_observer/block.json +++ b/src/main/resources/assets/create/models/block/content_observer/block.json @@ -2,13 +2,10 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "5": "create:block/brass_casing_inner", + "7": "create:block/brass_casing_connected", "8": "create:block/content_observer", "9": "create:block/content_observer_inner", "10": "create:block/filtered_detector_top", - "brass_casing": "create:block/brass_casing", - "particle": "create:block/brass_casing_side", - "1_brass_casing": "create:block/brass_casing_side", "end": "create:block/filtered_detector_front" }, "elements": [ @@ -22,7 +19,7 @@ "south": {"uv": [0, 10, 16, 16], "texture": "#8"}, "west": {"uv": [0, 10, 16, 16], "texture": "#8"}, "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#9"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#brass_casing"} + "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#7"} } }, { @@ -30,12 +27,12 @@ "from": [0.9, 2, 0.9], "to": [15.1, 14, 15.1], "faces": { - "north": {"uv": [0, 1, 12, 15], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 1, 12, 15], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 1, 12, 15], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 1, 12, 15], "rotation": 90, "texture": "#5"}, - "up": {"uv": [0, 0, 14, 14], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 0, 14, 14], "rotation": 270, "texture": "#5"} + "north": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#7"}, + "east": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#7"}, + "south": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#7"}, + "west": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 0, 14, 14], "rotation": 90, "texture": "#missing"}, + "down": {"uv": [0, 0, 14, 14], "rotation": 270, "texture": "#missing"} } }, { @@ -55,12 +52,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#1_brass_casing"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#1_brass_casing"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#1_brass_casing"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#1_brass_casing"}, + "north": {"uv": [0, 6, 2.125, 6.25], "texture": "#7"}, + "east": {"uv": [0, 6, 2.125, 6.25], "texture": "#7"}, + "south": {"uv": [0, 6, 2.125, 6.25], "texture": "#7"}, + "west": {"uv": [0, 6, 2.125, 6.25], "texture": "#7"}, "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#10"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#brass_casing"} + "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#7"} } } ], @@ -74,6 +71,7 @@ { "name": "stockpile_switch", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3] } ] diff --git a/src/main/resources/assets/create/models/block/creative_motor/block.json b/src/main/resources/assets/create/models/block/creative_motor/block.json index 5c1420dae..a2322aad2 100644 --- a/src/main/resources/assets/create/models/block/creative_motor/block.json +++ b/src/main/resources/assets/create/models/block/creative_motor/block.json @@ -4,10 +4,9 @@ "textures": { "5": "create:block/creative_casing", "6": "create:block/creative_motor", - "7": "create:block/gearbox", - "8": "block/polished_andesite", - "9": "create:block/andesite_bricks", - "particle": "#5" + "7": "create:block/flap_display_front", + "particle": "create:block/creative_casing", + "1_0": "create:block/axis" }, "elements": [ { @@ -42,11 +41,11 @@ "to": [11, 11, 13], "faces": { "north": {"uv": [14, 4, 20, 10], "texture": "#6"}, - "east": {"uv": [10, 6, 16, 10], "rotation": 270, "texture": "#6"}, + "east": {"uv": [10, 6, 16, 10], "rotation": 90, "texture": "#6"}, "south": {"uv": [10, 0, 16, 6], "texture": "#6"}, - "west": {"uv": [10, 6, 16, 10], "rotation": 90, "texture": "#6"}, - "up": {"uv": [10, 6, 16, 10], "rotation": 180, "texture": "#6"}, - "down": {"uv": [10, 6, 16, 10], "texture": "#6"} + "west": {"uv": [10, 6, 16, 10], "rotation": 270, "texture": "#6"}, + "up": {"uv": [10, 6, 16, 10], "texture": "#6"}, + "down": {"uv": [10, 6, 16, 10], "rotation": 180, "texture": "#6"} } }, { @@ -66,78 +65,95 @@ "to": [12, 12, 11], "faces": { "north": {"uv": [0, 4, 8, 14], "rotation": 180, "texture": "#5"}, - "east": {"uv": [4, 3, 12, 12], "rotation": 270, "texture": "#5"}, + "east": {"uv": [4, 3, 12, 12], "rotation": 90, "texture": "#5"}, "south": {"uv": [3, 3, 11, 11], "rotation": 180, "texture": "#5"}, "west": {"uv": [4, 3, 12, 12], "rotation": 90, "texture": "#5"}, "up": {"uv": [4, 3, 12, 12], "rotation": 180, "texture": "#5"}, "down": {"uv": [4, 3, 12, 12], "rotation": 180, "texture": "#5"} } }, + { + "from": [12, 12, 0], + "to": [14, 14, 15], + "faces": { + "north": {"uv": [16, 10, 14, 12], "texture": "#6"}, + "east": {"uv": [6, 15, 8, 0], "rotation": 270, "texture": "#1_0"}, + "south": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, + "west": {"uv": [8, 16, 10, 1], "rotation": 90, "texture": "#1_0"}, + "up": {"uv": [9, 0, 7, 15], "texture": "#1_0"}, + "down": {"uv": [8, 1, 6, 16], "texture": "#1_0"} + } + }, { "from": [2, 12, 0], "to": [4, 14, 15], "faces": { - "north": {"uv": [14, 10, 16, 12], "texture": "#6"}, - "east": {"uv": [14, 0, 16, 15], "rotation": 270, "texture": "#7"}, - "south": {"uv": [14, 10, 16, 12], "rotation": 90, "texture": "#6"}, - "west": {"uv": [0, 1, 2, 16], "rotation": 270, "texture": "#7"}, - "up": {"uv": [1, 0, 16, 2], "rotation": 90, "texture": "#7"}, - "down": {"uv": [0, 14, 15, 16], "rotation": 90, "texture": "#7"} + "north": {"uv": [16, 10, 14, 12], "texture": "#6"}, + "east": {"uv": [6, 15, 8, 0], "rotation": 270, "texture": "#1_0"}, + "south": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, + "west": {"uv": [8, 16, 10, 1], "rotation": 90, "texture": "#1_0"}, + "up": {"uv": [9, 0, 7, 15], "texture": "#1_0"}, + "down": {"uv": [8, 1, 6, 16], "texture": "#1_0"} } }, { "from": [2, 2, 0], "to": [4, 4, 15], - "faces": { - "north": {"uv": [14, 12, 16, 10], "texture": "#6"}, - "east": {"uv": [16, 0, 14, 15], "rotation": 270, "texture": "#7"}, - "south": {"uv": [16, 10, 14, 12], "rotation": 90, "texture": "#6"}, - "west": {"uv": [2, 1, 0, 16], "rotation": 270, "texture": "#7"}, - "up": {"uv": [15, 14, 0, 16], "rotation": 90, "texture": "#7"}, - "down": {"uv": [16, 0, 1, 2], "rotation": 90, "texture": "#7"} - } - }, - { - "from": [12, 12, 0], - "to": [14, 14, 15], "faces": { "north": {"uv": [16, 10, 14, 12], "texture": "#6"}, - "east": {"uv": [0, 16, 2, 1], "rotation": 270, "texture": "#7"}, + "east": {"uv": [6, 15, 8, 0], "rotation": 270, "texture": "#1_0"}, "south": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, - "west": {"uv": [14, 15, 16, 0], "rotation": 270, "texture": "#7"}, - "up": {"uv": [1, 2, 16, 0], "rotation": 90, "texture": "#7"}, - "down": {"uv": [0, 16, 15, 14], "rotation": 90, "texture": "#7"} + "west": {"uv": [8, 16, 10, 1], "rotation": 90, "texture": "#1_0"}, + "up": {"uv": [9, 0, 7, 15], "texture": "#1_0"}, + "down": {"uv": [8, 1, 6, 16], "texture": "#1_0"} } }, { "from": [12, 2, 0], "to": [14, 4, 15], "faces": { - "north": {"uv": [16, 12, 14, 10], "texture": "#6"}, - "east": {"uv": [2, 16, 0, 1], "rotation": 270, "texture": "#7"}, - "south": {"uv": [16, 12, 14, 10], "rotation": 90, "texture": "#6"}, - "west": {"uv": [16, 15, 14, 0], "rotation": 270, "texture": "#7"}, - "up": {"uv": [15, 16, 0, 14], "rotation": 90, "texture": "#7"}, - "down": {"uv": [16, 2, 1, 0], "rotation": 90, "texture": "#7"} + "north": {"uv": [16, 10, 14, 12], "texture": "#6"}, + "east": {"uv": [6, 15, 8, 0], "rotation": 270, "texture": "#1_0"}, + "south": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, + "west": {"uv": [8, 16, 10, 1], "rotation": 90, "texture": "#1_0"}, + "up": {"uv": [9, 0, 7, 15], "texture": "#1_0"}, + "down": {"uv": [8, 1, 6, 16], "texture": "#1_0"} } }, { "from": [1, 0, 3], "to": [15, 3, 10], "faces": { - "north": {"uv": [0, 0, 14, 3], "texture": "#9"}, - "east": {"uv": [8, 0, 15, 3], "texture": "#9"}, - "south": {"uv": [1, 0, 15, 3], "texture": "#9"}, - "west": {"uv": [8, 0, 15, 3], "texture": "#9"}, - "up": {"uv": [1, 4, 15, 11], "texture": "#8"}, - "down": {"uv": [1, 4, 15, 11], "texture": "#8"} + "north": {"uv": [0, 0, 14, 3], "texture": "#7"}, + "east": {"uv": [8, 0, 15, 3], "texture": "#7"}, + "south": {"uv": [1, 0, 15, 3], "texture": "#7"}, + "west": {"uv": [8, 0, 15, 3], "texture": "#7"}, + "up": {"uv": [1, 2, 8, 16], "rotation": 90, "texture": "#7"}, + "down": {"uv": [1, 4, 15, 11], "texture": "#7"} } } ], - "groups": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + "display": { + "gui": { + "rotation": [30, 45, 0], + "scale": [0.625, 0.625, 0.625] + } + }, + "groups": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, { "name": "shaft", "origin": [8, 8, 8], + "color": 0, "children": [] } ] diff --git a/src/main/resources/assets/create/models/block/creative_motor/block_vertical.json b/src/main/resources/assets/create/models/block/creative_motor/block_vertical.json index c76210cca..6e0468f40 100644 --- a/src/main/resources/assets/create/models/block/creative_motor/block_vertical.json +++ b/src/main/resources/assets/create/models/block/creative_motor/block_vertical.json @@ -4,12 +4,63 @@ "textures": { "5": "create:block/creative_casing", "6": "create:block/creative_motor", - "7": "create:block/gearbox", - "8": "block/polished_andesite", - "9": "create:block/andesite_bricks", - "particle": "#5" + "7": "create:block/flap_display_front", + "particle": "create:block/creative_casing", + "1_0": "create:block/axis" }, "elements": [ + { + "from": [12, 0, 2], + "to": [14, 15, 4], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [9, 0, 7, 15], "rotation": 180, "texture": "#1_0"}, + "east": {"uv": [6, 15, 8, 0], "texture": "#1_0"}, + "south": {"uv": [8, 1, 6, 16], "texture": "#1_0"}, + "west": {"uv": [8, 16, 10, 1], "texture": "#1_0"}, + "up": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, + "down": {"uv": [16, 10, 14, 12], "rotation": 180, "texture": "#6"} + } + }, + { + "from": [2, 0, 2], + "to": [4, 15, 4], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [9, 0, 7, 15], "rotation": 180, "texture": "#1_0"}, + "east": {"uv": [6, 15, 8, 0], "texture": "#1_0"}, + "south": {"uv": [8, 1, 6, 16], "texture": "#1_0"}, + "west": {"uv": [8, 16, 10, 1], "texture": "#1_0"}, + "up": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, + "down": {"uv": [16, 10, 14, 12], "rotation": 180, "texture": "#6"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 15, 14], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [9, 0, 7, 15], "rotation": 180, "texture": "#1_0"}, + "east": {"uv": [6, 15, 8, 0], "texture": "#1_0"}, + "south": {"uv": [8, 1, 6, 16], "texture": "#1_0"}, + "west": {"uv": [8, 16, 10, 1], "texture": "#1_0"}, + "up": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, + "down": {"uv": [16, 10, 14, 12], "rotation": 180, "texture": "#6"} + } + }, + { + "from": [12, 0, 12], + "to": [14, 15, 14], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [9, 0, 7, 15], "rotation": 180, "texture": "#1_0"}, + "east": {"uv": [6, 15, 8, 0], "texture": "#1_0"}, + "south": {"uv": [8, 1, 6, 16], "texture": "#1_0"}, + "west": {"uv": [8, 16, 10, 1], "texture": "#1_0"}, + "up": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, + "down": {"uv": [16, 10, 14, 12], "rotation": 180, "texture": "#6"} + } + }, { "name": "Back", "from": [3, 12, 3], @@ -61,65 +112,40 @@ "down": {"uv": [0, 4, 8, 14], "texture": "#5"} } }, - { - "from": [2, 0, 12], - "to": [4, 15, 14], - "faces": { - "north": {"uv": [1, 14, 16, 16], "rotation": 90, "texture": "#7"}, - "east": {"uv": [0, 0, 2, 15], "rotation": 180, "texture": "#7"}, - "south": {"uv": [0, 0, 15, 2], "rotation": 270, "texture": "#7"}, - "west": {"uv": [14, 1, 16, 16], "texture": "#7"}, - "up": {"uv": [16, 12, 14, 10], "texture": "#6"}, - "down": {"uv": [16, 12, 14, 10], "rotation": 270, "texture": "#6"} - } - }, - { - "from": [2, 0, 2], - "to": [4, 15, 4], - "faces": { - "north": {"uv": [0, 2, 15, 0], "rotation": 270, "texture": "#7"}, - "east": {"uv": [2, 0, 0, 15], "rotation": 180, "texture": "#7"}, - "south": {"uv": [1, 16, 16, 14], "rotation": 90, "texture": "#7"}, - "west": {"uv": [16, 1, 14, 16], "texture": "#7"}, - "up": {"uv": [16, 10, 14, 12], "texture": "#6"}, - "down": {"uv": [14, 12, 16, 10], "rotation": 270, "texture": "#6"} - } - }, - { - "from": [12, 0, 12], - "to": [14, 15, 14], - "faces": { - "north": {"uv": [1, 16, 16, 14], "rotation": 90, "texture": "#7"}, - "east": {"uv": [16, 1, 14, 16], "texture": "#7"}, - "south": {"uv": [0, 2, 15, 0], "rotation": 270, "texture": "#7"}, - "west": {"uv": [2, 0, 0, 15], "rotation": 180, "texture": "#7"}, - "up": {"uv": [14, 12, 16, 10], "texture": "#6"}, - "down": {"uv": [16, 10, 14, 12], "rotation": 270, "texture": "#6"} - } - }, - { - "from": [12, 0, 2], - "to": [14, 15, 4], - "faces": { - "north": {"uv": [0, 0, 15, 2], "rotation": 270, "texture": "#7"}, - "east": {"uv": [14, 1, 16, 16], "texture": "#7"}, - "south": {"uv": [1, 14, 16, 16], "rotation": 90, "texture": "#7"}, - "west": {"uv": [0, 0, 2, 15], "rotation": 180, "texture": "#7"}, - "up": {"uv": [14, 10, 16, 12], "texture": "#6"}, - "down": {"uv": [14, 10, 16, 12], "rotation": 270, "texture": "#6"} - } - }, { "from": [3, 0.2, 3], "to": [13, 4, 13], "faces": { - "north": {"uv": [5, 0, 15, 4], "texture": "#9"}, - "east": {"uv": [5, 0, 15, 4], "texture": "#9"}, - "south": {"uv": [5, 0, 15, 4], "texture": "#9"}, - "west": {"uv": [5, 0, 15, 4], "texture": "#9"}, - "up": {"uv": [11, 14, 1, 4], "rotation": 90, "texture": "#8"}, + "north": {"uv": [5, 0, 15, 4], "texture": "#7"}, + "east": {"uv": [5, 0, 15, 4], "texture": "#7"}, + "south": {"uv": [5, 0, 15, 4], "texture": "#7"}, + "west": {"uv": [3, 0, 13, 4], "rotation": 180, "texture": "#7"}, + "up": {"uv": [10, 10, 0, 0], "rotation": 90, "texture": "#6"}, "down": {"uv": [10, 10, 0, 0], "rotation": 180, "texture": "#6"} } } + ], + "display": { + "gui": { + "rotation": [30, 45, 0], + "scale": [0.625, 0.625, 0.625] + } + }, + "groups": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + { + "name": "shaft", + "origin": [8, 8, 8], + "color": 0, + "children": [] + } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/creative_motor/item.json b/src/main/resources/assets/create/models/block/creative_motor/item.json index 07f29fc7f..96da6b25b 100644 --- a/src/main/resources/assets/create/models/block/creative_motor/item.json +++ b/src/main/resources/assets/create/models/block/creative_motor/item.json @@ -4,12 +4,10 @@ "textures": { "5": "create:block/creative_casing", "6": "create:block/creative_motor", - "7": "create:block/gearbox", - "8": "block/polished_andesite", - "9": "create:block/andesite_bricks", + "7": "create:block/flap_display_front", + "particle": "create:block/creative_casing", "1_0": "create:block/axis", - "1_1": "create:block/axis_top", - "particle": "#5" + "1_1": "create:block/axis_top" }, "elements": [ { @@ -75,64 +73,64 @@ "down": {"uv": [4, 3, 12, 12], "rotation": 180, "texture": "#5"} } }, + { + "from": [12, 12, 0], + "to": [14, 14, 15], + "faces": { + "north": {"uv": [16, 10, 14, 12], "texture": "#6"}, + "east": {"uv": [6, 15, 8, 0], "rotation": 270, "texture": "#1_0"}, + "south": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, + "west": {"uv": [8, 16, 10, 1], "rotation": 90, "texture": "#1_0"}, + "up": {"uv": [9, 0, 7, 15], "texture": "#1_0"}, + "down": {"uv": [8, 1, 6, 16], "texture": "#1_0"} + } + }, { "from": [2, 12, 0], "to": [4, 14, 15], "faces": { - "north": {"uv": [14, 10, 16, 12], "texture": "#6"}, - "east": {"uv": [14, 1, 16, 16], "rotation": 270, "texture": "#7"}, - "south": {"uv": [14, 10, 16, 12], "rotation": 90, "texture": "#6"}, - "west": {"uv": [0, 0, 2, 15], "rotation": 270, "texture": "#7"}, - "up": {"uv": [0, 0, 15, 2], "rotation": 90, "texture": "#7"}, - "down": {"uv": [1, 14, 16, 16], "rotation": 90, "texture": "#7"} + "north": {"uv": [16, 10, 14, 12], "texture": "#6"}, + "east": {"uv": [6, 15, 8, 0], "rotation": 270, "texture": "#1_0"}, + "south": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, + "west": {"uv": [8, 16, 10, 1], "rotation": 90, "texture": "#1_0"}, + "up": {"uv": [9, 0, 7, 15], "texture": "#1_0"}, + "down": {"uv": [8, 1, 6, 16], "texture": "#1_0"} } }, { "from": [2, 2, 0], "to": [4, 4, 15], - "faces": { - "north": {"uv": [14, 12, 16, 10], "texture": "#6"}, - "east": {"uv": [16, 1, 14, 16], "rotation": 270, "texture": "#7"}, - "south": {"uv": [16, 10, 14, 12], "rotation": 90, "texture": "#6"}, - "west": {"uv": [2, 0, 0, 15], "rotation": 270, "texture": "#7"}, - "up": {"uv": [16, 14, 1, 16], "rotation": 90, "texture": "#7"}, - "down": {"uv": [15, 0, 0, 2], "rotation": 90, "texture": "#7"} - } - }, - { - "from": [12, 12, 0], - "to": [14, 14, 15], "faces": { "north": {"uv": [16, 10, 14, 12], "texture": "#6"}, - "east": {"uv": [0, 15, 2, 0], "rotation": 270, "texture": "#7"}, + "east": {"uv": [6, 15, 8, 0], "rotation": 270, "texture": "#1_0"}, "south": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, - "west": {"uv": [14, 16, 16, 1], "rotation": 270, "texture": "#7"}, - "up": {"uv": [0, 2, 15, 0], "rotation": 90, "texture": "#7"}, - "down": {"uv": [1, 16, 16, 14], "rotation": 90, "texture": "#7"} + "west": {"uv": [8, 16, 10, 1], "rotation": 90, "texture": "#1_0"}, + "up": {"uv": [9, 0, 7, 15], "texture": "#1_0"}, + "down": {"uv": [8, 1, 6, 16], "texture": "#1_0"} } }, { "from": [12, 2, 0], "to": [14, 4, 15], "faces": { - "north": {"uv": [16, 12, 14, 10], "texture": "#6"}, - "east": {"uv": [2, 15, 0, 0], "rotation": 270, "texture": "#7"}, - "south": {"uv": [16, 12, 14, 10], "rotation": 90, "texture": "#6"}, - "west": {"uv": [16, 16, 14, 1], "rotation": 270, "texture": "#7"}, - "up": {"uv": [16, 16, 1, 14], "rotation": 90, "texture": "#7"}, - "down": {"uv": [15, 2, 0, 0], "rotation": 90, "texture": "#7"} + "north": {"uv": [16, 10, 14, 12], "texture": "#6"}, + "east": {"uv": [6, 15, 8, 0], "rotation": 270, "texture": "#1_0"}, + "south": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, + "west": {"uv": [8, 16, 10, 1], "rotation": 90, "texture": "#1_0"}, + "up": {"uv": [9, 0, 7, 15], "texture": "#1_0"}, + "down": {"uv": [8, 1, 6, 16], "texture": "#1_0"} } }, { "from": [1, 0, 3], "to": [15, 3, 10], "faces": { - "north": {"uv": [0, 0, 14, 3], "texture": "#9"}, - "east": {"uv": [8, 0, 15, 3], "texture": "#9"}, - "south": {"uv": [1, 0, 15, 3], "texture": "#9"}, - "west": {"uv": [8, 0, 15, 3], "texture": "#9"}, - "up": {"uv": [1, 4, 15, 11], "texture": "#8"}, - "down": {"uv": [1, 4, 15, 11], "texture": "#8"} + "north": {"uv": [0, 0, 14, 3], "texture": "#7"}, + "east": {"uv": [8, 0, 15, 3], "texture": "#7"}, + "south": {"uv": [1, 0, 15, 3], "texture": "#7"}, + "west": {"uv": [8, 0, 15, 3], "texture": "#7"}, + "up": {"uv": [1, 2, 8, 16], "rotation": 90, "texture": "#7"}, + "down": {"uv": [1, 4, 15, 11], "texture": "#7"} } }, { @@ -156,10 +154,21 @@ "scale": [0.625, 0.625, 0.625] } }, - "groups": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + "groups": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, { "name": "shaft", "origin": [8, 8, 8], + "color": 0, "children": [10] } ] 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 20ace9c21..d4c8803dd 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 @@ -67,7 +67,7 @@ "east": {"uv": [11, 0, 14, 8], "rotation": 180, "texture": "#direction"}, "south": {"uv": [0, 8, 8, 16], "rotation": 180, "texture": "#direction"}, "west": {"uv": [11, 0, 14, 8], "texture": "#direction"}, - "up": {"uv": [11, 0, 14, 7.5], "rotation": 90, "texture": "#direction"}, + "up": {"uv": [11, 0, 14, 8], "rotation": 90, "texture": "#direction"}, "down": {"uv": [0, 8, 8, 11], "texture": "#direction"} } }, 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 94b2a6bb9..7af138154 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/brass_funnel_back" + "4": "create:block/funnel/funnel_back" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/reinforced_rail/block.json b/src/main/resources/assets/create/models/block/reinforced_rail/block.json deleted file mode 100644 index 63746f266..000000000 --- a/src/main/resources/assets/create/models/block/reinforced_rail/block.json +++ /dev/null @@ -1,136 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", -"ambientocclusion": false, - "textures": { - "oak_planks": "minecraft:block/oak_planks", - "rail": "create:block/reinforced_rail_top", - "particle": "create:block/reinforced_rail_top" - }, - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0 ], - "scale": [ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] - }, - "head": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 315, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 315, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - }, - "elements": [ - { - "name": "Cube", - "from": [ 0, -2, 0 ], - "to": [ 16, 1, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 1, 2, 15, 1 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 1, 16, 4 ] }, - "south": { "texture": "#oak_planks", "uv": [ 1, 1, 16, 4 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 3 ] }, - "up": { "texture": "#rail", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#oak_planks", "uv": [ 1, 0, 16, 16 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 0, 0 ], - "to": [ 1, 2, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 15, 0, 0 ], - "to": [ 17, 2, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 16, 7, -2 ], - "to": [ 17, 9, 7 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 5, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } - } - }, - { - "name": "Cube", - "from": [ 16, 7, 7 ], - "to": [ 17, 9, 18 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 12, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 7, 7 ], - "to": [ 0, 9, 18 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 7, -2 ], - "to": [ 0, 9, 7 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/reinforced_rail/block_n.json b/src/main/resources/assets/create/models/block/reinforced_rail/block_n.json deleted file mode 100644 index 5454c0292..000000000 --- a/src/main/resources/assets/create/models/block/reinforced_rail/block_n.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", -"ambientocclusion": false, - "textures": { - "oak_planks": "minecraft:block/oak_planks", - "rail": "create:block/reinforced_rail_top", - "particle": "create:block/reinforced_rail_top" - }, - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0 ], - "scale": [ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] - }, - "head": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 315, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 315, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - }, - "elements": [ - { - "name": "Cube", - "from": [ 0, -2, 0 ], - "to": [ 16, 1, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 1, 2, 15, 1 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 1, 16, 4 ] }, - "south": { "texture": "#oak_planks", "uv": [ 1, 1, 16, 4 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 3 ] }, - "up": { "texture": "#rail", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#oak_planks", "uv": [ 1, 0, 16, 16 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 0, 0 ], - "to": [ 1, 2, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 15, 0, 0 ], - "to": [ 17, 2, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 16, 7, -2 ], - "to": [ 17, 9, 7 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 5, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } - } - }, - { - "name": "Cube", - "from": [ 16, 7, 7 ], - "to": [ 17, 9, 18 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 12, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 7, 7 ], - "to": [ 0, 9, 18 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 7, -2 ], - "to": [ 0, 9, 7 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } - } - }, - { - "name": "connection_n", - "from": [ -1, 7, 0 ], - "to": [ 0, 9, 8 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 5, 7 ] } - } - }, - { - "name": "connection_n", - "from": [ 16, 7, 0 ], - "to": [ 17, 9, 8 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/reinforced_rail/block_s.json b/src/main/resources/assets/create/models/block/reinforced_rail/block_s.json deleted file mode 100644 index 75f76f222..000000000 --- a/src/main/resources/assets/create/models/block/reinforced_rail/block_s.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", -"ambientocclusion": false, - "textures": { - "oak_planks": "minecraft:block/oak_planks", - "rail": "create:block/reinforced_rail_top", - "particle": "create:block/reinforced_rail_top" - }, - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0 ], - "scale": [ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] - }, - "head": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 315, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 315, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - }, - "elements": [ - { - "name": "Cube", - "from": [ 0, -2, 0 ], - "to": [ 16, 1, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 1, 2, 15, 1 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 1, 16, 4 ] }, - "south": { "texture": "#oak_planks", "uv": [ 1, 1, 16, 4 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 3 ] }, - "up": { "texture": "#rail", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#oak_planks", "uv": [ 1, 0, 16, 16 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 0, 0 ], - "to": [ 1, 2, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 15, 0, 0 ], - "to": [ 17, 2, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 16, 7, -2 ], - "to": [ 17, 9, 7 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 5, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } - } - }, - { - "name": "Cube", - "from": [ 16, 7, 7 ], - "to": [ 17, 9, 18 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 12, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 7, 7 ], - "to": [ 0, 9, 18 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 7, -2 ], - "to": [ 0, 9, 7 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } - } - }, - { - "name": "connection_s", - "from": [ -1, 7, 8 ], - "to": [ 0, 9, 16 ], - "faces": { - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 10, 1 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 8 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 4, 7 ] } - } - }, - { - "name": "connection_s", - "from": [ 16, 7, 8 ], - "to": [ 17, 9, 16 ], - "faces": { - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/reinforced_rail/block_s_n.json b/src/main/resources/assets/create/models/block/reinforced_rail/block_s_n.json deleted file mode 100644 index 9d17be5be..000000000 --- a/src/main/resources/assets/create/models/block/reinforced_rail/block_s_n.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", -"ambientocclusion": false, - "textures": { - "oak_planks": "minecraft:block/oak_planks", - "rail": "create:block/reinforced_rail_top", - "particle": "create:block/reinforced_rail_top" - }, - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0 ], - "scale": [ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] - }, - "head": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 315, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 315, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - }, - "elements": [ - { - "name": "Cube", - "from": [ 0, -2, 0 ], - "to": [ 16, 1, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 1, 2, 15, 1 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 1, 16, 4 ] }, - "south": { "texture": "#oak_planks", "uv": [ 1, 1, 16, 4 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 3 ] }, - "up": { "texture": "#rail", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#oak_planks", "uv": [ 1, 0, 16, 16 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 0, 0 ], - "to": [ 1, 2, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 15, 0, 0 ], - "to": [ 17, 2, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 16, 7, -2 ], - "to": [ 17, 9, 7 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 5, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } - } - }, - { - "name": "Cube", - "from": [ 16, 7, 7 ], - "to": [ 17, 9, 18 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 12, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 7, 7 ], - "to": [ 0, 9, 18 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 7, -2 ], - "to": [ 0, 9, 7 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } - } - }, - { - "name": "connection_n", - "from": [ -1, 7, 0 ], - "to": [ 0, 9, 8 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 5, 7 ] } - } - }, - { - "name": "connection_s", - "from": [ -1, 7, 8 ], - "to": [ 0, 9, 16 ], - "faces": { - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 10, 1 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 8 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 4, 7 ] } - } - }, - { - "name": "connection_s", - "from": [ 16, 7, 8 ], - "to": [ 17, 9, 16 ], - "faces": { - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] } - } - }, - { - "name": "connection_n", - "from": [ 16, 7, 0 ], - "to": [ 17, 9, 8 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/rotation_speed_controller/block.json b/src/main/resources/assets/create/models/block/rotation_speed_controller/block.json index d4da4d489..2243c2211 100644 --- a/src/main/resources/assets/create/models/block/rotation_speed_controller/block.json +++ b/src/main/resources/assets/create/models/block/rotation_speed_controller/block.json @@ -3,10 +3,10 @@ "parent": "create:block/large_wheels", "textures": { "0": "create:block/rotation_speed_controller", - "3": "create:block/brass_funnel_plating", "4": "create:block/brass_gearbox", "5": "create:block/rotation_speed_controller_top", "6": "create:block/brass_block", + "7": "create:block/funnel/brass_funnel_neutral", "particle": "create:block/brass_gearbox" }, "elements": [ @@ -30,7 +30,7 @@ "north": {"uv": [6, 6, 11, 0], "texture": "#0"}, "east": {"uv": [0, 10, 16, 16], "texture": "#4"}, "south": {"uv": [0, 0, 5, 6], "texture": "#0"}, - "west": {"uv": [0, 0, 8, 3], "texture": "#3"}, + "west": {"uv": [0, 0, 8, 3], "texture": "#7"}, "up": {"uv": [0, 0, 5, 16], "texture": "#5"}, "down": {"uv": [0, 0, 5, 16], "texture": "#6"} } @@ -53,7 +53,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [19, 18, 8]}, "faces": { "north": {"uv": [0, 0, 5, 6], "texture": "#0"}, - "east": {"uv": [0, 0, 8, 3], "texture": "#3"}, + "east": {"uv": [0, 0, 8, 3], "texture": "#7"}, "south": {"uv": [6, 6, 11, 0], "texture": "#0"}, "west": {"uv": [0, 10, 16, 16], "texture": "#4"}, "up": {"uv": [11, 0, 16, 16], "texture": "#5"}, diff --git a/src/main/resources/assets/create/models/block/rotation_speed_controller/bracket.json b/src/main/resources/assets/create/models/block/rotation_speed_controller/bracket.json index 7ca552898..f155beab9 100644 --- a/src/main/resources/assets/create/models/block/rotation_speed_controller/bracket.json +++ b/src/main/resources/assets/create/models/block/rotation_speed_controller/bracket.json @@ -3,7 +3,6 @@ "parent": "block/block", "textures": { "2": "create:block/brass_casing", - "3": "create:block/brass_casing_side", "4": "create:block/brass_block", "5": "create:block/rotation_speed_controller_bracket", "6": "create:block/rotation_speed_controller", @@ -63,11 +62,11 @@ "to": [13.5, 14, 4.5], "rotation": {"angle": 0, "axis": "y", "origin": [20, 14, -16]}, "faces": { - "north": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "east": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "south": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "west": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "up": {"uv": [13, 9, 14, 10], "texture": "#3"}, + "north": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "east": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "south": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "west": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "up": {"uv": [13, 9, 14, 10], "texture": "#2"}, "down": {"uv": [0, 0, 0, 0], "texture": "#4"} } }, @@ -88,11 +87,11 @@ "to": [3.5, 14, 4.5], "rotation": {"angle": 0, "axis": "y", "origin": [10, 14, -16]}, "faces": { - "north": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "east": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "south": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "west": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "up": {"uv": [13, 9, 14, 10], "texture": "#3"}, + "north": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "east": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "south": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "west": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "up": {"uv": [13, 9, 14, 10], "texture": "#2"}, "down": {"uv": [0, 0, 0, 0], "texture": "#4"} } }, @@ -149,11 +148,11 @@ "to": [13.5, 14, 12.5], "rotation": {"angle": 0, "axis": "y", "origin": [20, 14, -8]}, "faces": { - "north": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "east": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "south": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "west": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "up": {"uv": [13, 9, 14, 10], "texture": "#3"}, + "north": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "east": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "south": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "west": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "up": {"uv": [13, 9, 14, 10], "texture": "#2"}, "down": {"uv": [0, 0, 0, 0], "texture": "#4"} } }, @@ -174,11 +173,11 @@ "to": [3.5, 14, 12.5], "rotation": {"angle": 0, "axis": "y", "origin": [10, 14, -8]}, "faces": { - "north": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "east": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "south": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "west": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "up": {"uv": [13, 9, 14, 10], "texture": "#3"}, + "north": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "east": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "south": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "west": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "up": {"uv": [13, 9, 14, 10], "texture": "#2"}, "down": {"uv": [0, 0, 0, 0], "texture": "#4"} } }, diff --git a/src/main/resources/assets/create/models/block/rotation_speed_controller/item.json b/src/main/resources/assets/create/models/block/rotation_speed_controller/item.json index 160965c86..43ee0d01e 100644 --- a/src/main/resources/assets/create/models/block/rotation_speed_controller/item.json +++ b/src/main/resources/assets/create/models/block/rotation_speed_controller/item.json @@ -5,10 +5,10 @@ "0": "create:block/axis", "3": "create:block/axis_top", "4": "create:block/brass_gearbox", + "7": "create:block/funnel/brass_funnel_neutral", "9": "create:block/brass_block", "particle": "create:block/brass_gearbox", "1_0": "create:block/rotation_speed_controller", - "1_3": "create:block/brass_funnel_plating", "1_5": "create:block/rotation_speed_controller_top" }, "elements": [ @@ -45,7 +45,7 @@ "north": {"uv": [6, 6, 11, 0], "texture": "#1_0"}, "east": {"uv": [0, 10, 16, 16], "texture": "#4"}, "south": {"uv": [0, 0, 5, 6], "texture": "#1_0"}, - "west": {"uv": [0, 0, 8, 3], "texture": "#1_3"}, + "west": {"uv": [0, 0, 8, 3], "texture": "#7"}, "up": {"uv": [0, 0, 5, 16], "texture": "#1_5"}, "down": {"uv": [0, 0, 5, 16], "texture": "#9"} } @@ -68,7 +68,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [19, 18, 8]}, "faces": { "north": {"uv": [0, 0, 5, 6], "texture": "#1_0"}, - "east": {"uv": [0, 0, 8, 3], "texture": "#1_3"}, + "east": {"uv": [0, 0, 8, 3], "texture": "#7"}, "south": {"uv": [6, 6, 11, 0], "texture": "#1_0"}, "west": {"uv": [0, 10, 16, 16], "texture": "#4"}, "up": {"uv": [11, 0, 16, 16], "texture": "#1_5"}, @@ -100,10 +100,12 @@ } } ], - "groups": [0, + "groups": [ + 0, { "name": "block", "origin": [8, 8, 8], + "color": 0, "children": [1, 2, 3, 4, 5, 6] } ] 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 8977344b6..6960b24d3 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 @@ -3,11 +3,11 @@ "parent": "block/block", "textures": { "1": "create:block/chute_diagonal", - "2": "create:block/brass_funnel_plating", - "3": "create:block/brass_block", - "5": "create:block/brass_funnel_tall", "13": "create:block/chute", - "particle": "block/hopper_outside" + "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" }, "elements": [ { @@ -119,64 +119,28 @@ "down": {"uv": [9.5, 9.5, 14.5, 14.5], "texture": "#13"} } }, - { - "from": [0, 9, 0], - "to": [2, 15, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 22, 8]}, - "faces": { - "north": {"uv": [7, 0, 8, 3], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#2"}, - "west": {"uv": [0, 0, 8, 3], "texture": "#2"}, - "up": {"uv": [0, 0, 2, 16], "texture": "#3"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#3"} - } - }, - { - "from": [2, 9, 0], - "to": [14, 15, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 22, 8]}, - "faces": { - "north": {"uv": [1, 0, 7, 3], "texture": "#2"}, - "east": {"uv": [7, 0, 8, 3], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#2"}, - "up": {"uv": [0, 2, 2, 14], "rotation": 90, "texture": "#3"}, - "down": {"uv": [0, 2, 2, 14], "rotation": 270, "texture": "#3"} - } - }, - { - "from": [2, 9, 14], - "to": [14, 15, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 22, 8]}, - "faces": { - "east": {"uv": [8, 0, 7, 3], "texture": "#2"}, - "south": {"uv": [7, 0, 1, 3], "texture": "#2"}, - "west": {"uv": [1, 0, 0, 3], "texture": "#2"}, - "up": {"uv": [2, 2, 0, 14], "rotation": 90, "texture": "#3"}, - "down": {"uv": [2, 2, 0, 14], "rotation": 270, "texture": "#3"} - } - }, - { - "from": [14, 9, 0], - "to": [16, 15, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 22, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#2"}, - "east": {"uv": [8, 0, 0, 3], "texture": "#2"}, - "south": {"uv": [7, 0, 8, 3], "texture": "#2"}, - "up": {"uv": [2, 0, 0, 16], "texture": "#3"}, - "down": {"uv": [2, 0, 0, 16], "texture": "#3"} - } - }, { "from": [1, 7, 1], "to": [15, 9, 15], "rotation": {"angle": 0, "axis": "y", "origin": [21, 18, 9]}, "faces": { - "north": {"uv": [1, 4, 15, 6], "texture": "#5"}, - "east": {"uv": [1, 4, 15, 6], "texture": "#5"}, - "south": {"uv": [1, 4, 15, 6], "texture": "#5"}, - "west": {"uv": [1, 4, 15, 6], "texture": "#5"}, - "down": {"uv": [1, 1, 15, 15], "texture": "#3"} + "north": {"uv": [1, 1, 3, 15], "rotation": 270, "texture": "#redstone"}, + "east": {"uv": [1, 1, 3, 15], "rotation": 270, "texture": "#redstone"}, + "south": {"uv": [1, 1, 3, 15], "rotation": 270, "texture": "#redstone"}, + "west": {"uv": [1, 1, 3, 15], "rotation": 270, "texture": "#redstone"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#frame"} + } + }, + { + "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"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#frame"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#frame"} } } ], @@ -184,11 +148,17 @@ { "name": "ChuteTop", "origin": [9, 16, -7], + "color": 0, "children": [0, 1, 2, 3, 4] }, { "name": "ChuteBase", "origin": [8, 8, -7], + "color": 0, "children": [5, 6, 7, 8] - }, 9, 10, 11, 12, 13, 14] + }, + 9, + 10, + 11 + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/smart_chute/block_powered.json b/src/main/resources/assets/create/models/block/smart_chute/block_powered.json index 1a2636b1b..185076fd7 100644 --- a/src/main/resources/assets/create/models/block/smart_chute/block_powered.json +++ b/src/main/resources/assets/create/models/block/smart_chute/block_powered.json @@ -1,6 +1,7 @@ { + "credit": "Made with Blockbench", "parent": "create:block/smart_chute/block", "textures": { - "5": "create:block/brass_funnel_tall_powered" + "redstone": "create:block/funnel/brass_funnel_powered" } } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/stockpile_switch.json b/src/main/resources/assets/create/models/block/stockpile_switch.json index 9439bb80c..88ac8bbc3 100644 --- a/src/main/resources/assets/create/models/block/stockpile_switch.json +++ b/src/main/resources/assets/create/models/block/stockpile_switch.json @@ -2,12 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "5": "create:block/brass_casing_inner", - "6": "create:block/brass_casing", "7": "create:block/filtered_detector_top", + "8": "create:block/brass_casing_connected", "indicator": "create:block/indicator/0", - "particle": "create:block/brass_casing_side", - "brass_casing": "create:block/brass_casing_side", "end": "create:block/filtered_detector_front" }, "elements": [ @@ -16,12 +13,12 @@ "from": [0, 0, 0], "to": [16, 2, 16], "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#brass_casing"}, - "east": {"uv": [0, 14, 16, 16], "texture": "#brass_casing"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#brass_casing"}, - "west": {"uv": [0, 14, 16, 16], "texture": "#brass_casing"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#6"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#6"} + "north": {"uv": [0, 7.75, 2.125, 8], "texture": "#8"}, + "east": {"uv": [0, 7.75, 2.125, 8], "texture": "#8"}, + "south": {"uv": [0, 7.75, 2.125, 8], "texture": "#8"}, + "west": {"uv": [0, 7.75, 2.125, 8], "texture": "#8"}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#8"}, + "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#8"} } }, { @@ -29,12 +26,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#brass_casing"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#brass_casing"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#brass_casing"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#brass_casing"}, + "north": {"uv": [0, 6, 2.125, 6.25], "texture": "#8"}, + "east": {"uv": [0, 6, 2.125, 6.25], "texture": "#8"}, + "south": {"uv": [0, 6, 2.125, 6.25], "texture": "#8"}, + "west": {"uv": [0, 6, 2.125, 6.25], "texture": "#8"}, "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#7"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#6"} + "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#8"} } }, { @@ -42,12 +39,25 @@ "from": [0.9, 2, 0.9], "to": [15.1, 14, 15.1], "faces": { - "north": {"uv": [0, 1, 12, 15], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 1, 12, 15], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 1, 12, 15], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 1, 12, 15], "rotation": 90, "texture": "#5"}, - "up": {"uv": [0, 0, 14, 14], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 0, 14, 14], "rotation": 270, "texture": "#5"} + "north": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#8"}, + "east": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#8"}, + "south": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#8"}, + "west": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#8"}, + "up": {"uv": [0, 0, 14, 14], "rotation": 90, "texture": "#missing"}, + "down": {"uv": [0, 0, 14, 14], "rotation": 270, "texture": "#missing"} + } + }, + { + "name": "Center", + "from": [0.9, 2, 0.9], + "to": [15.1, 14, 15.1], + "faces": { + "north": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#missing"}, + "east": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#missing"}, + "south": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#missing"}, + "west": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#missing"}, + "up": {"uv": [0, 0, 14, 14], "rotation": 90, "texture": "#missing"}, + "down": {"uv": [0, 0, 14, 14], "rotation": 270, "texture": "#missing"} } }, { diff --git a/src/main/resources/assets/create/textures/block/andesite_alloy_mesh.png b/src/main/resources/assets/create/textures/block/andesite_alloy_mesh.png deleted file mode 100644 index 6029dac92b6b549de04030726e61387a5564348e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$hffKP}k z5V*LwI6FH#IXO8xI@;UY+u7OK+S*!MTU%LKnVFfHnwpxJm>3%y8yOkt>FMd}>gwp| zXlrY0X=!O_Xw(}VeGN3K*VDx@q~extANwR0MIL5Xlj;PufB)C2?^JV~ew%Z*McUU- z;VyhPO#OBrPpxr1vHHxOA5{|`%ZU8hzd2cK)e{@nc?s#e>l9tTHH2E{uhMn;@vpRePJ^)ji<&bs_H3BzSV7et{a?FHn;0c1Uiht)78&qol`;+0JRffAOHXW diff --git a/src/main/resources/assets/create/textures/block/andesite_bricks.png b/src/main/resources/assets/create/textures/block/andesite_bricks.png deleted file mode 100644 index 6cef8fae12684af2bce71a607e275ac7aff1f1db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 651 zcmV;60(AX}P)U3P z#KgnH!@|PCz`(%1zP`M?yt})*y1Kf!xVX2sx3;#nwY9ahw6wFcv$3(UudlDJuCA@E zt*fi6s;a7~si~%>rlqB&q@<*yqobmtqM@OopP!$eo}QhZotvARnwpxKnVFcFn3k57 zm6es0l$4W`lai8>k&%&*kdTg!j*X3tjEszni;IeiiiwGdh=_=WhK7ZOg@lBJgM)*D zf`Wm8fq;O3e}8{|etvy@eSCa;dwY9&dU|OY;0_6Yinw1 zYH4X{XlQ6=W@cq&Wn^SzV`F1tVq#%oVPIfjUteEcU0qyUTw7aPT3T9JSy@wis_H=u^;(m@aF=IKgR_V2nobW$7f@(hK#R6(YA!;9ZfB3{UhVp z=9X2GUM?dJ%M)*Z{EPO=p`j!GHf>?ggx#k3c{T`x(RW~_=_SchX2oIj-aj_%!Okxs zk7Km!lx<)Oc!$C7m3-#;zM5OzGhfSm9#e7V!#8WrQAfiG)fSuX4TcW}$0w_sWxuZ{ zhD}#9&2cVOtdc(qU|8gHXzlUkQ`1zWbB9<`ed_8;;qK21b*&%E__HkWP{S002ovPDHLkV1mGoOqT!v diff --git a/src/main/resources/assets/create/textures/block/andesite_frame.png b/src/main/resources/assets/create/textures/block/andesite_frame.png deleted file mode 100644 index 26b27b3f4605cf060764fdd44ec0b8c011665f90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF^Ce_N0fgOM9X)v&0pHoEC#El4XvP1}n8Bl1+Vj z`3@^_IJ2#g(Ap$(szJNWaEWB!VIG^1IE^Js;+7oV@cYa=+w`*emdp%QHL~3gd04H1 PRxo(F`njxgN@xNA9gRy6 diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel.png b/src/main/resources/assets/create/textures/block/andesite_funnel.png deleted file mode 100644 index 0abae76cbbd4607ae4fbc1f9119f18cdb91de5e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$hNfKP}k zkY2KMPS=D9Z5{1R?QKo1E%hyJ^-WDR^$nFZmBr=7S-Hi@X~|KsQ9gdY-o8E&jEv!o zjNXilUW|^ir!I>MqrzGAn zlhFKnkYCTj{I-F`?uO)e$#rb=zFj?g_JYQtJ#HWB1;5@~x@U`Nv!2V051l*v=KT(l dJ+}Fz13t=Y`qJU0d@O1TaS?83{1OSe1XE^`> diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel_back.png b/src/main/resources/assets/create/textures/block/andesite_funnel_back.png deleted file mode 100644 index dc0ba1a4c9fb7df56550e329f1a3b4826932537e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 744 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvI6wX}dSYTi zLPAt*RCIK7BoIVIgoTBLgoFeK2L}ZO1qKHC`}_O&`2vBruMfmzFHbP=0D(AXl~^Yg zH#avI7Z+z|XD25oJ6lIv5U>FPKT8>3AhM9Lwzl>$m$tI9vb40c00MJsQxgjl6BA<~ zFfubTGBPkQ(AU@3)6;X%64uoe~jgzcHX5~2C`M+q9&(_OV z8EWDI*2hWwi`p=&;Ap7El(!j+<}ySxH(k7vvp90ol?mlJ za`#ewx3QmnV`m@ySL^-v5U)aC$*#@M8GbffvaK@sD3vgi=heKte0j}Y=K@Iw?I$1d z7R@Wr_{0BxnU&0}Mt*ro{@XW8s$QMme4UGe`j$K%ZzJY5_^DsK6l zWo2SEQz1K< zzZ>-9rtN**f4%v$(C+2Z|dA8&E3I>L3B@T_pGiu_1ZeZ|q^>bP0l+XkK(S&Hi diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel_plating.png b/src/main/resources/assets/create/textures/block/andesite_funnel_plating.png deleted file mode 100644 index c958f8aec6786707d90c4dddeec226d9395a2f8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 492 zcmV_e|da)b9Zxc zc5-TMb7N*>Vr61yVPRTbT3J|FOioQpO-xBhNJKnI5RRfEiEy+m{RQk z0004WQchCN9)HMDO27xgV~ zZ&ZEDn;G>jZzSr7p&zGx({m1u)`JLkyOVmplT+)#S$$vfq3CN5lZ1=(E>XXR#x;TbNT<-1nW|x8a53nS=%&mG`x> zo-4zc9s6V>n;0XnKW}2qci>6cp*&};)m#R7?Wx=~%L|#eX8pMTAae@$36qwYZVjI| hDC|7{UG?o}e%9k0OZR&Q>;Srf!PC{xWt~$(696Z0XC?pu diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel_pull.png b/src/main/resources/assets/create/textures/block/andesite_funnel_pull.png deleted file mode 100644 index 00ed0b7ab07bec72e62fef82af6fbccfd07c877a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$hZfKP}k zke)YZde?*rZ5{1Rtu6H}Z8h}`l{J;c<;BTq$x*RUg+aPG{<{8w{%KyC9-ba?&MMK4 zDp3x~VKxe(Hu3@HGQJivo(2;3n!-^n-;M!|V=M{s3ubV5b|VeQDfM)545_%a_G~NT zVFwP@3&oC)w*6o7^g8>Aoebv#-=9rWU)1-osw337S5tJY;pD{yxu0JIe|o$pj*)*k z&+!+hD>lrj;Mh1t;L0O!N3K_Uvy&7x{`<8jZH!lUjGWdR&$r%MBu%g_`8SKISn;dd hjh9}YFEro6-nD}5(pLda3!noSJYD@<);T3K0RTZ0Xn+6! diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel_push.png b/src/main/resources/assets/create/textures/block/andesite_funnel_push.png deleted file mode 100644 index 5ed71a133475a9088eec3c43a8f0ef926b3387d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$hZfKP}k zke)YZde?*rZ5{1Rtu6H}ZS_q}HT4aZHI-$R<;CU2$!W<^u~CIVx;g&3{(=4;o*r?| zD$$NAQ4Y#sHVUCO@&V>Do(2;3n!;s&_E-UpV=M{s3ubV5b|VeQDfV=645_%~bC#9q zfC2|=z>#m8&;6cXvgR$59A`j@lS=^~)9oit?{?)BZ;JD%h(ET?d}IFc%IBXGv%luu z{F1vnmVcV{wp%@UvzQ*Nt<)>h+S(kv@#5aT^5sUp`!~YaSW-rmF(f|U0m#~ubpmSXckly#8;Na!7IkbbUC2ylTmPD@Z&E< zZJ$0F7#m+M5>P&?qr-DXgWKD?-Qdyzo<$88cbAvn(`1&sv^%Y&B%j6Tk%N+dBTw-H d=Tnm<8D6ea;T9-9w-IO;gQu&X%Q~loCIHfYOpO2l diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel_tall.png b/src/main/resources/assets/create/textures/block/andesite_funnel_tall.png deleted file mode 100644 index e501791f9d44ba703a85b5532660a7b007587acc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$hNfKP}k zkY2KMPS=D9Z5{1R?QKo1E%hyJ^-WDR^$nFZmBr=7S-Hi@X~|KsQ9gdY-o8E&jEv!o zjNXilUW|5qB1zwWc zYb+F73nG~OKRBt{C~_^UHslHUE~mIn=~wpjZ`ZErTBKPi`Tg#&?u~mMTD!A?Va7%F Vpj?5*Q$WiZJYD@<);T3K0RZH5T^9fV diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel_tall_powered.png b/src/main/resources/assets/create/textures/block/andesite_funnel_tall_powered.png deleted file mode 100644 index 8321619db1405c0bbbcf3af0593a2c8bf2c1bbab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g;fKP}k zkY2KMPS=D9Z5{1R?QKo1E%hyJ^-WDR^$nFZmBr=7S-Hi@X~|KsQ9gdY-o8F(85qtm zFsx%>SPIn0z%ZSGVHyKN8Uw?HJx8N}W-*oo`2{mLJi7rDVkq@=aSW-r)!OgMbVPy2 z^*@XEN3MeZldqMU^7pC>+&ML&-_-1E!MdL1Hd78-ax9WJ?0&mJpk+c(m%8E+j{MhG z_^)r03)8&Z>6hc7sI%$-cb){N{*jIx`>vjct0g8JweSD5cG5*VuIR*>nXWnMNAuP` cPp^>{n_j|hTQ%M8CeQ&4p00i_>zopr0IaZNegFUf diff --git a/src/main/resources/assets/create/textures/block/andesite_tunnel.png b/src/main/resources/assets/create/textures/block/andesite_tunnel.png deleted file mode 100644 index 6c296521d348ff4f7d500490793d6ceab3c951c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 898 zcmV-|1AY97P)pF0drDELIAGL9O(c60SHh`R7C&)0E@xR z(CX=^(AlTY*o(oz8Za8fRCQ7ms!D{N0KY)&m}O)O+gE@nz8VM{J$NhnNCO=L(YOHE8mOG`>hN=Zpc zTty{YMJ7l{NMA!ET0|sWLL^;6B3(iuMn*$T5Ci!h99y6alA|K`W(_Nu@M%8u>a35rF75qh?^{)rs~I`Ozp?gYWVL!dB~T zlCKmplVYc3$nj1ToFQ-wq$-z(<&(>k)Ar?21=;b!aN!sX7GHNR{9ym!A~nV7KPW36AB2xG)%9IrT3B-`{=lkBZ2`5ivNHBv1Vp-=6TYcUqJrmj+>L zcs>ta{NUjG!~SJXk?=eR;ooxLUqk$w1OFO=b?!WDbM@BYwy>#ytOsCJqS-7kZ~W&iyyXY;h_UV%XQh|0K!8ElrT!OL1mZh zV{Z?_LkR3hDYSAM8LYxX2ogY&mX{d9QwR)U3I20M@V^T6#DhgcB#EUV)Ds5U*x3At z>-NIs@lW^nPgZxgS^EQI&|q4n72@)Qdbi%}HJjaLuU~J%vP8qQG>nGh@n|@-&vZQg Y0d~G==?9xi_@% diff --git a/src/main/resources/assets/create/textures/block/andesite_tunnel_top.png b/src/main/resources/assets/create/textures/block/andesite_tunnel_top.png deleted file mode 100644 index ff0e67138f04b001a9ce4bb27538257c1e67bd0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFab$Rn{Or>+gXEW`(`wq>lZA|s*aq~wPgAJ$8W5s{`u|X oELgVr@`>~XZSrp}ow{YOr)^^w*!mF1+#`5zwmMoo9y>5HggbCffbJ{xEYw8<{%Zsyei<8rmqhh1x%{Fua z>R~Pk@(X78_fN~``ZpkVs;7%%NCl(lK|`)X1`Mnh_^T8S?v=G^SRDR=K~72R;#J{} ze;#*SgjRG1A3ft#n6dnl*Dec>sV+7A=Pa|M5`%;`O5b6FMJKI~{d&tzs967x!1iGF%KRfLF|i?kl&*OI?n*F7Wg2cc23qJYD@<);T3K0RR|&cc}mX diff --git a/src/main/resources/assets/create/textures/block/brass_casing_inner.png b/src/main/resources/assets/create/textures/block/brass_casing_inner.png deleted file mode 100644 index 1f36fed4fed8dd9c0d9c264923681b2f8ab5a51b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFCfZmjzum2^+*hf3zVlLMy3VBh%@6-5 zd&ONdiCA`Ws}S>viQ3&$UWR<0s=-z&UwQN5hG0c?h7-?(89wj}#Opt8KD+D&&;<;h Lu6{1-oD!M<`eR%b diff --git a/src/main/resources/assets/create/textures/block/brass_funnel.png b/src/main/resources/assets/create/textures/block/brass_funnel.png deleted file mode 100644 index 37e12beb6b7f31886f90860c272267ecc019d025..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$h5fKP}k zkiNV=`p9(eJ-u%0TI?3rSj;FhnUrtZkz&>qqEY0d9l^*L&dBJ^$mqq$=+4OG&dBJ% z$awwVk!YY!#*!evUp8$P8!lvI6;O6G$;^N}$?Cj*^ zWM}JWYiny`V`FV?ZDnO;X=!Nz1m@PJCKe_pCdNQuWM*V!WME*RudlDCr>CoHsHUc- zs;a7@q9P|JCo3x}C@2`uIae6ybmo#EzhH)c|FnFre`8=^oayP}7*cV|=fc6PBL+Mz z4>Oy64Xmd7u6*2m=KsI^i0;rc=QQsdLJvZ#~?#Zs7|Jj{d&{FJJa%hTW zg2A@U!k-x{cs$aUzm&eb`+H~B!ElXGyQkF#clGyAyDhOlTt3-E*Yebl>IR-`5(W>O zY!Bq;J#wl4`{!%ist3so#RbdD)%)1ln%{qUS2D-c?@(q~p4YAUe*MlLR|72z;hwn0 z%XhiT*6OA4>red3$~9Iw`J;x>d%1}EujAZ>k5=n1`*NSlQo)Ufm9Zr2*edBYg4R3# z@3i_HxVv`uM`^j8vz|)v&F%Mz4Hs#ZS14S)O?}p~3uit*c9v=O<66?qz_I+To7-iH zXO(l0el(kRwc1K$b+v-duXDV-toB{G_NM|)h{qUIX@0r>tWxaf##g^T?qm9CRH2*D zX0b>_GWh@Eu3ubV5 zb|VeQN%nMc45_%4d}C|Tvon#}>F3fSv{o#MTa)wV=!Pd(RyLbuU#l?8vE7`u@%qf* zn>?pa#~$`}KDAr&oCD(~J;kL(%8v!wRMW4m5wt6P#dG*t@N&PIYb-ajtbDY zR4rLpSaM7&Nk~XUL_|J4K{z)%H8eOgGBzzOF#t)*(EtDd0d!JMQvg8b*k%9#0VPR9 zK~#9!rIX=q!ypWV!Pt~~W=M8SaWVFRb^Bm@9&5fCt71KxWn zTY0@fDv-NWH8)ADz_OO_W!)RV;!YAahkaej*Rqsg5zi~|JFN0dxS{ufVqS zhz{f{Am-3ZzOa?N0D0&T{{*%MJSX7XA?i>vGskm>I3E<{HOwQ1aONOpJHk~u73cTTOB!`uS5a>0000qqEY0deU^dY389x$-_0zfT>LR-43>@FSt;^O6b7mMp678kP>f>-Nl1pCF=WKVNf+yD96= yFA}S|y!GX#|9qLavBD+F=75yOT6WXE{|q}tSaKG=$u$I8$l&Sf=d#Wzp$Pzrg;VEaktaVz=8)}m);BDK@crA27fTs(U9`pxddlQT<|4zBmBG|aIr zeYNoJEaRIzr%#_wUO#Pmx$&GvCY9JGErnb?huCa~Tjv-`=Q3tSGhbo7cCGJ%D+>d| YwscGP<3{FfKsy*bUHx3vIVCg!0Cc5N$N&HU diff --git a/src/main/resources/assets/create/textures/block/brass_funnel_push.png b/src/main/resources/assets/create/textures/block/brass_funnel_push.png deleted file mode 100644 index 2ad0f81d22791fe1ad6dcdb5d176e73923335b4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFEaktaVz=8)}m);BDK@crA271NU4szd80e=lq< z?Cj*^WNT}ywIlf|P(NcykY6x^!?PP{Ku&_Ei(^Q|t+l6)HZle9uv{=dsaLk>zt+wN zLVWvK7bRQvFdD8X+3RAUIN8=XQuoi_&vof4CBZL3qC6L`QQl;*MdNCK!_U;#{gz3~ v=6n(|WB)AqXQ$1diQ9y<&;K@3cy?BNx}m(^x>PQZ4;egN{an^LB{Ts5-OpB% diff --git a/src/main/resources/assets/create/textures/block/brass_funnel_tall.png b/src/main/resources/assets/create/textures/block/brass_funnel_tall.png deleted file mode 100644 index 8e53222d059e3cc427c698a78ddb5b7c78a7ffb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$h5fKP}k zkiNV=`p9(eJ-u%0TI?3rSj;FhnUrtZkz&>qqEY0d9l^*L&dBJ^$mqq$=+4OG&dBJ% z$awwVk!YY!#*!evUm$1 zv>eDsgu;%8T_Wd}Co{(fNLF=Gb9f{D`wgsLjqH`j_ipYIy$ l+<0BMIZDChx!sy&a=Bkv=d-?bDFE8T;OXk;vd$@?2>`8!POty~ diff --git a/src/main/resources/assets/create/textures/block/brass_funnel_tall_powered.png b/src/main/resources/assets/create/textures/block/brass_funnel_tall_powered.png deleted file mode 100644 index 07db6a8f02803646c329f27476962d2381dc520a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$hHfKP}k zkiNV=`p9(eJ-u%0TI?3rSj;FhnUrtZkz&>qqEY0deU^dY3^AX-7mI3E@#w5yyXViHP2r7|$@<;fWR3PN`y(bMa8ADGm#2NjiZhLiD&{Z+R`NZu q*SeJ$ZurbWobix1i}K~i?|+B4Phy==RWAtg9D}E;pUXO@geCy`dsJiq diff --git a/src/main/resources/assets/create/textures/block/brass_tunnel.png b/src/main/resources/assets/create/textures/block/brass_tunnel.png deleted file mode 100644 index 37d64aca736b5a7896411eb96c563d33dbe35412..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 653 zcmV;80&@L{P)pF0drDELIAGL9O(c60E$pdR7C&)0E@xR ziCrwv>gn>qZK%-Mr_b1n!OhdJTf~=3z?4b6jYhhQMXrQCtbskFd^nhPG?Q>Ol5aJL zWHyLnHHlp;h+Qm*Tr7K6E`n4jfmA4XR4sT^EO%2Zbx$jDOe;%EOG-*gNl8gaNJvIT zMm#(`J3Bi%IyyNyIXE~tG&D3bGcz(WGB7YO)#)k}00003bW%=J0Qdg;j%>dG00DhT zL_t(|+J(@;P9#JS$KkL4T{8?U?g7IZ&%Xa-84o6`F`x)N)jAi&x$Lh`-=Qm&8jlpf zf-6_&D+LT+o?W?=AD%mx=l+Rn7hc{Xbe^-gc!AT4rEu2inc<9!*ZVxfF(eS#!$ty! zGYBb2VmRvtyaSr*MKah{Xv@bslwkKtK&1hYz@S$Z1Of7|2fHf(8USgqS7IQpiqdq& zaQz!e7IxY|w9*xf0 nq}9$?qw?Uo<38Atz322dNGh_rI_lf(00000NkvXXu0mjfBp4>q diff --git a/src/main/resources/assets/create/textures/block/brass_tunnel_top.png b/src/main/resources/assets/create/textures/block/brass_tunnel_top.png deleted file mode 100644 index 267bb9ce4c6121251108704b21ae2ec4d9247ba5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFoVzjbE~@ab9zTi=+6KJI_{si^Yqt$-D^sr~hr! zORhDJHGZY1j&GIl?tIlFvpN0H6wdG7{X&ANOEh+0zW+?^@QYWBs-Hha*>yGO@rW0O s|2UKK{*~9g1vZvC3A-n6{lgP~s!DA|-{J?tK!-4Ry85}Sb4q9e00_xpQ2+n{ diff --git a/src/main/resources/assets/create/textures/block/brass_tunnel_top_connected.png b/src/main/resources/assets/create/textures/block/brass_tunnel_top_connected.png deleted file mode 100644 index 5167a310f3a34c715e8e18b68d31696435a40b19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 436 zcmV;l0ZaagP)uUo{IOT3Lnu7p0Ld^nhPG>Bw2iCrv$R48~o1HhyHR(b8FUzvJ^dkN| z9XmY4)4a?JE#mWX^Sad_q6up_)gt;jp1Pd|6;1QHp+-gL=jECj_r;>(Y-U6A;&F^r}aKJ?L!@Jj6dv*ztwh0000NJIDRD|dj`Dky+UU&y+1anD{UogYJe_B4*zX7>ro-U3d6^yJ08MBxT1y~Hu-qPf3 zbo&4Qtk|KsZ`V$dXSy(BZoFDRTz1#{-Irfh)Xa$ZZMU`Zer9WN{A;P||E5|y3VA1F zv3$GWyOhzaWGkn_5*CIPTTB>YKQOQvuC$q)w0Db-WpV961M$tl^NkP0Ew4T$%Cgob~Df_#5~d3dCkSk%| z{8^J}S(a%ji_g9M6mb6W@%h2I=IQadcDnf7yTyR??if?t+)|Jd(l*^nd-4WU+l~Oo znR+SQ;|y#qhO4tH+SKtl%HD;DE2Hdv0AVPm3Eph_#i>~AZ-xh#WLSY8- zigwp_DjqI4_qvBxP+BeGK~1(^Jm9Q*5Ks!fh?yN-#6x+_4G;qKJdXjS;K0(Nm^`#o z0T^a907(EKYlqFDQeg2h-sJ0q+a`u2CBu0ULkGfpY@Cgob~Df_#5~d3* zBvm^fR68G4Iv-9p985PHMlu|sBR5$90004WQchC-{ z2NK&b49ngwQ^=CTY}xt$8w-jZI^|~R1^XZx0`cQt{bcd(Cm|0K7K`m_wc2cUi^X!W zSnT)f)oQUbOtc{3b%|3y^i%8yeJX3xA;f9ud4(4Vk9bl+r|3ofCyF47?wk-t65f34 zx-OxE?(H{wl@JpNDy731Bm<(-NyxW!yJ+nS17Z9c)Uhp&!FL$?^HJ{HHrHFYiFNR3)x%j9E{Ass>X8%!RG0Zdu z_o1Etr*_l`?ff5=qou>E&cTb$R*rfe>Ku$D&`@IgO^QLP&6oScT-*Ez&bnv z;2Hvi9U9fOh9KQ%_N}^E@U8lLn~4R$RksT~FfPhf`+|C#W21VkgHs4Fg2*4$V;!77 lKIn}`7=fa`0@GF#m|smTJ-<9FUy=X-002ovPDHLkV1m%@?<)WR diff --git a/src/main/resources/assets/create/textures/block/crate_copper.png b/src/main/resources/assets/create/textures/block/crate_copper.png deleted file mode 100644 index 822125d475206ed4abef1e57db35218fa63a6b80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 509 zcmV35LuBRgzHl&Q)mwar3(2oSg9%4^P8IZ&Szm`m+ zqb+HH8k;Z~2#OU%8(Esa#S)rE6q+!Lw6+F+%~;|elv4I+fyY~J|H0IuDwiMAhoUaH z4%*A~_D-D*lTz*U+x(#7j0wQsneq25XwG5@y3b~QEAJQ21xSVuVj?8_m;vsGAR)@|LGbbbN!$+sJHdPyOBxz!JusJaADZy+09e}e zQ-2bj$iMRDLy+H%7Wb5>2=K1+6=6SX--EQ~WPx1QHh4UqIUGpcLFJ0KZ zr=&!4J)f^qjip?73tR3`!+_H?&kPKNJvR$$Mktz<@WAwer;QOMc)*6}w8FCg2x_&k z(Q-rUSQ#IKra%cI)dB=f1Oh-<6_nfiAxYwejrisv_iYs6^==g3@95%eyM^cF>fw)t z^2+7s{a;Pf+!1B>dHZtHaP^e975%RGOzyEL*jUgkq3}?^*CExFE3U$Jxw=3QZ+kfEiPm% zELbo!TrVv?IY(47FFZL%KR85PEi64aMOrN}JUB)^H$*@-LS-l@S}iMLDJf(qC|)Wm zVkjv-H9<}O$cFhMIaKr1pqDls`NHdi4bOeG^#ARsj?H8L$XLntIkB_l~BC`%(INF^dVDKRoE zHZd$VMkOLlAtXN~EIlV9O&=mVCM`TAD^DFCHYP1g9v@H}8%7@=O&l9EBp*!}8A2T! zNf{ea6%{=m8#x{&MHw4G8yPtqA}k{vDyA{;0p96=TqCn6j- z8X7bjAwv@tGZ`N_7Z)-a8YvYVClwtf6&)iJ8zB=LAQKxO5*r&76(1228WIy25D^y; z5g88<77q~q_{r7)008YtL_t(|0R_Q@LPIeO0Kg!DF+6y1cZWB8EVvXcu4`~DGWz@6 z!D*_lvt#3}k}E`2et#ekNlN`Y9*O!O1c8J!Ema(yJT#162>98F;hpWpe8!^okw$Y4 zT8?ZO0r**{gkM1GIkLsag|XP(_gFK2f={AxaS5+;J`5q8fuFa|w27y|zJy`O0!?*tn!~B3-rUJs@Z*@*-(#Y+t?s5vQ3bhvyqEPvYb~{W1(NU&Z;(6&n2SqM P00000NkvXXu0mjf#C*#p diff --git a/src/main/resources/assets/create/textures/block/mineral/cinnabar.png b/src/main/resources/assets/create/textures/block/mineral/cinnabar.png deleted file mode 100644 index 3588679d1cfcaac1970de00c22d2c895862bdf2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHVEbxddW?Sb!sWojUo$*QFWo?x;#OjdH#5jK+*%Vb@k2A!ww zPmG|)N68k{S;*fMqvq2wtB%w zZN~4n#|PQtg6wcXSl1m+dT}8;x{w{5mv4w~(O*3x&Yuzh5J%ob005Fl_Hf%B|E{GZ zon1<@XnVmcQcd`?+#FWE+A}eFm%V<`d{O7hw=2q4-@BRI?I6(99lCDNP*Q9xV`@8j z=eU>UeR7Fe!b-Ax&nB&B!|IM)!mOo{QF6|yx{aiZnBNmtI@uE{Ljrb%@V9{3YvK+M zj-7*-XWz!O+^!;-kUu(_)S6tNXZ3RNJmI6Z^tQ~t?&>V|r#7?H^>DB{7CpH)G%xqk zX<7K~$D?lzhq`HvSW(xR*lIp2!Rr@IkF{&kBj0Z8y6eqVV^xKLyxgK~U(R=ee)hhDGao(8#j97_U92yyrmK?_54cp^VtbSkn)Z(3>h&OM&dF-D=^FNj{Iulf|P`5Z&<$VV^TxKwFuncsxmR`_Id*;SrR9=EzS zq{w)fA8$V7h2iEjibu~pq32aPwQneMmi$Q??^HYn-3G>;de>D~y)76lm92;l$+IUe zpbL!Z&oY)(_w%Y5W3QwySDTfV{}DFadB11vN^!%!D>you2oCnY?>+k4_R0ovCs;J7 zx%HspQ))}`S!)?T-fUx=bHD}yh`Zd-+4;lhlqWyp%+Xw#+4y-MPI(h(&?Cy4{i`LG zGc?uKWS(pF;q!!O7r%*e{nhYuwRx-+9sNwaCUeGCn_}7_D08mixe;{8|H(X(5@oo4-`YqiEu7!*=P0j$;`D%XZ$Q&K71f7b$o$bBed%A1hpu=?v*J2? z?CkgYYxp<=#&ivK+`F|&%(#Xb;}yh&p;F$zVBFN)2YzdyiQ=UJ-z6JF@UcCaV+OyE zLSaJXuhMB;o>H4o*_NujOF|>u-Fvk60oTrm@H@}Pd5;?xNxp;&Z<_WWuHhVZ?jA?RYi<+OxT8(y-Y)h zug26t8A^d~yDibu5ms$kvFzIQ5?h^Bd{_@8p8>o3KTQ>`P=ei0F`Y|(cDq_!TyOiG zU#;_B`b<|U?8XG;MG$I9m z=2w_Y(Pt!s7U!~qpH6GfA#I$|b|acVLY%>p&@b2uq=jKSU}Rj5bdd?(Nt?2Ii<{rf z!X5v3yh>zm{Opi{$xfTwj8KRr9GayamI>U|+C_&8x-5t{fc5J%+6m+|wd*2ZyrrWH zeyBLG>E-ez`PWdSu|fnN4hrAYvwAIHYOg>yV)D1zIptV{FZ@8iP(GBatNJJx zfHq6qC4p}l)`vh~a?}H#a}8yM(zegvw9vE<=~PPFa>L(3m}-U6ghht-$RUXn|4vBV zJ2^LZ1_3C?FW-He6`AL3B}@ktftr*2(y4 zsH&z_>tMkI^H&UR>xXeQ>bj+GB}ULJWb=w~#IhZL)wsqJG|9G}7c+)eTZ{30?CT;0 z&}Z)9@{wddj@*4*m#2R+j=3X<8`zAv_JZ;om{9E>2f^2>RU(!Xx{>duC#SD#fiXG! z_@9P8_b%9&Oe~-Ip7#*1OLw>=J5m%ULHijSUxM%-w4k_~U4kRh?AY-mDhLoLbQo!k zGma}1hmK4>m1_ZAx$4`PZk|4-d0W>Ut2?LHgsm@-1F$Mlj+|^hO90?j*#XdQ&Y2BM zr|x1TvWPE$1}^_k(aLUh8QzK=waMi*=?>3t-Z4u1vrSZ^dwctOL7=avr>DDnN_+d%wzlrh&hCzmHC08OZS7sHZL@1@I$K)X zT3TA0Te|A%TN@guR#dgs)i&4F_f=Lm*VY3;YfW`iZEZtsT|;eceQj+W5Y^Py*3>pu z)znwl)YjD00mgxK+s+y{*`ijcd(u#SR>6PW>6=mg>rDfG6rIn?n)x{;t z6JpCsN*nSEOG`kYs<61Ku&AWCq^h8(ys#Ju$_tBD#YB`86_*qhRpu8?NKG#*D6GrL zugohb&o8LU&a2GHE6K}m%*d|D&aKYODay(1iA~DS$}UUIEKJKNOHRwk$f$^o&qzqh zicg&5?w1)GUlS5l7!r}^ADS8*G1=Cm%GEbIFeJ$*u-no#!QD69+ppTlp;+HO(!e@W z-`dm2a&psRCSV|6@pN$vsbFM1n6Au}Aky}*c#7}0U2i8&oOyF{&l}y>TRBxf{olV^ zuejXZ$&txGfT=;Cg{O6akCq41fdz}Q7A-Rt?B(nK^43F*O}_i);q58OYxe%+;gOGu zu)llT=7;X|`}3cwEvt%3-{-b_^UaznDW57`k$?NRwWsOU9yxd?*`HTmI(DmXx%=tD zlmPqkQp20~%XY?w%NFVsRL|4@JEi;O`Kv#ZPbSpl?oa-fX1KHDQc$P#t-XFO$BK3~ y-uvCYR-xEkazc>8NnTC{hVpV|2F`MUKg?;ahY))W2S6HY?1Dm zoO)6lX(ze}qfnI6LsF4Zu4QX5_%N66Or5jObDp#R*k?WOde?g2_qX2neb)M8<+!;x z{;+1t8UO%(pwsL;lq>(+T!mKZxuL=(06^V!bKY;SG+R!xg~wU@M1^DFr%XdUY@0%?xh~C#U5@v zU*F^a|1+-pLqkJz4!9Q6TuK~WiXB}N7``XmoC@hKM;N|Q4BtGuTR6iv!P70&hjGY< z5$MDC+0n({hvCa$B<*v~w|307bt-~rry<%=D(yIApG$JcCEB0-CUy~YCwF)EG_qry z&E71c4bRdxnC6seZkI{04WQ9usW!(5wui0hEGv5kjh;-j;S#7`G`c5^?na~g+t4_8 z>ll(<8lDmo0F-KEd{b=m|A(7S&<>z zFhe4wG)*iI?k3UAAqHsa16n!|EbR$Uz%C0L0z}7?=y;+lNTlx}()JJ`0%T)q?qW!A zGBTqYo7o$hSsUV^U3e4F90bjYyYTp3c<{Z!Ddo$d*d8vP0CntbH~?Vs>2}upQ{FdR z7%%Q|&}{oW1ox88=1(+c5~@nFE3Rca&uBRxeyE_y5pZB)~ zw{g4QeG#!?EQaP^Qtr;fo9x%u09~(b< zSGa#!3clzSG^H+e8kVK0&CI2>^bVZD=@0N$?0e(n%9Nyy0kebR1)R2Q>bbNl@R&sG ze}49wH0ua0=GKFS0O}IY6dIcAL=8l9ZV{us^ZhWOhWYQ5GWTkWrBRiNkhaUl?t&i2 zDygP-ayK5cXcqq=vifhg9UR4)SRIpr0!di2Z(Ry6e{Z47#XdZy{id-zl5y9wl6W;g zxP61(8@e@7+xB_}aSe-BT6*P>yA-CTNUS=L5MnQrY))B}Yo%wk+# z`i0?+zNAfO+EObdB}A(6z37&@oS81yjDZYxoUmkgQ5rxwaQt~$N&nrkPDQ3RNCg;I z?WH*j#&Uz_+6Z#u!1g>`}<%248! zjb}*9Em9k;pxJi?8^xSw6QirYB`eR_seEwM*G=(H?jCsq!w1vDf|NYh4yXG8Tx$a1 zGn@LpN((kHM7eAc>?sQvR8yf_&&!W`2|c}js?1YOyCl5T&v~TswmuJ-gjK`i`3ak6 z<%E~D%R=MHfV<1bdS51CfA#QKAa}F8fZLO)utZroo^NWN&wW5A` z*Bx$fzedqKrK^xqZ@}I(chj%G-hz57vOMdNkrUr$~ZYQf@r z%a@0LO{+qP;fgzZae2IXJwTTV!;im+i{xFb8YI$;hT;dbe|4W zdB1Ef#AxYl%jQEO^i7yD6+6{&L@&D$DeXC9PYOA9gT`maF51B>$23=7fEC!cQrux7 z<%&`FW<4j;_R*h({oJ5dig(d(8=_}ddyRegk=)HMWZuEMy-in~sPEiY)YS|_!XheRb2OD+kt!&l6 z^RQC>e*K9`Q~fh)(8P{%Y_05r7_APJ)hGVr!Fet))3<5VOkaQ2Xtwfswh1)`dtqM9 z{E3IwhV*>Z43YP0_Cu_Ht<`l|g?mE>s}`esE@Erj(^88z*L2*A!G)twCiV%gLeviU zdfc5mfgWYWKn^sN`0DrODFyGt+LZE)t3`p^^|vqF$7=h(h;LBdB0TB$<5?g>!qx4) zWw>TrHnIen@W3GL&yiAKGB)I(D0hAYT0f=g9HIUB3RgFK5UCQ|lZGdBf;f+aqnA)C zN8Q$|!0JdXXDMsXjq%7LcJs=eX!L%ezyuebF^PF1k|>_Ssq2a`6Kdh>x@3dcq1ZuW zSZZ~m1Kp$fjS*v};Ra-edkI^FDF=hdo!=O7>Yo`{$>a`ykKS5RGAuk7Q1H6o4B&F{ zXY@3}X_`k5vm|q~Q>q?FZ1woj*GTbXs_r~8 zmZn3K3m*tD|KrZki4$FZa2Z38^C0Yf5ezj;f@K2Y2nv=qVN%F>qI>B^Lm46%=sGbY zJ$FiVKrGc6S~AHH&EDoqxgvBp^NHAxtPv*^bNFLpqVGh%s53g-tR=n zBP>*UsZ0@|)7;k~7LER;@pe&;G-zHJZ#*TsS0YwD`d1rmv1-nDra`DVpwMg;`@KZ4 zDvBP3j7R;nyh1_IjpLyZT*3V&K7ytB2R0*^9o66vf>!U-oJLSNlWJAmLB(|4SNWsy z7udkbL0tNv>`$gx8EwM`N|n)ri;o+17aL$XdPQ67=Qh~bRQXKA{{#=m B+d%*T diff --git a/src/main/resources/assets/create/textures/block/mineral/deepslate_cinnabar_ore.png b/src/main/resources/assets/create/textures/block/mineral/deepslate_cinnabar_ore.png deleted file mode 100644 index a060fd1d757cad9c17a41e8880d1be3ae06784e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 618 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJXMsm#F#`j)FbFd;%$g&?z`$q} z;1lAyp`l=NNk(O5Wkq>;Rasd@S=p+Xh>pzciu}SU@v%j@d8OI86B6Q@l2Th^!n2c; zdxOGKQd0VY0#lMxQj(KXlaf;slTs5Bk`fc=xcjBXCnU!wBqk)J#>OYb#wA6^#zsaZ zghj-JM^3i&i1iQXwsej34@ma%&2sk)3JeVM4+snl4D}BP_45z$^AGa#5AgR7^YLpo za}M(Hi}LW!wD$;c_lkFPPjGOrGIq$Zbg4FS@N@SpGj>R_aSe5HPquamb##lhbqRBD zO|@_evvVmnun)6!NjGtbwsi8bcg`@h53+K~)U(afwT&>fbFg!9vvzW{akjU0cDHnN zwQ{txb&k`scC&O0Hnz33bq+DIjnuaeGO~6txAic#@-(uv*S9b>03ve(eRF+%bM}n+ zzz}7)=jq}YQo+c2uw98cP=w{e>$a<>1x%}046{nQU&Kxk=(+m+?|*%Z<1#9mj0&z& zqD?A-OI#!$IBcA;EOS-X1fL^!vdWL2O^SD3wwZm)f}g!AUE7OxF7&CNX7qjO!@u39 zUcR_-*QK)2;P`=up_5cvHBN=sxiIT4@>hXN}{YE10UOy|;J+diM- z-dxPiq^9Z1`QhLCX>2F&FnT%i2^AExJF;0hF#Z4b)X-y= B-^Ty| diff --git a/src/main/resources/assets/create/textures/block/mineral/deepslate_magnetite_connected.png b/src/main/resources/assets/create/textures/block/mineral/deepslate_magnetite_connected.png deleted file mode 100644 index cc8e9c80731bf361118e9267a4f1e3cf749952ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2217 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 diff --git a/src/main/resources/assets/create/textures/block/mineral/deepslate_malachite_connected.png b/src/main/resources/assets/create/textures/block/mineral/deepslate_malachite_connected.png deleted file mode 100644 index 3b0cda5e7154f12ad0c5cbca59cb6042520b8a50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2280 zcmah~XIN8N8om(5Ft%U~Doa2S46~Y`U?PUx6nY6wr4ETk#e!5Lgpx!T2ia#(n5Z-X z9Y@*ORTKpUOkwQw84Fkm3W6+wKmxg3Qtn)Lf9yUxKlXXfdCxiT_nz~;-}mPfhH?BB z&0jqq0DwgS{@xMjD)}<4F(^(Cl)wOBK@SVw;e#F-l|oi|7PCB)QJx8wq2riPC`=L` z^(jsROVVh?sh($2Xs4483sMiI9yyepbSNolmtZeD`v4>7z-IA5H}S#EqJwUt1AF)G z^~~DK=kufYaU&8FJOsNvj`GMydC|Q1C|>-=3@&&mE;>FoIxaRkCYG{)mupfqF)4Zj ziie{&9FAhgM^N^Jk@*opJHx`m!?(wCTzO%xyimXJU}r98+m2wrkbuomettm#?vVk0 z0RfJ&J`S3m?K-8N%}Lq7!`S9-dwvRIl|QbB#C6)swo6$zIA} z*=?uWFjzPSYcYx-i@3#|M4}MMTQ+*+Pof>PI2yr;1Q^4w_5%PmI>4K`BkN5=88&K= zYWFa6RDQX!`CeEg!)a*qbYHpo^1y=RxQ%A2d-zg0o^~^h!t$ZHl z1f2f+&Ii<5u5gt*(h?{(gakFl%Iv8UyO<(%SJ%dPF7o^u?r2pyQ4i}99f(DhOsTek zosynC0AxF7FRi!`T%cd9D0mQFbZhmGDuUggM4`?hcc!bt)VxPQIJ!a5Q+*A+*Z0!^;X!sgIlCvHmiY3a zNxsz;i!5)LSCt-bITi0Hey$l4EzG0N1{D)OWjfQv=g)rRZ)^12n79_M>RCy-urQaJ zCArzMg}(L9st7H`cmGb&;3DE~U0Zh(+#Hoo@vR&gu;5H+*lXhA>Wv|nOA6aL$!}!v zqulnNyE7)C);@Ubuz+;oM&|e37q2LFt+q0)S!A@n#47qH4XeUl?K4vqwfBsH?$Y@k z&+U4y9XYxDjRl$R)tkE=AI>HGggHglYH>LU7hmU;6}#M15tp^+*GEIs;6jx9 z@b$OXRA9wP3;Ud=T}44$wHe}#Wh|DL!;abeg5R}}84&E~vTaUv=D1}2r|vy0vgPFq z_`ra3dP5GPvn!?FHjk9U=b}Jg8>%1;@F+>uEAc^y(`b$rx;2qL2Z(m8bZN(~^7t`hiRTQ$4+=@&ff@27_LACv? zk0<}slEE#(giIAA(z&}30n|#~} z-p>VyfWO3zIegx=P=J3sCmkn<=nNb8K0nfB#Fu?Oq2)- z>whAjYn`>!KTt~vvyTj7EnTyF4p8t=B2&cERzk>7UjKt>i`-w-A6{!r0PLmtk7iO0 zi6q8q2o%=nC;wNY?joR<9@WSR4oaaWw7*tPo%kXbRia3v3}T)lBQgjx1b^3tZcsPX zl~Wc{Bvh!uKF!!dml(y}IUwV|$=kWD{7tjR6J@kEq|%V*Fe}bb;;fLA3F!C$(q*FC z7?sT`>T zozv9HXn&w}Lk1%0j7gz=YgQReXG@=mRB)H#afej{zlbk+aTnzVXFa@x=apJ4} zatP@nKFMJYjLAb4HR%exRW(FM%ZC$e${;gZ

&sqt>ZHxAiZuk8`-mKL+fFgo$dM*t}TSZx82c!69LW zS|{u&ppj1J(KT@K$fNq65if#PM%BZz5q34+`P~9mH8f1}SY7bVeqz%i^uq-Ld^p~9 IEZ&LV0ql#700000 diff --git a/src/main/resources/assets/create/textures/block/mineral/deepslate_malachite_ore.png b/src/main/resources/assets/create/textures/block/mineral/deepslate_malachite_ore.png deleted file mode 100644 index eefcacef5527ddd20c45a04f02c35d101f6f5189..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 621 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJXMsm#F#`j)FbFd;%$g&?z`$r4 z;1l8+-&>j7Rp~Ih5(vB|mX=qP7gv>+Rg~LJC@L&2&Mz$Tsm*n+%&@OcF|5zDuS|~5 zNKHsj0fJ-@N={5oPD)8mNKN+1Pl!oNN=#0QO-+hVPE1Hjj7v_4PfCmhl8K42NeOWY z3DI%!u9>kx2~i=jQQq+p<{8l@>EU`=;pVB4Ch1{X*%2B!5%vk8zF|S$;X#2xKokfB z0fB+u!Tx@M0sa92K7syrVcwSEURGgV=HZ@B0X~ia-bN7~rlGzz0bb_*UUpvIwqD)} zkuGvkE=K0>h07Lbjr;B4q z1taUhb|t0&3DyVk;oG{CC+{`VFY@4=c~jXhET!cBf5DphmJ^n+G>Bw|^h|P@Ae7p` zY&7%M`}o+dNu4)5%1hTRVV^yjdG7+(r`MXl*HxHI_4yk3EGDle(^6!)dcXLe0Jdia zMG+dYVV{=AD_$(}XO_Pwzj|}7aB%Ab@$DHQ-`4)Bylho$wqMHcl*!BAPnCZ3ZT`8%Vl}?*v`s+_3q{Uoz-=>*nG79U*QM{ sH1v8VmdKI;Vst09&cs0RR91 diff --git a/src/main/resources/assets/create/textures/block/mineral/deepslate_ochrestone_connected.png b/src/main/resources/assets/create/textures/block/mineral/deepslate_ochrestone_connected.png deleted file mode 100644 index 266dcf3f4b9ee95c9ebca53a616432c1f3bbc1e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2317 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 diff --git a/src/main/resources/assets/create/textures/block/mineral/magnetite_connected.png b/src/main/resources/assets/create/textures/block/mineral/magnetite_connected.png deleted file mode 100644 index c6163a3e55052f96de88d446e4f330d6bf32cbb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2027 zcmY*ad03L!9tLTmTN+tS+nvx`lR8-sW^N@0x!iOzG;<@jvJ6un6_*r*@B7T0C~b^z zv@FCLw-%Q&l@x^MhZff|lzyLm&sOQ%D{oIjq<{N1irVJaq4U9AW+Zlw0TE()O0Z2N1^+utDn;S@}hUP z^vUK?o^4yMf5KqMJ6!3uktaiPOY$xW&YRr)D|@#sxtMHs(EKfh^q_CXeLbtFVlqMV z{RV;Da7~HtmGaOk$=sI@O!G=?dGbE_X4(({sW%yVP8JYs`HU~);xcuqh1|bgN|92> zk#8o^u4TRK)y@DQa^c8FF#nP^9XFTn31QI@;;P&`+Rq5{E`aD}KKh8Gys^@>#86!y zn2zU>GB^0V`}did!d_#ffsQ{@gIeIoYB~k>hCW-QPGzVMpn4GbK-FMz(N@Yl6F~K# ziASMrTYk~&**64M_={K#Kw7rB?3}z+b3&0o^-W)BW#C46lBdXhdWjl z*{*G+*V13WOWWvdml!Q8$MF4_WMQdI%tvr*!0?9f8C=v-;y|C?Yv`j8=mL4Qxedh& z%0cx6V6dwA9EH2tG%WkZLR@$SduEu@pJVYIVsv5oY^fQ{VNB=3SVxt7m&*L~6<=UU zHybKekmLXSBoxQ$G@sS`-yrWbS7{M%7L=;YF#pkIMD<-cnl-V4D$_zva6ne7Dk34_ zK2- zbgmP8cSplO=F9F2 z6zWdKhm((Iv!q( zdJS`AG?6|D9uo+A70S}1VS*UduLBFw1M&=b>YZRJ_nWWc$&qgkoh!V)+1lgq-?Hdb zSN`T{l_Tq7?xZI-NhZJgiYD%tep&Ps(x9bakypb5IXW=yX2+ zK)>pAig^QTSP6!Zl?Ed^dH-Htke(qx=F-`HFHYK@z7&KuvY&h$vCS?7|?28 zG_2pC1cf>vf=M`bqxQ=_kwf$}6QaKUph1k>YgHoK$XRk!cFnqB^aje#W{g$W(Gv2#jOYi~WEwd~wqc9^QGb1A-CA~B(wK+Jc zAvCcnHa^oero|^X*EcB9(=XoKCCkh?OT#o|#U|5!VCY@)ba4!+U}Qbm>ckW%;(D>V zR;}#xHrK!-eU?9R3>`KeJ0$V%zj4gzJ9j4rXfaA~FgncQlJtt7tm3(pi-9e7XX0%A z@~AFykpFPrUWM_3_u`lRM6yKjJ$@?N|Ax?wbNhi#gP4Q};(2 z9}{qrIhFiwF8|~F^2<9L1-`R=HhN*Pa^70KUK?|@>fN&5m6rMcwno`6zghib#fb%b zw%S^i?yjy7cDg@D+DhVfPW-y7V%>@{OO49E2~RlU<67j*#Bkv5T?U6kvMm2y@--sd Th0=6^zGLuo^>bP0l+XkKlw9-{ diff --git a/src/main/resources/assets/create/textures/block/mineral/malachite.png b/src/main/resources/assets/create/textures/block/mineral/malachite.png deleted file mode 100644 index f1787ed7b4816c8e1a32bace9909ddf7b00a6b11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHVEbxddW?)5S5Qf|2!LBjaHO4weJu%!y50u?w8U z0wNVozTfZlK0z$9MqO$8i-$)l?I+~teR$_<+Y#feb9ljR8$Wgv<@M6Mb)wl_3SCc3 zoad^_2|jpt!RCluhLp;*&I+-Mv#YLDHZ0q@vtHn%lI6dZ&%|dwF5hq%Xf1=MtDnm{ Hr-UW|OSDRL diff --git a/src/main/resources/assets/create/textures/block/mineral/malachite_connected.png b/src/main/resources/assets/create/textures/block/mineral/malachite_connected.png deleted file mode 100644 index c625c8bb30fe0bf78e20d3d6081575b2558ff63b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2164 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 diff --git a/src/main/resources/assets/create/textures/block/mineral/ochrestone.png b/src/main/resources/assets/create/textures/block/mineral/ochrestone.png deleted file mode 100644 index e59d793cb5037806c62d02b61b5431913c588e83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHVEbxddW?C}rHYaR81_V#sIYxi$lIg$O+(kGj* zm1ypKwzxX@U2FW83qMnJ;x0^_dgokFHqV`wg8mxC=?xoX!!90m{Ld&h-8zTGwe~pB OW(H4JKbLh*2~7Y`^in|p diff --git a/src/main/resources/assets/create/textures/block/mineral/ochrestone_connected.png b/src/main/resources/assets/create/textures/block/mineral/ochrestone_connected.png deleted file mode 100644 index a31db1e03a40ed9ee60212c45cc3ffbb77ed31fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2149 zcma)7c~Fx{9{nH%VFe~y&MG5LKycOz1RO`u1%oFdhzxfy5F&Cq7$8Up3HcIEks~4^ zs1QWOIDmk1$Pp%>awAbt0^taV2AwDoB7~gZMxCvi+P}7{ulIhh`gOnRs?KzGb241D zVHE%XhR(+hduV3bm#zoXjGw3TWB{P`y}PT|5e;m)72I5Qrl~Br>1J?U@tKD=PS+L$ z)D#3%<>M;z0xK>BR4`7J|3XT@4T{GNvPU*03IxHl zBqE(k&ZI=ssFVx}p&-F8l@y&qip`Jr&Pu?fpAP}!V{>Btb7K6HT z{=_Bx2@)ZO7#9;47ngO;`#d2wDLRaH4wHG-gBTT_7U7!_aWd{~I3eX& ze|>#UZjt3{;=F^;-l=N2S9|RB6D(2|r*;*VmuN}O98#5kEO>J9_An~MvU{PDI<_0( zTBqtRbsOIMd2++*WPuB|aeKlGPKCOof>hhWSI6J|bIjN-@)2W?kZ(*dz8gU$ULuY- ze|Id`C|w4V9UlU>CNAp^yiI$rjB9TC(Bdt?o6WHnw1Gy^$R(#1Z;O^!b`AvCGc+MI zl$zM~O0;x*GB~U!L2HlE=R|X+v8bnlsaoT=^VHRlN2cs%PP1rT*MO)xv@Rvl?V zbLJZ>sBF(zKW1|udqDPJ!9*2jc@DX$3+R9Bgp_%cLGvmU>@yEl<#qf+}m-4vf1 zFAqC1jGZv`y1`nsF^wTo{Sh_(a{T<{eA(k`#yyG1pes7r2QOm<(=%lZ68<9FDfdmA z8;gBf88W<4-eBmJ%gg`5IQDU``X8vE%I! zE9Zy3;yl9MZQ}F$4y@R68nqtj`8D>C3(ej0r29%Dm3-X|%(hlho6up`WC*>7Try}> zzIy~3lxUaNcWgcDy7=R@O+R-eI*f?hq-?-`yqp4skL>w$4Y0}+qpz`XQ7{Fqcl%q= z0!Dj$5lrg&oKqcj6OU8p^OU|n=&g~}Jp7cOhoar9j+%bpS=lQy=?1*sfLFXB{o7t6 z4Tj2iK4%`;+Tg6-!5%AI#NuYefjrR!^f-Ba*EAUwjwB1R?rqgW7z?UT2 zQ7$a`pJ02k=}oV99HqT!kv5>dvmfCq1P8>G_^<*(gjyg=u6hxos}1DNLi2?uW_Y%% zOQ0QjGJ)gBpUDq^OXh0nJlvwV$(nn1Zb*qIXxMF5M)LK6D!#6n1Y|Xs385hC>8e*c z!8W?ZA)451pbT4F!V9}K5^!}Y4u-DO7aG>u=z|wkj=mbWF# z6U@HTCetJb;_ChdYM1tgJL3rZfQfq+%UU>X-fPtXT1OS$^dX|@{e0)Atq|5)fZvDp zJ_^MYqx4orug9X?{XP8#!Ge61QobVTm%=isN4G&TE*FNE>IAP#9HKhDv5nmWqpd$ad1=;}e1Fz8$1j-}W!V;=hU2(oI(SwSqZ^pr1MO ziw_+smQ>IZ@f7!3%3J&|;Qb9?gv4kE#M7@7P5z^jV71aNW_^%q&*)Q8A)NJkTr%qa zTtJ}Ximzf8(&}2$SpjJ=Nm^=?APklU!Hsz9r~j9p9-aFrJ_Oz1jte@;92r~H$!nHo xamTTg95QExE$!qrX(0J8_^G$ekrJp-!zR(&`{Y#18qL25I3IC4TzxPo`9DCMc5(m! diff --git a/src/main/resources/assets/create/textures/block/mineral/ochrestone_ore.png b/src/main/resources/assets/create/textures/block/mineral/ochrestone_ore.png deleted file mode 100644 index e812365cdd6ba98dc49cff6a3dc49be450c479e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJXMsm#F#`j)FbFd;%$g$s6x;W=h(c$%#uQmoA-LG;dPvoQVy~CnQau(AMAIKc%m2a$m=! zzOIRV-BWv8rgoQ4?rNOUU9qeqVrfUzl8&fJT^0SEE%RGrds{0eH|Nc4NbYVb>uN0T zY^<156FjFTsH?7Mc6D$^U1>{wRYzS(bA9#n>d1!r`iAtX?cexB>56)B=IPr1$FtT>P|3NI)4-6-ka5=H!~Y_)-%;nD7c(&R zmHCyO&*Q6JeDU*kS-E)kDJRT5jaYV_J!56NefDh8XZybC>)x!ZZTj%&;rr$PswQo{ zrr1&v^WNz9^5~^gx;HZO?K*Sj>zTJ(YXx&Rg?pt{`@q2 zVH>xXC*$l{#l*vh*lu&>FfgcSG8}MYI?S~@PDON+*daZj2N*nE{an^LB{Ts5gg43b diff --git a/src/main/resources/assets/create/textures/block/noisy_iron_block.png b/src/main/resources/assets/create/textures/block/noisy_iron_block.png deleted file mode 100644 index 60e244bf9cc71cddb31728657327c8fcbb590050..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 480 zcmV<60U!Q}P)yu7=+ySTWxrKP2$q@MTo0^)Mn3$NCmzR~5m6Vi}larH>kdTg!j*X3ti;Ihjii(MeiHC=WhK7cOgoJ~G zgMop8fPjF1e}8^{etms?dwY9&dU|+xcz1Vqb#--gbaZobb8&HTaBy&LZfQV>)eU7ac1CwXI2&} z1LdQqX(SkVndWrxd~`gi(E-}>uza+1$!V-K$$^(%zLC}q>?`h+;Z%`l#&b(urLEEp zGD#=>h`S-KJ*OAh2WscE&&ltrG6qrvC>Z WQWQOPQ$-N~0000honpS7U%i}PyqjH|oSeFsTDg^2wv$-1 zlUTNrRkM&+u#Q!(j#90SSFMdwr-@Idf=#1>Nuz;EqJc@GfJ>l&NS%O3n|w!_d_|dj zLz{X+F mS~(7W