diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 5ce68e72c..d86b9fbb4 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -716,6 +716,7 @@ public class AllBlocks { .register(); public static final BlockEntry CHUTE = REGISTRATE.block("chute", ChuteBlock::new) + .addLayer(() -> RenderType::cutoutMipped) .initialProperties(SharedProperties::softMetal) .properties(p -> p.color(MaterialColor.COLOR_GRAY)) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) @@ -727,6 +728,7 @@ public class AllBlocks { .register(); public static final BlockEntry SMART_CHUTE = REGISTRATE.block("smart_chute", SmartChuteBlock::new) + .addLayer(() -> RenderType::cutoutMipped) .initialProperties(SharedProperties::softMetal) .properties(p -> p.color(MaterialColor.COLOR_GRAY)) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) diff --git a/src/main/resources/assets/create/models/block/content_observer/block.json b/src/main/resources/assets/create/models/block/content_observer/block.json index 4e3ce8d38..8bfd5a621 100644 --- a/src/main/resources/assets/create/models/block/content_observer/block.json +++ b/src/main/resources/assets/create/models/block/content_observer/block.json @@ -2,13 +2,10 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "5": "create:block/brass_casing_inner", + "7": "create:block/brass_casing_connected", "8": "create:block/content_observer", "9": "create:block/content_observer_inner", "10": "create:block/filtered_detector_top", - "brass_casing": "create:block/brass_casing", - "particle": "create:block/brass_casing_side", - "1_brass_casing": "create:block/brass_casing_side", "end": "create:block/filtered_detector_front" }, "elements": [ @@ -22,7 +19,7 @@ "south": {"uv": [0, 10, 16, 16], "texture": "#8"}, "west": {"uv": [0, 10, 16, 16], "texture": "#8"}, "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#9"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#brass_casing"} + "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#7"} } }, { @@ -30,12 +27,12 @@ "from": [0.9, 2, 0.9], "to": [15.1, 14, 15.1], "faces": { - "north": {"uv": [0, 1, 12, 15], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 1, 12, 15], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 1, 12, 15], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 1, 12, 15], "rotation": 90, "texture": "#5"}, - "up": {"uv": [0, 0, 14, 14], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 0, 14, 14], "rotation": 270, "texture": "#5"} + "north": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#7"}, + "east": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#7"}, + "south": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#7"}, + "west": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 0, 14, 14], "rotation": 90, "texture": "#missing"}, + "down": {"uv": [0, 0, 14, 14], "rotation": 270, "texture": "#missing"} } }, { @@ -55,12 +52,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#1_brass_casing"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#1_brass_casing"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#1_brass_casing"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#1_brass_casing"}, + "north": {"uv": [0, 6, 2.125, 6.25], "texture": "#7"}, + "east": {"uv": [0, 6, 2.125, 6.25], "texture": "#7"}, + "south": {"uv": [0, 6, 2.125, 6.25], "texture": "#7"}, + "west": {"uv": [0, 6, 2.125, 6.25], "texture": "#7"}, "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#10"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#brass_casing"} + "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#7"} } } ], @@ -74,6 +71,7 @@ { "name": "stockpile_switch", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3] } ] diff --git a/src/main/resources/assets/create/models/block/creative_motor/block.json b/src/main/resources/assets/create/models/block/creative_motor/block.json index 5c1420dae..a2322aad2 100644 --- a/src/main/resources/assets/create/models/block/creative_motor/block.json +++ b/src/main/resources/assets/create/models/block/creative_motor/block.json @@ -4,10 +4,9 @@ "textures": { "5": "create:block/creative_casing", "6": "create:block/creative_motor", - "7": "create:block/gearbox", - "8": "block/polished_andesite", - "9": "create:block/andesite_bricks", - "particle": "#5" + "7": "create:block/flap_display_front", + "particle": "create:block/creative_casing", + "1_0": "create:block/axis" }, "elements": [ { @@ -42,11 +41,11 @@ "to": [11, 11, 13], "faces": { "north": {"uv": [14, 4, 20, 10], "texture": "#6"}, - "east": {"uv": [10, 6, 16, 10], "rotation": 270, "texture": "#6"}, + "east": {"uv": [10, 6, 16, 10], "rotation": 90, "texture": "#6"}, "south": {"uv": [10, 0, 16, 6], "texture": "#6"}, - "west": {"uv": [10, 6, 16, 10], "rotation": 90, "texture": "#6"}, - "up": {"uv": [10, 6, 16, 10], "rotation": 180, "texture": "#6"}, - "down": {"uv": [10, 6, 16, 10], "texture": "#6"} + "west": {"uv": [10, 6, 16, 10], "rotation": 270, "texture": "#6"}, + "up": {"uv": [10, 6, 16, 10], "texture": "#6"}, + "down": {"uv": [10, 6, 16, 10], "rotation": 180, "texture": "#6"} } }, { @@ -66,78 +65,95 @@ "to": [12, 12, 11], "faces": { "north": {"uv": [0, 4, 8, 14], "rotation": 180, "texture": "#5"}, - "east": {"uv": [4, 3, 12, 12], "rotation": 270, "texture": "#5"}, + "east": {"uv": [4, 3, 12, 12], "rotation": 90, "texture": "#5"}, "south": {"uv": [3, 3, 11, 11], "rotation": 180, "texture": "#5"}, "west": {"uv": [4, 3, 12, 12], "rotation": 90, "texture": "#5"}, "up": {"uv": [4, 3, 12, 12], "rotation": 180, "texture": "#5"}, "down": {"uv": [4, 3, 12, 12], "rotation": 180, "texture": "#5"} } }, + { + "from": [12, 12, 0], + "to": [14, 14, 15], + "faces": { + "north": {"uv": [16, 10, 14, 12], "texture": "#6"}, + "east": {"uv": [6, 15, 8, 0], "rotation": 270, "texture": "#1_0"}, + "south": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, + "west": {"uv": [8, 16, 10, 1], "rotation": 90, "texture": "#1_0"}, + "up": {"uv": [9, 0, 7, 15], "texture": "#1_0"}, + "down": {"uv": [8, 1, 6, 16], "texture": "#1_0"} + } + }, { "from": [2, 12, 0], "to": [4, 14, 15], "faces": { - "north": {"uv": [14, 10, 16, 12], "texture": "#6"}, - "east": {"uv": [14, 0, 16, 15], "rotation": 270, "texture": "#7"}, - "south": {"uv": [14, 10, 16, 12], "rotation": 90, "texture": "#6"}, - "west": {"uv": [0, 1, 2, 16], "rotation": 270, "texture": "#7"}, - "up": {"uv": [1, 0, 16, 2], "rotation": 90, "texture": "#7"}, - "down": {"uv": [0, 14, 15, 16], "rotation": 90, "texture": "#7"} + "north": {"uv": [16, 10, 14, 12], "texture": "#6"}, + "east": {"uv": [6, 15, 8, 0], "rotation": 270, "texture": "#1_0"}, + "south": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, + "west": {"uv": [8, 16, 10, 1], "rotation": 90, "texture": "#1_0"}, + "up": {"uv": [9, 0, 7, 15], "texture": "#1_0"}, + "down": {"uv": [8, 1, 6, 16], "texture": "#1_0"} } }, { "from": [2, 2, 0], "to": [4, 4, 15], - "faces": { - "north": {"uv": [14, 12, 16, 10], "texture": "#6"}, - "east": {"uv": [16, 0, 14, 15], "rotation": 270, "texture": "#7"}, - "south": {"uv": [16, 10, 14, 12], "rotation": 90, "texture": "#6"}, - "west": {"uv": [2, 1, 0, 16], "rotation": 270, "texture": "#7"}, - "up": {"uv": [15, 14, 0, 16], "rotation": 90, "texture": "#7"}, - "down": {"uv": [16, 0, 1, 2], "rotation": 90, "texture": "#7"} - } - }, - { - "from": [12, 12, 0], - "to": [14, 14, 15], "faces": { "north": {"uv": [16, 10, 14, 12], "texture": "#6"}, - "east": {"uv": [0, 16, 2, 1], "rotation": 270, "texture": "#7"}, + "east": {"uv": [6, 15, 8, 0], "rotation": 270, "texture": "#1_0"}, "south": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, - "west": {"uv": [14, 15, 16, 0], "rotation": 270, "texture": "#7"}, - "up": {"uv": [1, 2, 16, 0], "rotation": 90, "texture": "#7"}, - "down": {"uv": [0, 16, 15, 14], "rotation": 90, "texture": "#7"} + "west": {"uv": [8, 16, 10, 1], "rotation": 90, "texture": "#1_0"}, + "up": {"uv": [9, 0, 7, 15], "texture": "#1_0"}, + "down": {"uv": [8, 1, 6, 16], "texture": "#1_0"} } }, { "from": [12, 2, 0], "to": [14, 4, 15], "faces": { - "north": {"uv": [16, 12, 14, 10], "texture": "#6"}, - "east": {"uv": [2, 16, 0, 1], "rotation": 270, "texture": "#7"}, - "south": {"uv": [16, 12, 14, 10], "rotation": 90, "texture": "#6"}, - "west": {"uv": [16, 15, 14, 0], "rotation": 270, "texture": "#7"}, - "up": {"uv": [15, 16, 0, 14], "rotation": 90, "texture": "#7"}, - "down": {"uv": [16, 2, 1, 0], "rotation": 90, "texture": "#7"} + "north": {"uv": [16, 10, 14, 12], "texture": "#6"}, + "east": {"uv": [6, 15, 8, 0], "rotation": 270, "texture": "#1_0"}, + "south": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, + "west": {"uv": [8, 16, 10, 1], "rotation": 90, "texture": "#1_0"}, + "up": {"uv": [9, 0, 7, 15], "texture": "#1_0"}, + "down": {"uv": [8, 1, 6, 16], "texture": "#1_0"} } }, { "from": [1, 0, 3], "to": [15, 3, 10], "faces": { - "north": {"uv": [0, 0, 14, 3], "texture": "#9"}, - "east": {"uv": [8, 0, 15, 3], "texture": "#9"}, - "south": {"uv": [1, 0, 15, 3], "texture": "#9"}, - "west": {"uv": [8, 0, 15, 3], "texture": "#9"}, - "up": {"uv": [1, 4, 15, 11], "texture": "#8"}, - "down": {"uv": [1, 4, 15, 11], "texture": "#8"} + "north": {"uv": [0, 0, 14, 3], "texture": "#7"}, + "east": {"uv": [8, 0, 15, 3], "texture": "#7"}, + "south": {"uv": [1, 0, 15, 3], "texture": "#7"}, + "west": {"uv": [8, 0, 15, 3], "texture": "#7"}, + "up": {"uv": [1, 2, 8, 16], "rotation": 90, "texture": "#7"}, + "down": {"uv": [1, 4, 15, 11], "texture": "#7"} } } ], - "groups": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + "display": { + "gui": { + "rotation": [30, 45, 0], + "scale": [0.625, 0.625, 0.625] + } + }, + "groups": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, { "name": "shaft", "origin": [8, 8, 8], + "color": 0, "children": [] } ] diff --git a/src/main/resources/assets/create/models/block/creative_motor/block_vertical.json b/src/main/resources/assets/create/models/block/creative_motor/block_vertical.json index c76210cca..6e0468f40 100644 --- a/src/main/resources/assets/create/models/block/creative_motor/block_vertical.json +++ b/src/main/resources/assets/create/models/block/creative_motor/block_vertical.json @@ -4,12 +4,63 @@ "textures": { "5": "create:block/creative_casing", "6": "create:block/creative_motor", - "7": "create:block/gearbox", - "8": "block/polished_andesite", - "9": "create:block/andesite_bricks", - "particle": "#5" + "7": "create:block/flap_display_front", + "particle": "create:block/creative_casing", + "1_0": "create:block/axis" }, "elements": [ + { + "from": [12, 0, 2], + "to": [14, 15, 4], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [9, 0, 7, 15], "rotation": 180, "texture": "#1_0"}, + "east": {"uv": [6, 15, 8, 0], "texture": "#1_0"}, + "south": {"uv": [8, 1, 6, 16], "texture": "#1_0"}, + "west": {"uv": [8, 16, 10, 1], "texture": "#1_0"}, + "up": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, + "down": {"uv": [16, 10, 14, 12], "rotation": 180, "texture": "#6"} + } + }, + { + "from": [2, 0, 2], + "to": [4, 15, 4], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [9, 0, 7, 15], "rotation": 180, "texture": "#1_0"}, + "east": {"uv": [6, 15, 8, 0], "texture": "#1_0"}, + "south": {"uv": [8, 1, 6, 16], "texture": "#1_0"}, + "west": {"uv": [8, 16, 10, 1], "texture": "#1_0"}, + "up": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, + "down": {"uv": [16, 10, 14, 12], "rotation": 180, "texture": "#6"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 15, 14], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [9, 0, 7, 15], "rotation": 180, "texture": "#1_0"}, + "east": {"uv": [6, 15, 8, 0], "texture": "#1_0"}, + "south": {"uv": [8, 1, 6, 16], "texture": "#1_0"}, + "west": {"uv": [8, 16, 10, 1], "texture": "#1_0"}, + "up": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, + "down": {"uv": [16, 10, 14, 12], "rotation": 180, "texture": "#6"} + } + }, + { + "from": [12, 0, 12], + "to": [14, 15, 14], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [9, 0, 7, 15], "rotation": 180, "texture": "#1_0"}, + "east": {"uv": [6, 15, 8, 0], "texture": "#1_0"}, + "south": {"uv": [8, 1, 6, 16], "texture": "#1_0"}, + "west": {"uv": [8, 16, 10, 1], "texture": "#1_0"}, + "up": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, + "down": {"uv": [16, 10, 14, 12], "rotation": 180, "texture": "#6"} + } + }, { "name": "Back", "from": [3, 12, 3], @@ -61,65 +112,40 @@ "down": {"uv": [0, 4, 8, 14], "texture": "#5"} } }, - { - "from": [2, 0, 12], - "to": [4, 15, 14], - "faces": { - "north": {"uv": [1, 14, 16, 16], "rotation": 90, "texture": "#7"}, - "east": {"uv": [0, 0, 2, 15], "rotation": 180, "texture": "#7"}, - "south": {"uv": [0, 0, 15, 2], "rotation": 270, "texture": "#7"}, - "west": {"uv": [14, 1, 16, 16], "texture": "#7"}, - "up": {"uv": [16, 12, 14, 10], "texture": "#6"}, - "down": {"uv": [16, 12, 14, 10], "rotation": 270, "texture": "#6"} - } - }, - { - "from": [2, 0, 2], - "to": [4, 15, 4], - "faces": { - "north": {"uv": [0, 2, 15, 0], "rotation": 270, "texture": "#7"}, - "east": {"uv": [2, 0, 0, 15], "rotation": 180, "texture": "#7"}, - "south": {"uv": [1, 16, 16, 14], "rotation": 90, "texture": "#7"}, - "west": {"uv": [16, 1, 14, 16], "texture": "#7"}, - "up": {"uv": [16, 10, 14, 12], "texture": "#6"}, - "down": {"uv": [14, 12, 16, 10], "rotation": 270, "texture": "#6"} - } - }, - { - "from": [12, 0, 12], - "to": [14, 15, 14], - "faces": { - "north": {"uv": [1, 16, 16, 14], "rotation": 90, "texture": "#7"}, - "east": {"uv": [16, 1, 14, 16], "texture": "#7"}, - "south": {"uv": [0, 2, 15, 0], "rotation": 270, "texture": "#7"}, - "west": {"uv": [2, 0, 0, 15], "rotation": 180, "texture": "#7"}, - "up": {"uv": [14, 12, 16, 10], "texture": "#6"}, - "down": {"uv": [16, 10, 14, 12], "rotation": 270, "texture": "#6"} - } - }, - { - "from": [12, 0, 2], - "to": [14, 15, 4], - "faces": { - "north": {"uv": [0, 0, 15, 2], "rotation": 270, "texture": "#7"}, - "east": {"uv": [14, 1, 16, 16], "texture": "#7"}, - "south": {"uv": [1, 14, 16, 16], "rotation": 90, "texture": "#7"}, - "west": {"uv": [0, 0, 2, 15], "rotation": 180, "texture": "#7"}, - "up": {"uv": [14, 10, 16, 12], "texture": "#6"}, - "down": {"uv": [14, 10, 16, 12], "rotation": 270, "texture": "#6"} - } - }, { "from": [3, 0.2, 3], "to": [13, 4, 13], "faces": { - "north": {"uv": [5, 0, 15, 4], "texture": "#9"}, - "east": {"uv": [5, 0, 15, 4], "texture": "#9"}, - "south": {"uv": [5, 0, 15, 4], "texture": "#9"}, - "west": {"uv": [5, 0, 15, 4], "texture": "#9"}, - "up": {"uv": [11, 14, 1, 4], "rotation": 90, "texture": "#8"}, + "north": {"uv": [5, 0, 15, 4], "texture": "#7"}, + "east": {"uv": [5, 0, 15, 4], "texture": "#7"}, + "south": {"uv": [5, 0, 15, 4], "texture": "#7"}, + "west": {"uv": [3, 0, 13, 4], "rotation": 180, "texture": "#7"}, + "up": {"uv": [10, 10, 0, 0], "rotation": 90, "texture": "#6"}, "down": {"uv": [10, 10, 0, 0], "rotation": 180, "texture": "#6"} } } + ], + "display": { + "gui": { + "rotation": [30, 45, 0], + "scale": [0.625, 0.625, 0.625] + } + }, + "groups": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + { + "name": "shaft", + "origin": [8, 8, 8], + "color": 0, + "children": [] + } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/creative_motor/item.json b/src/main/resources/assets/create/models/block/creative_motor/item.json index 07f29fc7f..96da6b25b 100644 --- a/src/main/resources/assets/create/models/block/creative_motor/item.json +++ b/src/main/resources/assets/create/models/block/creative_motor/item.json @@ -4,12 +4,10 @@ "textures": { "5": "create:block/creative_casing", "6": "create:block/creative_motor", - "7": "create:block/gearbox", - "8": "block/polished_andesite", - "9": "create:block/andesite_bricks", + "7": "create:block/flap_display_front", + "particle": "create:block/creative_casing", "1_0": "create:block/axis", - "1_1": "create:block/axis_top", - "particle": "#5" + "1_1": "create:block/axis_top" }, "elements": [ { @@ -75,64 +73,64 @@ "down": {"uv": [4, 3, 12, 12], "rotation": 180, "texture": "#5"} } }, + { + "from": [12, 12, 0], + "to": [14, 14, 15], + "faces": { + "north": {"uv": [16, 10, 14, 12], "texture": "#6"}, + "east": {"uv": [6, 15, 8, 0], "rotation": 270, "texture": "#1_0"}, + "south": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, + "west": {"uv": [8, 16, 10, 1], "rotation": 90, "texture": "#1_0"}, + "up": {"uv": [9, 0, 7, 15], "texture": "#1_0"}, + "down": {"uv": [8, 1, 6, 16], "texture": "#1_0"} + } + }, { "from": [2, 12, 0], "to": [4, 14, 15], "faces": { - "north": {"uv": [14, 10, 16, 12], "texture": "#6"}, - "east": {"uv": [14, 1, 16, 16], "rotation": 270, "texture": "#7"}, - "south": {"uv": [14, 10, 16, 12], "rotation": 90, "texture": "#6"}, - "west": {"uv": [0, 0, 2, 15], "rotation": 270, "texture": "#7"}, - "up": {"uv": [0, 0, 15, 2], "rotation": 90, "texture": "#7"}, - "down": {"uv": [1, 14, 16, 16], "rotation": 90, "texture": "#7"} + "north": {"uv": [16, 10, 14, 12], "texture": "#6"}, + "east": {"uv": [6, 15, 8, 0], "rotation": 270, "texture": "#1_0"}, + "south": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, + "west": {"uv": [8, 16, 10, 1], "rotation": 90, "texture": "#1_0"}, + "up": {"uv": [9, 0, 7, 15], "texture": "#1_0"}, + "down": {"uv": [8, 1, 6, 16], "texture": "#1_0"} } }, { "from": [2, 2, 0], "to": [4, 4, 15], - "faces": { - "north": {"uv": [14, 12, 16, 10], "texture": "#6"}, - "east": {"uv": [16, 1, 14, 16], "rotation": 270, "texture": "#7"}, - "south": {"uv": [16, 10, 14, 12], "rotation": 90, "texture": "#6"}, - "west": {"uv": [2, 0, 0, 15], "rotation": 270, "texture": "#7"}, - "up": {"uv": [16, 14, 1, 16], "rotation": 90, "texture": "#7"}, - "down": {"uv": [15, 0, 0, 2], "rotation": 90, "texture": "#7"} - } - }, - { - "from": [12, 12, 0], - "to": [14, 14, 15], "faces": { "north": {"uv": [16, 10, 14, 12], "texture": "#6"}, - "east": {"uv": [0, 15, 2, 0], "rotation": 270, "texture": "#7"}, + "east": {"uv": [6, 15, 8, 0], "rotation": 270, "texture": "#1_0"}, "south": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, - "west": {"uv": [14, 16, 16, 1], "rotation": 270, "texture": "#7"}, - "up": {"uv": [0, 2, 15, 0], "rotation": 90, "texture": "#7"}, - "down": {"uv": [1, 16, 16, 14], "rotation": 90, "texture": "#7"} + "west": {"uv": [8, 16, 10, 1], "rotation": 90, "texture": "#1_0"}, + "up": {"uv": [9, 0, 7, 15], "texture": "#1_0"}, + "down": {"uv": [8, 1, 6, 16], "texture": "#1_0"} } }, { "from": [12, 2, 0], "to": [14, 4, 15], "faces": { - "north": {"uv": [16, 12, 14, 10], "texture": "#6"}, - "east": {"uv": [2, 15, 0, 0], "rotation": 270, "texture": "#7"}, - "south": {"uv": [16, 12, 14, 10], "rotation": 90, "texture": "#6"}, - "west": {"uv": [16, 16, 14, 1], "rotation": 270, "texture": "#7"}, - "up": {"uv": [16, 16, 1, 14], "rotation": 90, "texture": "#7"}, - "down": {"uv": [15, 2, 0, 0], "rotation": 90, "texture": "#7"} + "north": {"uv": [16, 10, 14, 12], "texture": "#6"}, + "east": {"uv": [6, 15, 8, 0], "rotation": 270, "texture": "#1_0"}, + "south": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"}, + "west": {"uv": [8, 16, 10, 1], "rotation": 90, "texture": "#1_0"}, + "up": {"uv": [9, 0, 7, 15], "texture": "#1_0"}, + "down": {"uv": [8, 1, 6, 16], "texture": "#1_0"} } }, { "from": [1, 0, 3], "to": [15, 3, 10], "faces": { - "north": {"uv": [0, 0, 14, 3], "texture": "#9"}, - "east": {"uv": [8, 0, 15, 3], "texture": "#9"}, - "south": {"uv": [1, 0, 15, 3], "texture": "#9"}, - "west": {"uv": [8, 0, 15, 3], "texture": "#9"}, - "up": {"uv": [1, 4, 15, 11], "texture": "#8"}, - "down": {"uv": [1, 4, 15, 11], "texture": "#8"} + "north": {"uv": [0, 0, 14, 3], "texture": "#7"}, + "east": {"uv": [8, 0, 15, 3], "texture": "#7"}, + "south": {"uv": [1, 0, 15, 3], "texture": "#7"}, + "west": {"uv": [8, 0, 15, 3], "texture": "#7"}, + "up": {"uv": [1, 2, 8, 16], "rotation": 90, "texture": "#7"}, + "down": {"uv": [1, 4, 15, 11], "texture": "#7"} } }, { @@ -156,10 +154,21 @@ "scale": [0.625, 0.625, 0.625] } }, - "groups": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + "groups": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, { "name": "shaft", "origin": [8, 8, 8], + "color": 0, "children": [10] } ] diff --git a/src/main/resources/assets/create/models/block/funnel/block_horizontal.json b/src/main/resources/assets/create/models/block/funnel/block_horizontal.json index 20ace9c21..d4c8803dd 100644 --- a/src/main/resources/assets/create/models/block/funnel/block_horizontal.json +++ b/src/main/resources/assets/create/models/block/funnel/block_horizontal.json @@ -67,7 +67,7 @@ "east": {"uv": [11, 0, 14, 8], "rotation": 180, "texture": "#direction"}, "south": {"uv": [0, 8, 8, 16], "rotation": 180, "texture": "#direction"}, "west": {"uv": [11, 0, 14, 8], "texture": "#direction"}, - "up": {"uv": [11, 0, 14, 7.5], "rotation": 90, "texture": "#direction"}, + "up": {"uv": [11, 0, 14, 8], "rotation": 90, "texture": "#direction"}, "down": {"uv": [0, 8, 8, 11], "texture": "#direction"} } }, diff --git a/src/main/resources/assets/create/models/block/funnel/flap.json b/src/main/resources/assets/create/models/block/funnel/flap.json index 94b2a6bb9..7af138154 100644 --- a/src/main/resources/assets/create/models/block/funnel/flap.json +++ b/src/main/resources/assets/create/models/block/funnel/flap.json @@ -1,7 +1,7 @@ { "credit": "Made with Blockbench", "textures": { - "4": "create:block/brass_funnel_back" + "4": "create:block/funnel/funnel_back" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/reinforced_rail/block.json b/src/main/resources/assets/create/models/block/reinforced_rail/block.json deleted file mode 100644 index 63746f266..000000000 --- a/src/main/resources/assets/create/models/block/reinforced_rail/block.json +++ /dev/null @@ -1,136 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", -"ambientocclusion": false, - "textures": { - "oak_planks": "minecraft:block/oak_planks", - "rail": "create:block/reinforced_rail_top", - "particle": "create:block/reinforced_rail_top" - }, - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0 ], - "scale": [ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] - }, - "head": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 315, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 315, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - }, - "elements": [ - { - "name": "Cube", - "from": [ 0, -2, 0 ], - "to": [ 16, 1, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 1, 2, 15, 1 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 1, 16, 4 ] }, - "south": { "texture": "#oak_planks", "uv": [ 1, 1, 16, 4 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 3 ] }, - "up": { "texture": "#rail", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#oak_planks", "uv": [ 1, 0, 16, 16 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 0, 0 ], - "to": [ 1, 2, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 15, 0, 0 ], - "to": [ 17, 2, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 16, 7, -2 ], - "to": [ 17, 9, 7 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 5, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } - } - }, - { - "name": "Cube", - "from": [ 16, 7, 7 ], - "to": [ 17, 9, 18 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 12, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 7, 7 ], - "to": [ 0, 9, 18 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 7, -2 ], - "to": [ 0, 9, 7 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/reinforced_rail/block_n.json b/src/main/resources/assets/create/models/block/reinforced_rail/block_n.json deleted file mode 100644 index 5454c0292..000000000 --- a/src/main/resources/assets/create/models/block/reinforced_rail/block_n.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", -"ambientocclusion": false, - "textures": { - "oak_planks": "minecraft:block/oak_planks", - "rail": "create:block/reinforced_rail_top", - "particle": "create:block/reinforced_rail_top" - }, - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0 ], - "scale": [ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] - }, - "head": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 315, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 315, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - }, - "elements": [ - { - "name": "Cube", - "from": [ 0, -2, 0 ], - "to": [ 16, 1, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 1, 2, 15, 1 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 1, 16, 4 ] }, - "south": { "texture": "#oak_planks", "uv": [ 1, 1, 16, 4 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 3 ] }, - "up": { "texture": "#rail", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#oak_planks", "uv": [ 1, 0, 16, 16 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 0, 0 ], - "to": [ 1, 2, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 15, 0, 0 ], - "to": [ 17, 2, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 16, 7, -2 ], - "to": [ 17, 9, 7 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 5, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } - } - }, - { - "name": "Cube", - "from": [ 16, 7, 7 ], - "to": [ 17, 9, 18 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 12, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 7, 7 ], - "to": [ 0, 9, 18 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 7, -2 ], - "to": [ 0, 9, 7 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } - } - }, - { - "name": "connection_n", - "from": [ -1, 7, 0 ], - "to": [ 0, 9, 8 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 5, 7 ] } - } - }, - { - "name": "connection_n", - "from": [ 16, 7, 0 ], - "to": [ 17, 9, 8 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/reinforced_rail/block_s.json b/src/main/resources/assets/create/models/block/reinforced_rail/block_s.json deleted file mode 100644 index 75f76f222..000000000 --- a/src/main/resources/assets/create/models/block/reinforced_rail/block_s.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", -"ambientocclusion": false, - "textures": { - "oak_planks": "minecraft:block/oak_planks", - "rail": "create:block/reinforced_rail_top", - "particle": "create:block/reinforced_rail_top" - }, - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0 ], - "scale": [ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] - }, - "head": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 315, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 315, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - }, - "elements": [ - { - "name": "Cube", - "from": [ 0, -2, 0 ], - "to": [ 16, 1, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 1, 2, 15, 1 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 1, 16, 4 ] }, - "south": { "texture": "#oak_planks", "uv": [ 1, 1, 16, 4 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 3 ] }, - "up": { "texture": "#rail", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#oak_planks", "uv": [ 1, 0, 16, 16 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 0, 0 ], - "to": [ 1, 2, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 15, 0, 0 ], - "to": [ 17, 2, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 16, 7, -2 ], - "to": [ 17, 9, 7 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 5, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } - } - }, - { - "name": "Cube", - "from": [ 16, 7, 7 ], - "to": [ 17, 9, 18 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 12, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 7, 7 ], - "to": [ 0, 9, 18 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 7, -2 ], - "to": [ 0, 9, 7 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } - } - }, - { - "name": "connection_s", - "from": [ -1, 7, 8 ], - "to": [ 0, 9, 16 ], - "faces": { - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 10, 1 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 8 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 4, 7 ] } - } - }, - { - "name": "connection_s", - "from": [ 16, 7, 8 ], - "to": [ 17, 9, 16 ], - "faces": { - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/reinforced_rail/block_s_n.json b/src/main/resources/assets/create/models/block/reinforced_rail/block_s_n.json deleted file mode 100644 index 9d17be5be..000000000 --- a/src/main/resources/assets/create/models/block/reinforced_rail/block_s_n.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", -"ambientocclusion": false, - "textures": { - "oak_planks": "minecraft:block/oak_planks", - "rail": "create:block/reinforced_rail_top", - "particle": "create:block/reinforced_rail_top" - }, - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.625, 0.625, 0.625 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 3, 0 ], - "scale": [ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] - }, - "head": { - "rotation": [ 0, 180, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 315, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "thirdperson_righthand": { - "rotation": [ 75, 315, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - }, - "elements": [ - { - "name": "Cube", - "from": [ 0, -2, 0 ], - "to": [ 16, 1, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 1, 2, 15, 1 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 1, 16, 4 ] }, - "south": { "texture": "#oak_planks", "uv": [ 1, 1, 16, 4 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 3 ] }, - "up": { "texture": "#rail", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#oak_planks", "uv": [ 1, 0, 16, 16 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 0, 0 ], - "to": [ 1, 2, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 15, 0, 0 ], - "to": [ 17, 2, 16 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 16, 7, -2 ], - "to": [ 17, 9, 7 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 5, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } - } - }, - { - "name": "Cube", - "from": [ 16, 7, 7 ], - "to": [ 17, 9, 18 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 12, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 7, 7 ], - "to": [ 0, 9, 18 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } - } - }, - { - "name": "Cube", - "from": [ -1, 7, -2 ], - "to": [ 0, 9, 7 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } - } - }, - { - "name": "connection_n", - "from": [ -1, 7, 0 ], - "to": [ 0, 9, 8 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 5, 7 ] } - } - }, - { - "name": "connection_s", - "from": [ -1, 7, 8 ], - "to": [ 0, 9, 16 ], - "faces": { - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 10, 1 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 8 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 4, 7 ] } - } - }, - { - "name": "connection_s", - "from": [ 16, 7, 8 ], - "to": [ 17, 9, 16 ], - "faces": { - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] } - } - }, - { - "name": "connection_n", - "from": [ 16, 7, 0 ], - "to": [ 17, 9, 8 ], - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/rotation_speed_controller/block.json b/src/main/resources/assets/create/models/block/rotation_speed_controller/block.json index d4da4d489..2243c2211 100644 --- a/src/main/resources/assets/create/models/block/rotation_speed_controller/block.json +++ b/src/main/resources/assets/create/models/block/rotation_speed_controller/block.json @@ -3,10 +3,10 @@ "parent": "create:block/large_wheels", "textures": { "0": "create:block/rotation_speed_controller", - "3": "create:block/brass_funnel_plating", "4": "create:block/brass_gearbox", "5": "create:block/rotation_speed_controller_top", "6": "create:block/brass_block", + "7": "create:block/funnel/brass_funnel_neutral", "particle": "create:block/brass_gearbox" }, "elements": [ @@ -30,7 +30,7 @@ "north": {"uv": [6, 6, 11, 0], "texture": "#0"}, "east": {"uv": [0, 10, 16, 16], "texture": "#4"}, "south": {"uv": [0, 0, 5, 6], "texture": "#0"}, - "west": {"uv": [0, 0, 8, 3], "texture": "#3"}, + "west": {"uv": [0, 0, 8, 3], "texture": "#7"}, "up": {"uv": [0, 0, 5, 16], "texture": "#5"}, "down": {"uv": [0, 0, 5, 16], "texture": "#6"} } @@ -53,7 +53,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [19, 18, 8]}, "faces": { "north": {"uv": [0, 0, 5, 6], "texture": "#0"}, - "east": {"uv": [0, 0, 8, 3], "texture": "#3"}, + "east": {"uv": [0, 0, 8, 3], "texture": "#7"}, "south": {"uv": [6, 6, 11, 0], "texture": "#0"}, "west": {"uv": [0, 10, 16, 16], "texture": "#4"}, "up": {"uv": [11, 0, 16, 16], "texture": "#5"}, diff --git a/src/main/resources/assets/create/models/block/rotation_speed_controller/bracket.json b/src/main/resources/assets/create/models/block/rotation_speed_controller/bracket.json index 7ca552898..f155beab9 100644 --- a/src/main/resources/assets/create/models/block/rotation_speed_controller/bracket.json +++ b/src/main/resources/assets/create/models/block/rotation_speed_controller/bracket.json @@ -3,7 +3,6 @@ "parent": "block/block", "textures": { "2": "create:block/brass_casing", - "3": "create:block/brass_casing_side", "4": "create:block/brass_block", "5": "create:block/rotation_speed_controller_bracket", "6": "create:block/rotation_speed_controller", @@ -63,11 +62,11 @@ "to": [13.5, 14, 4.5], "rotation": {"angle": 0, "axis": "y", "origin": [20, 14, -16]}, "faces": { - "north": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "east": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "south": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "west": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "up": {"uv": [13, 9, 14, 10], "texture": "#3"}, + "north": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "east": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "south": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "west": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "up": {"uv": [13, 9, 14, 10], "texture": "#2"}, "down": {"uv": [0, 0, 0, 0], "texture": "#4"} } }, @@ -88,11 +87,11 @@ "to": [3.5, 14, 4.5], "rotation": {"angle": 0, "axis": "y", "origin": [10, 14, -16]}, "faces": { - "north": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "east": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "south": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "west": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "up": {"uv": [13, 9, 14, 10], "texture": "#3"}, + "north": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "east": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "south": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "west": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "up": {"uv": [13, 9, 14, 10], "texture": "#2"}, "down": {"uv": [0, 0, 0, 0], "texture": "#4"} } }, @@ -149,11 +148,11 @@ "to": [13.5, 14, 12.5], "rotation": {"angle": 0, "axis": "y", "origin": [20, 14, -8]}, "faces": { - "north": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "east": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "south": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "west": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "up": {"uv": [13, 9, 14, 10], "texture": "#3"}, + "north": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "east": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "south": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "west": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "up": {"uv": [13, 9, 14, 10], "texture": "#2"}, "down": {"uv": [0, 0, 0, 0], "texture": "#4"} } }, @@ -174,11 +173,11 @@ "to": [3.5, 14, 12.5], "rotation": {"angle": 0, "axis": "y", "origin": [10, 14, -8]}, "faces": { - "north": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "east": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "south": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "west": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, - "up": {"uv": [13, 9, 14, 10], "texture": "#3"}, + "north": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "east": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "south": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "west": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#2"}, + "up": {"uv": [13, 9, 14, 10], "texture": "#2"}, "down": {"uv": [0, 0, 0, 0], "texture": "#4"} } }, diff --git a/src/main/resources/assets/create/models/block/rotation_speed_controller/item.json b/src/main/resources/assets/create/models/block/rotation_speed_controller/item.json index 160965c86..43ee0d01e 100644 --- a/src/main/resources/assets/create/models/block/rotation_speed_controller/item.json +++ b/src/main/resources/assets/create/models/block/rotation_speed_controller/item.json @@ -5,10 +5,10 @@ "0": "create:block/axis", "3": "create:block/axis_top", "4": "create:block/brass_gearbox", + "7": "create:block/funnel/brass_funnel_neutral", "9": "create:block/brass_block", "particle": "create:block/brass_gearbox", "1_0": "create:block/rotation_speed_controller", - "1_3": "create:block/brass_funnel_plating", "1_5": "create:block/rotation_speed_controller_top" }, "elements": [ @@ -45,7 +45,7 @@ "north": {"uv": [6, 6, 11, 0], "texture": "#1_0"}, "east": {"uv": [0, 10, 16, 16], "texture": "#4"}, "south": {"uv": [0, 0, 5, 6], "texture": "#1_0"}, - "west": {"uv": [0, 0, 8, 3], "texture": "#1_3"}, + "west": {"uv": [0, 0, 8, 3], "texture": "#7"}, "up": {"uv": [0, 0, 5, 16], "texture": "#1_5"}, "down": {"uv": [0, 0, 5, 16], "texture": "#9"} } @@ -68,7 +68,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [19, 18, 8]}, "faces": { "north": {"uv": [0, 0, 5, 6], "texture": "#1_0"}, - "east": {"uv": [0, 0, 8, 3], "texture": "#1_3"}, + "east": {"uv": [0, 0, 8, 3], "texture": "#7"}, "south": {"uv": [6, 6, 11, 0], "texture": "#1_0"}, "west": {"uv": [0, 10, 16, 16], "texture": "#4"}, "up": {"uv": [11, 0, 16, 16], "texture": "#1_5"}, @@ -100,10 +100,12 @@ } } ], - "groups": [0, + "groups": [ + 0, { "name": "block", "origin": [8, 8, 8], + "color": 0, "children": [1, 2, 3, 4, 5, 6] } ] diff --git a/src/main/resources/assets/create/models/block/smart_chute/block.json b/src/main/resources/assets/create/models/block/smart_chute/block.json index 8977344b6..6960b24d3 100644 --- a/src/main/resources/assets/create/models/block/smart_chute/block.json +++ b/src/main/resources/assets/create/models/block/smart_chute/block.json @@ -3,11 +3,11 @@ "parent": "block/block", "textures": { "1": "create:block/chute_diagonal", - "2": "create:block/brass_funnel_plating", - "3": "create:block/brass_block", - "5": "create:block/brass_funnel_tall", "13": "create:block/chute", - "particle": "block/hopper_outside" + "redstone": "create:block/funnel/brass_funnel_unpowered", + "particle": "create:block/funnel/brass_funnel_frame", + "frame": "create:block/funnel/brass_funnel_frame", + "direction": "create:block/funnel/brass_funnel_pull" }, "elements": [ { @@ -119,64 +119,28 @@ "down": {"uv": [9.5, 9.5, 14.5, 14.5], "texture": "#13"} } }, - { - "from": [0, 9, 0], - "to": [2, 15, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 22, 8]}, - "faces": { - "north": {"uv": [7, 0, 8, 3], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#2"}, - "west": {"uv": [0, 0, 8, 3], "texture": "#2"}, - "up": {"uv": [0, 0, 2, 16], "texture": "#3"}, - "down": {"uv": [0, 0, 2, 16], "texture": "#3"} - } - }, - { - "from": [2, 9, 0], - "to": [14, 15, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 22, 8]}, - "faces": { - "north": {"uv": [1, 0, 7, 3], "texture": "#2"}, - "east": {"uv": [7, 0, 8, 3], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#2"}, - "up": {"uv": [0, 2, 2, 14], "rotation": 90, "texture": "#3"}, - "down": {"uv": [0, 2, 2, 14], "rotation": 270, "texture": "#3"} - } - }, - { - "from": [2, 9, 14], - "to": [14, 15, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 22, 8]}, - "faces": { - "east": {"uv": [8, 0, 7, 3], "texture": "#2"}, - "south": {"uv": [7, 0, 1, 3], "texture": "#2"}, - "west": {"uv": [1, 0, 0, 3], "texture": "#2"}, - "up": {"uv": [2, 2, 0, 14], "rotation": 90, "texture": "#3"}, - "down": {"uv": [2, 2, 0, 14], "rotation": 270, "texture": "#3"} - } - }, - { - "from": [14, 9, 0], - "to": [16, 15, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 22, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#2"}, - "east": {"uv": [8, 0, 0, 3], "texture": "#2"}, - "south": {"uv": [7, 0, 8, 3], "texture": "#2"}, - "up": {"uv": [2, 0, 0, 16], "texture": "#3"}, - "down": {"uv": [2, 0, 0, 16], "texture": "#3"} - } - }, { "from": [1, 7, 1], "to": [15, 9, 15], "rotation": {"angle": 0, "axis": "y", "origin": [21, 18, 9]}, "faces": { - "north": {"uv": [1, 4, 15, 6], "texture": "#5"}, - "east": {"uv": [1, 4, 15, 6], "texture": "#5"}, - "south": {"uv": [1, 4, 15, 6], "texture": "#5"}, - "west": {"uv": [1, 4, 15, 6], "texture": "#5"}, - "down": {"uv": [1, 1, 15, 15], "texture": "#3"} + "north": {"uv": [1, 1, 3, 15], "rotation": 270, "texture": "#redstone"}, + "east": {"uv": [1, 1, 3, 15], "rotation": 270, "texture": "#redstone"}, + "south": {"uv": [1, 1, 3, 15], "rotation": 270, "texture": "#redstone"}, + "west": {"uv": [1, 1, 3, 15], "rotation": 270, "texture": "#redstone"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#frame"} + } + }, + { + "from": [0, 9, 0], + "to": [16, 15, 16], + "faces": { + "north": {"uv": [0, 0, 8, 3], "texture": "#direction"}, + "east": {"uv": [0, 0, 8, 3], "texture": "#direction"}, + "south": {"uv": [0, 0, 8, 3], "texture": "#direction"}, + "west": {"uv": [0, 0, 8, 3], "texture": "#direction"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#frame"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#frame"} } } ], @@ -184,11 +148,17 @@ { "name": "ChuteTop", "origin": [9, 16, -7], + "color": 0, "children": [0, 1, 2, 3, 4] }, { "name": "ChuteBase", "origin": [8, 8, -7], + "color": 0, "children": [5, 6, 7, 8] - }, 9, 10, 11, 12, 13, 14] + }, + 9, + 10, + 11 + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/smart_chute/block_powered.json b/src/main/resources/assets/create/models/block/smart_chute/block_powered.json index 1a2636b1b..185076fd7 100644 --- a/src/main/resources/assets/create/models/block/smart_chute/block_powered.json +++ b/src/main/resources/assets/create/models/block/smart_chute/block_powered.json @@ -1,6 +1,7 @@ { + "credit": "Made with Blockbench", "parent": "create:block/smart_chute/block", "textures": { - "5": "create:block/brass_funnel_tall_powered" + "redstone": "create:block/funnel/brass_funnel_powered" } } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/stockpile_switch.json b/src/main/resources/assets/create/models/block/stockpile_switch.json index 9439bb80c..88ac8bbc3 100644 --- a/src/main/resources/assets/create/models/block/stockpile_switch.json +++ b/src/main/resources/assets/create/models/block/stockpile_switch.json @@ -2,12 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "5": "create:block/brass_casing_inner", - "6": "create:block/brass_casing", "7": "create:block/filtered_detector_top", + "8": "create:block/brass_casing_connected", "indicator": "create:block/indicator/0", - "particle": "create:block/brass_casing_side", - "brass_casing": "create:block/brass_casing_side", "end": "create:block/filtered_detector_front" }, "elements": [ @@ -16,12 +13,12 @@ "from": [0, 0, 0], "to": [16, 2, 16], "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#brass_casing"}, - "east": {"uv": [0, 14, 16, 16], "texture": "#brass_casing"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#brass_casing"}, - "west": {"uv": [0, 14, 16, 16], "texture": "#brass_casing"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#6"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#6"} + "north": {"uv": [0, 7.75, 2.125, 8], "texture": "#8"}, + "east": {"uv": [0, 7.75, 2.125, 8], "texture": "#8"}, + "south": {"uv": [0, 7.75, 2.125, 8], "texture": "#8"}, + "west": {"uv": [0, 7.75, 2.125, 8], "texture": "#8"}, + "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#8"}, + "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#8"} } }, { @@ -29,12 +26,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#brass_casing"}, - "east": {"uv": [0, 0, 16, 2], "texture": "#brass_casing"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#brass_casing"}, - "west": {"uv": [0, 0, 16, 2], "texture": "#brass_casing"}, + "north": {"uv": [0, 6, 2.125, 6.25], "texture": "#8"}, + "east": {"uv": [0, 6, 2.125, 6.25], "texture": "#8"}, + "south": {"uv": [0, 6, 2.125, 6.25], "texture": "#8"}, + "west": {"uv": [0, 6, 2.125, 6.25], "texture": "#8"}, "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#7"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#6"} + "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#8"} } }, { @@ -42,12 +39,25 @@ "from": [0.9, 2, 0.9], "to": [15.1, 14, 15.1], "faces": { - "north": {"uv": [0, 1, 12, 15], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 1, 12, 15], "rotation": 90, "texture": "#5"}, - "south": {"uv": [0, 1, 12, 15], "rotation": 90, "texture": "#5"}, - "west": {"uv": [0, 1, 12, 15], "rotation": 90, "texture": "#5"}, - "up": {"uv": [0, 0, 14, 14], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 0, 14, 14], "rotation": 270, "texture": "#5"} + "north": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#8"}, + "east": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#8"}, + "south": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#8"}, + "west": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#8"}, + "up": {"uv": [0, 0, 14, 14], "rotation": 90, "texture": "#missing"}, + "down": {"uv": [0, 0, 14, 14], "rotation": 270, "texture": "#missing"} + } + }, + { + "name": "Center", + "from": [0.9, 2, 0.9], + "to": [15.1, 14, 15.1], + "faces": { + "north": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#missing"}, + "east": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#missing"}, + "south": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#missing"}, + "west": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#missing"}, + "up": {"uv": [0, 0, 14, 14], "rotation": 90, "texture": "#missing"}, + "down": {"uv": [0, 0, 14, 14], "rotation": 270, "texture": "#missing"} } }, { diff --git a/src/main/resources/assets/create/textures/block/andesite_alloy_mesh.png b/src/main/resources/assets/create/textures/block/andesite_alloy_mesh.png deleted file mode 100644 index 6029dac92..000000000 Binary files a/src/main/resources/assets/create/textures/block/andesite_alloy_mesh.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/andesite_bricks.png b/src/main/resources/assets/create/textures/block/andesite_bricks.png deleted file mode 100644 index 6cef8fae1..000000000 Binary files a/src/main/resources/assets/create/textures/block/andesite_bricks.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/andesite_frame.png b/src/main/resources/assets/create/textures/block/andesite_frame.png deleted file mode 100644 index 26b27b3f4..000000000 Binary files a/src/main/resources/assets/create/textures/block/andesite_frame.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel.png b/src/main/resources/assets/create/textures/block/andesite_funnel.png deleted file mode 100644 index 0abae76cb..000000000 Binary files a/src/main/resources/assets/create/textures/block/andesite_funnel.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel_back.png b/src/main/resources/assets/create/textures/block/andesite_funnel_back.png deleted file mode 100644 index dc0ba1a4c..000000000 Binary files a/src/main/resources/assets/create/textures/block/andesite_funnel_back.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel_neutral.png b/src/main/resources/assets/create/textures/block/andesite_funnel_neutral.png deleted file mode 100644 index 0217ce818..000000000 Binary files a/src/main/resources/assets/create/textures/block/andesite_funnel_neutral.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel_plating.png b/src/main/resources/assets/create/textures/block/andesite_funnel_plating.png deleted file mode 100644 index c958f8aec..000000000 Binary files a/src/main/resources/assets/create/textures/block/andesite_funnel_plating.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel_powered.png b/src/main/resources/assets/create/textures/block/andesite_funnel_powered.png deleted file mode 100644 index 9044f6a19..000000000 Binary files a/src/main/resources/assets/create/textures/block/andesite_funnel_powered.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel_pull.png b/src/main/resources/assets/create/textures/block/andesite_funnel_pull.png deleted file mode 100644 index 00ed0b7ab..000000000 Binary files a/src/main/resources/assets/create/textures/block/andesite_funnel_pull.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel_push.png b/src/main/resources/assets/create/textures/block/andesite_funnel_push.png deleted file mode 100644 index 5ed71a133..000000000 Binary files a/src/main/resources/assets/create/textures/block/andesite_funnel_push.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel_slope.png b/src/main/resources/assets/create/textures/block/andesite_funnel_slope.png deleted file mode 100644 index c72abb194..000000000 Binary files a/src/main/resources/assets/create/textures/block/andesite_funnel_slope.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel_tall.png b/src/main/resources/assets/create/textures/block/andesite_funnel_tall.png deleted file mode 100644 index e501791f9..000000000 Binary files a/src/main/resources/assets/create/textures/block/andesite_funnel_tall.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/andesite_funnel_tall_powered.png b/src/main/resources/assets/create/textures/block/andesite_funnel_tall_powered.png deleted file mode 100644 index 8321619db..000000000 Binary files a/src/main/resources/assets/create/textures/block/andesite_funnel_tall_powered.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/andesite_tunnel.png b/src/main/resources/assets/create/textures/block/andesite_tunnel.png deleted file mode 100644 index 6c296521d..000000000 Binary files a/src/main/resources/assets/create/textures/block/andesite_tunnel.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/andesite_tunnel_top.png b/src/main/resources/assets/create/textures/block/andesite_tunnel_top.png deleted file mode 100644 index ff0e67138..000000000 Binary files a/src/main/resources/assets/create/textures/block/andesite_tunnel_top.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/andesite_tunnel_top_window.png b/src/main/resources/assets/create/textures/block/andesite_tunnel_top_window.png deleted file mode 100644 index 671d7fda6..000000000 Binary files a/src/main/resources/assets/create/textures/block/andesite_tunnel_top_window.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/brass_casing_inner.png b/src/main/resources/assets/create/textures/block/brass_casing_inner.png deleted file mode 100644 index 1f36fed4f..000000000 Binary files a/src/main/resources/assets/create/textures/block/brass_casing_inner.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/brass_casing_side.png b/src/main/resources/assets/create/textures/block/brass_casing_side.png deleted file mode 100644 index 15a42314f..000000000 Binary files a/src/main/resources/assets/create/textures/block/brass_casing_side.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/brass_funnel.png b/src/main/resources/assets/create/textures/block/brass_funnel.png deleted file mode 100644 index 37e12beb6..000000000 Binary files a/src/main/resources/assets/create/textures/block/brass_funnel.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/brass_funnel_back.png b/src/main/resources/assets/create/textures/block/brass_funnel_back.png deleted file mode 100644 index c2c98687b..000000000 Binary files a/src/main/resources/assets/create/textures/block/brass_funnel_back.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/brass_funnel_neutral.png b/src/main/resources/assets/create/textures/block/brass_funnel_neutral.png deleted file mode 100644 index 32e18176a..000000000 Binary files a/src/main/resources/assets/create/textures/block/brass_funnel_neutral.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/brass_funnel_plating.png b/src/main/resources/assets/create/textures/block/brass_funnel_plating.png deleted file mode 100644 index d795fd8d4..000000000 Binary files a/src/main/resources/assets/create/textures/block/brass_funnel_plating.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/brass_funnel_powered.png b/src/main/resources/assets/create/textures/block/brass_funnel_powered.png deleted file mode 100644 index 0f107775d..000000000 Binary files a/src/main/resources/assets/create/textures/block/brass_funnel_powered.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/brass_funnel_pull.png b/src/main/resources/assets/create/textures/block/brass_funnel_pull.png deleted file mode 100644 index 7b9f6d579..000000000 Binary files a/src/main/resources/assets/create/textures/block/brass_funnel_pull.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/brass_funnel_push.png b/src/main/resources/assets/create/textures/block/brass_funnel_push.png deleted file mode 100644 index 2ad0f81d2..000000000 Binary files a/src/main/resources/assets/create/textures/block/brass_funnel_push.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/brass_funnel_slope.png b/src/main/resources/assets/create/textures/block/brass_funnel_slope.png deleted file mode 100644 index beac7e015..000000000 Binary files a/src/main/resources/assets/create/textures/block/brass_funnel_slope.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/brass_funnel_tall.png b/src/main/resources/assets/create/textures/block/brass_funnel_tall.png deleted file mode 100644 index 8e53222d0..000000000 Binary files a/src/main/resources/assets/create/textures/block/brass_funnel_tall.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/brass_funnel_tall_powered.png b/src/main/resources/assets/create/textures/block/brass_funnel_tall_powered.png deleted file mode 100644 index 07db6a8f0..000000000 Binary files a/src/main/resources/assets/create/textures/block/brass_funnel_tall_powered.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/brass_tunnel.png b/src/main/resources/assets/create/textures/block/brass_tunnel.png deleted file mode 100644 index 37d64aca7..000000000 Binary files a/src/main/resources/assets/create/textures/block/brass_tunnel.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/brass_tunnel_top.png b/src/main/resources/assets/create/textures/block/brass_tunnel_top.png deleted file mode 100644 index 267bb9ce4..000000000 Binary files a/src/main/resources/assets/create/textures/block/brass_tunnel_top.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/brass_tunnel_top_connected.png b/src/main/resources/assets/create/textures/block/brass_tunnel_top_connected.png deleted file mode 100644 index 5167a310f..000000000 Binary files a/src/main/resources/assets/create/textures/block/brass_tunnel_top_connected.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/brass_tunnel_top_window.png b/src/main/resources/assets/create/textures/block/brass_tunnel_top_window.png deleted file mode 100644 index 1d3ff1308..000000000 Binary files a/src/main/resources/assets/create/textures/block/brass_tunnel_top_window.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/crate_andesite.png b/src/main/resources/assets/create/textures/block/crate_andesite.png deleted file mode 100644 index d164994c3..000000000 Binary files a/src/main/resources/assets/create/textures/block/crate_andesite.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/crate_andesite_side.png b/src/main/resources/assets/create/textures/block/crate_andesite_side.png deleted file mode 100644 index d303c7aff..000000000 Binary files a/src/main/resources/assets/create/textures/block/crate_andesite_side.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/crate_copper.png b/src/main/resources/assets/create/textures/block/crate_copper.png deleted file mode 100644 index 822125d47..000000000 Binary files a/src/main/resources/assets/create/textures/block/crate_copper.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/crate_copper_side.png b/src/main/resources/assets/create/textures/block/crate_copper_side.png deleted file mode 100644 index 5e86163e5..000000000 Binary files a/src/main/resources/assets/create/textures/block/crate_copper_side.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/incomplete_netherrack.png b/src/main/resources/assets/create/textures/block/incomplete_netherrack.png deleted file mode 100644 index a5dd10ce5..000000000 Binary files a/src/main/resources/assets/create/textures/block/incomplete_netherrack.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mineral/cinnabar.png b/src/main/resources/assets/create/textures/block/mineral/cinnabar.png deleted file mode 100644 index 3588679d1..000000000 Binary files a/src/main/resources/assets/create/textures/block/mineral/cinnabar.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mineral/cinnabar_connected.png b/src/main/resources/assets/create/textures/block/mineral/cinnabar_connected.png deleted file mode 100644 index 1da71b08c..000000000 Binary files a/src/main/resources/assets/create/textures/block/mineral/cinnabar_connected.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mineral/cinnabar_ore.png b/src/main/resources/assets/create/textures/block/mineral/cinnabar_ore.png deleted file mode 100644 index 4bbb26275..000000000 Binary files a/src/main/resources/assets/create/textures/block/mineral/cinnabar_ore.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mineral/deepslate_cinnabar_connected.png b/src/main/resources/assets/create/textures/block/mineral/deepslate_cinnabar_connected.png deleted file mode 100644 index 1897ba657..000000000 Binary files a/src/main/resources/assets/create/textures/block/mineral/deepslate_cinnabar_connected.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mineral/deepslate_cinnabar_ore.png b/src/main/resources/assets/create/textures/block/mineral/deepslate_cinnabar_ore.png deleted file mode 100644 index a060fd1d7..000000000 Binary files a/src/main/resources/assets/create/textures/block/mineral/deepslate_cinnabar_ore.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mineral/deepslate_magnetite_connected.png b/src/main/resources/assets/create/textures/block/mineral/deepslate_magnetite_connected.png deleted file mode 100644 index cc8e9c807..000000000 Binary files a/src/main/resources/assets/create/textures/block/mineral/deepslate_magnetite_connected.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mineral/deepslate_magnetite_ore.png b/src/main/resources/assets/create/textures/block/mineral/deepslate_magnetite_ore.png deleted file mode 100644 index 39815dcf4..000000000 Binary files a/src/main/resources/assets/create/textures/block/mineral/deepslate_magnetite_ore.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mineral/deepslate_malachite_connected.png b/src/main/resources/assets/create/textures/block/mineral/deepslate_malachite_connected.png deleted file mode 100644 index 3b0cda5e7..000000000 Binary files a/src/main/resources/assets/create/textures/block/mineral/deepslate_malachite_connected.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mineral/deepslate_malachite_ore.png b/src/main/resources/assets/create/textures/block/mineral/deepslate_malachite_ore.png deleted file mode 100644 index eefcacef5..000000000 Binary files a/src/main/resources/assets/create/textures/block/mineral/deepslate_malachite_ore.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mineral/deepslate_ochrestone_connected.png b/src/main/resources/assets/create/textures/block/mineral/deepslate_ochrestone_connected.png deleted file mode 100644 index 266dcf3f4..000000000 Binary files a/src/main/resources/assets/create/textures/block/mineral/deepslate_ochrestone_connected.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mineral/deepslate_ochrestone_ore.png b/src/main/resources/assets/create/textures/block/mineral/deepslate_ochrestone_ore.png deleted file mode 100644 index daa68a6d5..000000000 Binary files a/src/main/resources/assets/create/textures/block/mineral/deepslate_ochrestone_ore.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mineral/magnetite.png b/src/main/resources/assets/create/textures/block/mineral/magnetite.png deleted file mode 100644 index ff540a375..000000000 Binary files a/src/main/resources/assets/create/textures/block/mineral/magnetite.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mineral/magnetite_connected.png b/src/main/resources/assets/create/textures/block/mineral/magnetite_connected.png deleted file mode 100644 index c6163a3e5..000000000 Binary files a/src/main/resources/assets/create/textures/block/mineral/magnetite_connected.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mineral/magnetite_ore.png b/src/main/resources/assets/create/textures/block/mineral/magnetite_ore.png deleted file mode 100644 index a38b8fcb2..000000000 Binary files a/src/main/resources/assets/create/textures/block/mineral/magnetite_ore.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mineral/malachite.png b/src/main/resources/assets/create/textures/block/mineral/malachite.png deleted file mode 100644 index f1787ed7b..000000000 Binary files a/src/main/resources/assets/create/textures/block/mineral/malachite.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mineral/malachite_connected.png b/src/main/resources/assets/create/textures/block/mineral/malachite_connected.png deleted file mode 100644 index c625c8bb3..000000000 Binary files a/src/main/resources/assets/create/textures/block/mineral/malachite_connected.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mineral/malachite_ore.png b/src/main/resources/assets/create/textures/block/mineral/malachite_ore.png deleted file mode 100644 index c5d335d57..000000000 Binary files a/src/main/resources/assets/create/textures/block/mineral/malachite_ore.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mineral/ochrestone.png b/src/main/resources/assets/create/textures/block/mineral/ochrestone.png deleted file mode 100644 index e59d793cb..000000000 Binary files a/src/main/resources/assets/create/textures/block/mineral/ochrestone.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mineral/ochrestone_connected.png b/src/main/resources/assets/create/textures/block/mineral/ochrestone_connected.png deleted file mode 100644 index a31db1e03..000000000 Binary files a/src/main/resources/assets/create/textures/block/mineral/ochrestone_connected.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mineral/ochrestone_ore.png b/src/main/resources/assets/create/textures/block/mineral/ochrestone_ore.png deleted file mode 100644 index e812365cd..000000000 Binary files a/src/main/resources/assets/create/textures/block/mineral/ochrestone_ore.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/noisy_iron_block.png b/src/main/resources/assets/create/textures/block/noisy_iron_block.png deleted file mode 100644 index 60e244bf9..000000000 Binary files a/src/main/resources/assets/create/textures/block/noisy_iron_block.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/reinforced_rail_top.png b/src/main/resources/assets/create/textures/block/reinforced_rail_top.png deleted file mode 100644 index 94e64879f..000000000 Binary files a/src/main/resources/assets/create/textures/block/reinforced_rail_top.png and /dev/null differ