From 447d4236fc2d771c2ee8559867489d05c6feb1a4 Mon Sep 17 00:00:00 2001 From: Kryppers <65094918+Kryppers@users.noreply.github.com> Date: Fri, 21 Oct 2022 22:35:57 +0100 Subject: [PATCH] Spit and Shine part 1 Reworked funnel models Reorganised funnel assets WIP textures for funnels WIP texture for andesite_block Cleaned up some unused files --- .../create/models/block/brass_block.json | 2 +- .../java/com/simibubi/create/AllBlocks.java | 6 +- .../block/belt_funnel/block_connected.json | 232 --------------- .../block/belt_funnel/block_extended.json | 194 +++++-------- .../block/belt_funnel/block_pulling.json | 179 +++++------- .../block/belt_funnel/block_pushing.json | 179 +++++------- .../block/belt_funnel/block_retracted.json | 197 +++++-------- .../create/models/block/belt_funnel/flap.json | 2 +- .../models/block/funnel/block_horizontal.json | 161 +++++------ .../models/block/funnel/block_vertical.json | 172 ++++-------- .../funnel/block_vertical_filterless.json | 127 +++------ .../create/models/block/funnel/item.json | 263 ++++++++---------- .../create/textures/block/andesite_block.png | Bin 0 -> 752 bytes .../create/textures/block/brass_block.png | Bin 226 -> 6407 bytes .../create/textures/block/brass_casing.png | Bin 298 -> 6481 bytes .../textures/block/brass_storage_block.png | Bin 214 -> 0 bytes .../create/textures/block/crate_brass.png | Bin 493 -> 0 bytes .../textures/block/crate_brass_side.png | Bin 734 -> 0 bytes .../textures/block/funnel/andesite_funnel.png | Bin 0 -> 8648 bytes .../block/funnel/andesite_funnel_frame.png | Bin 0 -> 5725 bytes .../block/funnel/andesite_funnel_neutral.png | Bin 0 -> 6487 bytes .../block/funnel/andesite_funnel_powered.png | Bin 0 -> 6444 bytes .../block/funnel/andesite_funnel_pull.png | Bin 0 -> 6823 bytes .../block/funnel/andesite_funnel_push.png | Bin 0 -> 6821 bytes .../funnel/andesite_funnel_unpowered.png | Bin 0 -> 6335 bytes .../textures/block/funnel/brass_funnel.png | Bin 0 -> 8280 bytes .../block/funnel/brass_funnel_frame.png | Bin 0 -> 627 bytes .../block/funnel/brass_funnel_neutral.png | Bin 0 -> 752 bytes .../block/funnel/brass_funnel_powered.png | Bin 0 -> 734 bytes .../block/funnel/brass_funnel_pull.png | Bin 0 -> 804 bytes .../block/funnel/brass_funnel_push.png | Bin 0 -> 802 bytes .../block/funnel/brass_funnel_unpowered.png | Bin 0 -> 725 bytes .../textures/block/funnel/funnel_back.png | Bin 0 -> 7565 bytes .../textures/block/funnel/funnel_closed.png | Bin 0 -> 177 bytes .../textures/block/funnel/funnel_open.png | Bin 0 -> 186 bytes 35 files changed, 553 insertions(+), 1161 deletions(-) delete mode 100644 src/main/resources/assets/create/models/block/belt_funnel/block_connected.json create mode 100644 src/main/resources/assets/create/textures/block/andesite_block.png delete mode 100644 src/main/resources/assets/create/textures/block/brass_storage_block.png delete mode 100644 src/main/resources/assets/create/textures/block/crate_brass.png delete mode 100644 src/main/resources/assets/create/textures/block/crate_brass_side.png create mode 100644 src/main/resources/assets/create/textures/block/funnel/andesite_funnel.png create mode 100644 src/main/resources/assets/create/textures/block/funnel/andesite_funnel_frame.png create mode 100644 src/main/resources/assets/create/textures/block/funnel/andesite_funnel_neutral.png create mode 100644 src/main/resources/assets/create/textures/block/funnel/andesite_funnel_powered.png create mode 100644 src/main/resources/assets/create/textures/block/funnel/andesite_funnel_pull.png create mode 100644 src/main/resources/assets/create/textures/block/funnel/andesite_funnel_push.png create mode 100644 src/main/resources/assets/create/textures/block/funnel/andesite_funnel_unpowered.png create mode 100644 src/main/resources/assets/create/textures/block/funnel/brass_funnel.png create mode 100644 src/main/resources/assets/create/textures/block/funnel/brass_funnel_frame.png create mode 100644 src/main/resources/assets/create/textures/block/funnel/brass_funnel_neutral.png create mode 100644 src/main/resources/assets/create/textures/block/funnel/brass_funnel_powered.png create mode 100644 src/main/resources/assets/create/textures/block/funnel/brass_funnel_pull.png create mode 100644 src/main/resources/assets/create/textures/block/funnel/brass_funnel_push.png create mode 100644 src/main/resources/assets/create/textures/block/funnel/brass_funnel_unpowered.png create mode 100644 src/main/resources/assets/create/textures/block/funnel/funnel_back.png create mode 100644 src/main/resources/assets/create/textures/block/funnel/funnel_closed.png create mode 100644 src/main/resources/assets/create/textures/block/funnel/funnel_open.png diff --git a/src/generated/resources/assets/create/models/block/brass_block.json b/src/generated/resources/assets/create/models/block/brass_block.json index c3d4b94f4..124827f00 100644 --- a/src/generated/resources/assets/create/models/block/brass_block.json +++ b/src/generated/resources/assets/create/models/block/brass_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "create:block/brass_storage_block" + "all": "create:block/brass_block" } } \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 620af8219..89c1358ac 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -1699,6 +1699,7 @@ public class AllBlocks { public static final BlockEntry ANDESITE_FUNNEL = REGISTRATE.block("andesite_funnel", AndesiteFunnelBlock::new) + .addLayer(() -> RenderType::cutoutMipped) .initialProperties(SharedProperties::stone) .properties(p -> p.color(MaterialColor.STONE)) .transform(pickaxeOnly()) @@ -1712,6 +1713,7 @@ public class AllBlocks { public static final BlockEntry ANDESITE_BELT_FUNNEL = REGISTRATE.block("andesite_belt_funnel", p -> new BeltFunnelBlock(AllBlocks.ANDESITE_FUNNEL, p)) + .addLayer(() -> RenderType::cutoutMipped) .initialProperties(SharedProperties::stone) .properties(p -> p.color(MaterialColor.STONE)) .transform(pickaxeOnly()) @@ -1722,6 +1724,7 @@ public class AllBlocks { public static final BlockEntry BRASS_FUNNEL = REGISTRATE.block("brass_funnel", BrassFunnelBlock::new) + .addLayer(() -> RenderType::cutoutMipped) .initialProperties(SharedProperties::softMetal) .properties(p -> p.color(MaterialColor.TERRACOTTA_YELLOW)) .transform(pickaxeOnly()) @@ -1735,6 +1738,7 @@ public class AllBlocks { public static final BlockEntry BRASS_BELT_FUNNEL = REGISTRATE.block("brass_belt_funnel", p -> new BeltFunnelBlock(AllBlocks.BRASS_FUNNEL, p)) + .addLayer(() -> RenderType::cutoutMipped) .initialProperties(SharedProperties::softMetal) .properties(p -> p.color(MaterialColor.TERRACOTTA_YELLOW)) .transform(pickaxeOnly()) @@ -2077,7 +2081,7 @@ public class AllBlocks { .properties(p -> p.color(MaterialColor.TERRACOTTA_YELLOW)) .properties(p -> p.requiresCorrectToolForDrops()) .transform(pickaxeOnly()) - .blockstate(simpleCubeAll("brass_storage_block")) + .blockstate(simpleCubeAll("brass_block")) .tag(BlockTags.NEEDS_IRON_TOOL) .tag(Tags.Blocks.STORAGE_BLOCKS) .tag(BlockTags.BEACON_BASE_BLOCKS) diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_connected.json b/src/main/resources/assets/create/models/block/belt_funnel/block_connected.json deleted file mode 100644 index 447d36f7a..000000000 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_connected.json +++ /dev/null @@ -1,232 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "2": "create:block/brass_funnel_neutral", - "3": "create:block/brass_funnel_back", - "5": "create:block/brass_funnel_tall", - "6": "create:block/brass_funnel", - "7": "create:block/brass_funnel_plating", - "particle": "create:block/brass_block" - }, - "elements": [ - { - "name": "LeftWall", - "from": [14, -3, 5], - "to": [16, 0, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 5]}, - "faces": { - "north": {"uv": [8, 8, 9, 9.5], "texture": "#7"}, - "east": {"uv": [13, 0, 16, 6], "rotation": 90, "texture": "#2"}, - "south": {"uv": [15, 8, 16, 9.5], "texture": "#7"} - } - }, - { - "name": "LeftWall", - "from": [0, -3, 5], - "to": [2, 0, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 5]}, - "faces": { - "north": {"uv": [15, 8, 16, 9.5], "texture": "#7"}, - "south": {"uv": [8, 7.5, 9, 9], "texture": "#7"}, - "west": {"uv": [13, 6, 16, 0], "rotation": 90, "texture": "#2"} - } - }, - { - "name": "LeftWall", - "from": [0, 0, 5], - "to": [16, 16, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 5]}, - "faces": { - "north": {"uv": [8, 0, 16, 8], "texture": "#7"}, - "east": {"uv": [0, 6, 16, 12], "rotation": 90, "texture": "#2"}, - "south": {"uv": [8, 0, 16, 8], "texture": "#7"}, - "west": {"uv": [0, 12, 16, 6], "rotation": 90, "texture": "#2"}, - "up": {"uv": [0, 0, 8, 3], "texture": "#7"} - } - }, - { - "name": "LeftBottom", - "from": [15, -5, 5], - "to": [16, -3, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 5]}, - "faces": { - "east": {"uv": [5, 15, 8, 16], "texture": "#7"}, - "west": {"uv": [5, 15, 8, 16], "texture": "#7"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#particle"} - } - }, - { - "name": "LeftBottom", - "from": [0, -5, 5], - "to": [1, -3, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 5]}, - "faces": { - "east": {"uv": [8, 15, 5, 16], "texture": "#7"}, - "west": {"uv": [8, 15, 5, 16], "texture": "#7"}, - "down": {"uv": [1, 0, 0, 6], "texture": "#particle"} - } - }, - { - "name": "LeftBottom", - "from": [15, -5, 11], - "to": [16, -2, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 11]}, - "faces": { - "east": {"uv": [5, 14.5, 7.5, 16], "texture": "#7"}, - "south": {"uv": [7.5, 13, 8, 14.5], "texture": "#7"}, - "west": {"uv": [5.5, 14.5, 8, 16], "texture": "#7"}, - "up": {"uv": [0, 0, 1, 5], "texture": "#particle"}, - "down": {"uv": [0, 0, 1, 5], "texture": "#particle"} - } - }, - { - "name": "LeftBottom", - "from": [0, -5, 11], - "to": [1, -2, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 11]}, - "faces": { - "east": {"uv": [8, 14.5, 5.5, 16], "texture": "#7"}, - "south": {"uv": [8, 13, 7.5, 14.5], "texture": "#7"}, - "west": {"uv": [7.5, 14.5, 5, 16], "texture": "#7"}, - "up": {"uv": [1, 0, 0, 5], "texture": "#particle"}, - "down": {"uv": [1, 0, 0, 5], "texture": "#particle"} - } - }, - { - "name": "LeftBottom", - "from": [15, -5, 0], - "to": [16, -2, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 5]}, - "faces": { - "north": {"uv": [8, 13, 7.5, 14.5], "texture": "#7"}, - "east": {"uv": [7.5, 14.5, 5, 16], "texture": "#7"}, - "west": {"uv": [8, 14.5, 5.5, 16], "texture": "#7"}, - "up": {"uv": [0, 5, 1, 0], "texture": "#particle"}, - "down": {"uv": [0, 5, 1, 0], "texture": "#particle"} - } - }, - { - "name": "LeftBottom", - "from": [0, -5, 0], - "to": [1, -2, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 5]}, - "faces": { - "north": {"uv": [7.5, 13, 8, 14.5], "texture": "#7"}, - "east": {"uv": [5.5, 14.5, 8, 16], "texture": "#7"}, - "west": {"uv": [5, 14.5, 7.5, 16], "texture": "#7"}, - "up": {"uv": [1, 5, 0, 0], "texture": "#particle"}, - "down": {"uv": [1, 5, 0, 0], "texture": "#particle"} - } - }, - { - "name": "BackExtension", - "from": [3, -2, 10], - "to": [13, 13, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 6]}, - "faces": { - "east": {"uv": [9, 6, 16, 8], "rotation": 90, "texture": "#3"}, - "west": {"uv": [9, 6, 16, 8], "rotation": 270, "texture": "#3"}, - "up": {"uv": [9.5, 2, 14.5, 4], "texture": "#3"} - } - }, - { - "name": "BackExtension", - "from": [3, -2, 2], - "to": [13, 13, 6], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 10]}, - "faces": { - "east": {"uv": [9, 8, 16, 6], "rotation": 90, "texture": "#3"}, - "west": {"uv": [9, 8, 16, 6], "rotation": 270, "texture": "#3"}, - "up": {"uv": [9.5, 4, 14.5, 2], "texture": "#3"} - } - }, - { - "name": "MidExtension", - "from": [2, -2, 8], - "to": [14, 14, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, - "faces": { - "east": {"uv": [1, 6, 9, 8], "rotation": 90, "texture": "#3"}, - "south": {"uv": [8, 0, 16, 6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [1, 8, 9, 6], "rotation": 90, "texture": "#3"}, - "up": {"uv": [6, 0, 8, 6], "rotation": 90, "texture": "#3"} - } - }, - { - "name": "MidExtension", - "from": [2, -2, 4], - "to": [14, 14, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, - "faces": { - "north": {"uv": [8, 6, 16, 0], "rotation": 270, "texture": "#3"}, - "east": {"uv": [1, 8, 9, 6], "rotation": 90, "texture": "#3"}, - "west": {"uv": [1, 6, 9, 8], "rotation": 90, "texture": "#3"}, - "up": {"uv": [8, 0, 6, 6], "rotation": 90, "texture": "#3"} - } - }, - { - "name": "Back", - "from": [2.1, -2.1, -2.1], - "to": [13.9, 13.95, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 10]}, - "faces": { - "north": {"uv": [15, 1, 9, 9], "texture": "#7"}, - "east": {"uv": [0, 4, 16, 0], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 16, 16, 4], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 4, 16, 0], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 4, 12, 0], "texture": "#6"}, - "down": {"uv": [0, 4, 12, 0], "rotation": 180, "texture": "#6"} - } - }, - { - "name": "Back", - "from": [2.1, -2.1, 14], - "to": [13.9, 13.95, 18.1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 6]}, - "faces": { - "north": {"uv": [0, 4, 16, 16], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 16, 4], "rotation": 90, "texture": "#5"}, - "south": {"uv": [9, 1, 15, 9], "texture": "#7"}, - "west": {"uv": [0, 0, 16, 4], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 12, 4], "texture": "#6"}, - "down": {"uv": [0, 0, 12, 4], "rotation": 180, "texture": "#6"} - } - }, - { - "name": "RearBackPlate", - "from": [1, -5, 0], - "to": [15, -2, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [7, -8, 8]}, - "faces": { - "north": {"uv": [0.5, 13, 7.5, 14.5], "texture": "#7"}, - "south": {"uv": [0.5, 13, 7.5, 14.5], "texture": "#7"}, - "up": {"uv": [1, 0, 15, 16], "texture": "#particle"}, - "down": {"uv": [1, 0, 15, 16], "texture": "#particle"} - } - } - ], - "groups": [ - { - "name": "BeltFunnel", - "origin": [9, -4, 8], - "children": [ - { - "name": "FrontSection", - "origin": [9, -4, 8], - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8] - }, - { - "name": "Extension", - "origin": [9, -4, 8], - "children": [9, 10, 11, 12] - }, - { - "name": "Base", - "origin": [9, -4, 8], - "children": [13, 14, 15] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_extended.json b/src/main/resources/assets/create/models/block/belt_funnel/block_extended.json index 073985dd2..ca4b4eb0a 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_extended.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/block_extended.json @@ -2,88 +2,24 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "2": "create:block/brass_funnel_neutral", - "3": "create:block/brass_funnel_back", - "5": "create:block/brass_funnel_tall", - "6": "create:block/brass_funnel", - "7": "create:block/brass_funnel_plating", - "particle": "create:block/brass_block" + "back": "create:block/funnel/funnel_back", + "base": "create:block/funnel/brass_funnel", + "direction": "create:block/funnel/brass_funnel_neutral", + "redstone": "create:block/funnel/brass_funnel_unpowered", + "particle": "create:block/brass_block", + "block": "create:block/brass_block" }, "elements": [ - { - "name": "LeftWall", - "from": [14, -3, 0], - "to": [16, 0, 6], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 0]}, - "faces": { - "north": {"uv": [0, 8, 1, 9.5], "texture": "#7"}, - "east": {"uv": [13, 0, 16, 6], "rotation": 90, "texture": "#2"}, - "south": {"uv": [15, 8, 16, 9.5], "texture": "#7"}, - "west": {"uv": [13, 0, 16, 6], "rotation": 90, "texture": "#2"}, - "down": {"uv": [14, 10, 16, 16], "texture": "#particle"} - } - }, - { - "name": "LeftWall", - "from": [0, -3, 0], - "to": [2, 0, 6], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 0]}, - "faces": { - "north": {"uv": [7, 8, 8, 9.5], "texture": "#7"}, - "east": {"uv": [13, 6, 16, 0], "rotation": 90, "texture": "#2"}, - "south": {"uv": [8, 7.5, 9, 9], "texture": "#7"}, - "west": {"uv": [13, 6, 16, 0], "rotation": 90, "texture": "#2"}, - "down": {"uv": [0, 10, 2, 16], "texture": "#particle"} - } - }, - { - "name": "LeftWall", - "from": [14, 0, 0], - "to": [16, 16, 6], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 0]}, - "faces": { - "north": {"uv": [0, 0, 1, 8], "texture": "#7"}, - "east": {"uv": [0, 6, 16, 12], "rotation": 90, "texture": "#2"}, - "south": {"uv": [15, 0, 16, 8], "texture": "#7"}, - "west": {"uv": [0, 12, 16, 6], "rotation": 90, "texture": "#2"}, - "up": {"uv": [14, 0, 16, 6], "texture": "#2"} - } - }, - { - "name": "LeftWall", - "from": [0, 0, 0], - "to": [2, 16, 6], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 0]}, - "faces": { - "north": {"uv": [7, 0, 8, 8], "texture": "#7"}, - "east": {"uv": [0, 6, 16, 12], "rotation": 90, "texture": "#2"}, - "south": {"uv": [8, 0, 9, 8], "texture": "#7"}, - "west": {"uv": [0, 12, 16, 6], "rotation": 90, "texture": "#2"}, - "up": {"uv": [16, 0, 14, 6], "texture": "#2"} - } - }, - { - "name": "Top", - "from": [2, 10, 0], - "to": [14, 16, 6], - "rotation": {"angle": 0, "axis": "y", "origin": [6, -8, 0]}, - "faces": { - "north": {"uv": [9, 13, 15, 16], "texture": "#7"}, - "south": {"uv": [9, 0, 15, 3], "texture": "#7"}, - "up": {"uv": [1, 0, 7, 3], "texture": "#7"}, - "down": {"uv": [2, 0, 14, 6], "rotation": 180, "texture": "#2"} - } - }, { "name": "LeftBottom", "from": [15, -5, 0], "to": [16, -3, 6], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 0]}, "faces": { - "north": {"uv": [0, 9.5, 0.5, 10.5], "texture": "#7"}, - "east": {"uv": [5, 15, 8, 16], "texture": "#7"}, - "west": {"uv": [5, 15, 8, 16], "texture": "#7"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#particle"} + "north": {"uv": [8, 8, 9, 8.5], "rotation": 90, "texture": "#base"}, + "east": {"uv": [8, 8, 9, 11], "rotation": 90, "texture": "#base"}, + "west": {"uv": [8, 8, 9, 11], "rotation": 90, "texture": "#base"}, + "down": {"uv": [0, 0, 1, 6], "rotation": 180, "texture": "#block"} } }, { @@ -92,10 +28,31 @@ "to": [1, -3, 6], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 0]}, "faces": { - "north": {"uv": [7.5, 9.5, 8, 10.5], "texture": "#7"}, - "east": {"uv": [8, 15, 5, 16], "texture": "#7"}, - "west": {"uv": [8, 15, 5, 16], "texture": "#7"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#particle"} + "north": {"uv": [8, 8, 9, 8.5], "rotation": 90, "texture": "#base"}, + "east": {"uv": [8, 8, 9, 11], "rotation": 90, "texture": "#base"}, + "west": {"uv": [8, 8, 9, 11], "rotation": 90, "texture": "#base"}, + "down": {"uv": [15, 0, 16, 6], "rotation": 180, "texture": "#block"} + } + }, + { + "from": [0, -3, 0], + "to": [16, 16, 6], + "faces": { + "north": {"uv": [0, 6.5, 8, 16], "rotation": 180, "texture": "#direction"}, + "east": {"uv": [8, 0, 11, 9.5], "texture": "#direction"}, + "south": {"uv": [0, 6.5, 8, 16], "rotation": 180, "texture": "#direction"}, + "west": {"uv": [8, 0, 11, 9.5], "texture": "#direction"}, + "up": {"uv": [0, 0, 8, 3], "texture": "#direction"}, + "down": {"uv": [0, 8, 8, 11], "texture": "#direction"} + } + }, + { + "from": [2, -3, 6], + "to": [14, 10, 0], + "faces": { + "east": {"uv": [11, 8.5, 14, 16], "texture": "#base"}, + "west": {"uv": [13, 8.5, 16, 16], "texture": "#base"}, + "up": {"uv": [14, 9, 11, 15], "rotation": 90, "texture": "#base"} } }, { @@ -104,10 +61,9 @@ "to": [13, 13, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 6]}, "faces": { - "east": {"uv": [9, 6, 16, 8], "rotation": 90, "texture": "#3"}, - "south": {"uv": [0, 0.5, 8, 6.5], "rotation": 90, "texture": "#3"}, - "west": {"uv": [9, 6, 16, 8], "rotation": 270, "texture": "#3"}, - "up": {"uv": [9.5, 2, 14.5, 4], "texture": "#3"} + "east": {"uv": [8.5, 6, 16, 8], "rotation": 90, "texture": "#back"}, + "west": {"uv": [8.5, 6, 16, 8], "rotation": 270, "texture": "#back"}, + "up": {"uv": [0.5, 8.5, 5.5, 10.5], "texture": "#back"} } }, { @@ -116,61 +72,39 @@ "to": [14, 14, 10], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 6]}, "faces": { - "north": {"uv": [0, 6, 6, 14], "texture": "#3"}, - "east": {"uv": [1, 6, 9, 8], "rotation": 90, "texture": "#3"}, - "south": {"uv": [8, 0, 16, 6], "rotation": 270, "texture": "#3"}, - "west": {"uv": [1, 8, 9, 6], "rotation": 90, "texture": "#3"}, - "up": {"uv": [6, 0, 8, 6], "rotation": 90, "texture": "#3"} + "north": {"uv": [0, 0, 8, 6], "rotation": 270, "texture": "#base"}, + "east": {"uv": [0.5, 6, 8.5, 8], "rotation": 90, "texture": "#back"}, + "south": {"uv": [8, 0, 16, 6], "rotation": 90, "texture": "#back"}, + "west": {"uv": [0.5, 8, 8.5, 6], "rotation": 90, "texture": "#back"}, + "up": {"uv": [6, 0, 8, 6], "rotation": 90, "texture": "#back"} } }, { "name": "Back", - "from": [2.1, -2.1, 14], - "to": [13.9, 13.95, 18.1], + "from": [2.05, -2, 14], + "to": [13.95, 13.95, 18], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 6]}, "faces": { - "north": {"uv": [0, 4, 16, 16], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 0, 16, 4], "rotation": 90, "texture": "#5"}, - "south": {"uv": [9, 1, 15, 9], "texture": "#7"}, - "west": {"uv": [0, 0, 16, 4], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 12, 4], "texture": "#6"}, - "down": {"uv": [0, 0, 12, 4], "rotation": 180, "texture": "#6"} + "north": {"uv": [4, 0, 16, 16], "texture": "#redstone"}, + "east": {"uv": [0, 0, 4, 16], "texture": "#redstone"}, + "south": {"uv": [0, 8, 6, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 4, 16], "rotation": 180, "texture": "#redstone"}, + "up": {"uv": [8, 2, 12, 14], "rotation": 270, "texture": "#redstone"}, + "down": {"uv": [8, 2, 12, 14], "rotation": 90, "texture": "#redstone"} } }, { "name": "RearBackPlate", - "from": [1, -5, 5], - "to": [15, -2, 16.05], + "from": [0, -5, 6], + "to": [16, -2, 16], "rotation": {"angle": 0, "axis": "y", "origin": [7, -8, 8]}, "faces": { - "north": {"uv": [1, 13, 15, 16], "texture": "#particle"}, - "south": {"uv": [0.5, 13, 7.5, 14.5], "texture": "#7"}, - "up": {"uv": [1, 5, 15, 16], "texture": "#particle"}, - "down": {"uv": [1, 0, 15, 11], "texture": "#particle"} - } - }, - { - "name": "BackPlateLeft", - "from": [15, -5, 6], - "to": [16, -2, 16.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 6]}, - "faces": { - "east": {"uv": [0, 14.5, 5, 16], "texture": "#7"}, - "south": {"uv": [7.5, 14.5, 8, 16], "texture": "#7"}, - "up": {"uv": [0, 14.5, 5.5, 15], "rotation": 270, "texture": "#7"}, - "down": {"uv": [0, 0, 1, 10], "texture": "#particle"} - } - }, - { - "name": "BackPlateLeft", - "from": [0, -5, 6], - "to": [1, -2, 16.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 6]}, - "faces": { - "south": {"uv": [0, 14.5, 0.5, 16], "texture": "#7"}, - "west": {"uv": [5, 14.5, 0, 16], "texture": "#7"}, - "up": {"uv": [0, 15, 5.5, 14.5], "rotation": 270, "texture": "#7"}, - "down": {"uv": [0, 0, 1, 10], "texture": "#particle"} + "north": {"uv": [0, 3, 16, 6], "texture": "#block"}, + "east": {"uv": [7.5, 11, 9, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [7.5, 8, 9, 16], "rotation": 90, "texture": "#base"}, + "west": {"uv": [7.5, 10.5, 9, 16], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 6, 16, 16], "texture": "#block"}, + "down": {"uv": [0, 6, 16, 16], "rotation": 180, "texture": "#block"} } } ], @@ -178,21 +112,25 @@ { "name": "BeltFunnel", "origin": [9, -4, 8], + "color": 0, "children": [ { "name": "FrontSection", "origin": [9, -4, 8], - "children": [0, 1, 2, 3, 4, 5, 6] + "color": 0, + "children": [0, 1, 2, 3] }, { "name": "Extension", "origin": [9, -4, 8], - "children": [7, 8] + "color": 0, + "children": [4, 5] }, { "name": "Base", "origin": [9, -4, 8], - "children": [9, 10, 11, 12] + "color": 0, + "children": [6, 7] } ] } diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json b/src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json index d59a3ae68..e3dd34e56 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json @@ -2,135 +2,84 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "3": "create:block/brass_funnel_back", - "5": "create:block/brass_funnel_tall", - "6": "create:block/brass_funnel", - "7": "create:block/brass_funnel_plating", - "2_2": "create:block/brass_funnel_pull", - "particle": "create:block/brass_block" + "back": "create:block/funnel/funnel_back", + "particle": "create:block/funnel/brass_funnel", + "base": "create:block/funnel/brass_funnel", + "direction": "create:block/funnel/brass_funnel_pull", + "redstone": "create:block/funnel/brass_funnel_unpowered" }, "elements": [ - { - "name": "LeftWall", - "from": [14, -2, 6], - "to": [16.05, 1, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 15, 12]}, - "faces": { - "north": {"uv": [0, 8, 1, 9.5], "texture": "#7"}, - "east": {"uv": [13, 0, 16, 6], "rotation": 90, "texture": "#2_2"}, - "south": {"uv": [15, 8, 16, 9.5], "texture": "#7"}, - "west": {"uv": [13, 0, 16, 6], "rotation": 90, "texture": "#2_2"}, - "down": {"uv": [14, 0, 16, 6], "texture": "#2_2"} - } - }, - { - "name": "LeftWall", - "from": [-0.05, -2, 6], - "to": [2, 1, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 15, 12]}, - "faces": { - "north": {"uv": [7, 8, 8, 9.5], "texture": "#7"}, - "east": {"uv": [13, 6, 16, 0], "rotation": 90, "texture": "#2_2"}, - "south": {"uv": [8, 7.5, 9, 9], "texture": "#7"}, - "west": {"uv": [13, 6, 16, 0], "rotation": 90, "texture": "#2_2"}, - "down": {"uv": [0, 0, 2, 6], "texture": "#2_2"} - } - }, - { - "name": "LeftWall", - "from": [14, 1, 6], - "to": [16.05, 17, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 15, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 8], "texture": "#7"}, - "east": {"uv": [0, 6, 16, 12], "rotation": 90, "texture": "#2_2"}, - "south": {"uv": [15, 0, 16, 8], "texture": "#7"}, - "west": {"uv": [0, 12, 16, 6], "rotation": 90, "texture": "#2_2"}, - "up": {"uv": [14, 0, 16, 6], "texture": "#2_2"} - } - }, - { - "name": "LeftWall", - "from": [-0.05, 1, 6], - "to": [2, 17, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 15, 12]}, - "faces": { - "north": {"uv": [7, 0, 8, 8], "texture": "#7"}, - "east": {"uv": [0, 6, 16, 12], "rotation": 90, "texture": "#2_2"}, - "south": {"uv": [8, 0, 9, 8], "texture": "#7"}, - "west": {"uv": [0, 12, 16, 6], "rotation": 90, "texture": "#2_2"}, - "up": {"uv": [16, 0, 14, 6], "texture": "#2_2"} - } - }, - { - "name": "Top", - "from": [2, 11, 6], - "to": [14, 17, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 15, 12]}, - "faces": { - "north": {"uv": [1, 0, 7, 3], "texture": "#7"}, - "south": {"uv": [9, 0, 15, 3], "texture": "#7"}, - "up": {"uv": [2, 0, 14, 6], "texture": "#2_2"}, - "down": {"uv": [2, 0, 14, 6], "rotation": 180, "texture": "#2_2"} - } - }, { "name": "Back", - "from": [2.1, -2.1, 14], - "to": [13.9, 13.95, 18.1], + "from": [2.05, -2, 14], + "to": [13.95, 13.95, 18], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8.1, 6]}, "faces": { - "north": {"uv": [0, 6, 6, 14], "texture": "#3"}, - "east": {"uv": [0, 0, 16, 4], "rotation": 90, "texture": "#5"}, - "south": {"uv": [9, 1, 15, 9], "texture": "#7"}, - "west": {"uv": [0, 0, 16, 4], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 12, 4], "texture": "#6"}, - "down": {"uv": [0, 0, 12, 4], "rotation": 180, "texture": "#6"} - } - }, - { - "name": "Back", - "from": [2.1, 2.9, 11.9], - "to": [13.9, 13.95, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8.1, 22]}, - "faces": { - "east": {"uv": [5, 1, 16, 3], "rotation": 270, "texture": "#5"}, - "west": {"uv": [5, 3, 16, 1], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 3, 12, 1], "texture": "#6"} + "north": {"uv": [0, 0, 6, 8], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 4, 16], "texture": "#redstone"}, + "south": {"uv": [0, 8, 6, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 4, 16], "rotation": 180, "texture": "#redstone"}, + "up": {"uv": [8, 2, 12, 14], "rotation": 270, "texture": "#redstone"}, + "down": {"uv": [12, 2, 8, 14], "rotation": 270, "texture": "#redstone"} } }, { "name": "RearBackPlate", - "from": [0.05, -5, 13], - "to": [15.95, -2, 15.95], + "from": [0.1, -5, 13], + "to": [15.9, -2, 16], "rotation": {"angle": 0, "axis": "y", "origin": [7, -8, 8]}, "faces": { - "north": {"uv": [0, 13, 8, 14.5], "texture": "#7"}, - "east": {"uv": [6.5, 14.5, 8, 16], "texture": "#7"}, - "south": {"uv": [0, 13, 8, 14.5], "texture": "#7"}, - "west": {"uv": [0, 14.5, 1.5, 16], "texture": "#7"}, - "up": {"uv": [0, 13, 8, 14.5], "texture": "#7"}, - "down": {"uv": [0, 13, 8, 14.5], "texture": "#7"} + "north": {"uv": [7.5, 8, 9, 16], "rotation": 90, "texture": "#base"}, + "east": {"uv": [7.5, 8, 9, 9.5], "rotation": 90, "texture": "#base"}, + "south": {"uv": [7.5, 8, 9, 16], "rotation": 90, "texture": "#base"}, + "west": {"uv": [7.5, 8, 9, 9.5], "rotation": 90, "texture": "#base"}, + "up": {"uv": [6, 8, 7.5, 16], "texture": "#base"}, + "down": {"uv": [6, 8, 7.5, 16], "rotation": 90, "texture": "#base"} } }, { "name": "RearBackPlate", - "from": [2, 9.9, 9], - "to": [14, 11.9, 16], + "from": [2, 9.9, 10], + "to": [14, 11.9, 14], "rotation": {"angle": 0, "axis": "y", "origin": [7, 6.9, 8]}, "faces": { - "down": {"uv": [2, 6, 14, 13], "texture": "#2_2"} + "down": {"uv": [12, 9.5, 14, 15.5], "rotation": 90, "texture": "#base"} } }, { "from": [1, 8, 11], - "to": [15, 15, 14], + "to": [15, 14.95, 14], "rotation": {"angle": 0, "axis": "y", "origin": [9, 6, 21]}, "faces": { - "east": {"uv": [1, 6.5, 4.5, 8], "rotation": 90, "texture": "#3"}, - "south": {"uv": [8, 0, 11.5, 6], "rotation": 90, "texture": "#3"}, - "west": {"uv": [1, 6, 4.5, 7.5], "rotation": 90, "texture": "#3"}, - "up": {"uv": [6.5, 0, 8, 6], "rotation": 90, "texture": "#3"} + "east": {"uv": [0.5, 6.5, 4, 8], "rotation": 90, "texture": "#back"}, + "south": {"uv": [8, 0, 11.5, 6], "rotation": 90, "texture": "#back"}, + "west": {"uv": [0.5, 6, 4, 7.5], "rotation": 90, "texture": "#back"}, + "up": {"uv": [6.5, 0, 8, 6], "rotation": 90, "texture": "#back"} + } + }, + { + "name": "External", + "from": [0, -3, 13], + "to": [16, 16, 19], + "rotation": {"angle": -22.5, "axis": "x", "origin": [0, -3, 13]}, + "faces": { + "north": {"uv": [0, 0, 8, 9.5], "texture": "#direction"}, + "east": {"uv": [11, 0, 8, 9.5], "texture": "#direction"}, + "south": {"uv": [0, 6.5, 8, 16], "rotation": 180, "texture": "#direction"}, + "west": {"uv": [8, 0, 11, 9.5], "texture": "#direction"}, + "up": {"uv": [11, 0, 14, 8], "rotation": 90, "texture": "#direction"}, + "down": {"uv": [0, 6.5, 8, 9.5], "texture": "#direction"} + } + }, + { + "name": "Internal", + "from": [2, -3, 19], + "to": [14, 10, 13], + "rotation": {"angle": -22.5, "axis": "x", "origin": [0, -3, 13]}, + "faces": { + "east": {"uv": [11, 9.5, 14, 16], "texture": "#base"}, + "west": {"uv": [13, 9.5, 16, 16], "texture": "#base"}, + "up": {"uv": [11, 9.5, 14, 15.5], "rotation": 270, "texture": "#base"} } } ], @@ -138,23 +87,29 @@ { "name": "block_retracted", "origin": [8, 8, 8], + "color": 0, "children": [ { "name": "BeltFunnel", "origin": [9, -4, 8], + "color": 0, "children": [ - { - "name": "FrontSection", - "origin": [9, -4, 8], - "children": [0, 1, 2, 3, 4] - }, { "name": "Base", "origin": [9, -4, 8], - "children": [5, 6, 7, 8] + "color": 0, + "children": [0, 1, 2] } ] - }, 9] + }, + 3 + ] + }, + { + "name": "Front_section", + "origin": [8, 8, 8], + "color": 0, + "children": [4, 5] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json b/src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json index 4fbd350ed..e098c5b1c 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json @@ -2,135 +2,84 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "3": "create:block/brass_funnel_back", - "5": "create:block/brass_funnel_tall", - "6": "create:block/brass_funnel", - "7": "create:block/brass_funnel_plating", - "2_1": "create:block/brass_funnel_push", - "particle": "create:block/brass_block" + "back": "create:block/funnel/funnel_back", + "particle": "create:block/funnel/brass_funnel", + "base": "create:block/funnel/brass_funnel", + "direction": "create:block/funnel/brass_funnel_push", + "redstone": "create:block/funnel/brass_funnel_unpowered" }, "elements": [ - { - "name": "LeftWall", - "from": [14, -2, 6], - "to": [16.05, 1, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 15, 12]}, - "faces": { - "north": {"uv": [0, 8, 1, 9.5], "texture": "#7"}, - "east": {"uv": [13, 0, 16, 6], "rotation": 90, "texture": "#2_1"}, - "south": {"uv": [15, 8, 16, 9.5], "texture": "#7"}, - "west": {"uv": [13, 0, 16, 6], "rotation": 90, "texture": "#2_1"}, - "down": {"uv": [14, 0, 16, 6], "texture": "#2_1"} - } - }, - { - "name": "LeftWall", - "from": [-0.05, -2, 6], - "to": [2, 1, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 15, 12]}, - "faces": { - "north": {"uv": [7, 8, 8, 9.5], "texture": "#7"}, - "east": {"uv": [13, 6, 16, 0], "rotation": 90, "texture": "#2_1"}, - "south": {"uv": [8, 7.5, 9, 9], "texture": "#7"}, - "west": {"uv": [13, 6, 16, 0], "rotation": 90, "texture": "#2_1"}, - "down": {"uv": [0, 0, 2, 6], "texture": "#2_1"} - } - }, - { - "name": "LeftWall", - "from": [14, 1, 6], - "to": [16.05, 17, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 15, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 8], "texture": "#7"}, - "east": {"uv": [0, 6, 16, 12], "rotation": 90, "texture": "#2_1"}, - "south": {"uv": [15, 0, 16, 8], "texture": "#7"}, - "west": {"uv": [0, 12, 16, 6], "rotation": 90, "texture": "#2_1"}, - "up": {"uv": [14, 0, 16, 6], "texture": "#2_1"} - } - }, - { - "name": "LeftWall", - "from": [-0.05, 1, 6], - "to": [2, 17, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 15, 12]}, - "faces": { - "north": {"uv": [7, 0, 8, 8], "texture": "#7"}, - "east": {"uv": [0, 6, 16, 12], "rotation": 90, "texture": "#2_1"}, - "south": {"uv": [8, 0, 9, 8], "texture": "#7"}, - "west": {"uv": [0, 12, 16, 6], "rotation": 90, "texture": "#2_1"}, - "up": {"uv": [16, 0, 14, 6], "texture": "#2_1"} - } - }, - { - "name": "Top", - "from": [2, 11, 6], - "to": [14, 17, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 15, 12]}, - "faces": { - "north": {"uv": [1, 0, 7, 3], "texture": "#7"}, - "south": {"uv": [9, 0, 15, 3], "texture": "#7"}, - "up": {"uv": [2, 0, 14, 6], "texture": "#2_1"}, - "down": {"uv": [2, 0, 14, 6], "rotation": 180, "texture": "#2_1"} - } - }, { "name": "Back", - "from": [2.1, -2.1, 14], - "to": [13.9, 13.95, 18.1], + "from": [2.05, -2, 14], + "to": [13.95, 13.95, 18], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8.1, 6]}, "faces": { - "north": {"uv": [0, 6, 6, 14], "texture": "#3"}, - "east": {"uv": [0, 0, 16, 4], "rotation": 90, "texture": "#5"}, - "south": {"uv": [9, 1, 15, 9], "texture": "#7"}, - "west": {"uv": [0, 0, 16, 4], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 12, 4], "texture": "#6"}, - "down": {"uv": [0, 0, 12, 4], "rotation": 180, "texture": "#6"} - } - }, - { - "name": "Back", - "from": [2.1, 2.9, 11.9], - "to": [13.9, 13.95, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8.1, 22]}, - "faces": { - "east": {"uv": [5, 1, 16, 3], "rotation": 270, "texture": "#5"}, - "west": {"uv": [5, 3, 16, 1], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 3, 12, 1], "texture": "#6"} + "north": {"uv": [0, 0, 6, 8], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 4, 16], "texture": "#redstone"}, + "south": {"uv": [0, 8, 6, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 4, 16], "rotation": 180, "texture": "#redstone"}, + "up": {"uv": [8, 2, 12, 14], "rotation": 270, "texture": "#redstone"}, + "down": {"uv": [12, 2, 8, 14], "rotation": 270, "texture": "#redstone"} } }, { "name": "RearBackPlate", - "from": [0.05, -5, 13], - "to": [15.95, -2, 15.95], + "from": [0.1, -5, 13], + "to": [15.9, -2, 16], "rotation": {"angle": 0, "axis": "y", "origin": [7, -8, 8]}, "faces": { - "north": {"uv": [0, 13, 8, 14.5], "texture": "#7"}, - "east": {"uv": [6.5, 14.5, 8, 16], "texture": "#7"}, - "south": {"uv": [0, 13, 8, 14.5], "texture": "#7"}, - "west": {"uv": [0, 14.5, 1.5, 16], "texture": "#7"}, - "up": {"uv": [0, 13, 8, 14.5], "texture": "#7"}, - "down": {"uv": [0, 13, 8, 14.5], "texture": "#7"} + "north": {"uv": [7.5, 8, 9, 16], "rotation": 90, "texture": "#base"}, + "east": {"uv": [7.5, 8, 9, 9.5], "rotation": 90, "texture": "#base"}, + "south": {"uv": [7.5, 8, 9, 16], "rotation": 90, "texture": "#base"}, + "west": {"uv": [7.5, 8, 9, 9.5], "rotation": 90, "texture": "#base"}, + "up": {"uv": [6, 8, 7.5, 16], "texture": "#base"}, + "down": {"uv": [6, 8, 7.5, 16], "rotation": 90, "texture": "#base"} } }, { "name": "RearBackPlate", - "from": [2, 9.9, 9], - "to": [14, 11.9, 16], + "from": [2, 9.9, 10], + "to": [14, 11.9, 14], "rotation": {"angle": 0, "axis": "y", "origin": [7, 6.9, 8]}, "faces": { - "down": {"uv": [2, 6, 14, 13], "texture": "#2_1"} + "down": {"uv": [12, 9.5, 14, 15.5], "rotation": 90, "texture": "#base"} } }, { "from": [1, 8, 11], - "to": [15, 15, 14], + "to": [15, 14.95, 14], "rotation": {"angle": 0, "axis": "y", "origin": [9, 6, 21]}, "faces": { - "east": {"uv": [1, 6.5, 4.5, 8], "rotation": 90, "texture": "#3"}, - "south": {"uv": [8, 0, 11.5, 6], "rotation": 90, "texture": "#3"}, - "west": {"uv": [1, 6, 4.5, 7.5], "rotation": 90, "texture": "#3"}, - "up": {"uv": [6.5, 0, 8, 6], "rotation": 90, "texture": "#3"} + "east": {"uv": [0.5, 6.5, 4, 8], "rotation": 90, "texture": "#back"}, + "south": {"uv": [8, 0, 11.5, 6], "rotation": 90, "texture": "#back"}, + "west": {"uv": [0.5, 6, 4, 7.5], "rotation": 90, "texture": "#back"}, + "up": {"uv": [6.5, 0, 8, 6], "rotation": 90, "texture": "#back"} + } + }, + { + "name": "External", + "from": [0, -3, 13], + "to": [16, 16, 19], + "rotation": {"angle": -22.5, "axis": "x", "origin": [0, -3, 13]}, + "faces": { + "north": {"uv": [0, 0, 8, 9.5], "texture": "#direction"}, + "east": {"uv": [11, 0, 8, 9.5], "texture": "#direction"}, + "south": {"uv": [0, 6.5, 8, 16], "rotation": 180, "texture": "#direction"}, + "west": {"uv": [8, 0, 11, 9.5], "texture": "#direction"}, + "up": {"uv": [11, 0, 14, 8], "rotation": 90, "texture": "#direction"}, + "down": {"uv": [0, 6.5, 8, 9.5], "texture": "#direction"} + } + }, + { + "name": "Internal", + "from": [2, -3, 19], + "to": [14, 10, 13], + "rotation": {"angle": -22.5, "axis": "x", "origin": [0, -3, 13]}, + "faces": { + "east": {"uv": [11, 9.5, 14, 16], "texture": "#base"}, + "west": {"uv": [13, 9.5, 16, 16], "texture": "#base"}, + "up": {"uv": [11, 9.5, 14, 15.5], "rotation": 270, "texture": "#base"} } } ], @@ -138,23 +87,29 @@ { "name": "block_retracted", "origin": [8, 8, 8], + "color": 0, "children": [ { "name": "BeltFunnel", "origin": [9, -4, 8], + "color": 0, "children": [ - { - "name": "FrontSection", - "origin": [9, -4, 8], - "children": [0, 1, 2, 3, 4] - }, { "name": "Base", "origin": [9, -4, 8], - "children": [5, 6, 7, 8] + "color": 0, + "children": [0, 1, 2] } ] - }, 9] + }, + 3 + ] + }, + { + "name": "Front_section", + "origin": [8, 8, 8], + "color": 0, + "children": [4, 5] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json b/src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json index 6336e2bd4..da2a1b625 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json @@ -3,98 +3,24 @@ "parent": "block/block", "texture_size": [32, 32], "textures": { - "2": "create:block/brass_funnel_neutral", - "3": "create:block/brass_funnel_back", - "5": "create:block/brass_funnel_tall", - "6": "create:block/brass_funnel", - "7": "create:block/brass_funnel_plating", - "particle": "create:block/brass_block" + "back": "create:block/funnel/funnel_back", + "base": "create:block/funnel/brass_funnel", + "direction": "create:block/funnel/brass_funnel_neutral", + "redstone": "create:block/funnel/brass_funnel_unpowered", + "particle": "create:block/brass_block", + "block": "create:block/brass_block" }, "elements": [ - { - "name": "LeftWall", - "from": [14, -3, 8], - "to": [16, 0, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, - "faces": { - "north": {"uv": [0, 8, 1, 9.5], "texture": "#7"}, - "east": {"uv": [13, 0, 16, 6], "rotation": 90, "texture": "#2"}, - "south": {"uv": [15, 8, 16, 9.5], "texture": "#7"}, - "west": {"uv": [13, 0, 16, 6], "rotation": 90, "texture": "#2"}, - "down": {"uv": [14, 10, 16, 16], "texture": "#particle"} - } - }, - { - "name": "LeftWall", - "from": [0, -3, 8], - "to": [2, 0, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, - "faces": { - "north": {"uv": [7, 8, 8, 9.5], "texture": "#7"}, - "east": {"uv": [13, 6, 16, 0], "rotation": 90, "texture": "#2"}, - "south": {"uv": [8, 7.5, 9, 9], "texture": "#7"}, - "west": {"uv": [13, 6, 16, 0], "rotation": 90, "texture": "#2"}, - "down": {"uv": [0, 10, 2, 16], "texture": "#particle"} - } - }, - { - "name": "LeftWall", - "from": [14, 0, 8], - "to": [16, 16, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 8], "texture": "#7"}, - "east": {"uv": [0, 6, 16, 12], "rotation": 90, "texture": "#2"}, - "south": {"uv": [15, 0, 16, 8], "texture": "#7"}, - "west": {"uv": [0, 12, 16, 6], "rotation": 90, "texture": "#2"}, - "up": {"uv": [14, 0, 16, 6], "texture": "#2"} - } - }, - { - "name": "LeftWall", - "from": [0, 0, 8], - "to": [2, 16, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, - "faces": { - "north": {"uv": [7, 0, 8, 8], "texture": "#7"}, - "east": {"uv": [0, 6, 16, 12], "rotation": 90, "texture": "#2"}, - "south": {"uv": [8, 0, 9, 8], "texture": "#7"}, - "west": {"uv": [0, 12, 16, 6], "rotation": 90, "texture": "#2"}, - "up": {"uv": [16, 0, 14, 6], "texture": "#2"} - } - }, - { - "name": "Top", - "from": [2, 10, 8], - "to": [14, 16, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [6, -8, 8]}, - "faces": { - "north": {"uv": [1, 0, 7, 3], "texture": "#7"}, - "south": {"uv": [9, 0, 15, 3], "texture": "#7"}, - "up": {"uv": [2, 0, 14, 6], "texture": "#2"}, - "down": {"uv": [2, 0, 14, 6], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "Top", - "from": [2, -2, 12], - "to": [14, 10, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [6, -14, 8]}, - "faces": { - "north": {"uv": [0, 8, 6, 14], "texture": "#3"}, - "south": {"uv": [9, 3, 15, 9.5], "texture": "#7"} - } - }, { "name": "LeftBottom", "from": [15, -5, 8], "to": [16, -3, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, "faces": { - "north": {"uv": [0, 9.5, 0.5, 10.5], "texture": "#7"}, - "east": {"uv": [5, 15, 8, 16], "texture": "#7"}, - "west": {"uv": [5, 15, 8, 16], "texture": "#7"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#particle"} + "north": {"uv": [8, 12, 9, 12.5], "rotation": 90, "texture": "#base"}, + "east": {"uv": [8, 12, 9, 15], "rotation": 90, "texture": "#base"}, + "west": {"uv": [8, 12, 9, 15], "rotation": 90, "texture": "#base"}, + "down": {"uv": [0, 8, 1, 14], "texture": "#block"} } }, { @@ -103,60 +29,68 @@ "to": [1, -3, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, "faces": { - "north": {"uv": [7.5, 9.5, 8, 10.5], "texture": "#7"}, - "east": {"uv": [8, 15, 5, 16], "texture": "#7"}, - "west": {"uv": [8, 15, 5, 16], "texture": "#7"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#particle"} + "north": {"uv": [8, 11.5, 9, 12], "rotation": 90, "texture": "#base"}, + "east": {"uv": [8, 12, 9, 9], "rotation": 90, "texture": "#base"}, + "west": {"uv": [8, 12, 9, 9], "rotation": 90, "texture": "#base"}, + "down": {"uv": [15, 8, 16, 14], "texture": "#block"} + } + }, + { + "from": [0, -3, 8], + "to": [16, 16, 14], + "faces": { + "north": {"uv": [0, 0, 8, 9.5], "texture": "#direction"}, + "east": {"uv": [8, 0, 11, 9.5], "texture": "#direction"}, + "south": {"uv": [0, 6.5, 8, 16], "rotation": 180, "texture": "#direction"}, + "west": {"uv": [8, 0, 11, 9.5], "texture": "#direction"}, + "up": {"uv": [11, 0, 14, 8], "rotation": 90, "texture": "#direction"}, + "down": {"uv": [0, 8, 8, 11], "texture": "#direction"} + } + }, + { + "from": [2, -3, 14], + "to": [14, 10, 8], + "faces": { + "east": {"uv": [11, 9.5, 14, 16], "texture": "#base"}, + "west": {"uv": [13, 9.5, 16, 16], "texture": "#base"}, + "up": {"uv": [14, 9, 11, 15], "rotation": 90, "texture": "#base"} } }, { "name": "Back", - "from": [2.1, -2.1, 14], - "to": [13.9, 13.95, 18.1], + "from": [2.05, -2, 12], + "to": [13.95, 13.95, 18], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8.1, 6]}, "faces": { - "east": {"uv": [0, 0, 16, 4], "rotation": 90, "texture": "#5"}, - "south": {"uv": [9, 1, 15, 9], "texture": "#7"}, - "west": {"uv": [0, 0, 16, 4], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 12, 4], "texture": "#6"}, - "down": {"uv": [0, 0, 12, 4], "rotation": 180, "texture": "#6"} + "north": {"uv": [0, 0, 6, 8], "rotation": 180, "texture": "#base"}, + "east": {"uv": [0, 0, 6, 16], "texture": "#redstone"}, + "south": {"uv": [0, 8, 6, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 6, 16], "rotation": 180, "texture": "#redstone"}, + "up": {"uv": [8, 2, 14, 14], "rotation": 270, "texture": "#redstone"}, + "down": {"uv": [8, 2, 14, 14], "rotation": 90, "texture": "#redstone"} } }, { "name": "RearBackPlate", - "from": [1, -5, 10], - "to": [15, -2, 16.05], + "from": [0, -5, 14], + "to": [16, -2, 16], "rotation": {"angle": 0, "axis": "y", "origin": [7, -8, 8]}, "faces": { - "north": {"uv": [1, 13, 15, 16], "texture": "#particle"}, - "south": {"uv": [0.5, 13, 7.5, 14.5], "texture": "#7"}, - "up": {"uv": [1, 10, 15, 16], "texture": "#particle"} + "east": {"uv": [7.5, 15, 9, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [7.5, 8, 9, 16], "rotation": 90, "texture": "#base"}, + "west": {"uv": [7.5, 8, 9, 9], "rotation": 90, "texture": "#base"}, + "up": {"uv": [0, 14, 16, 16], "texture": "#block"}, + "down": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#block"} } }, { - "name": "BackPlateLeft", - "from": [15, -5, 14], - "to": [16, -2, 16.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 6]}, + "name": "RearBackPlate", + "from": [1, -5, 12], + "to": [15, -2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [7, -8, 8]}, "faces": { - "east": {"uv": [0, 14.5, 1, 16], "texture": "#7"}, - "south": {"uv": [7.5, 14.5, 8, 16], "texture": "#7"}, - "west": {"uv": [7, 14.5, 8, 16], "texture": "#7"}, - "up": {"uv": [0, 15, 1, 14.5], "rotation": 270, "texture": "#7"}, - "down": {"uv": [0, 0, 1, 2], "texture": "#particle"} - } - }, - { - "name": "BackPlateLeft", - "from": [0, -5, 14], - "to": [1, -2, 16.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 6]}, - "faces": { - "east": {"uv": [8, 14.5, 7, 16], "texture": "#7"}, - "south": {"uv": [0, 14.5, 0.5, 16], "texture": "#7"}, - "west": {"uv": [1, 14.5, 0, 16], "texture": "#7"}, - "up": {"uv": [0, 15, 1, 14.5], "rotation": 270, "texture": "#7"}, - "down": {"uv": [0, 0, 1, 2], "texture": "#particle"} + "north": {"uv": [1, 10, 15, 12], "texture": "#block"}, + "down": {"uv": [1, 12, 15, 14], "rotation": 180, "texture": "#block"} } }, { @@ -164,10 +98,10 @@ "to": [15, 15, 15], "rotation": {"angle": 0, "axis": "y", "origin": [9, 6, 22]}, "faces": { - "east": {"uv": [1, 6, 9, 6.5], "rotation": 90, "texture": "#3"}, - "south": {"uv": [8, 0, 16, 6], "rotation": 90, "texture": "#3"}, - "west": {"uv": [1, 6, 9, 6.5], "rotation": 90, "texture": "#3"}, - "up": {"uv": [6, 0, 6.5, 6], "rotation": 90, "texture": "#3"} + "east": {"uv": [7.5, 0, 16, 0.5], "rotation": 90, "texture": "#back"}, + "south": {"uv": [7.5, 0, 16, 6], "rotation": 90, "texture": "#back"}, + "west": {"uv": [7.5, 5.5, 16, 6], "rotation": 90, "texture": "#back"}, + "up": {"uv": [7.5, 0, 8, 6], "rotation": 270, "texture": "#back"} } } ], @@ -175,17 +109,22 @@ { "name": "BeltFunnel", "origin": [9, -4, 8], + "color": 0, "children": [ { "name": "FrontSection", "origin": [9, -4, 8], - "children": [0, 1, 2, 3, 4, 5, 6, 7] + "color": 0, + "children": [0, 1, 2, 3] }, { "name": "Base", "origin": [9, -4, 8], - "children": [8, 9, 10, 11] + "color": 0, + "children": [4, 5, 6] } ] - }, 12] + }, + 7 + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_funnel/flap.json b/src/main/resources/assets/create/models/block/belt_funnel/flap.json index 2cc22b0b7..04fc536bb 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/flap.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/flap.json @@ -1,7 +1,7 @@ { "credit": "Made with Blockbench", "textures": { - "4": "create:block/brass_funnel_back" + "4": "create:block/funnel/funnel_back" }, "elements": [ { 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 23c63640f..184f3899c 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 @@ -2,124 +2,83 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "3": "create:block/brass_funnel_back", - "5": "create:block/brass_funnel_tall", - "6": "create:block/brass_funnel", - "7": "create:block/brass_funnel_plating", - "2_2": "create:block/brass_funnel_pull" + "back": "create:block/funnel/funnel_back", + "base": "create:block/funnel/brass_funnel", + "particle": "create:block/funnel/brass_funnel_pull", + "direction": "create:block/funnel/brass_funnel_pull", + "redstone": "create:block/funnel/brass_funnel_unpowered", + "block": "create:block/brass_block" }, "elements": [ - { - "name": "LeftWall", - "from": [14, 1, 6], - "to": [16.05, 17, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 15, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 8], "texture": "#7"}, - "east": {"uv": [0, 0, 16, 6], "rotation": 90, "texture": "#2_2"}, - "south": {"uv": [15, 0, 16, 8], "texture": "#7"}, - "west": {"uv": [0, 12, 16, 6], "rotation": 90, "texture": "#2_2"}, - "up": {"uv": [0, 0, 2, 6], "rotation": 180, "texture": "#2_2"}, - "down": {"uv": [14, 0, 16, 6], "texture": "#2_2"} - } - }, - { - "name": "LeftWall", - "from": [-0.05, 1, 6], - "to": [2, 17, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 15, 12]}, - "faces": { - "north": {"uv": [7, 0, 8, 8], "texture": "#7"}, - "east": {"uv": [0, 6, 16, 12], "rotation": 90, "texture": "#2_2"}, - "south": {"uv": [8, 0, 9, 8], "texture": "#7"}, - "west": {"uv": [0, 6, 16, 0], "rotation": 90, "texture": "#2_2"}, - "up": {"uv": [16, 0, 14, 6], "texture": "#2_2"}, - "down": {"uv": [0, 0, 2, 6], "texture": "#2_2"} - } - }, { "name": "Top", - "from": [2, 11, 6], - "to": [14, 17, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 15, 12]}, + "from": [0.1, -1, 12], + "to": [15.9, 2, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 4]}, "faces": { - "north": {"uv": [1, 0, 7, 3], "texture": "#7"}, - "south": {"uv": [9, 0, 15, 3], "texture": "#7"}, - "up": {"uv": [2, 0, 14, 6], "texture": "#2_2"}, - "down": {"uv": [9, 13, 15, 16], "rotation": 180, "texture": "#7"} - } - }, - { - "name": "Top", - "from": [0.05, -1, 12], - "to": [15.95, 1, 15.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 17]}, - "faces": { - "north": {"uv": [0, 11.5, 8, 12.5], "rotation": 180, "texture": "#7"}, - "east": {"uv": [16, 11, 15, 13], "rotation": 270, "texture": "#7"}, - "south": {"uv": [0, 13.5, 8, 14.5], "texture": "#7"}, - "west": {"uv": [9, 11, 8, 13], "rotation": 90, "texture": "#7"}, - "up": {"uv": [8, 11, 16, 13], "texture": "#7"}, - "down": {"uv": [8, 11, 16, 13], "rotation": 180, "texture": "#7"} - } - }, - { - "name": "Top", - "from": [0, 1, 14], - "to": [16, 1.9, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 13.9, 17]}, - "faces": { - "north": {"uv": [0, 7, 0.5, 15], "rotation": 90, "texture": "#3"}, - "east": {"uv": [7, 13, 6, 13.5], "texture": "#7"}, - "south": {"uv": [0, 13, 8, 13.5], "texture": "#7"}, - "west": {"uv": [8, 13, 7, 13.5], "texture": "#7"}, - "up": {"uv": [8, 11, 16, 13], "texture": "#7"}, - "down": {"uv": [8, 11, 16, 13], "rotation": 180, "texture": "#7"} + "north": {"uv": [0, 9, 16, 12], "texture": "#block"}, + "east": {"uv": [9, 8, 7.5, 10], "rotation": 270, "texture": "#base"}, + "south": {"uv": [7.5, 8, 9, 16], "rotation": 90, "texture": "#base"}, + "west": {"uv": [9, 8, 7.5, 10], "rotation": 270, "texture": "#base"}, + "up": {"uv": [0, 5, 16, 9], "rotation": 180, "texture": "#block"}, + "down": {"uv": [0, 12, 16, 16], "rotation": 180, "texture": "#block"} } }, { "from": [1, 8, 11], - "to": [15, 15, 14], + "to": [15, 14.95, 14], "rotation": {"angle": 0, "axis": "y", "origin": [9, 6, 21]}, "faces": { - "east": {"uv": [1, 6.5, 4.5, 8], "rotation": 90, "texture": "#3"}, - "south": {"uv": [8, 0, 11.5, 6], "rotation": 90, "texture": "#3"}, - "west": {"uv": [1, 6, 4.5, 7.5], "rotation": 90, "texture": "#3"}, - "up": {"uv": [6.5, 0, 8, 6], "rotation": 90, "texture": "#3"} + "east": {"uv": [0.5, 6.5, 4, 8], "rotation": 90, "texture": "#back"}, + "south": {"uv": [8, 0, 11.5, 6], "rotation": 90, "texture": "#back"}, + "west": {"uv": [0.5, 6, 4, 7.5], "rotation": 90, "texture": "#back"}, + "up": {"uv": [6.5, 0, 8, 6], "rotation": 90, "texture": "#back"} } }, { "name": "Back", - "from": [2.1, 1.9, 14], - "to": [13.9, 13.95, 18.1], + "from": [2.05, 2, 14], + "to": [13.95, 13.95, 18], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8.1, 6]}, "faces": { - "north": {"uv": [0, 7.5, 6, 13.5], "texture": "#3"}, - "east": {"uv": [0, 0, 12, 4], "rotation": 90, "texture": "#6"}, - "south": {"uv": [6, 8, 12, 14], "texture": "#3"}, - "west": {"uv": [0, 0, 12, 4], "rotation": 270, "texture": "#6"}, - "up": {"uv": [0, 0, 12, 4], "texture": "#6"}, - "down": {"uv": [0, 0, 12, 4], "rotation": 180, "texture": "#6"} - } - }, - { - "name": "Back", - "from": [2.1, 2.9, 11.9], - "to": [13.9, 13.95, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8.1, 22]}, - "faces": { - "east": {"uv": [2.5, 0.5, 8, 1.5], "rotation": 270, "texture": "#5"}, - "west": {"uv": [2.5, 1.5, 8, 0.5], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 1.5, 6, 0.5], "texture": "#6"} + "north": {"uv": [0, 0, 6, 6], "texture": "#base"}, + "east": {"uv": [8, 2, 12, 14], "texture": "#redstone"}, + "south": {"uv": [6, 0, 12, 6], "texture": "#base"}, + "west": {"uv": [8, 2, 12, 14], "rotation": 180, "texture": "#redstone"}, + "up": {"uv": [8, 2, 12, 14], "rotation": 270, "texture": "#redstone"}, + "down": {"uv": [8, 2, 12, 14], "rotation": 90, "texture": "#redstone"} } }, { "name": "RearBackPlate", - "from": [2, 9.9, 10], - "to": [14, 11.9, 14], + "from": [2, 10, 10], + "to": [14, 12, 14], "rotation": {"angle": 0, "axis": "y", "origin": [7, 6.9, 8]}, "faces": { - "down": {"uv": [0, 11.5, 6, 14], "texture": "#3"} + "down": {"uv": [0, 0, 6, 2.5], "rotation": 180, "texture": "#base"} + } + }, + { + "from": [0, 0, 12], + "to": [16, 16, 18], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0, 12]}, + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#direction"}, + "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"}, + "down": {"uv": [0, 8, 8, 11], "texture": "#direction"} + } + }, + { + "from": [2, 0, 18], + "to": [14, 10, 12], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0, 12]}, + "faces": { + "east": {"uv": [11, 11, 14, 16], "texture": "#base"}, + "west": {"uv": [13, 11, 16, 16], "texture": "#base"}, + "up": {"uv": [11, 9, 14, 15], "rotation": 270, "texture": "#base"} } } ], @@ -127,24 +86,30 @@ { "name": "block_retracted", "origin": [8, 8, 8], + "color": 0, "children": [ { "name": "BeltFunnel", "origin": [9, -4, 8], + "color": 0, "children": [ { "name": "FrontSection", "origin": [9, -4, 8], - "children": [0, 1, 2, 3, 4, 5] + "color": 0, + "children": [0, 1] }, { "name": "Base", "origin": [9, -4, 8], - "children": [6, 7, 8] + "color": 0, + "children": [2, 3] } ] } ] - } + }, + 4, + 5 ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/funnel/block_vertical.json b/src/main/resources/assets/create/models/block/funnel/block_vertical.json index e72ebfa9d..e727afeeb 100644 --- a/src/main/resources/assets/create/models/block/funnel/block_vertical.json +++ b/src/main/resources/assets/create/models/block/funnel/block_vertical.json @@ -2,73 +2,24 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "3": "create:block/brass_funnel_back", - "5": "create:block/brass_funnel_tall", - "7": "create:block/brass_funnel_plating", - "8": "create:block/brass_storage_block", - "9": "create:block/brass_funnel_slope", - "10": "create:block/funnel_closed", - "2_2": "create:block/brass_funnel_pull" + "base": "create:block/funnel/brass_funnel", + "direction": "create:block/funnel/brass_funnel_pull", + "redstone": "create:block/funnel/brass_funnel_unpowered", + "open": "create:block/funnel_closed", + "particle": "create:block/funnel/brass_funnel_frame", + "frame": "create:block/funnel/brass_funnel_frame" }, "elements": [ - { - "name": "LeftWall", - "from": [0, 4, 0], - "to": [2, 10, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 2]}, - "faces": { - "north": {"uv": [14, 0, 16, 6], "texture": "#2_2"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#2_2"}, - "west": {"uv": [0, 0, 16, 6], "texture": "#2_2"}, - "up": {"uv": [0, 0, 2, 16], "texture": "#8"}, - "down": {"uv": [0, 0, 16, 2], "rotation": 270, "texture": "#8"} - } - }, - { - "name": "LeftWall", - "from": [14, 4, 0], - "to": [16, 10, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 2]}, - "faces": { - "north": {"uv": [2, 0, 0, 6], "rotation": 180, "texture": "#2_2"}, - "east": {"uv": [0, 6, 16, 0], "rotation": 180, "texture": "#2_2"}, - "south": {"uv": [14, 0, 16, 6], "texture": "#2_2"}, - "up": {"uv": [14, 0, 16, 16], "texture": "#8"}, - "down": {"uv": [0, 14, 16, 16], "rotation": 270, "texture": "#8"} - } - }, - { - "name": "Top", - "from": [2, 4, 0], - "to": [14, 10, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 2]}, - "faces": { - "north": {"uv": [2, 0, 14, 6], "texture": "#2_2"}, - "up": {"uv": [2, 0, 14, 2], "texture": "#8"}, - "down": {"uv": [0, 2, 2, 14], "rotation": 270, "texture": "#8"} - } - }, - { - "name": "Top", - "from": [2, 4, 14], - "to": [14, 10, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 18]}, - "faces": { - "south": {"uv": [14, 0, 2, 6], "texture": "#2_2"}, - "up": {"uv": [2, 16, 14, 14], "rotation": 180, "texture": "#8"}, - "down": {"uv": [14, 14, 16, 2], "rotation": 270, "texture": "#8"} - } - }, { "from": [1, 1, 1], "to": [15, 4, 15], "rotation": {"angle": 0, "axis": "y", "origin": [7, -6, 10]}, "faces": { - "north": {"uv": [1, 0, 15, 3], "texture": "#5"}, - "east": {"uv": [1, 0, 15, 3], "texture": "#5"}, - "south": {"uv": [1, 0, 15, 3], "texture": "#5"}, - "west": {"uv": [1, 0, 15, 3], "texture": "#5"}, - "down": {"uv": [2, 2, 14, 14], "rotation": 270, "texture": "#8"} + "north": {"uv": [1, 1, 4, 15], "rotation": 270, "texture": "#redstone"}, + "east": {"uv": [1, 1, 4, 15], "rotation": 270, "texture": "#redstone"}, + "south": {"uv": [1, 1, 4, 15], "rotation": 270, "texture": "#redstone"}, + "west": {"uv": [1, 1, 4, 15], "rotation": 270, "texture": "#redstone"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 270, "texture": "#frame"} } }, { @@ -76,7 +27,7 @@ "to": [2, 10, 14], "rotation": {"angle": 22.5, "axis": "z", "origin": [2, 10, 8]}, "faces": { - "east": {"uv": [2, 2, 14, 7], "texture": "#9"} + "east": {"uv": [12, 0, 14.5, 6], "rotation": 90, "texture": "#base"} } }, { @@ -84,7 +35,7 @@ "to": [15, 10, 14], "rotation": {"angle": -22.5, "axis": "z", "origin": [14, 10, 8]}, "faces": { - "west": {"uv": [2, 2, 14, 7], "texture": "#9"} + "west": {"uv": [12, 0, 14.5, 6], "rotation": 90, "texture": "#base"} } }, { @@ -92,7 +43,7 @@ "to": [14, 10, 15], "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 10, 14]}, "faces": { - "north": {"uv": [2, 2, 14, 7], "texture": "#9"} + "north": {"uv": [12, 0, 14.5, 6], "rotation": 90, "texture": "#base"} } }, { @@ -100,15 +51,27 @@ "to": [14, 10, 2], "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 10, 2]}, "faces": { - "south": {"uv": [2, 2, 14, 7], "texture": "#9"} + "south": {"uv": [12, 0, 14.5, 6], "rotation": 90, "texture": "#base"} } }, { "from": [3, 5, 3], - "to": [13, 6, 13], + "to": [13, 6.3, 13], "rotation": {"angle": 0, "axis": "y", "origin": [11, 13, 11]}, "faces": { - "up": {"uv": [3, 3, 13, 13], "texture": "#10"} + "up": {"uv": [3, 3, 13, 13], "texture": "#open"} + } + }, + { + "from": [0, 4, 0], + "to": [16, 10, 16], + "faces": { + "north": {"uv": [11, 0, 14, 8], "rotation": 90, "texture": "#direction"}, + "east": {"uv": [11, 0, 14, 8], "rotation": 90, "texture": "#direction"}, + "south": {"uv": [11, 0, 14, 8], "rotation": 90, "texture": "#direction"}, + "west": {"uv": [11, 0, 14, 8], "rotation": 90, "texture": "#direction"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#frame"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#frame"} } }, { @@ -117,65 +80,47 @@ "to": [14.075, 2, 14.075], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.025, 8]}, "faces": { - "north": {"uv": [2, 12, 14, 16], "texture": "#9"}, - "east": {"uv": [2, 12, 14, 16], "texture": "#9"}, - "south": {"uv": [2, 12, 14, 16], "texture": "#9"}, - "west": {"uv": [2, 12, 14, 16], "texture": "#9"}, - "down": {"uv": [6, 8, 12, 14], "rotation": 180, "texture": "#3"} - } - }, - { - "name": "Back", - "from": [2.1, 2, 2.05], - "to": [13.9, 4.1, 13.1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -6, 24.1]}, - "faces": { - "east": {"uv": [2.5, 1.5, 8, 0.5], "texture": "#5"}, - "west": {"uv": [2.5, 0.5, 8, 1.5], "rotation": 180, "texture": "#5"} + "north": {"uv": [9, 9, 11, 15], "rotation": 270, "texture": "#base"}, + "east": {"uv": [9, 9, 11, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [9, 9, 11, 15], "rotation": 270, "texture": "#base"}, + "west": {"uv": [9, 9, 11, 15], "rotation": 270, "texture": "#base"}, + "down": {"uv": [6, 0, 12, 6], "rotation": 180, "texture": "#base"} } }, { "from": [5.05, -0.95, 0.05], "to": [10.95, 4, 2], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "color": 5, "faces": { - "north": {"uv": [2.5, 0.5, 5.5, 3], "texture": "#7"}, - "east": {"uv": [4.5, 0.5, 5.5, 3], "texture": "#7"}, - "west": {"uv": [2.5, 0.5, 3.5, 3], "texture": "#7"}, - "down": {"uv": [2.5, 11.5, 5.5, 12.5], "texture": "#7"} + "north": {"uv": [2.5, 0.5, 5.5, 3], "texture": "#missing"}, + "east": {"uv": [4.5, 0.5, 5.5, 3], "texture": "#missing"}, + "west": {"uv": [2.5, 0.5, 3.5, 3], "texture": "#missing"}, + "down": {"uv": [2.5, 11.5, 5.5, 12.5], "texture": "#missing"} } }, { - "from": [5.05, -0.95, 14], - "to": [10.95, 4, 15.95], + "from": [0, -1, 5], + "to": [16, 4, 11], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "east": {"uv": [2.5, 0.5, 3.5, 3], "texture": "#7"}, - "south": {"uv": [2.5, 0.5, 5.5, 3], "texture": "#7"}, - "west": {"uv": [4.5, 0.5, 5.5, 3], "texture": "#7"}, - "down": {"uv": [2.5, 11.5, 5.5, 12.5], "rotation": 180, "texture": "#7"} + "north": {"uv": [0, 3, 8, 5.5], "texture": "#direction"}, + "east": {"uv": [2.5, 0.5, 5.5, 3], "texture": "#direction"}, + "south": {"uv": [0, 3, 8, 5.5], "texture": "#direction"}, + "west": {"uv": [2.5, 0.5, 5.5, 3], "texture": "#direction"}, + "down": {"uv": [8, 3, 0, 6], "texture": "#direction"} } }, { - "from": [14, -0.95, 5.05], - "to": [15.95, 4, 10.95], + "from": [5, -1, 0], + "to": [11, 4, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [2.5, 0.5, 3.5, 3], "texture": "#7"}, - "east": {"uv": [2.5, 0.5, 5.5, 3], "texture": "#7"}, - "south": {"uv": [4.5, 0.5, 5.5, 3], "texture": "#7"}, - "down": {"uv": [2.5, 11.5, 5.5, 12.5], "rotation": 270, "texture": "#7"} - } - }, - { - "from": [0.05, -0.95, 5.05], - "to": [2, 4, 10.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, - "faces": { - "north": {"uv": [4.5, 0.5, 5.5, 3], "texture": "#7"}, - "south": {"uv": [2.5, 0.5, 3.5, 3], "texture": "#7"}, - "west": {"uv": [2.5, 0.5, 5.5, 3], "texture": "#7"}, - "down": {"uv": [2.5, 11.5, 5.5, 12.5], "rotation": 90, "texture": "#7"} + "north": {"uv": [2.5, 0.5, 5.5, 3], "texture": "#direction"}, + "east": {"uv": [0, 3, 8, 5.5], "texture": "#direction"}, + "south": {"uv": [2.5, 0.5, 5.5, 3], "texture": "#direction"}, + "west": {"uv": [0, 3, 8, 5.5], "texture": "#direction"}, + "down": {"uv": [8, 3, 0, 6], "rotation": 90, "texture": "#direction"} } } ], @@ -183,20 +128,24 @@ { "name": "block_retracted", "origin": [8, 8, 8], + "color": 0, "children": [ { "name": "BeltFunnel", "origin": [9, -4, 8], + "color": 0, "children": [ { "name": "FrontSection", "origin": [9, -4, 8], - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6] }, { "name": "Base", "origin": [9, -4, 8], - "children": [10, 11] + "color": 0, + "children": [7] } ] } @@ -205,7 +154,8 @@ { "name": "Item Filter", "origin": [8, 0, 8], - "children": [12, 13, 14, 15] + "color": 0, + "children": [8, 9, 10] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/funnel/block_vertical_filterless.json b/src/main/resources/assets/create/models/block/funnel/block_vertical_filterless.json index 6d16d099c..f5e0e2692 100644 --- a/src/main/resources/assets/create/models/block/funnel/block_vertical_filterless.json +++ b/src/main/resources/assets/create/models/block/funnel/block_vertical_filterless.json @@ -2,72 +2,24 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "3": "create:block/brass_funnel_back", - "5": "create:block/brass_funnel_tall", - "8": "create:block/brass_storage_block", - "9": "create:block/brass_funnel_slope", - "10": "create:block/funnel_closed", - "2_2": "create:block/brass_funnel_pull" + "base": "create:block/funnel/brass_funnel", + "direction": "create:block/funnel/brass_funnel_pull", + "redstone": "create:block/funnel/brass_funnel_unpowered", + "open": "create:block/funnel_closed", + "particle": "create:block/funnel/brass_funnel_frame", + "frame": "create:block/funnel/brass_funnel_frame" }, "elements": [ - { - "name": "LeftWall", - "from": [0, 4, 0], - "to": [2, 10, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 2]}, - "faces": { - "north": {"uv": [14, 0, 16, 6], "texture": "#2_2"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#2_2"}, - "west": {"uv": [0, 0, 16, 6], "texture": "#2_2"}, - "up": {"uv": [0, 0, 2, 16], "texture": "#8"}, - "down": {"uv": [0, 0, 16, 2], "rotation": 270, "texture": "#8"} - } - }, - { - "name": "LeftWall", - "from": [14, 4, 0], - "to": [16, 10, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 2]}, - "faces": { - "north": {"uv": [2, 0, 0, 6], "rotation": 180, "texture": "#2_2"}, - "east": {"uv": [0, 6, 16, 0], "rotation": 180, "texture": "#2_2"}, - "south": {"uv": [14, 0, 16, 6], "texture": "#2_2"}, - "up": {"uv": [14, 0, 16, 16], "texture": "#8"}, - "down": {"uv": [0, 14, 16, 16], "rotation": 270, "texture": "#8"} - } - }, - { - "name": "Top", - "from": [2, 4, 0], - "to": [14, 10, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 2]}, - "faces": { - "north": {"uv": [2, 0, 14, 6], "texture": "#2_2"}, - "up": {"uv": [2, 0, 14, 2], "texture": "#8"}, - "down": {"uv": [0, 2, 2, 14], "rotation": 270, "texture": "#8"} - } - }, - { - "name": "Top", - "from": [2, 4, 14], - "to": [14, 10, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 18]}, - "faces": { - "south": {"uv": [14, 0, 2, 6], "texture": "#2_2"}, - "up": {"uv": [2, 16, 14, 14], "rotation": 180, "texture": "#8"}, - "down": {"uv": [14, 14, 16, 2], "rotation": 270, "texture": "#8"} - } - }, { "from": [1, 1, 1], "to": [15, 4, 15], "rotation": {"angle": 0, "axis": "y", "origin": [7, -6, 10]}, "faces": { - "north": {"uv": [1, 0, 15, 3], "texture": "#5"}, - "east": {"uv": [1, 0, 15, 3], "texture": "#5"}, - "south": {"uv": [1, 0, 15, 3], "texture": "#5"}, - "west": {"uv": [1, 0, 15, 3], "texture": "#5"}, - "down": {"uv": [2, 2, 14, 14], "rotation": 270, "texture": "#8"} + "north": {"uv": [1, 1, 4, 15], "rotation": 270, "texture": "#redstone"}, + "east": {"uv": [1, 1, 4, 15], "rotation": 270, "texture": "#redstone"}, + "south": {"uv": [1, 1, 4, 15], "rotation": 270, "texture": "#redstone"}, + "west": {"uv": [1, 1, 4, 15], "rotation": 270, "texture": "#redstone"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 270, "texture": "#frame"} } }, { @@ -75,7 +27,7 @@ "to": [2, 10, 14], "rotation": {"angle": 22.5, "axis": "z", "origin": [2, 10, 8]}, "faces": { - "east": {"uv": [2, 2, 14, 7], "texture": "#9"} + "east": {"uv": [12, 0, 14.5, 6], "rotation": 90, "texture": "#base"} } }, { @@ -83,7 +35,7 @@ "to": [15, 10, 14], "rotation": {"angle": -22.5, "axis": "z", "origin": [14, 10, 8]}, "faces": { - "west": {"uv": [2, 2, 14, 7], "texture": "#9"} + "west": {"uv": [12, 0, 14.5, 6], "rotation": 90, "texture": "#base"} } }, { @@ -91,7 +43,7 @@ "to": [14, 10, 15], "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 10, 14]}, "faces": { - "north": {"uv": [2, 2, 14, 7], "texture": "#9"} + "north": {"uv": [12, 0, 14.5, 6], "rotation": 90, "texture": "#base"} } }, { @@ -99,15 +51,27 @@ "to": [14, 10, 2], "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 10, 2]}, "faces": { - "south": {"uv": [2, 2, 14, 7], "texture": "#9"} + "south": {"uv": [12, 0, 14.5, 6], "rotation": 90, "texture": "#base"} } }, { "from": [3, 5, 3], - "to": [13, 6, 13], + "to": [13, 6.3, 13], "rotation": {"angle": 0, "axis": "y", "origin": [11, 13, 11]}, "faces": { - "up": {"uv": [3, 3, 13, 13], "texture": "#10"} + "up": {"uv": [3, 3, 13, 13], "texture": "#open"} + } + }, + { + "from": [0, 4, 0], + "to": [16, 10, 16], + "faces": { + "north": {"uv": [11, 0, 14, 8], "rotation": 90, "texture": "#direction"}, + "east": {"uv": [11, 0, 14, 8], "rotation": 90, "texture": "#direction"}, + "south": {"uv": [11, 0, 14, 8], "rotation": 90, "texture": "#direction"}, + "west": {"uv": [11, 0, 14, 8], "rotation": 90, "texture": "#direction"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#frame"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#frame"} } }, { @@ -116,21 +80,11 @@ "to": [14.075, 2, 14.075], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.025, 8]}, "faces": { - "north": {"uv": [2, 12, 14, 16], "texture": "#9"}, - "east": {"uv": [2, 12, 14, 16], "texture": "#9"}, - "south": {"uv": [2, 12, 14, 16], "texture": "#9"}, - "west": {"uv": [2, 12, 14, 16], "texture": "#9"}, - "down": {"uv": [6, 8, 12, 14], "rotation": 180, "texture": "#3"} - } - }, - { - "name": "Back", - "from": [2.1, 2, 2.05], - "to": [13.9, 4.1, 13.1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -6, 24.1]}, - "faces": { - "east": {"uv": [2.5, 1.5, 8, 0.5], "texture": "#5"}, - "west": {"uv": [2.5, 0.5, 8, 1.5], "rotation": 180, "texture": "#5"} + "north": {"uv": [9, 9, 11, 15], "rotation": 270, "texture": "#base"}, + "east": {"uv": [9, 9, 11, 15], "rotation": 270, "texture": "#base"}, + "south": {"uv": [9, 9, 11, 15], "rotation": 270, "texture": "#base"}, + "west": {"uv": [9, 9, 11, 15], "rotation": 270, "texture": "#base"}, + "down": {"uv": [6, 0, 12, 6], "rotation": 180, "texture": "#base"} } } ], @@ -138,29 +92,28 @@ { "name": "block_retracted", "origin": [8, 8, 8], + "color": 0, "children": [ { "name": "BeltFunnel", "origin": [9, -4, 8], + "color": 0, "children": [ { "name": "FrontSection", "origin": [9, -4, 8], - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6] }, { "name": "Base", "origin": [9, -4, 8], - "children": [10, 11] + "color": 0, + "children": [7] } ] } ] - }, - { - "name": "Item Filter", - "origin": [8, 0, 8], - "children": [] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/funnel/item.json b/src/main/resources/assets/create/models/block/funnel/item.json index 8a9560327..73e46d81c 100644 --- a/src/main/resources/assets/create/models/block/funnel/item.json +++ b/src/main/resources/assets/create/models/block/funnel/item.json @@ -3,86 +3,22 @@ "parent": "block/block", "texture_size": [32, 32], "textures": { - "2": "create:block/brass_funnel_neutral", - "3": "create:block/brass_funnel_back", - "5": "create:block/brass_funnel_tall", - "6": "create:block/brass_funnel", - "7": "create:block/brass_funnel_plating", - "particle": "create:block/brass_block" + "back": "create:block/funnel/funnel_back", + "base": "create:block/funnel/brass_funnel", + "direction": "create:block/funnel/brass_funnel_neutral", + "redstone": "create:block/funnel/brass_funnel_unpowered", + "particle": "create:block/brass_block", + "block": "create:block/brass_block" }, "elements": [ - { - "name": "LeftWall", - "from": [14, -3, 8], - "to": [16, 0, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, - "faces": { - "north": {"uv": [0, 8, 1, 9.5], "texture": "#7"}, - "east": {"uv": [13, 0, 16, 6], "rotation": 90, "texture": "#2"}, - "south": {"uv": [15, 8, 16, 9.5], "texture": "#7"}, - "west": {"uv": [13, 0, 16, 6], "rotation": 90, "texture": "#2"}, - "down": {"uv": [14, 10, 16, 16], "texture": "#particle"} - } - }, - { - "name": "LeftWall", - "from": [0, -3, 8], - "to": [2, 0, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, - "faces": { - "north": {"uv": [7, 8, 8, 9.5], "texture": "#7"}, - "east": {"uv": [13, 6, 16, 0], "rotation": 90, "texture": "#2"}, - "south": {"uv": [8, 7.5, 9, 9], "texture": "#7"}, - "west": {"uv": [13, 6, 16, 0], "rotation": 90, "texture": "#2"}, - "down": {"uv": [0, 10, 2, 16], "texture": "#particle"} - } - }, - { - "name": "LeftWall", - "from": [14, 0, 8], - "to": [16, 16, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 8], "texture": "#7"}, - "east": {"uv": [0, 6, 16, 12], "rotation": 90, "texture": "#2"}, - "south": {"uv": [15, 0, 16, 8], "texture": "#7"}, - "west": {"uv": [0, 12, 16, 6], "rotation": 90, "texture": "#2"}, - "up": {"uv": [14, 0, 16, 6], "texture": "#2"} - } - }, - { - "name": "LeftWall", - "from": [0, 0, 8], - "to": [2, 16, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, - "faces": { - "north": {"uv": [7, 0, 8, 8], "texture": "#7"}, - "east": {"uv": [0, 6, 16, 12], "rotation": 90, "texture": "#2"}, - "south": {"uv": [8, 0, 9, 8], "texture": "#7"}, - "west": {"uv": [0, 12, 16, 6], "rotation": 90, "texture": "#2"}, - "up": {"uv": [16, 0, 14, 6], "texture": "#2"} - } - }, - { - "name": "Top", - "from": [2, 10, 8], - "to": [14, 16, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [6, -8, 8]}, - "faces": { - "north": {"uv": [1, 0, 7, 3], "texture": "#7"}, - "south": {"uv": [9, 0, 15, 3], "texture": "#7"}, - "up": {"uv": [2, 0, 14, 6], "texture": "#2"}, - "down": {"uv": [2, 0, 14, 6], "rotation": 180, "texture": "#2"} - } - }, { "name": "Top", "from": [2, -2, 12], "to": [14, 10, 14], "rotation": {"angle": 0, "axis": "y", "origin": [6, -14, 8]}, "faces": { - "north": {"uv": [0, 8, 6, 14], "texture": "#3"}, - "south": {"uv": [9, 3, 15, 9.5], "texture": "#7"} + "north": {"uv": [0, 0, 6, 6], "texture": "#base"}, + "south": {"uv": [9, 3, 15, 9.5], "texture": "#missing"} } }, { @@ -91,10 +27,10 @@ "to": [16, -3, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, "faces": { - "north": {"uv": [0, 9.5, 0.5, 10.5], "texture": "#7"}, - "east": {"uv": [5, 15, 8, 16], "texture": "#7"}, - "west": {"uv": [5, 15, 8, 16], "texture": "#7"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#particle"} + "north": {"uv": [8, 8, 9, 8.5], "rotation": 90, "texture": "#base"}, + "east": {"uv": [8, 12, 9, 15], "rotation": 90, "texture": "#base"}, + "west": {"uv": [8, 12.5, 9, 15.5], "rotation": 90, "texture": "#base"}, + "down": {"uv": [0, 8, 1, 14], "texture": "#block"} } }, { @@ -103,35 +39,56 @@ "to": [1, -3, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, "faces": { - "north": {"uv": [7.5, 9.5, 8, 10.5], "texture": "#7"}, - "east": {"uv": [8, 15, 5, 16], "texture": "#7"}, - "west": {"uv": [8, 15, 5, 16], "texture": "#7"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#particle"} + "north": {"uv": [8, 15.5, 9, 16], "rotation": 90, "texture": "#base"}, + "east": {"uv": [8, 11.5, 9, 8.5], "rotation": 90, "texture": "#base"}, + "west": {"uv": [8, 12, 9, 9], "rotation": 90, "texture": "#base"}, + "down": {"uv": [15, 8, 16, 14], "texture": "#block"} + } + }, + { + "from": [0, -3, 8], + "to": [16, 16, 14], + "faces": { + "north": {"uv": [0, 0, 8, 9.5], "texture": "#direction"}, + "east": {"uv": [8, 0, 11, 9.5], "texture": "#direction"}, + "south": {"uv": [0, 6.5, 8, 16], "rotation": 180, "texture": "#direction"}, + "west": {"uv": [8, 0, 11, 9.5], "texture": "#direction"}, + "up": {"uv": [11, 0, 14, 8], "rotation": 90, "texture": "#direction"}, + "down": {"uv": [0, 8, 8, 11], "texture": "#direction"} + } + }, + { + "from": [2, -3, 14], + "to": [14, 10, 8], + "faces": { + "east": {"uv": [11, 9.5, 14, 16], "texture": "#base"}, + "west": {"uv": [13, 9.5, 16, 16], "texture": "#base"}, + "up": {"uv": [11, 9.5, 14, 15.5], "rotation": 270, "texture": "#base"} } }, { "name": "Back", - "from": [2.1, -2.1, 14], - "to": [13.9, 13.95, 18.1], + "from": [2.05, -2, 14], + "to": [13.95, 13.95, 18.1], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8.1, 6]}, "faces": { - "east": {"uv": [0, 0, 16, 4], "rotation": 90, "texture": "#5"}, - "south": {"uv": [9, 1, 15, 9], "texture": "#7"}, - "west": {"uv": [0, 0, 16, 4], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 0, 12, 4], "texture": "#6"}, - "down": {"uv": [0, 0, 12, 4], "rotation": 180, "texture": "#6"} + "east": {"uv": [0, 0, 4, 16], "texture": "#redstone"}, + "south": {"uv": [0, 8, 6, 16], "texture": "#base"}, + "west": {"uv": [0, 0, 4, 16], "rotation": 180, "texture": "#redstone"}, + "up": {"uv": [8, 2, 12, 14], "rotation": 270, "texture": "#redstone"}, + "down": {"uv": [8, 2, 12, 14], "rotation": 90, "texture": "#redstone"} } }, { "name": "RearBackPlate", "from": [1, -5, 10], - "to": [15, -2, 16.05], + "to": [15, -2, 16], "rotation": {"angle": 0, "axis": "y", "origin": [7, -8, 8]}, "faces": { - "north": {"uv": [1, 13, 15, 16], "texture": "#particle"}, - "south": {"uv": [0.5, 13, 7.5, 14.5], "texture": "#7"}, - "up": {"uv": [1, 10, 15, 16], "texture": "#particle"}, - "down": {"uv": [8.5, 13, 15.5, 16], "texture": "#7"} + "north": {"uv": [1, 7, 15, 10], "texture": "#block"}, + "south": {"uv": [7.5, 8.5, 9, 15.5], "rotation": 90, "texture": "#base"}, + "up": {"uv": [1, 15, 15, 16], "rotation": 180, "texture": "#block"}, + "down": {"uv": [1, 10, 15, 16], "rotation": 180, "texture": "#block"} } }, { @@ -140,11 +97,11 @@ "to": [16, -2, 16.05], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 6]}, "faces": { - "east": {"uv": [0, 14.5, 1, 16], "texture": "#7"}, - "south": {"uv": [7.5, 14.5, 8, 16], "texture": "#7"}, - "west": {"uv": [7, 14.5, 8, 16], "texture": "#7"}, - "up": {"uv": [0, 15, 1, 14.5], "rotation": 270, "texture": "#7"}, - "down": {"uv": [0, 0, 1, 2], "texture": "#particle"} + "east": {"uv": [7.5, 15, 9, 16], "rotation": 90, "texture": "#base"}, + "south": {"uv": [7.5, 8, 9, 8.5], "rotation": 90, "texture": "#base"}, + "west": {"uv": [7, 14.5, 8, 16], "texture": "#missing"}, + "up": {"uv": [16, 14, 15, 16], "texture": "#block"}, + "down": {"uv": [0, 14, 1, 16], "rotation": 180, "texture": "#block"} } }, { @@ -153,22 +110,22 @@ "to": [1, -2, 16.05], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 6]}, "faces": { - "east": {"uv": [8, 14.5, 7, 16], "texture": "#7"}, - "south": {"uv": [0, 14.5, 0.5, 16], "texture": "#7"}, - "west": {"uv": [1, 14.5, 0, 16], "texture": "#7"}, - "up": {"uv": [0, 15, 1, 14.5], "rotation": 270, "texture": "#7"}, - "down": {"uv": [0, 0, 1, 2], "texture": "#particle"} + "east": {"uv": [8, 14.5, 7, 16], "texture": "#missing"}, + "south": {"uv": [7.5, 15.5, 9, 16], "rotation": 90, "texture": "#base"}, + "west": {"uv": [7.5, 9, 9, 8], "rotation": 90, "texture": "#base"}, + "up": {"uv": [1, 14, 0, 16], "texture": "#block"}, + "down": {"uv": [15, 14, 16, 16], "rotation": 180, "texture": "#block"} } }, { "from": [1, -2, 14], - "to": [15, 15, 15], + "to": [15, 14.95, 15], "rotation": {"angle": 0, "axis": "y", "origin": [9, 6, 22]}, "faces": { - "east": {"uv": [1, 6, 9, 6.5], "rotation": 90, "texture": "#3"}, - "south": {"uv": [8, 0, 16, 6], "rotation": 90, "texture": "#3"}, - "west": {"uv": [1, 6, 9, 6.5], "rotation": 90, "texture": "#3"}, - "up": {"uv": [6, 0, 6.5, 6], "rotation": 90, "texture": "#3"} + "east": {"uv": [7.5, 0, 16, 0.5], "rotation": 90, "texture": "#back"}, + "south": {"uv": [7.5, 0, 16, 6], "rotation": 90, "texture": "#back"}, + "west": {"uv": [7.5, 5.5, 16, 6], "rotation": 90, "texture": "#back"}, + "up": {"uv": [8, 0, 8.5, 6], "rotation": 90, "texture": "#back"} } }, { @@ -177,12 +134,12 @@ "to": [14, 10, 10], "rotation": {"angle": 0, "axis": "y", "origin": [-24.5, -7.5, 9]}, "faces": { - "north": {"uv": [14, 8.5, 12.5, 15], "texture": "#3"}, - "east": {"uv": [13.5, 8.5, 14, 15], "texture": "#3"}, - "south": {"uv": [12.5, 8.5, 14, 15], "texture": "#3"}, - "west": {"uv": [12.5, 8.5, 13, 15], "texture": "#3"}, - "up": {"uv": [12.5, 8.5, 14, 9], "texture": "#3"}, - "down": {"uv": [12.5, 14.5, 14, 15], "texture": "#3"} + "north": {"uv": [14, 8.5, 12.5, 15], "texture": "#back"}, + "east": {"uv": [13.5, 8.5, 14, 15], "texture": "#back"}, + "south": {"uv": [12.5, 8.5, 14, 15], "texture": "#back"}, + "west": {"uv": [12.5, 8.5, 13, 15], "texture": "#back"}, + "up": {"uv": [12.5, 8.5, 14, 9], "texture": "#back"}, + "down": {"uv": [12.5, 14.5, 14, 15], "texture": "#back"} } }, { @@ -191,12 +148,12 @@ "to": [11, 10, 10], "rotation": {"angle": 0, "axis": "y", "origin": [-27.5, -7.5, 9]}, "faces": { - "north": {"uv": [14, 8.5, 12.5, 15], "texture": "#3"}, - "east": {"uv": [13.5, 8.5, 14, 15], "texture": "#3"}, - "south": {"uv": [12.5, 8.5, 14, 15], "texture": "#3"}, - "west": {"uv": [12.5, 8.5, 13, 15], "texture": "#3"}, - "up": {"uv": [12.5, 8.5, 14, 9], "texture": "#3"}, - "down": {"uv": [12.5, 14.5, 14, 15], "texture": "#3"} + "north": {"uv": [14, 8.5, 12.5, 15], "texture": "#back"}, + "east": {"uv": [13.5, 8.5, 14, 15], "texture": "#back"}, + "south": {"uv": [12.5, 8.5, 14, 15], "texture": "#back"}, + "west": {"uv": [12.5, 8.5, 13, 15], "texture": "#back"}, + "up": {"uv": [12.5, 8.5, 14, 9], "texture": "#back"}, + "down": {"uv": [12.5, 14.5, 14, 15], "texture": "#back"} } }, { @@ -205,12 +162,12 @@ "to": [8, 10, 10], "rotation": {"angle": 0, "axis": "y", "origin": [-30.5, -7.5, 9]}, "faces": { - "north": {"uv": [14, 8.5, 12.5, 15], "texture": "#3"}, - "east": {"uv": [13.5, 8.5, 14, 15], "texture": "#3"}, - "south": {"uv": [12.5, 8.5, 14, 15], "texture": "#3"}, - "west": {"uv": [12.5, 8.5, 13, 15], "texture": "#3"}, - "up": {"uv": [12.5, 8.5, 14, 9], "texture": "#3"}, - "down": {"uv": [12.5, 14.5, 14, 15], "texture": "#3"} + "north": {"uv": [14, 8.5, 12.5, 15], "texture": "#back"}, + "east": {"uv": [13.5, 8.5, 14, 15], "texture": "#back"}, + "south": {"uv": [12.5, 8.5, 14, 15], "texture": "#back"}, + "west": {"uv": [12.5, 8.5, 13, 15], "texture": "#back"}, + "up": {"uv": [12.5, 8.5, 14, 9], "texture": "#back"}, + "down": {"uv": [12.5, 14.5, 14, 15], "texture": "#back"} } }, { @@ -219,12 +176,12 @@ "to": [5, 10, 10], "rotation": {"angle": 0, "axis": "y", "origin": [-33.5, -7.5, 9]}, "faces": { - "north": {"uv": [14, 8.5, 12.5, 15], "texture": "#3"}, - "east": {"uv": [13.5, 8.5, 14, 15], "texture": "#3"}, - "south": {"uv": [12.5, 8.5, 14, 15], "texture": "#3"}, - "west": {"uv": [12.5, 8.5, 13, 15], "texture": "#3"}, - "up": {"uv": [12.5, 8.5, 14, 9], "texture": "#3"}, - "down": {"uv": [12.5, 14.5, 14, 15], "texture": "#3"} + "north": {"uv": [14, 8.5, 12.5, 15], "texture": "#back"}, + "east": {"uv": [13.5, 8.5, 14, 15], "texture": "#back"}, + "south": {"uv": [12.5, 8.5, 14, 15], "texture": "#back"}, + "west": {"uv": [12.5, 8.5, 13, 15], "texture": "#back"}, + "up": {"uv": [12.5, 8.5, 14, 9], "texture": "#back"}, + "down": {"uv": [12.5, 14.5, 14, 15], "texture": "#back"} } } ], @@ -268,38 +225,46 @@ { "name": "BeltFunnel", "origin": [9, -4, 8], + "color": 0, "children": [ { "name": "FrontSection", "origin": [9, -4, 8], - "children": [0, 1, 2, 3, 4, 5, 6, 7] + "color": 0, + "children": [0, 1, 2, 3, 4] }, { "name": "Base", "origin": [9, -4, 8], - "children": [8, 9, 10, 11] + "color": 0, + "children": [5, 6, 7, 8] } ] - }, 12, + }, + 9, { "name": "flap", "origin": [8, 8, 8], + "color": 0, + "children": [10] + }, + { + "name": "flap", + "origin": [8, 8, 8], + "color": 0, + "children": [11] + }, + { + "name": "flap", + "origin": [8, 8, 8], + "color": 0, + "children": [12] + }, + { + "name": "flap", + "origin": [8, 8, 8], + "color": 0, "children": [13] - }, - { - "name": "flap", - "origin": [8, 8, 8], - "children": [14] - }, - { - "name": "flap", - "origin": [8, 8, 8], - "children": [15] - }, - { - "name": "flap", - "origin": [8, 8, 8], - "children": [16] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/andesite_block.png b/src/main/resources/assets/create/textures/block/andesite_block.png new file mode 100644 index 0000000000000000000000000000000000000000..53724fc0be8c71c4566d3224b325399db2c1b79e GIT binary patch literal 752 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 delta 210 zcmV;@04@KAGU5S{7=Hu<0002(-QrRJ000DMK}|sb0I`n?{9y$E001FSOjJek!EMv8 zTf~=3yp2Y#gg&EuIGA=ciCrv$R48~3`N2B zHO?&&+>n835?Y}wDmWk^vqeZGc6AL_P}zPr2y|?I(IDo>AWL-URAb0}J~u-VH3LIp zz0YZhQv*zq^>W83uOTo`zBpL2N{O4`(H*ru*J+1rnkkP;-9f(K4~^j`Se<1G>i_@% M07*qoM6N<$f(sQ-Z~y=R diff --git a/src/main/resources/assets/create/textures/block/brass_casing.png b/src/main/resources/assets/create/textures/block/brass_casing.png index a5f88ba6648d17348821843351c6a8eb81eb4c96..3d4580fe07dfb059b6cd05357a8cb78e4077b694 100644 GIT binary patch literal 6481 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 M07*qoM6N<$f&rysPXGV_ diff --git a/src/main/resources/assets/create/textures/block/brass_storage_block.png b/src/main/resources/assets/create/textures/block/brass_storage_block.png deleted file mode 100644 index 7c5c69ba5b0f937e09cd0f6975c0f6a66b85df93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFs*?-eWK)K(dt1&#IT4h$zl7>?)dWK3kAwkiI==4o@B=QUj{R!uo+ymCvjtZq~O zPBlgM`SPmEHpiMP6@NBs&DekK%&7_PEB2Ozt-mFAH$k)ffc!RorSm7M&&vR9WbkzL Kb6Mw<&;$U+F-{Bs diff --git a/src/main/resources/assets/create/textures/block/crate_brass.png b/src/main/resources/assets/create/textures/block/crate_brass.png deleted file mode 100644 index f47739e6631d4bc2242fd79b6fbaefc97ce9a97f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 493 zcmV!$mMy5KSN#0a9+F zsvt1HmWS|&>R`sw*259&x-9F8o(H+iEX|K zxs`t_?HB>Z?hsG_Y(axILBTQvq6`$wj#sSfeO-bDYR4sB$D_%h-SUx6I zIwDgz8c;YPO*kP=H6Bkg7)diANHZNsF&arP7fCJ_L@yjfFB(KG7ep)-Kr9zNDHS~_ z6+S5vLnsP5BoR9!4nHCYIUx)*Ar3ho2Q(lHG#?Ex9u6uR3n>~5E*SzU83-sC3M>}{ zD-{AM6aps`0VEOvB@qB45da|%03Qzm9u5H=3;-Gn0LRB}`v3p{0d!JMQvg8b*k%9# z0n155K~#9!Vjv7S0aTBH#>7AngI$ZiU=a*J3}DRrzu*6jQ8ez7-AyF=Jbz#Xe6Iwq z>-W3B%KY#9h7mxZRo#^dqws3YgPK68bbNpn_R--tP+}2CWe6*r$Q-q5V{JqCHYPI4 z&~R@twfu@4)__HR+H51M-?NlFz2LWsu zYXV8*u0WuXL_juyf3ac%Y%m5;0T*7tKnBnTlu1TA4Z|=LRn@(@)r{6L27ofc0>%LX zfC2yihhbYx)u1m`)$8Q=>Y$eVgwRS7@GXu-h(Nt%9N$|~WcQ)#-GUII>#ev!Y8miT z>TjUy=I*-AibJV{+b=Dt4bddC)#TM#RpeK+M_j&D%}FqP*xCQh=JaCY23TOFyqZ3e zpYyzZJtprO6YC2NJPXI}F zLWb?DIusKfl(Fud0h%pz1EZ9nUi7mv{UT0qUV`;YZm{#f?2QHfKYxVz0Y`ILUV!Wr QUH||907*qoM6N<$g0A}-w*UYD diff --git a/src/main/resources/assets/create/textures/block/funnel/andesite_funnel.png b/src/main/resources/assets/create/textures/block/funnel/andesite_funnel.png new file mode 100644 index 0000000000000000000000000000000000000000..d4887d1f2b0befa6095ecf4f8a02178270a13ad5 GIT binary patch literal 8648 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 ATL1t6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_frame.png b/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..3b3ff2c4089dad8ee5a46b519f8c2bc74ec636d7 GIT binary patch literal 5725 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 F{|O<`$us}} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_powered.png b/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_powered.png new file mode 100644 index 0000000000000000000000000000000000000000..19f31bbf76da3a8c77d36174b3355b9058acfca8 GIT binary patch literal 6444 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_pull.png b/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_pull.png new file mode 100644 index 0000000000000000000000000000000000000000..59f9e487aeead2a28662477d4404da4e42f80854 GIT binary patch literal 6823 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_unpowered.png b/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_unpowered.png new file mode 100644 index 0000000000000000000000000000000000000000..c4ce955879e6c7c0808756555c994ac1fc8e82b9 GIT binary patch literal 6335 zcmeHKX;@R|whpsQiUJNO5P}E@nG;AN0V81u^CTjZ>?Au7$K*E5vPhrL|bsUI{_8%@%CJw=bV2gPau2kcfD(U>wDMwvNQdB z+;p{!v|uopF2kK30R7jKf99w|e@(~V0Wg?ab5c-4sMa_IyaW-sJ^J4vSD$KZBe|p1@G+^pGidK0@t^UoV{-l z8#d6--s|-431)A1QQuOp)`q;8Kap0OS~GafOv|YuXCUeK7X9^3M8UqYCxI7}pDw;y zX+n?ns%8_Pw&#PX#!iQMMre`!zOLon-xNrzk+jt}+Zaykk320eFrQrAw3*pbVxw1e zL1%OvS@?Qtq;kn^%kJ8Oe6;jRbbLgbLrUX1|HiZTBE(8&x&sw0d1Pgl>%~997mBbc zCaj`$trl80!cu*DU82L&5liSzxraS6DL?&X8x&Q7@5U6h8${t_m^bKw$Ag>OckiqR zqSl^(RVybT%kS5uAH7NHHC$j-rRw9X=c=7DF00B;OER_gExotP@CnYmI;wrOVDN(4 z>T=V>yV0rHkKZn-3xz+3{y}Z-io*RFPq?GMUo>B}xi;!WLe&{~RTylI>X1o$j+!zh zXTrd}8tb){r1gxUx4fN_tE7}DTzQ;uxgREK)fozDAtdg$-?^(u4Sr5{pOWql%@8ud z?(V!*w7C|-#_^jPS0XpPu)aQ$HqT77xEp;M>?l&fYrFX{+cNjVZA+GW>{t;>a5Htj zYlUs!TTGyde|e<3ZSR>&b`4J?7Yi&p3bd}3)!p{A3a96V1Q2_JUt}7sTvu`WsH<+p zZ{g!eg5Vm{)41YyzHI1K&(EIO)WY)bLrWSDBb?lwRxhIx~-|jvFuG{`VAW5MT2`K-)%ie&Iweh zZ`xd7)RVmWso`1s^4`+}2K-)n%-&mbj@4Q<(J$ZGS$OzIOS6z4CYSl+a;vUbW|N{+ zZBJM^UCPf73;MH-Sc2`I$lpB1rWMz8=C=7~q3OhmSVQJqlKy$6tG;~yuwBNfLnm%L zzGWw7%`rMS0<5j@%=Y7=3w(Et6+M#app9wZ61fN%v)fzNBWSq-9R+a?NU|7vl*+fiTKrp z)}ckWQv&2%v!&#UegPVH7imFc(+k3UgylF|Vjfm>As1Qy?Eq&G4Jh0Eg>$>sW z!xv8Kl+PU6qh8DUwoXzbOYULZw)5EXzAK(MYjGnUpu^8gxuP z*tS0Y<L>S+Ao25HmZyM8tEb~D0tpw-i7yB@$~4!v|FsH#MJZK3x-IhZKkAg zpY*h>5tDl-zYE1aBJ!Ln7h7zweuoa)RiD?DZR7fehHm(?I${?D^Ji` z&iZbCq}|biE>!MyJ2_lM%6HW+Pam0dM6G+hWiW2D%CpNn{VelWyAyc52oRCkwB+=? zbF2#G{m(L}Zx_)2oN_98o4d96b;LiRka0yvBUE(MBbM$eiFmO|vlnYu zSl<7NS*_>m#*bSmmc|KTr8;d;{X83L7{AO71oHYyZ6Z9mk%9V+@d8Wf- zB@UfaHxE_%UOK4rEVEVOWp8_1_x1sA&(U+f%QzMcGe=7k`*PZCx2jH5(>ExJ?X#{^ z-!r=Pw`aC7H9C#EJhpi_crWu0+WkEJc&FAV^76(b?V-uf7paf;d*nY3YRO<}YA!ch z+<_ZEZ>e8m`FFUMy zs*@rt&rL)>tLQjB++#-GbI8NW zAoUe~^5`LjTmXMDE*g__VO5lqiZNOj-P6;A_6$?t?OfZ@&pd!W^nhMv)XQ3E`6Ho*c2I-Q(jmIGzwcrk7Hir^Gcb%btuBeC@sZ>Nkqh&G~N`^-X z#nEUinM_7waA+J32_cY@M1d4YKnf)0a*AmVIw)a@AwhG60=S$LU<%`;R0IOL51%2I z%iSdbGR_2$Un}S(QZ||aT@ax4KmarjgCQX?I3$jYp6w6a_4fYYEs)Gq5vnIT0T7|F zC=8m<|HMNgb&3BN@3S6~Am~>WIslXijO>{C*~yh92mqeg&ANW5(zps}f7e!qubRjEF9+W|+BINl}*g_VUO;LOWh#V%CXwO12Nh|`A zfVIaXNgR-fWHHGgfdmlA01-EfiXo6l0Ran?Q$ge?F2uuTVX+t%o`@u}IZPzM4o^ms z?3g4Z(~iku5kL&do(0aL@D+2RP5^kbvyxM>Au51nhbI995J?~saYzCa5(|LE14uhN zJezC}00b-^qo9)S1BK?tpdxUnSr$JYAms?fe5k#+0=7^l`3Mf;^1(nUATJx%4&o!( z+Y|A40>%!H{|E{O#S%#7a#kz`g_~YEn?-SjH~~m*Ts{yDqD6veg^PS+DA01C(gO1C zfS46_Xf+gPF$hS7;vk`rM@7i9h07@wO$B$DX%~u@kfm@`fI+sr<7Rqp4G@i1Tsolt z4*V}nfiXgv;Qz<-5&D6JCYH*C;#gm?FLNWvlKwr<=fEGB0-$Lpk%|);|7KDD3+FH` zSa--*C{COeKM?$8`f7S4@wkdo!QqNA0Lf;${1PA@WGl7+s^j!6RtzAB2BCR7(`@hU z+|LNvp1>k=FgOyDLne`s1U!?BBs1|iB*q>jLfU2#$ed{*e_)pgIZ_!Q25Hfd2B3Y0 znoF_IaH|>pS$~?1EC!T|3j-1hX{|9cC|BOceo%?Lqw70WRln8ZkjMP^q_}lQG0Zub` zaao{1BK*75XG5mTGV36Ma-Oz92OM->qCXs%Gb)ic(tq(aqrU%Q1c>@;kT0t5*K&O= z*B4dbi@;yi^|f4IRDmx7e^u9itXx_jAGtvR^t(?6Jy4r4BM8vLxH{9*jShP!e-}5F z904JpIhMdQAfp`o#EeO7@cWa?$mX+fmU-dw8IFRS%j zhj--ZVe%G|UEFUiNxO+CVnv*spA8&GB3lDPT0H=Ny{$iCum>&Pwq8EDgcJSO{q8g7 zE2@9i+>#N{@Ma6UgGj=Nve$!k?^ zwy?c&j|tZ7$)jcVxl+GX)lCqh`sQdS)^1+saNUMDzbIUJ_+eCK=BeRr#m5c~YYt8x znm?#_H;ZPI=3lQGRoF^Q^J!GMi%hw#q~|>lGr9qt8`k52v%3Ez%wJ_uY~h$sd8GK@ TNn8%JKp4ZthhDWND(!y&=;nlj literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/funnel/brass_funnel.png b/src/main/resources/assets/create/textures/block/funnel/brass_funnel.png new file mode 100644 index 0000000000000000000000000000000000000000..a49b74abe675160eb2787005674ff11de3aa35e1 GIT binary patch literal 8280 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 N002ovPDHLkV1g)V`o{nO literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_neutral.png b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_neutral.png new file mode 100644 index 0000000000000000000000000000000000000000..b1b3f49ac1370729e1096276e52f9936508ef347 GIT binary patch literal 752 zcmVEX>4Tx04R}tkv&MmP!xqvQ$;BihgJ|#$WWauh>AE$6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRg44N3P2*zi}=)Ebz>*kx9)Hhl#~v2g@DIN`^{2O&n2Fjq-)8 z%L?Z$&T6H`T7B{t2J_lVn(I`??*IS*24YJ`L;(K){{a7>y{D4^000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2j&VD3@9tvMMJ#+000?uMObu0Z*6U5Zgc=ca%Ew3 zWn>_CX>@2HM@dakSAh-}0002TNklFH#Q!{EpcG_HnZk(7 zXJKGqU=Y>dLv_F%1_qBDHx#iQQ+8pfdwt^*12+AH#E}6L!vKR(2e4p`8x{eE9aDB; zD8?3tRB?c)1|LIcP8%aB8dp!L`cDl9(L4&S+!0{7az|j0rvYmDl!1YPK}Y2Sia0ud z_=W%>pNEX>4Tx04R}tkv&MmP!xqvQ$;BihgJ|#$WWauh>AE$6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRg44N3P2*zi}=)Ebz>*kx9)Hhl#~v2g@DIN`^{2O&n2Fjq-)8 z%L?Z$&T6H`T7B{t2J_lVn(I`??*IS*24YJ`L;(K){{a7>y{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2j&VD4Hp-$Hh(by007!aL_t(I%e|Aa4Z<)GMPCqg zsG^j#DPe+CjKCJ2zymPB35gk)f|3f#RFP65sOV8>>~KU!M1;g|&OY1!o-JRpb*{~d zl&EWU2jDD12^2sB%vC%BI0wKKLs^ls5)VKfayn+JSZ8o^8%|-o63^Og5`aEo%OjW*D)Y^eb9UT!{yz%n02V444y-~v>? z5ahsNh#*$@MDP&beQ%Q>R@jaBiANx@x>3)E^wv!M1w@z`?R)`Fz#_Es6T)Xxi9j3y Q3jhEB07*qoM6N<$f;*`*3IG5A literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_pull.png b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_pull.png new file mode 100644 index 0000000000000000000000000000000000000000..443a9aec79e2eb78efc38e16b428ba488cb777aa GIT binary patch literal 804 zcmV+<1Ka$GP)EX>4Tx04R}tkv&MmP!xqvQ$;BihgJ|#$WWauh>AE$6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRg44N3P2*zi}=)Ebz>*kx9)Hhl#~v2g@DIN`^{2O&n2Fjq-)8 z%L?Z$&T6H`T7B{t2J_lVn(I`??*IS*24YJ`L;(K){{a7>y{D4^000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2j&VD3>Fixg5X{N000?uMObu0Z*6U5Zgc=ca%Ew3 zWn>_CX>@2HM@dakSAh-}0002{NklFH#Q!{EpcG_HnZk(7 zXJKGqU=Y>dLv_F%1_qBDHx#iQQ+8pfdwt^*12+AH#E}6L!vKTf?SLzH1PH2O!5TL# z0t`E*?7~otEe`Pkj~q9K9aDBO=%{?a?*LH^K8DboHbznmUp=MjKg>Z_?g-$tgpebs z5(OSPZg_(mpFGvl03k=vB@yCs1kIxWA0U(nnP_PlA0b)u{nmGWy-XFBJAq%~Nnr03lHmFBtgJjeJqYfZC8@|5ri2+*=iB@@^V9$u2 iju=e?gC`LV6aWAK&1g__VOL%N0000EX>4Tx04R}tkv&MmP!xqvQ$;BihgJ|#$WWauh>AE$6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRg44N3P2*zi}=)Ebz>*kx9)Hhl#~v2g@DIN`^{2O&n2Fjq-)8 z%L?Z$&T6H`T7B{t2J_lVn(I`??*IS*24YJ`L;(K){{a7>y{D4^000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2j&VD3?~to(T2bP000?uMObu0Z*6U5Zgc=ca%Ew3 zWn>_CX>@2HM@dakSAh-}0002_NklFH#Q!{EpcG_HnZk(7 zXJKGqU=Y>dLv_F%1_qBDHx#iQQ+8pfdwt^*12+AH#E}6L!vKSk<$ps;A05QX=5bC(A86_{$q2{l{*3q;tZcKET>Bp zpj$@Ba;iFj7|Uqp09=;qsC>Yhmgt%b2swg@9+u#fXQG!+byPmkJ_?A5bDF0CTt3AG zSZJ95i77d0<^c41f6&&3Ec6O$nmK^jpdM|Ij5=V{0eG|F>l>dKu=S8=mG=qujOgiz g(KIl465&7r0Fd)%2t`r!@&Et;07*qoM6N<$g1dH5SpWb4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_unpowered.png b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_unpowered.png new file mode 100644 index 0000000000000000000000000000000000000000..c339a57942194b2321e842cdd3426e0fd2de1f91 GIT binary patch literal 725 zcmV;`0xJE9P)EX>4Tx04R}tkv&MmP!xqvQ$;BihgJ|#$WWauh>AE$6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRg44N3P2*zi}=)Ebz>*kx9)Hhl#~v2g@DIN`^{2O&n2Fjq-)8 z%L?Z$&T6H`T7B{t2J_lVn(I`??*IS*24YJ`L;(K){{a7>y{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2j&VD4HW~2+R4rU007ZRL_t(I%hi)H3c@fHKwrQ~ zXt6`lBlJRg0=L%PdVu0y*iZN$q)a(ANXP$MamCc z8j8FGAd`{_a7N&vUa_7+}EjhRM?05A=k`~7C6 zGAY{vjb0yy`Un-^e0Z!IHaL0#r~a^a*bFbGfoF8ku^Eo~7_@oyyMdYiGlK_$qfwxj z!8~08aEKDSfvrOqCqUS?Q9pmZOlBgJl5sufNQ)J4)7JS3Ob%a**@Y?K00000NkvXX Hu0mjft_3Zv literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/funnel/funnel_back.png b/src/main/resources/assets/create/textures/block/funnel/funnel_back.png new file mode 100644 index 0000000000000000000000000000000000000000..d7db70c40be78bb20f9e8ad34115b21f7c8c99b4 GIT binary patch literal 7565 zcmeHLc|4TuyC1U4PN}3ZQuLaAVa7<-42djRLXDYc7|e`jX-3wxNh@ig6j`IRXt5QQ z7AYiIin5h9g$lj4^NdtFzxTYq^M20x{TF7rujhMxuj{_H=l1M!S-nz8VZH(c0#Tya z+qi+9J z3b3DOWBld)y|uzuUAbx9qW5E%x^Al{#}0nseDrR6{?4n}b%*08ppli}N2Ttp$-H)W zquhjcbHK{mYjlR@#n*nmCDhSxT+u(FZ1kZ1rgF_4H5vC+m+VpMN>z5f4x0J6Q^I)f z2K~?^ukJn4Y768zRmSFg`74~ueRhT|BAGK;5NhYPlM@dHveU0=4eE^y_G^8HN$WM% z-+ME!K=r_Rj?M+*$nxhg^PA)4E|!#3R=yfldqnhYan-R^l}lCHwj9e? z6(1j4r^mf_Losn1#9~fWuBA)H(L8;rEh$SbWogpv!W7;-7p;stYmkFgs79Shv` z?r$=-}K z)^=&bvzJ6K4GPYbK9yoMLS5S&D{%uIL*hdw{qyg@xf1d?;BEZ@2%LacC*!1{h|7?KfZlskAK%I*FT*% zW}0zVTMsXV_2T&JZ9X&?N2y;v%{PhU&(U+T7Ub`@ukhE9)$B-lmm~efv_F4=(o8~rqK5Q>qyTBtz)AGLBb7^9xuAfzoX45dXkMK;@pjfpzy;TJF z%efr0<9s9<{x-nUmo&t96XtnN9r04uS=)D=(MA0cPL7DM$?q@M-5${@Lv9on z2Cyai4Sk*J)Dzv-)kue34D4IrvnSriZQ%OT%uN!rtoQlNHt1ZsG=b)}Ikn-6(U7Ts zvt!SLXFslp?#K(`HUn z*=W~Y{kH5?!AIl<&lZeYg$wX7>&NTVuPzTSAk>-6y0@>0^?G(-!A1A^6XT<6Y-58q zZq+nu4Am`*T7KuvTtw=Sy}d7eCr6-#@_4skwgjSnf$Ukkb!Nj>la^O6rv*0!`d(x0 z-_S>heN_t#*xToMYgeJ~7SdWB=iGMgDRG4MY=Neq;1sCH9E!saO0BO_IC?0*Q6j&( z3iTe^xn)n=GPAW-%&~d6i6^gTt6NZ1QJ#T;G;>m!rxaH{$Ot z2tY_;d$xXne?5{UAG=;9g|2_F^jw;XG)0gae?K5o_wD0r_}-2jb|YZ)6$&knHeAiq z(mbu1CDrOjh;x?=ph;!xC0jUI>P&bXZ_r$XA(69uZ#p{h?Pa@O?1vVy&GMX@U@dHZq%Zbv*S=6mGnDLql%^=y9RLGH$-yH78*ew9~DPqvDUdvh~S z0o6u3x%{eRd)WS{u%P*&jnR$|uRFBr?tP}+n0%l@LNy_R=@+FeB|*8zyh>z^D0}M= z=XS$3RM)lD3CM(biXDB{E9x(21j<$y>KgMZS9Tii>goA|nDHWL|L#L}?-ZZQE(v%S zbUec5~pPLcS=X(lXBTc;=s63 zYNR^Gz^La$s#Ig%xnolA)Z+5%d;92@{Q8D2j5bxHUf;(YA6(Sqx`TWyc%06^c zz7D4TgiYB|Yf7n~{fA!q{nxS?$w{Z>baJ5!d46Lbb+>nD?FiCTOGE@M2yA#hAipz{ zxd;;B=4B|7IHVF2<0&7SF-sx)%B?4*Lzf&UF73JhB!N>bWt%%l zR?<$eciyn&s4~3%?c;E5qk)LG!HKn2iw6~t*fn;}u9Znk*FM>Fi`y3SI4yFI;+Sjy zcGM-4jn-}s8d29OyBa6rOV@4s4}5DpI< z!|^M6^h;Mn?qzJ*pSeS~y}xnN-%NhMz@~jaYHaI(M}2CLBWcCCC$v?!BYWmp^pgP~^ZF!s+J9o154$&e3iKE0+<5Dc#1<${h5Rqa1q zhf433MVR#teN1Z_i-xeex!Ib_*BU|~su4`^2UXVPI)MAY=1gEHynFi*S_$|=km2x8iA<^pb;SG&_ThtP<0n8k7hvWNr{ zumC<4Dq@AQc_fiJY>Jlzeiw_8Fz6J7A7T#ka&m!MbGQH$hrl6Fa9a^`69%?i0ZQi5 z86;O5yJ-q=WeyAC^TS9;q);eC2(btbHxP*?5{XC@28qGIK?Ix^&gN4^a5hh0O!1Aw z2H?@SU_CQAY^a!%8o&|o&0#R`I&_*`Ty`%9v8XiPe3>Z^$<5k_h0Wtr z*)%{*1(G9}AP*Lx(il`zG@M8y5aBo))&y=!LlfYp7!w>7k7Zy37^oQ(&Rizg3DnS; zUWuvbAQc9{V@;_HQ#clbL&I?>JPl5z;c##?z@QQs1Ol3d!Awz!^FXq6p_s!kh;QUm z5|>aapTXg>!1iLY=^P>NC)l0I0^ImiaoErV0s(7kf;BP0nGo@4+)vP2fXf5RT+E6_ zA*OB7X(T(4lM0p_lSK^#kYVh=DHU;INZ@wB&{DC&tHLmFu8)$j>qSQQ~u4S{u_?`tzhjzT@E*VhJ80+I^~9h+IB|}xP>m|8jLSaMS2Ve!ZbCjW z)eYf+P_DR7{Nnnu%PV2o*AJ6PJcD@DqSiMVehJla7cx2<66+;XTcgadAC=le{pUfV zqsz9UjSL{MDT%#A$cE_2ZG@uRf!>=oSzsXf$Lx*PsUWX}RBiN~h>@RL+!S=#XJBkX z9@!c9REI-27YbRHt$KH3iLUa_0tq>YXmsMs85-WqI<=pyV$)dN`l@-5o*JCDvTz_N8rcR1RdIK5clT>SvSl zmUfA1Sfr51H08Y`RSx&c?mHDPqjsuP)3fZF&x=A=-~AR>7tK3V@Ge|K`q>Kn?dHI( zT9u=pZpl9VdYzNKK56mGGTx}y;oItymP?ZscRCoCywXoNwHoH0+djsL)W-(TOAmfe zk^hX4!U}6+ORk}>DLP-QKP=HZH1NXk*=^%I6Kd2`zT{mqlUxN zRkDx#1MGarS^OY5cMU|-R)Vpk+q9d$LQbMta2K#Vs5*Xi{VIg^*YjmjAz-;cD7LF@ J3avK8{TGKf!|DJ4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/funnel/funnel_closed.png b/src/main/resources/assets/create/textures/block/funnel/funnel_closed.png new file mode 100644 index 0000000000000000000000000000000000000000..1475a7bd6e87b7e0dcc1772623e3b4e5ba54f5ec GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFqbkr5G|9v&_(E_Sw#7UtHbCKkpsr90xrZjBfNK1|55MN{^A{iUZFPW`^|l{0EZu SG=~8-GkCiCxvX^+a&oe=vVwwwNmoAw097!S1o;IsI6S+N2IN?Ix;TbZ z+)6&cKI8D|)3GcKJlD?5G+u7OAem#_$Z#Zq-H_{pafCw;gTUe9XJ=L_#P$FUQ{?)w bhK1qxJ4uFn#TwgyrZ9NA`njxgN@xNAsSPtb literal 0 HcmV?d00001