Asset patches

- Fixed uvs on stress- and speedometers' block models - Toolbox hotbar slot overlay now uses the revised brass palette from 0.5.1
Attack8 · Nov 2, 2023 · 2201d87 · 2201d87
1 parent fff2512
commit 2201d87
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/src/main/resources/assets/create/models/block/gauge/base.json b/src/main/resources/assets/create/models/block/gauge/base.json
@@ -24,12 +24,12 @@
 			"from": [1, 0, 0],
 			"to": [15, 2, 16],
 			"faces": {
-				"north": {"uv": [0, 9, 8, 10], "texture": "#2"},
+				"north": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"},
 				"east": {"uv": [0, 9, 8, 10], "texture": "#2"},
-				"south": {"uv": [0, 9, 7, 10], "texture": "#2"},
+				"south": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"},
 				"west": {"uv": [0, 9, 8, 10], "texture": "#2"},
-				"up": {"uv": [0, 0, 8, 7], "rotation": 270, "texture": "#2"},
-				"down": {"uv": [0, 0, 8, 7], "texture": "#2"}
+				"up": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#2"},
+				"down": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#2"}
 			}
 		}
 	]

diff --git a/src/main/resources/assets/create/models/block/gauge/base_wall.json b/src/main/resources/assets/create/models/block/gauge/base_wall.json
@@ -24,10 +24,10 @@
 			"from": [0, 1, 0],
 			"to": [2, 15, 16],
 			"faces": {
-				"north": {"uv": [0, 9, 8, 10], "rotation": 270, "texture": "#2"},
+				"north": {"uv": [0.5, 9, 7.5, 10], "rotation": 270, "texture": "#2"},
 				"east": {"uv": [0, 0, 8, 7], "texture": "#2"},
-				"south": {"uv": [0, 9, 7, 10], "rotation": 90, "texture": "#2"},
-				"west": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#2"},
+				"south": {"uv": [0.5, 9, 7.5, 10], "rotation": 90, "texture": "#2"},
+				"west": {"uv": [0, 0, 8, 7], "texture": "#2"},
 				"up": {"uv": [0, 9, 8, 10], "rotation": 90, "texture": "#2"},
 				"down": {"uv": [0, 9, 8, 10], "rotation": 90, "texture": "#2"}
 			}

diff --git a/src/main/resources/assets/create/models/block/gauge/speedometer/item.json b/src/main/resources/assets/create/models/block/gauge/speedometer/item.json
@@ -26,12 +26,12 @@
 			"from": [1, 0, 0],
 			"to": [15, 2, 16],
 			"faces": {
-				"north": {"uv": [0, 9, 8, 10], "texture": "#2"},
+				"north": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"},
 				"east": {"uv": [0, 9, 8, 10], "texture": "#2"},
-				"south": {"uv": [0, 9, 7, 10], "texture": "#2"},
+				"south": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"},
 				"west": {"uv": [0, 9, 8, 10], "texture": "#2"},
 				"up": {"uv": [0, 0, 8, 7], "rotation": 270, "texture": "#2"},
-				"down": {"uv": [0, 0, 8, 7], "texture": "#2"}
+				"down": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#2"}
 			}
 		},
 		{
@@ -148,11 +148,13 @@
 		{
 			"name": "Gauge",
 			"origin": [8, 8, 8],
+			"color": 0,
 			"children": [0, 1, 2, 3, 4, 5, 6]
 		},
 		{
 			"name": "shaft",
 			"origin": [8, 8, 8],
+			"color": 0,
 			"children": [7]
 		}
 	]

diff --git a/src/main/resources/assets/create/models/block/gauge/stressometer/item.json b/src/main/resources/assets/create/models/block/gauge/stressometer/item.json
@@ -26,12 +26,12 @@
 			"from": [1, 0, 0],
 			"to": [15, 2, 16],
 			"faces": {
-				"north": {"uv": [0, 9, 8, 10], "texture": "#2"},
+				"north": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"},
 				"east": {"uv": [0, 9, 8, 10], "texture": "#2"},
-				"south": {"uv": [0, 9, 7, 10], "texture": "#2"},
+				"south": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"},
 				"west": {"uv": [0, 9, 8, 10], "texture": "#2"},
 				"up": {"uv": [0, 0, 8, 7], "rotation": 270, "texture": "#2"},
-				"down": {"uv": [0, 0, 8, 7], "texture": "#2"}
+				"down": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#2"}
 			}
 		},
 		{

diff --git a/src/main/resources/assets/create/textures/gui/widgets.png b/src/main/resources/assets/create/textures/gui/widgets.png