diff --git a/src/main/resources/assets/create/models/block/blaze_heater/block.json b/src/main/resources/assets/create/models/block/blaze_heater/block.json index 97283a910..135de425a 100644 --- a/src/main/resources/assets/create/models/block/blaze_heater/block.json +++ b/src/main/resources/assets/create/models/block/blaze_heater/block.json @@ -11,92 +11,51 @@ "from": [2, 5, 2], "to": [14, 14, 14], "faces": { - "north": {"uv": [1.5, 2, 6.5, 5.5], "texture": "#0"}, - "east": {"uv": [1.5, 2, 6.5, 5.5], "texture": "#0"}, - "south": {"uv": [1.5, 2, 6.5, 5.5], "texture": "#0"}, - "west": {"uv": [1.5, 2, 6.5, 5.5], "texture": "#0"}, - "up": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "down": {"uv": [0, 0, 12, 12], "texture": "#0"} + "north": {"uv": [1, 1, 7, 5.5], "texture": "#0"}, + "east": {"uv": [1, 1, 7, 5.5], "texture": "#0"}, + "south": {"uv": [1, 1, 7, 5.5], "texture": "#0"}, + "west": {"uv": [1, 1, 7, 5.5], "texture": "#0"} } }, { "name": "Brazier Sides 2", - "from": [1, 5, 2], - "to": [2, 14, 14], + "from": [2, 5, 14], + "to": [14, 14, 15], "faces": { - "north": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "east": {"uv": [1.5, 2, 6.5, 5.5], "texture": "#0"}, - "south": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "west": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "up": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "down": {"uv": [0, 0, 12, 12], "texture": "#0"} + "north": {"uv": [1, 1, 7, 5.5], "texture": "#0"} } }, { "name": "Brazier Sides 3", - "from": [2, 5, 14], - "to": [14, 14, 15], + "from": [1, 5, 2], + "to": [2, 14, 14], "faces": { - "north": {"uv": [1.5, 2, 6.5, 5.5], "texture": "#0"}, - "east": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "south": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "west": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "up": {"uv": [8, 8, 16, 16], "rotation": 270, "texture": "#0"}, - "down": {"uv": [0, 0, 12, 12], "rotation": 90, "texture": "#0"} + "east": {"uv": [1, 1, 7, 5.5], "texture": "#0"} } }, { "name": "Brazier Sides 4", - "from": [14, 5, 2], - "to": [15, 14, 14], + "from": [2, 5, 1], + "to": [14, 14, 2], "faces": { - "north": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "east": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "south": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "west": {"uv": [1.5, 2, 6.5, 5.5], "texture": "#0"}, - "up": {"uv": [8, 8, 16, 16], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 12, 12], "rotation": 180, "texture": "#0"} + "south": {"uv": [1, 1, 7, 5.5], "texture": "#0"} } }, { "name": "Brazier Sides 5", - "from": [2, 5, 1], - "to": [14, 14, 2], + "from": [14, 5, 2], + "to": [15, 14, 14], "faces": { - "north": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "east": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "south": {"uv": [1.5, 2, 6.5, 5.5], "texture": "#0"}, - "west": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "up": {"uv": [8, 8, 16, 16], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 12, 12], "rotation": 270, "texture": "#0"} + "west": {"uv": [1, 1, 7, 5.5], "texture": "#0"} } }, { "name": "Brazier Spikes 1", - "from": [2, 14, 2], - "to": [14, 17, 3], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 14, 2]}, + "from": [2, 14, 13], + "to": [14, 17, 14], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 14, 14]}, "faces": { - "north": {"uv": [1.5, 0.5, 6.5, 2], "texture": "#0"}, - "east": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "south": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#0"}, - "up": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "down": {"uv": [8, 8, 16, 16], "texture": "#0"} - } - }, - { - "name": "Brazier Spikes 1b", - "from": [2, 14, 1], - "to": [14, 17, 2], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 14, 2]}, - "faces": { - "north": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#0"}, - "south": {"uv": [1.5, 0.5, 6.5, 2], "texture": "#0"}, - "west": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "up": {"uv": [8, 8, 16, 16], "rotation": 180, "texture": "#0"}, - "down": {"uv": [8, 8, 16, 16], "rotation": 180, "texture": "#0"} + "south": {"uv": [8, 8, 14, 9.5], "texture": "#0"} } }, { @@ -105,12 +64,34 @@ "to": [3, 17, 14], "rotation": {"angle": 45, "axis": "z", "origin": [2, 14, 8]}, "faces": { - "north": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "east": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "south": {"uv": [0, 0, 1, 3], "texture": "#0"}, - "west": {"uv": [1.5, 0.5, 6.5, 2], "texture": "#0"}, - "up": {"uv": [8, 8, 16, 16], "rotation": 270, "texture": "#0"}, - "down": {"uv": [8, 8, 16, 16], "rotation": 90, "texture": "#0"} + "west": {"uv": [8, 8, 14, 9.5], "texture": "#0"} + } + }, + { + "name": "Brazier Spikes 3", + "from": [2, 14, 2], + "to": [14, 17, 3], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 14, 2]}, + "faces": { + "north": {"uv": [8, 8, 14, 9.5], "texture": "#0"} + } + }, + { + "name": "Brazier Spikes 4", + "from": [13, 14, 2], + "to": [14, 17, 14], + "rotation": {"angle": -45, "axis": "z", "origin": [14, 14, 8]}, + "faces": { + "east": {"uv": [8, 8, 14, 9.5], "texture": "#0"} + } + }, + { + "name": "Brazier Spikes 1b", + "from": [2, 14, 14], + "to": [14, 17, 15], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 14, 14]}, + "faces": { + "north": {"uv": [8, 8, 14, 9.5], "texture": "#0"} } }, { @@ -119,68 +100,25 @@ "to": [2, 17, 14], "rotation": {"angle": 45, "axis": "z", "origin": [2, 14, 8]}, "faces": { - "north": {"uv": [0, 0, 1, 3], "texture": "#0"}, - "east": {"uv": [1.5, 0.5, 6.5, 2], "texture": "#0"}, - "south": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "west": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "up": {"uv": [8, 8, 16, 16], "rotation": 90, "texture": "#0"}, - "down": {"uv": [8, 8, 16, 16], "rotation": 270, "texture": "#0"} - } - }, - { - "name": "Brazier Spikes 3", - "from": [2, 14, 13], - "to": [14, 17, 14], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 14, 14]}, - "faces": { - "north": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 3], "texture": "#0"}, - "south": {"uv": [1.5, 0.5, 6.5, 2], "texture": "#0"}, - "west": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "up": {"uv": [8, 8, 16, 16], "rotation": 180, "texture": "#0"}, - "down": {"uv": [8, 8, 16, 16], "rotation": 180, "texture": "#0"} + "east": {"uv": [8, 8, 14, 9.5], "texture": "#0"} } }, { "name": "Brazier Spikes 3b", - "from": [2, 14, 14], - "to": [14, 17, 15], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 14, 14]}, + "from": [2, 14, 1], + "to": [14, 17, 2], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 14, 2]}, "faces": { - "north": {"uv": [1.5, 0.5, 6.5, 2], "texture": "#0"}, - "east": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "south": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#0"}, - "up": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "down": {"uv": [8, 8, 16, 16], "texture": "#0"} - } - }, - { - "name": "Brazier Spikes 4", - "from": [14, 14, 2], - "to": [17, 15, 14], - "rotation": {"angle": 45, "axis": "z", "origin": [14, 14, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 3], "rotation": 270, "texture": "#0"}, - "east": {"uv": [8, 8, 16, 16], "rotation": 180, "texture": "#0"}, - "south": {"uv": [8, 8, 16, 16], "rotation": 90, "texture": "#0"}, - "west": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "up": {"uv": [8, 8, 16, 16], "rotation": 90, "texture": "#0"}, - "down": {"uv": [1.5, 0.5, 6.5, 2], "rotation": 90, "texture": "#0"} + "south": {"uv": [8, 8, 14, 9.5], "texture": "#0"} } }, { "name": "Brazier Spikes 4b", - "from": [14, 13, 2], - "to": [17, 14, 14], - "rotation": {"angle": 45, "axis": "z", "origin": [14, 14, 8]}, + "from": [14, 14, 2], + "to": [15, 17, 14], + "rotation": {"angle": -45, "axis": "z", "origin": [14, 14, 8]}, "faces": { - "north": {"uv": [8, 8, 16, 16], "rotation": 270, "texture": "#0"}, - "east": {"uv": [8, 8, 16, 16], "texture": "#0"}, - "south": {"uv": [0, 0, 1, 3], "rotation": 90, "texture": "#0"}, - "west": {"uv": [8, 8, 16, 16], "rotation": 180, "texture": "#0"}, - "up": {"uv": [1.5, 0.5, 6.5, 2], "rotation": 90, "texture": "#0"}, - "down": {"uv": [8, 8, 16, 16], "rotation": 90, "texture": "#0"} + "west": {"uv": [8, 8, 14, 9.5], "texture": "#0"} } }, { @@ -189,12 +127,12 @@ "to": [16, 4, 16], "rotation": {"angle": 0, "axis": "y", "origin": [0.5, 8, 0.5]}, "faces": { - "north": {"uv": [0, 6, 8, 8], "texture": "#0"}, - "east": {"uv": [0, 6, 8, 8], "texture": "#0"}, - "south": {"uv": [0, 6, 8, 8], "texture": "#0"}, - "west": {"uv": [0, 6, 8, 8], "texture": "#0"}, - "up": {"uv": [0, 8, 8, 16], "texture": "#0"}, - "down": {"uv": [0, 8, 8, 16], "texture": "#0"} + "north": {"uv": [0, 6, 8, 8], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0, 6, 8, 8], "texture": "#0", "cullface": "east"}, + "south": {"uv": [0, 6, 8, 8], "texture": "#0", "cullface": "south"}, + "west": {"uv": [0, 6, 8, 8], "texture": "#0", "cullface": "west"}, + "up": {"uv": [8, 0, 16, 8], "texture": "#0"}, + "down": {"uv": [0, 8, 8, 16], "texture": "#0", "cullface": "down"} } }, { @@ -203,12 +141,11 @@ "to": [14, 5, 14], "rotation": {"angle": 0, "axis": "y", "origin": [2.5, 8, 2.5]}, "faces": { - "north": {"uv": [1.5, 5.5, 6.5, 6], "texture": "#0"}, - "east": {"uv": [1.5, 5.5, 6.5, 6], "texture": "#0"}, - "south": {"uv": [1.5, 5.5, 6.5, 6], "texture": "#0"}, - "west": {"uv": [1.5, 5.5, 6.5, 6], "texture": "#0"}, - "up": {"uv": [9, 1, 15, 7], "texture": "#0"}, - "down": {"uv": [8, 8, 16, 16], "texture": "#0"} + "north": {"uv": [1, 5.5, 7, 6], "texture": "#0"}, + "east": {"uv": [1, 5.5, 7, 6], "texture": "#0"}, + "south": {"uv": [1, 5.5, 7, 6], "texture": "#0"}, + "west": {"uv": [1, 5.5, 7, 6], "texture": "#0"}, + "up": {"uv": [9, 1, 15, 7], "texture": "#0"} } } ], @@ -231,7 +168,7 @@ { "name": "Blazes", "origin": [8, 8, 8], - "children": [15, 16, 17, 18] + "children": [] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/blaze_heater_brazier.png b/src/main/resources/assets/create/textures/block/blaze_heater_brazier.png index 5bb9f3d37..c74da74a3 100644 Binary files a/src/main/resources/assets/create/textures/block/blaze_heater_brazier.png and b/src/main/resources/assets/create/textures/block/blaze_heater_brazier.png differ diff --git a/src/main/resources/assets/create/textures/block/brass_casing_belt.png b/src/main/resources/assets/create/textures/block/brass_casing_belt.png index b916b9e74..5c0c6cfd3 100644 Binary files a/src/main/resources/assets/create/textures/block/brass_casing_belt.png and b/src/main/resources/assets/create/textures/block/brass_casing_belt.png 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 index cd380a8b9..ff5b11607 100644 Binary files a/src/main/resources/assets/create/textures/block/brass_funnel.png and b/src/main/resources/assets/create/textures/block/brass_funnel.png 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 index 4723126a0..638481460 100644 Binary files a/src/main/resources/assets/create/textures/block/brass_funnel_back.png and b/src/main/resources/assets/create/textures/block/brass_funnel_back.png 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 index c65e8626c..4653ff14c 100644 Binary files a/src/main/resources/assets/create/textures/block/brass_funnel_plating.png and b/src/main/resources/assets/create/textures/block/brass_funnel_plating.png 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 index eb51c22fe..26a0d0c52 100644 Binary files a/src/main/resources/assets/create/textures/block/brass_funnel_powered.png and b/src/main/resources/assets/create/textures/block/brass_funnel_powered.png 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 index dbb3fab83..ebc52fde6 100644 Binary files a/src/main/resources/assets/create/textures/block/brass_funnel_pull.png and b/src/main/resources/assets/create/textures/block/brass_funnel_pull.png differ diff --git a/src/main/resources/assets/create/textures/block/brass_funnel_pull_powered.png b/src/main/resources/assets/create/textures/block/brass_funnel_pull_powered.png index cb757e00f..d66a2d4aa 100644 Binary files a/src/main/resources/assets/create/textures/block/brass_funnel_pull_powered.png and b/src/main/resources/assets/create/textures/block/brass_funnel_pull_powered.png 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 index 4e31e327f..e214fb94f 100644 Binary files a/src/main/resources/assets/create/textures/block/brass_funnel_push.png and b/src/main/resources/assets/create/textures/block/brass_funnel_push.png differ diff --git a/src/main/resources/assets/create/textures/block/brass_funnel_push_powered.png b/src/main/resources/assets/create/textures/block/brass_funnel_push_powered.png index 203afe626..b470004c1 100644 Binary files a/src/main/resources/assets/create/textures/block/brass_funnel_push_powered.png and b/src/main/resources/assets/create/textures/block/brass_funnel_push_powered.png differ diff --git a/src/main/resources/assets/create/textures/block/fluid_pipe.png b/src/main/resources/assets/create/textures/block/fluid_pipe.png index d20660b19..16b475d5e 100644 Binary files a/src/main/resources/assets/create/textures/block/fluid_pipe.png and b/src/main/resources/assets/create/textures/block/fluid_pipe.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 113380983..c01a1ca7f 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/pump.png b/src/main/resources/assets/create/textures/block/pump.png index 602d2a942..9d412d1a7 100644 Binary files a/src/main/resources/assets/create/textures/block/pump.png and b/src/main/resources/assets/create/textures/block/pump.png differ