diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 61a7ae487..a5962bafc 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -1309,6 +1309,7 @@ public class AllBlocks { public static final BlockEntry MECHANICAL_SAW = REGISTRATE.block("mechanical_saw", SawBlock::new) .initialProperties(SharedProperties::stone) + .addLayer(() -> RenderType::cutoutMipped) .properties(p -> p.color(MaterialColor.PODZOL)) .transform(axeOrPickaxe()) .blockstate(new SawGenerator()::generate) diff --git a/src/main/resources/assets/create/models/block/elevator_pulley/block.json b/src/main/resources/assets/create/models/block/elevator_pulley/block.json index cc3c334ee..f651006ab 100644 --- a/src/main/resources/assets/create/models/block/elevator_pulley/block.json +++ b/src/main/resources/assets/create/models/block/elevator_pulley/block.json @@ -138,6 +138,18 @@ "south": {"uv": [0, 8, 6, 9], "texture": "#0"}, "down": {"uv": [0, 9, 6, 14], "rotation": 180, "texture": "#0"} } + }, + { + "from": [5, -1, 9.5], + "to": [11, 1, 13.5], + "faces": { + "north": {"uv": [6.5, 13, 9.5, 14], "rotation": 180, "texture": "#0"}, + "east": {"uv": [6.5, 13, 8.5, 14], "rotation": 180, "texture": "#0"}, + "south": {"uv": [6.5, 13, 9.5, 14], "rotation": 180, "texture": "#0"}, + "west": {"uv": [6.5, 13, 8.5, 14], "rotation": 180, "texture": "#0"}, + "up": {"uv": [10.5, 13.5, 13.5, 15.5], "texture": "#0"}, + "down": {"uv": [10.5, 13.5, 13.5, 15.5], "texture": "#0"} + } } ], "groups": [ @@ -145,7 +157,7 @@ "name": "Frame", "origin": [8, 8, 8], "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10] + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/mechanical_arm/block.json b/src/main/resources/assets/create/models/block/mechanical_arm/block.json index 94299bdca..2e0edad94 100644 --- a/src/main/resources/assets/create/models/block/mechanical_arm/block.json +++ b/src/main/resources/assets/create/models/block/mechanical_arm/block.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "3": "create:block/mechanical_arm_side", + "3": "create:block/mechanical_arm", "7": "create:block/brass_block", - "particle": "create:block/crafter_top" + "particle": "create:block/brass_casing" }, "elements": [ { @@ -12,10 +12,10 @@ "from": [0, 0, 0], "to": [16, 6, 16], "faces": { - "north": {"uv": [0, 0, 16, 6], "texture": "#3"}, - "east": {"uv": [0, 0, 16, 6], "texture": "#3"}, - "south": {"uv": [0, 0, 16, 6], "texture": "#3"}, - "west": {"uv": [0, 0, 16, 6], "texture": "#3"}, + "north": {"uv": [0, 8, 8, 11], "texture": "#3"}, + "east": {"uv": [0, 8, 8, 11], "texture": "#3"}, + "south": {"uv": [0, 8, 8, 11], "texture": "#3"}, + "west": {"uv": [0, 8, 8, 11], "texture": "#3"}, "up": {"uv": [0, 0, 16, 16], "texture": "#7"}, "down": {"uv": [0, 0, 16, 16], "texture": "#particle"} } diff --git a/src/main/resources/assets/create/models/block/mechanical_arm/claw_base.json b/src/main/resources/assets/create/models/block/mechanical_arm/claw_base.json index f3868dd89..b6c896994 100644 --- a/src/main/resources/assets/create/models/block/mechanical_arm/claw_base.json +++ b/src/main/resources/assets/create/models/block/mechanical_arm/claw_base.json @@ -37,12 +37,12 @@ "to": [1, 4.5, -4], "rotation": {"angle": 0, "axis": "x", "origin": [8, 9, 4]}, "faces": { - "north": {"uv": [0, 9, 4.5, 10], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 9, 4.5, 10], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 9, 4.5, 10], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 9, 4.5, 10], "rotation": 90, "texture": "#5"}, - "up": {"uv": [4.5, 9, 5.5, 10], "texture": "#5"}, - "down": {"uv": [4.5, 9, 5.5, 10], "texture": "#5"} + "north": {"uv": [11.5, 0, 12.5, 4.5], "texture": "#5"}, + "east": {"uv": [11.5, 0, 12.5, 4.5], "texture": "#5"}, + "south": {"uv": [11.5, 0, 12.5, 4.5], "texture": "#5"}, + "west": {"uv": [11.5, 0, 12.5, 4.5], "texture": "#5"}, + "up": {"uv": [11.5, 4.5, 12.5, 5.5], "texture": "#5"}, + "down": {"uv": [11.5, 4.5, 12.5, 5.5], "rotation": 90, "texture": "#5"} } } ], diff --git a/src/main/resources/assets/create/models/block/mechanical_arm/claw_base_goggles.json b/src/main/resources/assets/create/models/block/mechanical_arm/claw_base_goggles.json index 4916537a8..8bd6fd97b 100644 --- a/src/main/resources/assets/create/models/block/mechanical_arm/claw_base_goggles.json +++ b/src/main/resources/assets/create/models/block/mechanical_arm/claw_base_goggles.json @@ -39,12 +39,12 @@ "to": [1, 4.5, -4], "rotation": {"angle": 0, "axis": "x", "origin": [8, 9, 4]}, "faces": { - "north": {"uv": [0, 9, 4.5, 10], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 9, 4.5, 10], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 9, 4.5, 10], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 9, 4.5, 10], "rotation": 90, "texture": "#5"}, - "up": {"uv": [4.5, 9, 5.5, 10], "texture": "#5"}, - "down": {"uv": [4.5, 9, 5.5, 10], "texture": "#5"} + "north": {"uv": [11.5, 0, 12.5, 4.5], "texture": "#5"}, + "east": {"uv": [11.5, 0, 12.5, 4.5], "texture": "#5"}, + "south": {"uv": [11.5, 0, 12.5, 4.5], "texture": "#5"}, + "west": {"uv": [11.5, 0, 12.5, 4.5], "texture": "#5"}, + "up": {"uv": [11.5, 4.5, 12.5, 5.5], "texture": "#5"}, + "down": {"uv": [11.5, 4.5, 12.5, 5.5], "rotation": 90, "texture": "#5"} } }, { diff --git a/src/main/resources/assets/create/models/block/mechanical_arm/cog.json b/src/main/resources/assets/create/models/block/mechanical_arm/cog.json index 75668cf1d..d10a6472d 100644 --- a/src/main/resources/assets/create/models/block/mechanical_arm/cog.json +++ b/src/main/resources/assets/create/models/block/mechanical_arm/cog.json @@ -3,77 +3,63 @@ "parent": "block/block", "texture_size": [32, 32], "textures": { - "5": "create:block/mechanical_arm" + "5": "create:block/flywheel" }, "elements": [ - { - "name": "GearCaseOuter", - "from": [4, 5.5, 4], - "to": [12, 10.5, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 8]}, - "faces": { - "north": {"uv": [7.5, 0, 9.5, 4], "rotation": 90, "texture": "#5"}, - "east": {"uv": [7.5, 0, 9.5, 4], "rotation": 90, "texture": "#5"}, - "south": {"uv": [7.5, 0, 9.5, 4], "rotation": 90, "texture": "#5"}, - "west": {"uv": [7.5, 0, 9.5, 4], "rotation": 90, "texture": "#5"}, - "up": {"uv": [1, 1, 5, 5], "texture": "#5"}, - "down": {"uv": [1, 1, 5, 5], "texture": "#5"} - } - }, { "name": "Gear5", "from": [6.5, 6, -1], "to": [9.5, 10, 17], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6, 8]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [7.5, 4, 9, 6], "texture": "#5"}, - "east": {"uv": [0, 7.5, 9, 9.5], "texture": "#5"}, - "south": {"uv": [7.5, 4, 9, 6], "texture": "#5"}, - "west": {"uv": [0, 7.5, 9, 9.5], "texture": "#5"}, - "up": {"uv": [0, 6, 9, 7.5], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 6, 9, 7.5], "rotation": 270, "texture": "#5"} + "north": {"uv": [13, 5.5, 15, 7], "rotation": 90, "texture": "#5"}, + "east": {"uv": [13, 7, 15, 16], "rotation": 90, "texture": "#5"}, + "south": {"uv": [13, 5.5, 15, 7], "rotation": 90, "texture": "#5"}, + "west": {"uv": [13, 7, 15, 16], "rotation": 90, "texture": "#5"}, + "up": {"uv": [11.5, 7, 13, 16], "texture": "#5"}, + "down": {"uv": [11.5, 7, 13, 16], "texture": "#5"} } }, { "name": "Gear6", "from": [6.5, 6, -1], "to": [9.5, 10, 17], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 6, 8]}, + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [7.5, 4, 9, 6], "texture": "#5"}, - "east": {"uv": [0, 7.5, 9, 9.5], "texture": "#5"}, - "south": {"uv": [7.5, 4, 9, 6], "texture": "#5"}, - "west": {"uv": [0, 7.5, 9, 9.5], "texture": "#5"}, - "up": {"uv": [0, 6, 9, 7.5], "rotation": 270, "texture": "#5"}, - "down": {"uv": [0, 6, 9, 7.5], "rotation": 270, "texture": "#5"} + "north": {"uv": [13, 5.5, 15, 7], "rotation": 90, "texture": "#5"}, + "east": {"uv": [13, 7, 15, 16], "rotation": 90, "texture": "#5"}, + "south": {"uv": [13, 5.5, 15, 7], "rotation": 90, "texture": "#5"}, + "west": {"uv": [13, 7, 15, 16], "rotation": 90, "texture": "#5"}, + "up": {"uv": [11.5, 7, 13, 16], "texture": "#5"}, + "down": {"uv": [11.5, 7, 13, 16], "texture": "#5"} } }, { "name": "Gear7", "from": [-1, 6, 6.5], "to": [17, 10, 9.5], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 6, 8]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 7.5, 9, 9.5], "texture": "#5"}, - "east": {"uv": [7.5, 4, 9, 6], "texture": "#5"}, - "south": {"uv": [0, 7.5, 9, 9.5], "texture": "#5"}, - "west": {"uv": [7.5, 4, 9, 6], "texture": "#5"}, - "up": {"uv": [0, 6, 9, 7.5], "rotation": 180, "texture": "#5"}, - "down": {"uv": [0, 6, 9, 7.5], "rotation": 180, "texture": "#5"} + "north": {"uv": [13, 7, 15, 16], "rotation": 90, "texture": "#5"}, + "east": {"uv": [13, 5.5, 15, 7], "rotation": 90, "texture": "#5"}, + "south": {"uv": [13, 7, 15, 16], "rotation": 90, "texture": "#5"}, + "west": {"uv": [13, 5.5, 15, 7], "rotation": 90, "texture": "#5"}, + "up": {"uv": [11.5, 7, 13, 16], "rotation": 270, "texture": "#5"}, + "down": {"uv": [11.5, 7, 13, 16], "rotation": 90, "texture": "#5"} } }, { - "name": "Gear7", + "name": "Gear8", "from": [-1, 6, 6.5], "to": [17, 10, 9.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6, 8]}, + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 7.5, 9, 9.5], "texture": "#5"}, - "east": {"uv": [7.5, 4, 9, 6], "texture": "#5"}, - "south": {"uv": [0, 7.5, 9, 9.5], "texture": "#5"}, - "west": {"uv": [7.5, 4, 9, 6], "texture": "#5"}, - "up": {"uv": [0, 6, 9, 7.5], "rotation": 180, "texture": "#5"}, - "down": {"uv": [0, 6, 9, 7.5], "rotation": 180, "texture": "#5"} + "north": {"uv": [13, 7, 15, 16], "rotation": 90, "texture": "#5"}, + "east": {"uv": [13, 5.5, 15, 7], "rotation": 90, "texture": "#5"}, + "south": {"uv": [13, 7, 15, 16], "rotation": 90, "texture": "#5"}, + "west": {"uv": [13, 5.5, 15, 7], "rotation": 90, "texture": "#5"}, + "up": {"uv": [11.5, 7, 13, 16], "rotation": 270, "texture": "#5"}, + "down": {"uv": [11.5, 7, 13, 16], "rotation": 90, "texture": "#5"} } }, { @@ -82,12 +68,12 @@ "to": [14, 9.5, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 8]}, "faces": { - "north": {"uv": [5.5, 0, 7, 6], "rotation": 90, "texture": "#5"}, - "east": {"uv": [5.5, 0, 7, 6], "rotation": 90, "texture": "#5"}, - "south": {"uv": [5.5, 0, 7, 6], "rotation": 90, "texture": "#5"}, - "west": {"uv": [5.5, 0, 7, 6], "rotation": 90, "texture": "#5"}, - "up": {"uv": [0, 0, 6, 6], "rotation": 180, "texture": "#5"}, - "down": {"uv": [0, 0, 6, 6], "rotation": 180, "texture": "#5"} + "north": {"uv": [10, 10, 11.5, 16], "rotation": 90, "texture": "#5"}, + "east": {"uv": [10, 10, 11.5, 16], "rotation": 90, "texture": "#5"}, + "south": {"uv": [10, 10, 11.5, 16], "rotation": 90, "texture": "#5"}, + "west": {"uv": [10, 10, 11.5, 16], "rotation": 90, "texture": "#5"}, + "up": {"uv": [3, 6, 3.5, 6.5], "rotation": 180, "texture": "#5"}, + "down": {"uv": [3.5, 5.5, 4, 6], "rotation": 180, "texture": "#5"} } } ], @@ -129,11 +115,13 @@ { "name": "inserter", "origin": [8, 8, 8], + "color": 0, "children": [ { "name": "cogwheel", "origin": [8, 8, 8], - "children": [0, 1, 2, 3, 4, 5] + "color": 0, + "children": [0, 1, 2, 3, 4] } ] } diff --git a/src/main/resources/assets/create/models/block/mechanical_arm/item.json b/src/main/resources/assets/create/models/block/mechanical_arm/item.json index 15053874a..55ee9f8c3 100644 --- a/src/main/resources/assets/create/models/block/mechanical_arm/item.json +++ b/src/main/resources/assets/create/models/block/mechanical_arm/item.json @@ -2,79 +2,68 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "4": "create:block/mechanical_arm_side", + "4": "create:block/flywheel", "5": "create:block/mechanical_arm", "6": "create:block/elevator_pulley", "7": "create:block/brass_block", - "particle": "create:block/crafter_top" + "8": "create:block/brass_casing", + "particle": "create:block/brass_casing" }, "elements": [ - { - "name": "GearCaseOuter", - "from": [4, -10, 4], - "to": [12, -6, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, - "faces": { - "north": {"uv": [7.5, 0, 9.5, 4], "rotation": 90, "texture": "#missing"}, - "east": {"uv": [7.5, 0, 9.5, 4], "rotation": 90, "texture": "#missing"}, - "south": {"uv": [7.5, 0, 9.5, 4], "rotation": 90, "texture": "#missing"}, - "west": {"uv": [7.5, 0, 9.5, 4], "rotation": 90, "texture": "#missing"} - } - }, { "name": "Gear5", "from": [6.5, -10, -1], "to": [9.5, -6, 17], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -10, 8]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, "faces": { - "north": {"uv": [7.5, 4, 9, 6], "texture": "#missing"}, - "east": {"uv": [0, 7.5, 9, 9.5], "texture": "#missing"}, - "south": {"uv": [7.5, 4, 9, 6], "texture": "#missing"}, - "west": {"uv": [0, 7.5, 9, 9.5], "texture": "#missing"}, - "up": {"uv": [0, 6, 9, 7.5], "rotation": 270, "texture": "#missing"}, - "down": {"uv": [0, 6, 9, 7.5], "rotation": 270, "texture": "#missing"} + "north": {"uv": [13, 5.5, 15, 7], "rotation": 90, "texture": "#4"}, + "east": {"uv": [13, 7, 15, 16], "rotation": 90, "texture": "#4"}, + "south": {"uv": [13, 5.5, 15, 7], "rotation": 90, "texture": "#4"}, + "west": {"uv": [13, 7, 15, 16], "rotation": 90, "texture": "#4"}, + "up": {"uv": [11.5, 7, 13, 16], "texture": "#4"}, + "down": {"uv": [11.5, 7, 13, 16], "texture": "#4"} } }, { "name": "Gear6", "from": [6.5, -10, -1], "to": [9.5, -6, 17], - "rotation": {"angle": 45, "axis": "y", "origin": [8, -10, 8]}, + "rotation": {"angle": 45, "axis": "y", "origin": [8, -8, 8]}, "faces": { - "north": {"uv": [7.5, 4, 9, 6], "texture": "#missing"}, - "east": {"uv": [0, 7.5, 9, 9.5], "texture": "#missing"}, - "south": {"uv": [7.5, 4, 9, 6], "texture": "#missing"}, - "west": {"uv": [0, 7.5, 9, 9.5], "texture": "#missing"}, - "up": {"uv": [0, 6, 9, 7.5], "rotation": 270, "texture": "#missing"}, - "down": {"uv": [0, 6, 9, 7.5], "rotation": 270, "texture": "#missing"} + "north": {"uv": [13, 5.5, 15, 7], "rotation": 90, "texture": "#4"}, + "east": {"uv": [13, 7, 15, 16], "rotation": 90, "texture": "#4"}, + "south": {"uv": [13, 5.5, 15, 7], "rotation": 90, "texture": "#4"}, + "west": {"uv": [13, 7, 15, 16], "rotation": 90, "texture": "#4"}, + "up": {"uv": [11.5, 7, 13, 16], "texture": "#4"}, + "down": {"uv": [11.5, 7, 13, 16], "texture": "#4"} } }, { "name": "Gear7", "from": [-1, -10, 6.5], "to": [17, -6, 9.5], - "rotation": {"angle": 45, "axis": "y", "origin": [8, -10, 8]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, "faces": { - "north": {"uv": [0, 7.5, 9, 9.5], "texture": "#missing"}, - "east": {"uv": [7.5, 4, 9, 6], "texture": "#missing"}, - "south": {"uv": [0, 7.5, 9, 9.5], "texture": "#missing"}, - "west": {"uv": [7.5, 4, 9, 6], "texture": "#missing"}, - "up": {"uv": [0, 6, 9, 7.5], "rotation": 180, "texture": "#missing"}, - "down": {"uv": [0, 6, 9, 7.5], "rotation": 180, "texture": "#missing"} + "north": {"uv": [13, 7, 15, 16], "rotation": 90, "texture": "#4"}, + "east": {"uv": [13, 5.5, 15, 7], "rotation": 90, "texture": "#4"}, + "south": {"uv": [13, 7, 15, 16], "rotation": 90, "texture": "#4"}, + "west": {"uv": [13, 5.5, 15, 7], "rotation": 90, "texture": "#4"}, + "up": {"uv": [11.5, 7, 13, 16], "rotation": 270, "texture": "#4"}, + "down": {"uv": [11.5, 7, 13, 16], "rotation": 90, "texture": "#4"} } }, { - "name": "Gear7", + "name": "Gear8", "from": [-1, -10, 6.5], "to": [17, -6, 9.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -10, 8]}, + "rotation": {"angle": 45, "axis": "y", "origin": [8, -8, 8]}, "faces": { - "north": {"uv": [0, 7.5, 9, 9.5], "texture": "#missing"}, - "east": {"uv": [7.5, 4, 9, 6], "texture": "#missing"}, - "south": {"uv": [0, 7.5, 9, 9.5], "texture": "#missing"}, - "west": {"uv": [7.5, 4, 9, 6], "texture": "#missing"}, - "up": {"uv": [0, 6, 9, 7.5], "rotation": 180, "texture": "#missing"}, - "down": {"uv": [0, 6, 9, 7.5], "rotation": 180, "texture": "#missing"} + "north": {"uv": [13, 7, 15, 16], "rotation": 90, "texture": "#4"}, + "east": {"uv": [13, 5.5, 15, 7], "rotation": 90, "texture": "#4"}, + "south": {"uv": [13, 7, 15, 16], "rotation": 90, "texture": "#4"}, + "west": {"uv": [13, 5.5, 15, 7], "rotation": 90, "texture": "#4"}, + "up": {"uv": [11.5, 7, 13, 16], "rotation": 270, "texture": "#4"}, + "down": {"uv": [11.5, 7, 13, 16], "rotation": 90, "texture": "#4"} } }, { @@ -83,12 +72,12 @@ "to": [14, -6.5, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, -9.5, 8]}, "faces": { - "north": {"uv": [6, 0, 7.5, 6], "rotation": 90, "texture": "#missing"}, - "east": {"uv": [6, 0, 7.5, 6], "rotation": 90, "texture": "#missing"}, - "south": {"uv": [6, 0, 7.5, 6], "rotation": 90, "texture": "#missing"}, - "west": {"uv": [6, 0, 7.5, 6], "rotation": 90, "texture": "#missing"}, - "up": {"uv": [0, 0, 6, 6], "rotation": 180, "texture": "#missing"}, - "down": {"uv": [0, 0, 6, 6], "rotation": 180, "texture": "#missing"} + "north": {"uv": [10, 10, 11.5, 16], "rotation": 90, "texture": "#4"}, + "east": {"uv": [10, 10, 11.5, 16], "rotation": 90, "texture": "#4"}, + "south": {"uv": [10, 10, 11.5, 16], "rotation": 90, "texture": "#4"}, + "west": {"uv": [10, 10, 11.5, 16], "rotation": 90, "texture": "#4"}, + "up": {"uv": [3, 6, 3.5, 6.5], "rotation": 180, "texture": "#4"}, + "down": {"uv": [3, 5.5, 3.5, 6], "rotation": 180, "texture": "#4"} } }, { @@ -122,12 +111,12 @@ "to": [16, -10, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]}, "faces": { - "north": {"uv": [0, 0, 16, 6], "texture": "#4"}, - "east": {"uv": [0, 0, 16, 6], "texture": "#4"}, - "south": {"uv": [0, 0, 16, 6], "texture": "#4"}, - "west": {"uv": [0, 0, 16, 6], "texture": "#4"}, + "north": {"uv": [0, 8, 8, 11], "texture": "#5"}, + "east": {"uv": [0, 8, 8, 11], "texture": "#5"}, + "south": {"uv": [0, 8, 8, 11], "texture": "#5"}, + "west": {"uv": [0, 8, 8, 11], "texture": "#5"}, "up": {"uv": [0, 0, 16, 16], "texture": "#7"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#particle"} + "down": {"uv": [0, 0, 16, 16], "texture": "#8"} } }, { @@ -161,9 +150,9 @@ "from": [4.5, 7, 4], "to": [11.5, 11, 19], "faces": { - "north": {"uv": [12.5, 6.5, 16, 8.5], "texture": "#5"}, - "east": {"uv": [10.5, 8.5, 12.5, 16], "rotation": 90, "texture": "#5"}, - "south": {"uv": [12.5, 6.5, 16, 8.5], "texture": "#5"}, + "north": {"uv": [12.5, 8.5, 16, 6.5], "texture": "#5"}, + "east": {"uv": [12.5, 8.5, 10.5, 16], "rotation": 90, "texture": "#5"}, + "south": {"uv": [12.5, 8.5, 16, 6.5], "texture": "#5"}, "west": {"uv": [10.5, 8.5, 12.5, 16], "rotation": 270, "texture": "#5"}, "up": {"uv": [12.5, 8.5, 16, 16], "texture": "#5"}, "down": {"uv": [12.5, 8.5, 16, 16], "texture": "#5"} @@ -201,12 +190,12 @@ "to": [9, 13.5, 0], "rotation": {"angle": 0, "axis": "x", "origin": [8, 9, 4]}, "faces": { - "north": {"uv": [0, 9, 4.5, 10], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 9, 4.5, 10], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 9, 4.5, 10], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 9, 4.5, 10], "rotation": 90, "texture": "#5"}, - "up": {"uv": [4.5, 9, 5.5, 10], "texture": "#5"}, - "down": {"uv": [4.5, 9, 5.5, 10], "texture": "#5"} + "north": {"uv": [11.5, 0, 12.5, 4.5], "texture": "#5"}, + "east": {"uv": [11.5, 0, 12.5, 4.5], "texture": "#5"}, + "south": {"uv": [11.5, 0, 12.5, 4.5], "texture": "#5"}, + "west": {"uv": [11.5, 0, 12.5, 4.5], "texture": "#5"}, + "up": {"uv": [11.5, 4.5, 12.5, 5.5], "texture": "#5"}, + "down": {"uv": [11.5, 4.5, 12.5, 5.5], "rotation": 90, "texture": "#5"} } }, { @@ -286,15 +275,15 @@ "name": "cogwheel", "origin": [8, 8, 8], "color": 0, - "children": [0, 1, 2, 3, 4, 5] + "children": [0, 1, 2, 3, 4] }, { "name": "Base Pivot", "origin": [8, 2, 5], "color": 0, - "children": [6, 7] + "children": [5, 6] }, - 8 + 7 ] }, { @@ -302,19 +291,19 @@ "origin": [8, 8, 8], "color": 0, "children": [ - 9, + 8, { "name": "Arm 2", "origin": [8, 8, 8], "color": 0, "children": [ + 9, 10, - 11, { "name": "Hand", "origin": [8, 8, 8], "color": 0, - "children": [12, 13, 14, 15, 16] + "children": [11, 12, 13, 14, 15] } ] } diff --git a/src/main/resources/assets/create/models/block/mechanical_arm/upper_body.json b/src/main/resources/assets/create/models/block/mechanical_arm/upper_body.json index 9cd322974..4bec577d8 100644 --- a/src/main/resources/assets/create/models/block/mechanical_arm/upper_body.json +++ b/src/main/resources/assets/create/models/block/mechanical_arm/upper_body.json @@ -23,9 +23,9 @@ "from": [-3.5, -2, -15], "to": [3.5, 2, 0], "faces": { - "north": {"uv": [12.5, 6.5, 16, 8.5], "texture": "#5"}, + "north": {"uv": [12.5, 8.5, 16, 6.5], "texture": "#5"}, "east": {"uv": [10.5, 8.5, 12.5, 16], "rotation": 90, "texture": "#5"}, - "south": {"uv": [12.5, 6.5, 16, 8.5], "texture": "#5"}, + "south": {"uv": [12.5, 8.5, 16, 6.5], "texture": "#5"}, "west": {"uv": [10.5, 8.5, 12.5, 16], "rotation": 270, "texture": "#5"}, "up": {"uv": [12.5, 8.5, 16, 16], "texture": "#5"}, "down": {"uv": [12.5, 8.5, 16, 16], "texture": "#5"} diff --git a/src/main/resources/assets/create/models/block/redstone_link/receiver.json b/src/main/resources/assets/create/models/block/redstone_link/receiver.json index 91c26e608..77ca940e3 100644 --- a/src/main/resources/assets/create/models/block/redstone_link/receiver.json +++ b/src/main/resources/assets/create/models/block/redstone_link/receiver.json @@ -55,6 +55,28 @@ "up": {"uv": [4, 0, 9, 5], "texture": "#redstone_antenna"}, "down": {"uv": [4, 0, 9, 5], "texture": "#redstone_antenna"} } + }, + { + "from": [6.1, 2.5, 3.6], + "to": [9.9, 3.5, 7.4], + "faces": { + "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "south": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "west": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "up": {"uv": [11, 0, 13, 2], "texture": "#redstone_bridge"} + } + }, + { + "from": [6.1, 2.5, 8.6], + "to": [9.9, 3.5, 12.4], + "faces": { + "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "south": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "west": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "up": {"uv": [13, 0, 15, 2], "texture": "#redstone_bridge"} + } } ], "display": { diff --git a/src/main/resources/assets/create/models/block/redstone_link/receiver_powered.json b/src/main/resources/assets/create/models/block/redstone_link/receiver_powered.json index 8401656e8..eab866aed 100644 --- a/src/main/resources/assets/create/models/block/redstone_link/receiver_powered.json +++ b/src/main/resources/assets/create/models/block/redstone_link/receiver_powered.json @@ -55,6 +55,28 @@ "up": {"uv": [4, 0, 9, 5], "texture": "#redstone_antenna"}, "down": {"uv": [4, 0, 9, 5], "texture": "#redstone_antenna"} } + }, + { + "from": [6.1, 2.5, 3.6], + "to": [9.9, 3.5, 7.4], + "faces": { + "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "south": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "west": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "up": {"uv": [11, 0, 13, 2], "texture": "#redstone_bridge"} + } + }, + { + "from": [6.1, 2.5, 8.6], + "to": [9.9, 3.5, 12.4], + "faces": { + "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "south": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "west": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "up": {"uv": [13, 0, 15, 2], "texture": "#redstone_bridge"} + } } ], "display": { diff --git a/src/main/resources/assets/create/models/block/redstone_link/receiver_vertical.json b/src/main/resources/assets/create/models/block/redstone_link/receiver_vertical.json index ff3f5c397..d8af8b9b5 100644 --- a/src/main/resources/assets/create/models/block/redstone_link/receiver_vertical.json +++ b/src/main/resources/assets/create/models/block/redstone_link/receiver_vertical.json @@ -55,6 +55,28 @@ "north": {"uv": [4, 0, 9, 5], "texture": "#redstone_antenna"}, "south": {"uv": [4, 0, 9, 5], "texture": "#redstone_antenna"} } + }, + { + "from": [6.1, 2.5, 3.6], + "to": [9.9, 3.5, 7.4], + "faces": { + "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "south": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "west": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "up": {"uv": [11, 0, 13, 2], "texture": "#redstone_bridge_side"} + } + }, + { + "from": [6.1, 2.5, 8.6], + "to": [9.9, 3.5, 12.4], + "faces": { + "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "south": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "west": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "up": {"uv": [13, 0, 15, 2], "texture": "#redstone_bridge_side"} + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/redstone_link/receiver_vertical_powered.json b/src/main/resources/assets/create/models/block/redstone_link/receiver_vertical_powered.json index 4c2fe10cd..7a1ee91fe 100644 --- a/src/main/resources/assets/create/models/block/redstone_link/receiver_vertical_powered.json +++ b/src/main/resources/assets/create/models/block/redstone_link/receiver_vertical_powered.json @@ -55,6 +55,28 @@ "north": {"uv": [4, 0, 9, 5], "texture": "#redstone_antenna"}, "south": {"uv": [4, 0, 9, 5], "texture": "#redstone_antenna"} } + }, + { + "from": [6.1, 2.5, 3.6], + "to": [9.9, 3.5, 7.4], + "faces": { + "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "south": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "west": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "up": {"uv": [11, 0, 13, 2], "texture": "#redstone_bridge_side"} + } + }, + { + "from": [6.1, 2.5, 8.6], + "to": [9.9, 3.5, 12.4], + "faces": { + "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "south": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "west": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "up": {"uv": [13, 0, 15, 2], "texture": "#redstone_bridge_side"} + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/redstone_link/transmitter.json b/src/main/resources/assets/create/models/block/redstone_link/transmitter.json index 235a9a0e5..818591a9e 100644 --- a/src/main/resources/assets/create/models/block/redstone_link/transmitter.json +++ b/src/main/resources/assets/create/models/block/redstone_link/transmitter.json @@ -46,6 +46,28 @@ "south": {"uv": [0, 0, 3, 10], "texture": "#redstone_antenna"}, "down": {"uv": [0, 9, 3, 10], "texture": "#redstone_antenna"} } + }, + { + "from": [6.1, 2.5, 3.6], + "to": [9.9, 3.5, 7.4], + "faces": { + "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "south": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "west": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "up": {"uv": [11, 0, 13, 2], "texture": "#redstone_bridge"} + } + }, + { + "from": [6.1, 2.5, 8.6], + "to": [9.9, 3.5, 12.4], + "faces": { + "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "south": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "west": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "up": {"uv": [13, 0, 15, 2], "texture": "#redstone_bridge"} + } } ], "display": { @@ -54,10 +76,10 @@ "translation": [0, 2.5, 0], "scale": [0.625, 0.625, 0.625] }, - "fixed": { - "rotation": [ 270, 0, 0 ], - "translation": [ 0, 0, -3], - "scale":[ 0.5, 0.5, 0.5 ] - } - } + "fixed": { + "rotation": [270, 0, 0], + "translation": [0, 0, -3], + "scale": [0.5, 0.5, 0.5] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/redstone_link/transmitter_powered.json b/src/main/resources/assets/create/models/block/redstone_link/transmitter_powered.json index 9cf06e461..633007a5e 100644 --- a/src/main/resources/assets/create/models/block/redstone_link/transmitter_powered.json +++ b/src/main/resources/assets/create/models/block/redstone_link/transmitter_powered.json @@ -46,6 +46,28 @@ "south": {"uv": [0, 0, 3, 10], "texture": "#redstone_antenna"}, "down": {"uv": [0, 9, 3, 10], "texture": "#redstone_antenna"} } + }, + { + "from": [6.1, 2.5, 3.6], + "to": [9.9, 3.5, 7.4], + "faces": { + "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "south": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "west": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "up": {"uv": [11, 0, 13, 2], "texture": "#redstone_bridge"} + } + }, + { + "from": [6.1, 2.5, 8.6], + "to": [9.9, 3.5, 12.4], + "faces": { + "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "south": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "west": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, + "up": {"uv": [13, 0, 15, 2], "texture": "#redstone_bridge"} + } } ], "display": { diff --git a/src/main/resources/assets/create/models/block/redstone_link/transmitter_vertical.json b/src/main/resources/assets/create/models/block/redstone_link/transmitter_vertical.json index f1bd67560..f975717bf 100644 --- a/src/main/resources/assets/create/models/block/redstone_link/transmitter_vertical.json +++ b/src/main/resources/assets/create/models/block/redstone_link/transmitter_vertical.json @@ -46,6 +46,28 @@ "faces": { "north": {"uv": [1, 1, 2, 2], "texture": "#redstone_antenna"} } + }, + { + "from": [6.1, 2.5, 3.6], + "to": [9.9, 3.5, 7.4], + "faces": { + "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "south": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "west": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "up": {"uv": [11, 0, 13, 2], "texture": "#redstone_bridge_side"} + } + }, + { + "from": [6.1, 2.5, 8.6], + "to": [9.9, 3.5, 12.4], + "faces": { + "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "south": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "west": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "up": {"uv": [13, 0, 15, 2], "texture": "#redstone_bridge_side"} + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/redstone_link/transmitter_vertical_powered.json b/src/main/resources/assets/create/models/block/redstone_link/transmitter_vertical_powered.json index fad07a7b7..bc79632b5 100644 --- a/src/main/resources/assets/create/models/block/redstone_link/transmitter_vertical_powered.json +++ b/src/main/resources/assets/create/models/block/redstone_link/transmitter_vertical_powered.json @@ -46,6 +46,28 @@ "faces": { "north": {"uv": [1, 1, 2, 2], "texture": "#redstone_antenna"} } + }, + { + "from": [6.1, 2.5, 3.6], + "to": [9.9, 3.5, 7.4], + "faces": { + "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "south": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "west": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "up": {"uv": [11, 0, 13, 2], "texture": "#redstone_bridge_side"} + } + }, + { + "from": [6.1, 2.5, 8.6], + "to": [9.9, 3.5, 12.4], + "faces": { + "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "south": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "west": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, + "up": {"uv": [13, 0, 15, 2], "texture": "#redstone_bridge_side"} + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/crafter_top.png b/src/main/resources/assets/create/textures/block/crafter_top.png deleted file mode 100644 index b64b22098..000000000 Binary files a/src/main/resources/assets/create/textures/block/crafter_top.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/elevator_pulley.png b/src/main/resources/assets/create/textures/block/elevator_pulley.png index a9d81564e..59c455235 100644 Binary files a/src/main/resources/assets/create/textures/block/elevator_pulley.png and b/src/main/resources/assets/create/textures/block/elevator_pulley.png differ diff --git a/src/main/resources/assets/create/textures/block/flywheel.png b/src/main/resources/assets/create/textures/block/flywheel.png index 9b38a6e04..fd6b0fac0 100644 Binary files a/src/main/resources/assets/create/textures/block/flywheel.png and b/src/main/resources/assets/create/textures/block/flywheel.png differ diff --git a/src/main/resources/assets/create/textures/block/gauge.png b/src/main/resources/assets/create/textures/block/gauge.png index 1e97d07a8..0be8ef473 100644 Binary files a/src/main/resources/assets/create/textures/block/gauge.png and b/src/main/resources/assets/create/textures/block/gauge.png differ diff --git a/src/main/resources/assets/create/textures/block/mechanical_arm.png b/src/main/resources/assets/create/textures/block/mechanical_arm.png index 98db40d5e..4b1f572cb 100644 Binary files a/src/main/resources/assets/create/textures/block/mechanical_arm.png and b/src/main/resources/assets/create/textures/block/mechanical_arm.png differ diff --git a/src/main/resources/assets/create/textures/block/mechanical_saw_top_no_slot.png b/src/main/resources/assets/create/textures/block/mechanical_saw_top_no_slot.png index affe70c43..85dc497bd 100644 Binary files a/src/main/resources/assets/create/textures/block/mechanical_saw_top_no_slot.png and b/src/main/resources/assets/create/textures/block/mechanical_saw_top_no_slot.png differ diff --git a/src/main/resources/assets/create/textures/block/mechanical_saw_top_vertical.png b/src/main/resources/assets/create/textures/block/mechanical_saw_top_vertical.png new file mode 100644 index 000000000..6b16edfcd Binary files /dev/null and b/src/main/resources/assets/create/textures/block/mechanical_saw_top_vertical.png differ diff --git a/src/main/resources/assets/create/textures/block/redstone_bridge.png b/src/main/resources/assets/create/textures/block/redstone_bridge.png index f0b904fdc..5eba3344b 100644 Binary files a/src/main/resources/assets/create/textures/block/redstone_bridge.png and b/src/main/resources/assets/create/textures/block/redstone_bridge.png differ diff --git a/src/main/resources/assets/create/textures/block/redstone_bridge_powered.png b/src/main/resources/assets/create/textures/block/redstone_bridge_powered.png index ac7f9ddb6..07b8e87b2 100644 Binary files a/src/main/resources/assets/create/textures/block/redstone_bridge_powered.png and b/src/main/resources/assets/create/textures/block/redstone_bridge_powered.png differ