diff --git a/src/main/resources/assets/create/models/block/mechanical_arm/cog.json b/src/main/resources/assets/create/models/block/mechanical_arm/cog.json index 38d591111..75668cf1d 100644 --- a/src/main/resources/assets/create/models/block/mechanical_arm/cog.json +++ b/src/main/resources/assets/create/models/block/mechanical_arm/cog.json @@ -1,20 +1,23 @@ { "credit": "Made with Blockbench", "parent": "block/block", + "texture_size": [32, 32], "textures": { - "5": "create:block/mechanical_arm", - "particle": "create:block/crafter_top" + "5": "create:block/mechanical_arm" }, "elements": [ { "name": "GearCaseOuter", - "from": [4, 6, 4], - "to": [12, 10, 12], + "from": [4, 5.5, 4], + "to": [12, 10.5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 8]}, "faces": { "north": {"uv": [7.5, 0, 9.5, 4], "rotation": 90, "texture": "#5"}, "east": {"uv": [7.5, 0, 9.5, 4], "rotation": 90, "texture": "#5"}, "south": {"uv": [7.5, 0, 9.5, 4], "rotation": 90, "texture": "#5"}, - "west": {"uv": [7.5, 0, 9.5, 4], "rotation": 90, "texture": "#5"} + "west": {"uv": [7.5, 0, 9.5, 4], "rotation": 90, "texture": "#5"}, + "up": {"uv": [1, 1, 5, 5], "texture": "#5"}, + "down": {"uv": [1, 1, 5, 5], "texture": "#5"} } }, { @@ -79,10 +82,10 @@ "to": [14, 9.5, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 8]}, "faces": { - "north": {"uv": [6, 0, 7.5, 6], "rotation": 90, "texture": "#5"}, - "east": {"uv": [6, 0, 7.5, 6], "rotation": 90, "texture": "#5"}, - "south": {"uv": [6, 0, 7.5, 6], "rotation": 90, "texture": "#5"}, - "west": {"uv": [6, 0, 7.5, 6], "rotation": 90, "texture": "#5"}, + "north": {"uv": [5.5, 0, 7, 6], "rotation": 90, "texture": "#5"}, + "east": {"uv": [5.5, 0, 7, 6], "rotation": 90, "texture": "#5"}, + "south": {"uv": [5.5, 0, 7, 6], "rotation": 90, "texture": "#5"}, + "west": {"uv": [5.5, 0, 7, 6], "rotation": 90, "texture": "#5"}, "up": {"uv": [0, 0, 6, 6], "rotation": 180, "texture": "#5"}, "down": {"uv": [0, 0, 6, 6], "rotation": 180, "texture": "#5"} } diff --git a/src/main/resources/assets/create/models/block/mechanical_pump/cog.json b/src/main/resources/assets/create/models/block/mechanical_pump/cog.json index 88cb31a39..615d7cf83 100644 --- a/src/main/resources/assets/create/models/block/mechanical_pump/cog.json +++ b/src/main/resources/assets/create/models/block/mechanical_pump/cog.json @@ -1,33 +1,21 @@ { "credit": "Made with Blockbench", - "parent": "create:block/large_wheels", + "parent": "block/block", + "texture_size": [32, 32], "textures": { "5": "create:block/millstone", "particle": "create:block/fluid_pipe" }, "elements": [ - { - "name": "Gear5", - "from": [6.5, -1, 5], - "to": [9.5, 17, 11], - "faces": { - "north": {"uv": [0, 8.5, 9, 10], "rotation": 90, "texture": "#5"}, - "east": {"uv": [0, 10, 9, 13], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 8.5, 9, 10], "rotation": 270, "texture": "#5"}, - "west": {"uv": [0, 10, 9, 13], "rotation": 90, "texture": "#5"}, - "up": {"uv": [9, 10, 10.5, 13], "rotation": 180, "texture": "#5"}, - "down": {"uv": [9, 10, 10.5, 13], "texture": "#5"} - } - }, { "name": "Gear6", "from": [6.5, -1, 5], "to": [9.5, 17, 11], - "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 8]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6.5]}, "faces": { - "north": {"uv": [0, 8.5, 9, 10], "rotation": 90, "texture": "#5"}, + "north": {"uv": [6, 3, 15, 4.5], "rotation": 270, "texture": "#5"}, "east": {"uv": [0, 10, 9, 13], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 8.5, 9, 10], "rotation": 270, "texture": "#5"}, + "south": {"uv": [6, 3, 15, 4.5], "rotation": 90, "texture": "#5"}, "west": {"uv": [0, 10, 9, 13], "rotation": 90, "texture": "#5"}, "up": {"uv": [9, 10, 10.5, 13], "rotation": 180, "texture": "#5"}, "down": {"uv": [9, 10, 10.5, 13], "texture": "#5"} @@ -35,26 +23,41 @@ }, { "name": "Gear7", + "from": [6.5, -1, 5], + "to": [9.5, 17, 11], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 6.5]}, + "faces": { + "north": {"uv": [6, 3, 15, 4.5], "rotation": 270, "texture": "#5"}, + "east": {"uv": [0, 10, 9, 13], "rotation": 270, "texture": "#5"}, + "south": {"uv": [6, 3, 15, 4.5], "rotation": 90, "texture": "#5"}, + "west": {"uv": [0, 10, 9, 13], "rotation": 90, "texture": "#5"}, + "up": {"uv": [9, 10, 10.5, 13], "rotation": 180, "texture": "#5"}, + "down": {"uv": [9, 10, 10.5, 13], "texture": "#5"} + } + }, + { + "name": "Gear8", "from": [-1, 6.5, 5], "to": [17, 9.5, 11], - "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 8]}, + "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 6.5]}, "faces": { - "north": {"uv": [0, 8.5, 9, 10], "rotation": 180, "texture": "#5"}, + "north": {"uv": [6, 3, 15, 4.5], "texture": "#5"}, "east": {"uv": [9, 10, 10.5, 13], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 8.5, 9, 10], "rotation": 180, "texture": "#5"}, + "south": {"uv": [6, 3, 15, 4.5], "texture": "#5"}, "west": {"uv": [9, 10, 10.5, 13], "rotation": 90, "texture": "#5"}, "up": {"uv": [0, 10, 9, 13], "rotation": 180, "texture": "#5"}, "down": {"uv": [0, 10, 9, 13], "texture": "#5"} } }, { - "name": "Gear7", + "name": "Gear8", "from": [-1, 6.5, 5], "to": [17, 9.5, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6.5]}, "faces": { - "north": {"uv": [0, 8.5, 9, 10], "rotation": 180, "texture": "#5"}, + "north": {"uv": [6, 3, 15, 4.5], "texture": "#5"}, "east": {"uv": [9, 10, 10.5, 13], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 8.5, 9, 10], "rotation": 180, "texture": "#5"}, + "south": {"uv": [6, 3, 15, 4.5], "texture": "#5"}, "west": {"uv": [9, 10, 10.5, 13], "rotation": 90, "texture": "#5"}, "up": {"uv": [0, 10, 9, 13], "rotation": 180, "texture": "#5"}, "down": {"uv": [0, 10, 9, 13], "texture": "#5"} @@ -64,14 +67,29 @@ "name": "GearCaseInner", "from": [2, 2, 5.5], "to": [14, 14, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#5"}, + "north": {"uv": [0, 0, 6, 6], "rotation": 180, "texture": "#5"}, "east": {"uv": [0, 6, 6, 8.5], "rotation": 270, "texture": "#5"}, - "south": {"uv": [0, 0, 6, 6], "rotation": 180, "texture": "#5"}, + "south": {"uv": [0, 0, 6, 6], "texture": "#5"}, "west": {"uv": [0, 6, 6, 8.5], "rotation": 90, "texture": "#5"}, "up": {"uv": [0, 6, 6, 8.5], "rotation": 180, "texture": "#5"}, "down": {"uv": [0, 6, 6, 8.5], "texture": "#5"} } + }, + { + "name": "GearCaseOuter", + "from": [4, 4, 4.5], + "to": [12, 12, 11.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 6.5]}, + "faces": { + "north": {"uv": [1, 1, 5, 5], "rotation": 180, "texture": "#5"}, + "east": {"uv": [6, 4.5, 10, 8], "rotation": 270, "texture": "#5"}, + "south": {"uv": [1, 1, 5, 5], "texture": "#5"}, + "west": {"uv": [6, 4.5, 10, 8], "rotation": 90, "texture": "#5"}, + "up": {"uv": [6, 4.5, 10, 8], "rotation": 180, "texture": "#5"}, + "down": {"uv": [6, 4.5, 10, 8], "texture": "#5"} + } } ], "display": { @@ -112,7 +130,7 @@ { "name": "cogwheel", "origin": [8, 8, 8], - "children": [0, 1, 2, 3, 4] + "children": [0, 1, 2, 3, 4, 5] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/millstone/inner.json b/src/main/resources/assets/create/models/block/millstone/inner.json index 1a21a6e74..1735ba332 100644 --- a/src/main/resources/assets/create/models/block/millstone/inner.json +++ b/src/main/resources/assets/create/models/block/millstone/inner.json @@ -1,6 +1,7 @@ { "credit": "Made with Blockbench", "parent": "block/block", + "texture_size": [32, 32], "textures": { "5": "create:block/millstone", "particle": "create:block/axis", @@ -17,8 +18,8 @@ "east": {"uv": [0, 10, 9, 13], "texture": "#5"}, "south": {"uv": [9, 10, 10.5, 13], "texture": "#5"}, "west": {"uv": [0, 10, 9, 13], "texture": "#5"}, - "up": {"uv": [0, 8.5, 9, 10], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 8.5, 9, 10], "rotation": 90, "texture": "#5"} + "up": {"uv": [6, 3, 15, 4.5], "rotation": 90, "texture": "#5"}, + "down": {"uv": [6, 3, 15, 4.5], "rotation": 90, "texture": "#5"} } }, { @@ -31,8 +32,8 @@ "east": {"uv": [0, 10, 9, 13], "texture": "#5"}, "south": {"uv": [9, 10, 10.5, 13], "texture": "#5"}, "west": {"uv": [0, 10, 9, 13], "texture": "#5"}, - "up": {"uv": [0, 8.5, 9, 10], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 8.5, 9, 10], "rotation": 90, "texture": "#5"} + "up": {"uv": [6, 3, 15, 4.5], "rotation": 90, "texture": "#5"}, + "down": {"uv": [6, 3, 15, 4.5], "rotation": 90, "texture": "#5"} } }, { @@ -45,8 +46,8 @@ "east": {"uv": [9, 10, 10.5, 13], "texture": "#5"}, "south": {"uv": [0, 10, 9, 13], "texture": "#5"}, "west": {"uv": [9, 10, 10.5, 13], "texture": "#5"}, - "up": {"uv": [0, 8.5, 9, 10], "texture": "#5"}, - "down": {"uv": [0, 8.5, 9, 10], "rotation": 180, "texture": "#5"} + "up": {"uv": [6, 3, 15, 4.5], "texture": "#5"}, + "down": {"uv": [6, 3, 15, 4.5], "rotation": 180, "texture": "#5"} } }, { @@ -58,14 +59,15 @@ "east": {"uv": [9, 10, 10.5, 13], "texture": "#5"}, "south": {"uv": [0, 10, 9, 13], "texture": "#5"}, "west": {"uv": [9, 10, 10.5, 13], "texture": "#5"}, - "up": {"uv": [0, 8.5, 9, 10], "texture": "#5"}, - "down": {"uv": [0, 8.5, 9, 10], "rotation": 180, "texture": "#5"} + "up": {"uv": [6, 3, 15, 4.5], "texture": "#5"}, + "down": {"uv": [6, 3, 15, 4.5], "rotation": 180, "texture": "#5"} } }, { "name": "GearCaseInner", - "from": [2, 6.6, 2], - "to": [14, 11.6, 14], + "from": [2, 7, 2], + "to": [14, 12, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 8]}, "faces": { "north": {"uv": [0, 6, 6, 8.5], "texture": "#5"}, "east": {"uv": [0, 6, 6, 8.5], "texture": "#5"}, @@ -80,10 +82,10 @@ "from": [4, 6, 4], "to": [12, 13, 12], "faces": { - "north": {"uv": [1, 1.5, 5, 5], "texture": "#5"}, - "east": {"uv": [1, 1.5, 5, 5], "texture": "#5"}, - "south": {"uv": [1, 1.5, 5, 5], "texture": "#5"}, - "west": {"uv": [1, 1.5, 5, 5], "texture": "#5"}, + "north": {"uv": [6, 4.5, 10, 8], "texture": "#5"}, + "east": {"uv": [6, 4.5, 10, 8], "texture": "#5"}, + "south": {"uv": [6, 4.5, 10, 8], "texture": "#5"}, + "west": {"uv": [6, 4.5, 10, 8], "texture": "#5"}, "up": {"uv": [1, 1, 5, 5], "texture": "#5"}, "down": {"uv": [1, 1, 5, 5], "texture": "#5"} } @@ -94,10 +96,10 @@ "to": [10, 8, 10], "shade": false, "faces": { - "north": {"uv": [6, 0, 10, 8], "rotation": 180, "texture": "#1_0"}, - "east": {"uv": [6, 0, 10, 8], "rotation": 180, "texture": "#1_0"}, - "south": {"uv": [6, 0, 10, 8], "rotation": 180, "texture": "#1_0"}, - "west": {"uv": [6, 0, 10, 8], "rotation": 180, "texture": "#1_0"}, + "north": {"uv": [6, 8, 10, 16], "rotation": 180, "texture": "#1_0"}, + "east": {"uv": [6, 8, 10, 16], "rotation": 180, "texture": "#1_0"}, + "south": {"uv": [6, 8, 10, 16], "rotation": 180, "texture": "#1_0"}, + "west": {"uv": [6, 8, 10, 16], "rotation": 180, "texture": "#1_0"}, "up": {"uv": [6, 6, 10, 10], "texture": "#1_1"}, "down": {"uv": [6, 6, 10, 10], "texture": "#1_1"} } diff --git a/src/main/resources/assets/create/models/block/refined_radiance_block.json b/src/main/resources/assets/create/models/block/refined_radiance_block.json new file mode 100644 index 000000000..c879e90cd --- /dev/null +++ b/src/main/resources/assets/create/models/block/refined_radiance_block.json @@ -0,0 +1,69 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "create:block/refined_radiance_block", + "particle": "create:block/refined_radiance_block" + }, + "elements": [ + { + "from": [1, 1, 1], + "to": [15, 15, 15], + "shade": false, + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 9]}, + "faces": { + "north": {"uv": [1, 1, 15, 15], "rotation": 270, "texture": "#0"}, + "east": {"uv": [1, 1, 15, 15], "texture": "#0"}, + "south": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [1, 1, 15, 15], "texture": "#0"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#0"}, + "down": {"uv": [1, 1, 15, 15], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "cube_outline", + "from": [15.99, 15.99, 15.99], + "to": [0.01, 0.01, 0.01], + "shade": false, + "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 9]}, + "faces": { + "north": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#0"}, + "east": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#0"}, + "south": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#0"}, + "west": {"uv": [15, 0, 16, 16], "rotation": 180, "texture": "#0"}, + "up": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/blaze_seething.png b/src/main/resources/assets/create/textures/block/blaze_seething.png index e9ac5162e..33ee915fd 100644 Binary files a/src/main/resources/assets/create/textures/block/blaze_seething.png and b/src/main/resources/assets/create/textures/block/blaze_seething.png differ diff --git a/src/main/resources/assets/create/textures/block/blaze_smouldering.png b/src/main/resources/assets/create/textures/block/blaze_smouldering.png index 13d4e8fdb..9fe08e2a4 100644 Binary files a/src/main/resources/assets/create/textures/block/blaze_smouldering.png and b/src/main/resources/assets/create/textures/block/blaze_smouldering.png differ diff --git a/src/main/resources/assets/create/textures/block/cogwheel.png b/src/main/resources/assets/create/textures/block/cogwheel.png index 00d3a727e..944bb51a6 100644 Binary files a/src/main/resources/assets/create/textures/block/cogwheel.png and b/src/main/resources/assets/create/textures/block/cogwheel.png differ diff --git a/src/main/resources/assets/create/textures/block/mechanical_arm.png b/src/main/resources/assets/create/textures/block/mechanical_arm.png index c01a1ca7f..bc8def665 100644 Binary files a/src/main/resources/assets/create/textures/block/mechanical_arm.png and b/src/main/resources/assets/create/textures/block/mechanical_arm.png differ diff --git a/src/main/resources/assets/create/textures/block/millstone.png b/src/main/resources/assets/create/textures/block/millstone.png index cac9a112a..43e1ab01c 100644 Binary files a/src/main/resources/assets/create/textures/block/millstone.png and b/src/main/resources/assets/create/textures/block/millstone.png differ diff --git a/src/main/resources/assets/create/textures/block/refined_radiance_block.png b/src/main/resources/assets/create/textures/block/refined_radiance_block.png new file mode 100644 index 000000000..027da9087 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/refined_radiance_block.png differ