Fix resourcepack format version 22 short_grass and filtering out block models

MCprep_addon/MCprep_resources/mcprep_data_update.json

@@ -4294,6 +4294,11 @@
 				0.614651,
 				0.089036
 			],
+			"short_grass": [
+				0.227161,
+				0.614651,
+				0.089036
+			],
 			"grass_block_side_overlay": [
 				0.227161,
 				0.614651,
@@ -4631,6 +4636,7 @@
 		"shulker_box",
 		"sunflower",
 		"water_still",
-		"water"
+		"water",
+		"conduit"
 	]
 }

MCprep_addon/materials/generate.py

@@ -16,6 +16,7 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+import json
 import os
 from typing import Dict, Optional, List, Any, Tuple, Union, cast
 from pathlib import Path
@@ -216,6 +217,39 @@ def find_from_texturepack(blockname: str, resource_folder: Optional[Path]=None)
 	return res
 
 
+def get_format_version_texturepack(resource_folder: Optional[Path]=None) -> Union[int, MCprepError]:
+	""" Get texturepack format version
+
+	See https://minecraft.wiki/w/Pack_format#List_of_resource_pack_formats"""
+	if resource_folder is None:
+		# default to internal pack
+		resource_folder = Path(cast(
+			str,
+			bpy.path.abspath(bpy.context.scene.mcprep_texturepack_path)
+		))
+
+	if not resource_folder.exists() or not resource_folder.is_dir():
+		env.log("Error, resource folder does not exist")
+		line, file = env.current_line_and_file()
+		return MCprepError(FileNotFoundError(), line, file, f"Resource pack folder at {resource_folder} does not exist!")
+
+	# Resource folder is same level as assets folder
+	meta_file = Path(resource_folder, "pack.mcmeta")
+	if meta_file.exists() and meta_file.is_file():
+		with open(meta_file, 'r') as f:
+			data = json.load(f)
+			if data.get("pack"):
+				r = data.get("pack").get("pack_format")
+				if r:
+					return r
+			# Comment this out for now
+			# Invalid pack.mcmeta file
+			# line, file = env.current_line_and_file()
+			# MCprepError(TypeError(), line, file, f"Resource pack metadata ({meta_file}) is invalid!")
+	# return the unaffected change version, 22
+	return 21
+
+
 def detect_form(materials: List[Material]) -> Optional[Form]:
 	"""Function which, given the input materials, guesses the exporter form.
 
@@ -367,6 +401,15 @@ def set_texture_pack(
 	run the swap (and auto load e.g. normals and specs if avail.)
 	"""
 	mc_name, _ = get_mc_canonical_name(material.name)
+	texture_pack_format = get_format_version_texturepack(folder)
+	if isinstance(texture_pack_format, MCprepError):
+		if texture_pack_format.msg:
+			env.log(texture_pack_format.msg)
+		return 0
+	# grass rename to short_grass in MC 1.20.3 with pack format version 22
+	if (material.name == "grass" and texture_pack_format > 21):
+		mc_name = "short_grass"
+
 	image = find_from_texturepack(mc_name, folder)
 	if isinstance(image, MCprepError):
 		if image.msg:
@@ -588,7 +631,7 @@ def get_textures(material: Material) -> Dict[str, Image]:
 
 def find_additional_passes(image_file: Path) -> Dict[str, Image]:
 	"""Find relevant passes like normal and spec in same folder as image."""
-	print("What is this?", image_file)
+	# print("What is this?", image_file) # just gonna comment this out for now
 	abs_img_file = bpy.path.abspath(str(image_file))  # needs to be blend file relative
 	env.log(f"\tFind additional passes for: {image_file}", vv_only=True)
 	if not os.path.isfile(abs_img_file):

MCprep_addon/spawner/mcmodel.py

@@ -18,6 +18,7 @@
 
 import os
 import json
+import re
 from mathutils import Vector
 from math import sin, cos, radians
 from pathlib import Path
@@ -456,7 +457,18 @@ def update_model_list(context: Context):
 
 		# Filter out models that can't spawn. Typically those that reference
 		# #fire or the likes in the file.
-		if "template" in name:
+		# These blocks just don't make sense to put in the for "unspawnable_for_now"
+		# Template base of that block for example candle, cake with candles
+		# Orient blocks base, cube same as orientable (no texture)
+		# Light blocks are just special no geometry block with 15 states of light levels
+		# Shulkers, Hanging Signs, Signs are entities, put it here for now since they have a lot of variants
+		is_contains = re.search(r"template_|orientable|cube|_shulker_box|_sign|light_0|light_1", name)
+		if is_contains:
+			continue
+		# Single word condition filter
+		# block single block parent, base parent of most MC contain gui displays
+		# Air, Barrier, Structure void has no geometry
+		if name in ["block", "air", "barrier", "structure_void"]:
 			continue
 		# Filter the "unspawnable_for_now"
 		# Either entity block or block that doesn't good for json

mcprep_data_base.json

@@ -36,6 +36,7 @@
 	"desaturated":{
 		"vine": [0.227161, 0.614651, 0.089036],
 		"grass": [0.227161, 0.614651, 0.089036],
+		"short_grass": [0.227161, 0.614651, 0.089036],
 		"colormap/grass": [0.227161, 0.614651, 0.089036],
 		"lily_pad": [0.227161, 0.614651, 0.089036],
 		"attached_melon_stem": [0.227161, 0.614651, 0.089036],

test_files/materials_test.py

@@ -342,6 +342,7 @@ def test_detect_desaturated_images(self):
         should_saturate = {
             # Sample of canonically grayscale textures.
             "grass": True,
+            "short_grass": True,
             "grass_block_top": True,
             "acacia_leaves": True,
             "redstone_dust_line0": True,