Merge pull request #616 from Moo-Ack-Productions/fix-update-data-gene…

…rator Add non_color_options to mcprep base data json
Moo-Ack-Productions · Aug 8, 2024 · e3f136e · e3f136e
2 parents 03000b0 + ebed056
commit e3f136e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/MCprep_addon/MCprep_resources/mcprep_data_update.json b/MCprep_addon/MCprep_resources/mcprep_data_update.json
@@ -4608,6 +4608,11 @@
 		"Strider",
 		"Warden"
 	],
+	"non_color_options": [
+		"Non-Color",
+		"Non-Colour Data",
+		"NONE"
+	],
 	"unspawnable_for_now": [
 		"banner",
 		"bed",

diff --git a/MCprep_addon/util.py b/MCprep_addon/util.py
@@ -74,7 +74,7 @@ def apply_noncolor_data(node: Node) -> Optional[MCprepError]:
 	"""
 	options: List[str] = []
 	if env.json_data:
-		options = env.json_data["non_color_options"]
+		options = env.json_data.get("non_color_options", [])
 
 	if not node.image:
 		env.log("Node has no image applied yet, cannot change colorspace")

diff --git a/mcprep_data_base.json b/mcprep_data_base.json
@@ -127,5 +127,11 @@
 ],
 "make_real": [
 	"chest",
-	"chest_double"]
+	"chest_double"
+],
+"non_color_options": [
+	"Non-Color",
+	"Non-Colour Data",
+	"NONE"
+]
 }