diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/straight.json b/src/main/resources/assets/create/models/block/belt_tunnel/straight.json index ba208112f..bad0cdc8b 100644 --- a/src/main/resources/assets/create/models/block/belt_tunnel/straight.json +++ b/src/main/resources/assets/create/models/block/belt_tunnel/straight.json @@ -38,7 +38,7 @@ "faces": { "north": {"uv": [0, 0, 8, 9.5], "texture": "#2"}, "east": {"uv": [0, 9.5, 9.5, 10.5], "rotation": 90, "texture": "#2"}, - "south": {"uv": [0, 0, 8, 9], "texture": "#2"}, + "south": {"uv": [0, 0, 8, 9.5], "texture": "#2"}, "west": {"uv": [0, 10.5, 9.5, 11.5], "rotation": 90, "texture": "#2"}, "up": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#1"} } diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/window.json b/src/main/resources/assets/create/models/block/belt_tunnel/window.json index 0d65fed25..670987e89 100644 --- a/src/main/resources/assets/create/models/block/belt_tunnel/window.json +++ b/src/main/resources/assets/create/models/block/belt_tunnel/window.json @@ -38,7 +38,7 @@ "faces": { "north": {"uv": [8, 0, 16, 9.5], "texture": "#2"}, "east": {"uv": [0, 9.5, 9.5, 10.5], "rotation": 90, "texture": "#2"}, - "south": {"uv": [8, 0, 16, 9], "texture": "#2"}, + "south": {"uv": [8, 0, 16, 9.5], "texture": "#2"}, "west": {"uv": [0, 10.5, 9.5, 11.5], "rotation": 90, "texture": "#2"}, "up": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#3"} } diff --git a/src/main/resources/assets/create/models/block/mechanical_crafter/item.json b/src/main/resources/assets/create/models/block/mechanical_crafter/item.json index f0a221f11..428d2e7ee 100644 --- a/src/main/resources/assets/create/models/block/mechanical_crafter/item.json +++ b/src/main/resources/assets/create/models/block/mechanical_crafter/item.json @@ -1,6 +1,7 @@ { "credit": "Made with Blockbench", "parent": "block/block", + "texture_size": [32, 32], "textures": { "3": "create:block/crafter_thingies", "4": "create:block/crafter_side", @@ -8,8 +9,8 @@ "6": "create:block/crafter_top", "7": "create:block/crafter_topunderside", "8": "create:block/smooth_dark_log_top", - "particle": "create:block/crafter_top", - "1_2": "create:block/cogwheel" + "9": "create:block/cogwheel", + "particle": "create:block/brass_casing" }, "elements": [ { @@ -147,12 +148,12 @@ "from": [-1, 6.5, 6.5], "to": [17, 9.5, 9.5], "faces": { - "north": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, - "east": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, - "south": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, - "west": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, - "up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}, - "down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"} + "north": {"uv": [7, 8, 16, 9.5], "texture": "#9"}, + "east": {"uv": [5, 8, 6.5, 9.5], "texture": "#9"}, + "south": {"uv": [7, 8, 16, 9.5], "texture": "#9"}, + "west": {"uv": [5, 8, 6.5, 9.5], "texture": "#9"}, + "up": {"uv": [7, 6, 16, 7.5], "texture": "#9"}, + "down": {"uv": [7, 6, 16, 7.5], "texture": "#9"} } }, { @@ -161,12 +162,12 @@ "to": [17, 9.5, 9.5], "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, - "east": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, - "south": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, - "west": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, - "up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}, - "down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"} + "north": {"uv": [7, 8, 16, 9.5], "texture": "#9"}, + "east": {"uv": [5, 8, 6.5, 9.5], "texture": "#9"}, + "south": {"uv": [7, 8, 16, 9.5], "texture": "#9"}, + "west": {"uv": [5, 8, 6.5, 9.5], "texture": "#9"}, + "up": {"uv": [7, 6, 16, 7.5], "texture": "#9"}, + "down": {"uv": [7, 6, 16, 7.5], "texture": "#9"} } }, { @@ -175,12 +176,12 @@ "to": [17, 9.5, 9.5], "rotation": {"angle": -45, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, - "east": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, - "south": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, - "west": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, - "up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}, - "down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"} + "north": {"uv": [7, 8, 16, 9.5], "texture": "#9"}, + "east": {"uv": [5, 8, 6.5, 9.5], "texture": "#9"}, + "south": {"uv": [7, 8, 16, 9.5], "texture": "#9"}, + "west": {"uv": [5, 8, 6.5, 9.5], "texture": "#9"}, + "up": {"uv": [7, 6, 16, 7.5], "texture": "#9"}, + "down": {"uv": [7, 6, 16, 7.5], "texture": "#9"} } }, { @@ -188,25 +189,25 @@ "from": [6.5, 6.5, -1], "to": [9.5, 9.5, 17], "faces": { - "north": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, - "east": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, - "south": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, - "west": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, - "up": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#1_2"}, - "down": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#1_2"} + "north": {"uv": [5, 8, 6.5, 9.5], "texture": "#9"}, + "east": {"uv": [7, 8, 16, 9.5], "texture": "#9"}, + "south": {"uv": [5, 8, 6.5, 9.5], "texture": "#9"}, + "west": {"uv": [7, 8, 16, 9.5], "texture": "#9"}, + "up": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#9"}, + "down": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#9"} } }, { "name": "GearCaseInner", - "from": [2, 7, 2], - "to": [14, 9, 14], + "from": [2, 6.55, 2], + "to": [14, 9.45, 14], "faces": { - "north": {"uv": [0, 6, 6, 7], "texture": "#1_2"}, - "east": {"uv": [0, 6, 6, 7], "texture": "#1_2"}, - "south": {"uv": [0, 6, 6, 7], "texture": "#1_2"}, - "west": {"uv": [0, 6, 6, 7], "texture": "#1_2"}, - "up": {"uv": [4, 0, 10, 6], "texture": "#1_2"}, - "down": {"uv": [4, 0, 10, 6], "texture": "#1_2"} + "north": {"uv": [0, 6, 6, 7.5], "texture": "#9"}, + "east": {"uv": [0, 6, 6, 7.5], "texture": "#9"}, + "south": {"uv": [0, 6, 6, 7.5], "texture": "#9"}, + "west": {"uv": [0, 6, 6, 7.5], "texture": "#9"}, + "up": {"uv": [4, 0, 10, 6], "texture": "#9"}, + "down": {"uv": [4, 0, 10, 6], "texture": "#9"} } }, { @@ -214,24 +215,37 @@ "from": [4, 6, 4], "to": [12, 10, 12], "faces": { - "north": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, - "east": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, - "south": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, - "west": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#1_2"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1_2"} + "north": {"uv": [0, 4, 4, 6], "texture": "#9"}, + "east": {"uv": [0, 4, 4, 6], "texture": "#9"}, + "south": {"uv": [0, 4, 4, 6], "texture": "#9"}, + "west": {"uv": [0, 4, 4, 6], "texture": "#9"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#9"}, + "down": {"uv": [0, 0, 4, 4], "texture": "#9"} } } ], - "groups": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, + "groups": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, { "name": "lid", "origin": [8, 8, 8], + "color": 0, "children": [11] }, { "name": "cogwheel_shaftless", "origin": [8, 8, 8], + "color": 0, "children": [12, 13, 14, 15, 16, 17] } ] diff --git a/src/main/resources/assets/create/models/block/mechanical_mixer/block.json b/src/main/resources/assets/create/models/block/mechanical_mixer/block.json index c266f74ba..45c159a61 100644 --- a/src/main/resources/assets/create/models/block/mechanical_mixer/block.json +++ b/src/main/resources/assets/create/models/block/mechanical_mixer/block.json @@ -6,7 +6,7 @@ "2": "block/spruce_log_top", "4": "create:block/mixer_base_side", "11": "create:block/mechanical_press_top", - "particle": "block/stripped_spruce_log" + "particle": "create:block/mixer_base_side" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/mechanical_mixer/item.json b/src/main/resources/assets/create/models/block/mechanical_mixer/item.json index 93dd7cdd5..e423867e7 100644 --- a/src/main/resources/assets/create/models/block/mechanical_mixer/item.json +++ b/src/main/resources/assets/create/models/block/mechanical_mixer/item.json @@ -1,6 +1,6 @@ { "credit": "Made with Blockbench", - "parent": "block/block", + "parent": "create:block/large_wheels", "ambientocclusion": false, "texture_size": [32, 32], "textures": { @@ -10,93 +10,9 @@ "11": "create:block/mechanical_press_top", "1_2": "create:block/cogwheel", "mechanical_press_pole": "create:block/mechanical_press_pole", - "particle": "create:block/andesite_casing" + "particle": "create:block/mixer_base_side" }, "elements": [ - { - "name": "Gear", - "from": [-1, 13.5, 6.5], - "to": [17, 16.5, 9.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]}, - "faces": { - "north": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, - "east": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, - "south": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, - "west": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, - "up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}, - "down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"} - } - }, - { - "name": "Gear2", - "from": [-1, 13.5, 6.5], - "to": [17, 16.5, 9.5], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 15, 8]}, - "faces": { - "north": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, - "east": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, - "south": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, - "west": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, - "up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}, - "down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"} - } - }, - { - "name": "Gear3", - "from": [-1, 13.5, 6.5], - "to": [17, 16.5, 9.5], - "rotation": {"angle": -45, "axis": "y", "origin": [8, 15, 8]}, - "faces": { - "north": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, - "east": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, - "south": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, - "west": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, - "up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}, - "down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"} - } - }, - { - "name": "Gear4", - "from": [6.5, 13.5, -1], - "to": [9.5, 16.5, 17], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]}, - "faces": { - "north": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, - "east": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, - "south": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, - "west": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, - "up": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#1_2"}, - "down": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#1_2"} - } - }, - { - "name": "GearCaseInner", - "from": [2, 14, 2], - "to": [14, 16, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]}, - "faces": { - "north": {"uv": [0, 6, 6, 7], "texture": "#1_2"}, - "east": {"uv": [0, 6, 6, 7], "texture": "#1_2"}, - "south": {"uv": [0, 6, 6, 7], "texture": "#1_2"}, - "west": {"uv": [0, 6, 6, 7], "texture": "#1_2"}, - "up": {"uv": [4, 0, 10, 6], "texture": "#1_2"}, - "down": {"uv": [4, 0, 10, 6], "texture": "#1_2"} - } - }, - { - "name": "GearCaseOuter", - "from": [4, 13, 4], - "to": [12, 17, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]}, - "faces": { - "north": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, - "east": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, - "south": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, - "west": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#1_2"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1_2"} - } - }, { "name": "Side3", "from": [0, 13, 16], @@ -370,6 +286,90 @@ "east": {"uv": [0, 6, 16, 10], "texture": "#4"}, "west": {"uv": [0, 6, 16, 10], "texture": "#4"} } + }, + { + "name": "Gear", + "from": [-1, 13.5, 6.5], + "to": [17, 16.5, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 0]}, + "faces": { + "north": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"}, + "east": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"}, + "south": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"}, + "west": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"}, + "up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}, + "down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"} + } + }, + { + "name": "Gear2", + "from": [-1, 13.5, 6.5], + "to": [17, 16.5, 9.5], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 15, 8]}, + "faces": { + "north": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"}, + "east": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"}, + "south": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"}, + "west": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"}, + "up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}, + "down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"} + } + }, + { + "name": "Gear3", + "from": [-1, 13.5, 6.5], + "to": [17, 16.5, 9.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 15, 8]}, + "faces": { + "north": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"}, + "east": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"}, + "south": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"}, + "west": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"}, + "up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}, + "down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"} + } + }, + { + "name": "Gear4", + "from": [6.5, 13.5, -1], + "to": [9.5, 16.5, 17], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 0]}, + "faces": { + "north": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"}, + "east": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"}, + "south": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"}, + "west": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"}, + "up": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#1_2"}, + "down": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#1_2"} + } + }, + { + "name": "GearCaseInner", + "from": [2, 13.55, 2], + "to": [14, 16.45, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 0]}, + "faces": { + "north": {"uv": [0, 6, 6, 7.5], "texture": "#1_2"}, + "east": {"uv": [0, 6, 6, 7.5], "texture": "#1_2"}, + "south": {"uv": [0, 6, 6, 7.5], "texture": "#1_2"}, + "west": {"uv": [0, 6, 6, 7.5], "texture": "#1_2"}, + "up": {"uv": [4, 0, 10, 6], "texture": "#1_2"}, + "down": {"uv": [4, 0, 10, 6], "texture": "#1_2"} + } + }, + { + "name": "GearCaseOuter", + "from": [4, 13, 4], + "to": [12, 17, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 0]}, + "faces": { + "north": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, + "east": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, + "south": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, + "west": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#1_2"}, + "down": {"uv": [0, 0, 4, 4], "texture": "#1_2"} + } } ], "display": { @@ -405,33 +405,46 @@ "scale": [0.5, 0.5, 0.5] } }, - "groups": [0, 1, 2, 3, 4, 5, + "groups": [ { "name": "item", "origin": [8, 8, 8], - "children": [6, 7, + "color": 0, + "children": [ + 0, + 1, { "name": "mixerhead", "origin": [8, 8, 8], - "children": [8, 9, 10, 11, 12, 13, 14, 15, 16] + "color": 0, + "children": [2, 3, 4, 5, 6, 7, 8, 9, 10] }, { "name": "mechanical_press_head", "origin": [8, 8, 8], - "children": [17, 18, 19, 20, 21, 22, 23] + "color": 0, + "children": [11, 12, 13, 14, 15, 16, 17] }, { "name": "mixer_base", "origin": [8, 8, 8], + "color": 0, "children": [ { "name": "mixerbase", "origin": [8, 8, 8], - "children": [24, 25, 26, 27] + "color": 0, + "children": [18, 19, 20, 21] } ] } ] + }, + { + "name": "cogwheel_shaftless", + "origin": [8, 8, 8], + "color": 0, + "children": [22, 23, 24, 25, 26, 27] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/andesite_tunnel.png b/src/main/resources/assets/create/textures/block/andesite_tunnel.png index d9bb320f1..8821d7086 100644 Binary files a/src/main/resources/assets/create/textures/block/andesite_tunnel.png and b/src/main/resources/assets/create/textures/block/andesite_tunnel.png 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 index d07ab8491..f9b707656 100644 Binary files a/src/main/resources/assets/create/textures/block/brass_tunnel.png and b/src/main/resources/assets/create/textures/block/brass_tunnel.png differ