Fix some custom model data conflicts

Also update pack format
Minebench · Jun 16, 2024 · 58a67dc · 58a67dc
1 parent db21720
commit 58a67dc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/assets/minecraft/models/item/black_stained_glass.json b/assets/minecraft/models/item/black_stained_glass.json
@@ -3,6 +3,7 @@
     "overrides": [
 		{ "predicate": {"custom_model_data": 1}, "model": "realhats:item/sunglasses/black_sunglasses_black"},
 		{ "predicate": {"custom_model_data": 2}, "model": "realhats:item/sunglasses/sunglasses_black"},
-		{ "predicate": {"custom_model_data": 3}, "model": "realhats:item/sunglasses/silver_sunglasses_black"}
+		{ "predicate": {"custom_model_data": 3}, "model": "realhats:item/sunglasses/silver_sunglasses_black"},
+		{ "predicate": {"custom_model_data": 4}, "model": "minecraft:item/black_stained_glass"}
 	]
 }
diff --git a/assets/minecraft/models/item/lime_wool.json b/assets/minecraft/models/item/lime_wool.json
@@ -2,6 +2,7 @@
     "__comment": "Created by Phoenix616",
     "parent": "block/lime_wool",
 	"overrides": [
-		{ "predicate": {"custom_model_data": 1}, "model": "realhats:item/winter_hat"}
+		{ "predicate": {"custom_model_data": 1}, "model": "realhats:item/winter_hat"},
+		{ "predicate": {"custom_model_data": 2}, "model": "minecraft:item/lime_wool"}
 	]
 }
diff --git a/assets/minecraft/models/item/red_wool.json b/assets/minecraft/models/item/red_wool.json
@@ -3,6 +3,7 @@
     "parent": "block/red_wool",
 	"overrides": [
 		{ "predicate": {"custom_model_data": 1}, "model": "realhats:item/fez"},
-		{ "predicate": {"custom_model_data": 2}, "model": "realhats:item/santa_hat"}
+		{ "predicate": {"custom_model_data": 2}, "model": "realhats:item/santa_hat"},
+		{ "predicate": {"custom_model_data": 3}, "model": "minecraft:item/red_wool"}
 	]
 }
diff --git a/pack.mcmeta b/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
-    "pack_format": 15,
+    "pack_format": 22,
     "description": "Minebench.de Resourcepack"
   }
 }