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 000000000..53724fc0b Binary files /dev/null and b/src/main/resources/assets/create/textures/block/andesite_block.png differ diff --git a/src/main/resources/assets/create/textures/block/brass_block.png b/src/main/resources/assets/create/textures/block/brass_block.png index 03f9489d6..e441608c6 100644 Binary files a/src/main/resources/assets/create/textures/block/brass_block.png and b/src/main/resources/assets/create/textures/block/brass_block.png differ diff --git a/src/main/resources/assets/create/textures/block/brass_casing.png b/src/main/resources/assets/create/textures/block/brass_casing.png index a5f88ba66..3d4580fe0 100644 Binary files a/src/main/resources/assets/create/textures/block/brass_casing.png and b/src/main/resources/assets/create/textures/block/brass_casing.png differ 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 7c5c69ba5..000000000 Binary files a/src/main/resources/assets/create/textures/block/brass_storage_block.png and /dev/null differ 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 f47739e66..000000000 Binary files a/src/main/resources/assets/create/textures/block/crate_brass.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/crate_brass_side.png b/src/main/resources/assets/create/textures/block/crate_brass_side.png deleted file mode 100644 index 2c19e2255..000000000 Binary files a/src/main/resources/assets/create/textures/block/crate_brass_side.png and /dev/null differ 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 000000000..d4887d1f2 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/funnel/andesite_funnel.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_frame.png b/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_frame.png new file mode 100644 index 000000000..3b3ff2c40 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_frame.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_neutral.png b/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_neutral.png new file mode 100644 index 000000000..6bdcb93b3 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_neutral.png differ 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 000000000..19f31bbf7 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_powered.png differ 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 000000000..59f9e487a Binary files /dev/null and b/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_pull.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_push.png b/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_push.png new file mode 100644 index 000000000..b5e320d9e Binary files /dev/null and b/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_push.png differ 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 000000000..c4ce95587 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/funnel/andesite_funnel_unpowered.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/brass_funnel.png b/src/main/resources/assets/create/textures/block/funnel/brass_funnel.png new file mode 100644 index 000000000..a49b74abe Binary files /dev/null and b/src/main/resources/assets/create/textures/block/funnel/brass_funnel.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_frame.png b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_frame.png new file mode 100644 index 000000000..d058c42b9 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_frame.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_neutral.png b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_neutral.png new file mode 100644 index 000000000..b1b3f49ac Binary files /dev/null and b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_neutral.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_powered.png b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_powered.png new file mode 100644 index 000000000..131e6ce05 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_powered.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_pull.png b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_pull.png new file mode 100644 index 000000000..443a9aec7 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_pull.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_push.png b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_push.png new file mode 100644 index 000000000..523390679 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_push.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/brass_funnel_unpowered.png b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_unpowered.png new file mode 100644 index 000000000..c339a5794 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/funnel/brass_funnel_unpowered.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/funnel_back.png b/src/main/resources/assets/create/textures/block/funnel/funnel_back.png new file mode 100644 index 000000000..d7db70c40 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/funnel/funnel_back.png differ 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 000000000..1475a7bd6 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/funnel/funnel_closed.png differ diff --git a/src/main/resources/assets/create/textures/block/funnel/funnel_open.png b/src/main/resources/assets/create/textures/block/funnel/funnel_open.png new file mode 100644 index 000000000..d8c6ccc87 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/funnel/funnel_open.png differ