Merge pull request #43 from CodeMonkeysMods/models-and-textures

Fixed furnace models

Author: The-Code-Monkey

src/main/resources/assets/minetale/models/block/bench/furnace_bottom.json

@@ -8,9 +8,8 @@
 	},
 	"elements": [
 		{
-			"from": [0, 0, 1],
-			"to": [32, 5, 15],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-8, 0, 0]},
+			"from": [1, 0, 1],
+			"to": [31, 5, 15],
 			"faces": {
 				"north": {"uv": [0, 2.5, 7.5, 3.75], "texture": "#0"},
 				"east": {"uv": [7.5, 2.5, 11, 3.75], "texture": "#0"},
@@ -22,7 +21,7 @@
 		{
 			"from": [0, 5, 0],
 			"to": [32, 8, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-8, 6, 0]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 6, 0]},
 			"faces": {
 				"north": {"uv": [0, 1.75, 8, 2.5], "texture": "#0"},
 				"east": {"uv": [8, 1.75, 12, 2.5], "texture": "#0"},
@@ -35,7 +34,7 @@
 		{
 			"from": [4, 8, 2],
 			"to": [28, 15, 14],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-8, 8, 0]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 8, 0]},
 			"faces": {
 				"north": {"uv": [7, 0, 13, 1.75], "texture": "#0"},
 				"east": {"uv": [6.1875, 0, 6.8125, 1.75], "texture": "#0"},
@@ -44,9 +43,9 @@
 			}
 		},
 		{
-			"from": [24.5, 0, 3.5],
-			"to": [30.5, 16, 12.5],
-			"rotation": {"angle": 15, "axis": "z", "origin": [23.5, 8, 8]},
+			"from": [27.5, 8, 3.5],
+			"to": [31.5, 16, 12.5],
+			"rotation": {"angle": 15, "axis": "z", "origin": [31.5, 8, 8]},
 			"faces": {
 				"north": {"uv": [0, 8.75, 1, 10.75], "texture": "#0"},
 				"east": {"uv": [0, 8.75, 2.25, 10.75], "texture": "#0"},
@@ -55,13 +54,24 @@
 		},
 		{
 			"from": [0.5, 8, 3.5],
-			"to": [4.5, 24, 12.5],
-			"rotation": {"angle": -15, "axis": "z", "origin": [-7.5, 8, 8]},
+			"to": [4.5, 16, 12.5],
+			"rotation": {"angle": -15, "axis": "z", "origin": [0.5, 8, 8]},
 			"faces": {
 				"north": {"uv": [1.25, 8.75, 2.25, 10.75], "texture": "#0"},
 				"south": {"uv": [0, 8.75, 1, 10.75], "texture": "#0"},
 				"west": {"uv": [0, 8.75, 2.25, 10.75], "texture": "#0"}
 			}
+		},
+		{
+			"from": [21, 14, 14],
+			"to": [11, 8, 2],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 8, 0]},
+			"faces": {
+				"north": {"uv": [13.5, 4, 16, 5.5], "texture": "#0"},
+				"east": {"uv": [16, 2.5, 13, 4], "texture": "#0"},
+				"west": {"uv": [13, 2.5, 16, 4], "texture": "#0"},
+				"down": {"uv": [13, 0, 16, 2.5], "rotation": 180, "texture": "#0"}
+			}
 		}
 	]
 }

src/main/resources/assets/minetale/models/block/bench/furnace_top.json

@@ -10,7 +10,7 @@
 		{
 			"from": [2, -1, 1],
 			"to": [30, 5, 15],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-8, -1, 0]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, -1, 0]},
 			"faces": {
 				"north": {"uv": [0, 3.75, 7, 5.25], "texture": "#0"},
 				"east": {"uv": [7, 3.75, 10.5, 5.25], "texture": "#0"},
@@ -23,14 +23,27 @@
 		{
 			"from": [7, 5, 4],
 			"to": [25, 15, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [-8, 5, 0]},
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 5, 0]},
 			"faces": {
 				"north": {"uv": [0, 6.25, 4.5, 8.75], "texture": "#0"},
 				"east": {"uv": [4.5, 6.25, 6.5, 8.75], "texture": "#0"},
 				"south": {"uv": [0, 6.25, 4.5, 8.75], "texture": "#0"},
 				"west": {"uv": [4.5, 6.25, 6.5, 8.75], "texture": "#0"},
 				"up": {"uv": [11.25, 6.25, 15.75, 8.25], "texture": "#0"}
 			}
+		},
+		{
+			"from": [6, 10, 3],
+			"to": [26, 14, 13],
+			"rotation": {"angle": 0, "axis": "y", "origin": [0, 10, 0]},
+			"faces": {
+				"north": {"uv": [0, 5.25, 5, 6.25], "texture": "#0"},
+				"east": {"uv": [5, 5.25, 7.5, 6.25], "texture": "#0"},
+				"south": {"uv": [0, 5.25, 5, 6.25], "texture": "#0"},
+				"west": {"uv": [5, 5.25, 7.5, 6.25], "texture": "#0"},
+				"up": {"uv": [11, 6, 16, 8.5], "texture": "#0"},
+				"down": {"uv": [11, 6, 16, 8.5], "texture": "#0"}
+			}
 		}
 	]
 }

src/main/resources/assets/minetale/models/item/bench/furnace.json

@@ -98,6 +98,19 @@
 				"west": {"uv": [13, 2.5, 16, 4], "texture": "#0"},
 				"down": {"uv": [13, 0, 16, 2.5], "rotation": 180, "texture": "#0"}
 			}
+		},
+		{
+			"from": [-2, 18, 3],
+			"to": [18, 22, 13],
+			"rotation": {"angle": 0, "axis": "y", "origin": [-8, 18, 0]},
+			"faces": {
+				"north": {"uv": [0, 5.25, 5, 6.25], "texture": "#0"},
+				"east": {"uv": [5, 5.25, 7.5, 6.25], "texture": "#0"},
+				"south": {"uv": [0, 5.25, 5, 6.25], "texture": "#0"},
+				"west": {"uv": [5, 5.25, 7.5, 6.25], "texture": "#0"},
+				"up": {"uv": [11, 6, 16, 8.5], "texture": "#0"},
+				"down": {"uv": [11, 6, 16, 8.5], "texture": "#0"}
+			}
 		}
 	],
 	"display": {