Fix deattached greekfire tube (#3)

Mvndi · Oct 21, 2024 · 871002d · 871002d
1 parent 370ebb6
commit 871002d
Show file tree

Hide file tree

Showing 2 changed files with 470 additions and 17 deletions.
diff --git a/core/assets/mvndicraft/models/siege/block/greek_fire/all.json b/core/assets/mvndicraft/models/siege/block/greek_fire/all.json
@@ -374,7 +374,7 @@
 		{
 			"from": [6.25, 10.575, 4],
 			"to": [9.75, 14.075, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 11.825, 8]},
+			"rotation": {"angle": 0, "axis": "x", "origin": [8, 11.825, 8]},
 			"faces": {
 				"north": {"uv": [0, 0, 3.5, 3.5], "texture": "#missing"},
 				"east": {"uv": [2, 1.5, 10, 5], "texture": "#4"},
@@ -387,7 +387,7 @@
 		{
 			"from": [6.25, 10.575, 2.25],
 			"to": [9.75, 14.075, 4],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 11.825, 0]},
+			"rotation": {"angle": 0, "axis": "x", "origin": [8, 11.825, 0]},
 			"faces": {
 				"east": {"uv": [4, 8, 0.5, 15], "texture": "#3"},
 				"south": {"uv": [0, 0, 3.5, 3.5], "texture": "#missing"},
@@ -397,7 +397,7 @@
 		{
 			"from": [6.25, 10.575, 12],
 			"to": [9.75, 14.075, 13.75],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 11.825, 16]},
+			"rotation": {"angle": 0, "axis": "x", "origin": [8, 11.825, 16]},
 			"faces": {
 				"north": {"uv": [3.5, 0, 0, 3.5], "texture": "#missing"},
 				"east": {"uv": [0.5, 8, 4, 15], "texture": "#3"},
@@ -418,16 +418,38 @@
 			}
 		},
 		{
-			"from": [7.75, 9.01367, 11.51367],
-			"to": [8.25, 12.51367, 12.01367],
+			"from": [7.749, 9.01267, 11.51267],
+			"to": [8.251, 12.51467, 12.01467],
 			"rotation": {"angle": 0, "axis": "x", "origin": [8, 9.51367, 11.76367]},
 			"faces": {
 				"north": {"uv": [2.375, 14.125, 3.25, 14.25], "rotation": 270, "texture": "#0"},
 				"east": {"uv": [2.375, 14.125, 3.25, 14.25], "rotation": 270, "texture": "#0"},
 				"south": {"uv": [2.375, 14.125, 3.25, 14.25], "rotation": 270, "texture": "#0"},
 				"west": {"uv": [2.375, 14.125, 3.25, 14.25], "rotation": 270, "texture": "#0"},
-				"up": {"uv": [0, 0.5, 0.5, 1], "rotation": 180, "texture": "#missing"},
-				"down": {"uv": [0, 0.5, 0.5, 1], "texture": "#missing"}
+				"up": {"uv": [2.375, 14.125, 3.25, 14.25], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.749, 13.43767, 7.08767],
+			"to": [8.251, 13.93967, 10.58967],
+			"rotation": {"angle": 0, "axis": "x", "origin": [8, 13.68867, 7.58867]},
+			"faces": {
+				"east": {"uv": [2.375, 14.125, 3.25, 14.25], "rotation": 180, "texture": "#0"},
+				"south": {"uv": [2.375, 14.125, 3.25, 14.25], "rotation": 270, "texture": "#0"},
+				"west": {"uv": [2.375, 14.125, 3.25, 14.25], "texture": "#0"},
+				"up": {"uv": [2.375, 14.125, 3.25, 14.25], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [2.375, 14.125, 3.25, 14.25], "rotation": 270, "texture": "#0"}
+			}
+		},
+		{
+			"from": [7.75, 12.43867, 9.95468],
+			"to": [8.25, 12.93867, 11.98867],
+			"rotation": {"angle": 45, "axis": "x", "origin": [8, 12.68867, 11.48867]},
+			"faces": {
+				"east": {"uv": [2.375, 14.125, 2.8835, 14.25], "texture": "#0"},
+				"west": {"uv": [2.375, 14.125, 2.8835, 14.25], "rotation": 180, "texture": "#0"},
+				"up": {"uv": [2.375, 14.125, 2.8835, 14.25], "rotation": 270, "texture": "#0"},
+				"down": {"uv": [2.375, 14.125, 2.8835, 14.25], "rotation": 90, "texture": "#0"}
 			}
 		},
 		{
@@ -517,16 +539,46 @@
 			"scale": [1.75, 1.75, 1.75]
 		}
 	},
-	"groups": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+	"groups": [
+		0,
+		1,
+		2,
+		3,
+		4,
+		5,
+		6,
+		7,
+		8,
+		9,
+		10,
+		11,
+		12,
+		13,
+		14,
+		15,
+		16,
+		17,
+		18,
+		19,
+		20,
+		21,
+		22,
 		{
 			"name": "group",
 			"origin": [8, 10.30723, 12],
+			"color": 0,
 			"children": [23, 24, 25, 26, 27, 28, 29, 30]
-		}, 31, 32, 33,
+		},
+		31,
+		32,
+		33,
+		34,
+		35,
 		{
 			"name": "octagon",
 			"origin": [8, 8, 8],
-			"children": [34, 35, 36, 37, 38]
+			"color": 0,
+			"children": [36, 37, 38, 39, 40]
 		}
 	]
 }