add bogged head

aternosorg · Feb 15, 2024 · 802bc09 · 802bc09
1 parent 9bd7e09
commit 802bc09
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 69 deletions.
diff --git a/builtin/mobheads/models/item/base/head_64_32.json b/builtin/mobheads/models/item/base/head_64_32.json
@@ -2,6 +2,9 @@
 	"credit": "Made with Blockbench",
 	"parent": "mobheads:item/base/head_display",
 	"texture_size": [64, 32],
+	"textures": {
+		"overlay": "renderchest:item/empty"
+	},
 	"elements": [
 		{
 			"from": [4, 4, 4],
@@ -14,6 +17,18 @@
 				"up": {"uv": [2, 0, 4, 4], "rotation": 180, "texture": "#texture"},
 				"down": {"uv": [4, 0, 6, 4], "texture": "#texture"}
 			}
+		},
+		{
+			"from": [3.5, 3.5, 3.5],
+			"to": [12.5, 12.5, 12.5],
+			"faces": {
+				"north": {"uv": [2, 4, 4, 8], "texture": "#overlay"},
+				"east": {"uv": [0, 4, 2, 8], "texture": "#overlay"},
+				"south": {"uv": [6, 4, 8, 8], "texture": "#overlay"},
+				"west": {"uv": [4, 4, 6, 8], "texture": "#overlay"},
+				"up": {"uv": [2, 0, 4, 4], "rotation": 180, "texture": "#overlay"},
+				"down": {"uv": [4, 0, 6, 4], "texture": "#overlay"}
+			}
 		}
 	]
-}
+}
diff --git a/builtin/mobheads/models/item/base/head_64_64.json b/builtin/mobheads/models/item/base/head_64_64.json
@@ -2,6 +2,9 @@
 	"credit": "Made with Blockbench",
 	"parent": "mobheads:item/base/head_display",
 	"texture_size": [64, 64],
+	"textures": {
+		"overlay": "renderchest:item/empty"
+	},
 	"elements": [
 		{
 			"from": [4, 4, 4],
@@ -14,6 +17,18 @@
 				"up": {"uv": [2, 0, 4, 2], "rotation": 180, "texture": "#texture"},
 				"down": {"uv": [4, 0, 6, 2], "texture": "#texture"}
 			}
+		},
+		{
+			"from": [3.5, 3.5, 3.5],
+			"to": [12.5, 12.5, 12.5],
+			"faces": {
+				"north": {"uv": [2, 2, 4, 4], "texture": "#overlay"},
+				"east": {"uv": [0, 2, 2, 4], "texture": "#overlay"},
+				"south": {"uv": [6, 2, 8, 4], "texture": "#overlay"},
+				"west": {"uv": [4, 2, 6, 4], "texture": "#overlay"},
+				"up": {"uv": [2, 0, 4, 2], "texture": "#overlay"},
+				"down": {"uv": [4, 0, 6, 2], "texture": "#overlay"}
+			}
 		}
 	]
-}
+}
diff --git a/builtin/mobheads/models/item/bogged.json b/builtin/mobheads/models/item/bogged.json
@@ -0,0 +1,8 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "mobheads:item/base/head_64_32",
+	"textures": {
+		"texture": "entity/skeleton/bogged",
+		"overlay": "entity/skeleton/bogged_overlay"
+	}
+}
diff --git a/builtin/mobheads/models/item/drowned.json b/builtin/mobheads/models/item/drowned.json
@@ -1,35 +1,8 @@
 {
 	"credit": "Made with Blockbench",
-  	"parent": "mobheads:item/base/head_display",
-	"texture_size": [64, 64],
+  	"parent": "mobheads:item/base/head_64_64",
 	"textures": {
-		"0": "minecraft:entity/zombie/drowned",
-		"1": "minecraft:entity/zombie/drowned_outer_layer"
-	},
-	"elements": [
-		{
-			"from": [4, 4, 4],
-			"to": [12, 12, 12],
-			"faces": {
-				"north": {"uv": [2, 2, 4, 4], "texture": "#0"},
-				"east": {"uv": [0, 2, 2, 4], "texture": "#0"},
-				"south": {"uv": [6, 2, 8, 4], "texture": "#0"},
-				"west": {"uv": [4, 2, 6, 4], "texture": "#0"},
-				"up": {"uv": [2, 0, 4, 2], "texture": "#0"},
-				"down": {"uv": [4, 0, 6, 2], "texture": "#0"}
-			}
-		},
-		{
-			"from": [3.5, 3.5, 3.5],
-			"to": [12.5, 12.5, 12.5],
-			"faces": {
-				"north": {"uv": [2, 2, 4, 4], "texture": "#1"},
-				"east": {"uv": [0, 2, 2, 4], "texture": "#1"},
-				"south": {"uv": [6, 2, 8, 4], "texture": "#1"},
-				"west": {"uv": [4, 2, 6, 4], "texture": "#1"},
-				"up": {"uv": [2, 0, 4, 2], "texture": "#1"},
-				"down": {"uv": [4, 0, 6, 2], "texture": "#1"}
-			}
-		}
-	]
-}
+		"texture": "minecraft:entity/zombie/drowned",
+		"overlay": "minecraft:entity/zombie/drowned_outer_layer"
+	}
+}
diff --git a/builtin/mobheads/models/item/stray.json b/builtin/mobheads/models/item/stray.json
@@ -1,35 +1,8 @@
 {
 	"credit": "Made with Blockbench",
-	"parent": "mobheads:item/base/head_display",
-	"texture_size": [64, 32],
+	"parent": "mobheads:item/base/head_64_32",
 	"textures": {
-		"0": "entity/skeleton/stray",
-		"1": "entity/skeleton/stray_overlay"
-	},
-	"elements": [
-		{
-			"from": [4, 4, 4],
-			"to": [12, 12, 12],
-			"faces": {
-				"north": {"uv": [2, 4, 4, 8], "texture": "#0"},
-				"east": {"uv": [0, 4, 2, 8], "texture": "#0"},
-				"south": {"uv": [6, 4, 8, 8], "texture": "#0"},
-				"west": {"uv": [4, 4, 6, 8], "texture": "#0"},
-				"up": {"uv": [2, 0, 4, 4], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [4, 0, 6, 4], "texture": "#0"}
-			}
-		},
-		{
-			"from": [3.5, 3.5, 3.5],
-			"to": [12.5, 12.5, 12.5],
-			"faces": {
-				"north": {"uv": [2, 4, 4, 8], "texture": "#1"},
-				"east": {"uv": [0, 4, 2, 8], "texture": "#1"},
-				"south": {"uv": [6, 4, 8, 8], "texture": "#1"},
-				"west": {"uv": [4, 4, 6, 8], "texture": "#1"},
-				"up": {"uv": [2, 0, 4, 4], "rotation": 180, "texture": "#1"},
-				"down": {"uv": [4, 0, 6, 4], "texture": "#1"}
-			}
-		}
-	]
-}
+		"texture": "entity/skeleton/stray",
+		"overlay": "entity/skeleton/stray_overlay"
+	}
+}
diff --git a/src/Resource/Texture/TextureList.php b/src/Resource/Texture/TextureList.php
@@ -58,9 +58,6 @@ public function getResolvable(string $name): TextureInterface
         if (str_starts_with($name, "#")) {
             $name = substr($name, 1);
         }
-        if (isset($this->textures[$name])) {
-            return $this->textures[$name];
-        }
         return new ResolvableTexture($this, $name);
     }