Merge pull request #36 from gentlegiantJGC/impl-AND

Added support for AND case
gentlegiantJGC · Aug 23, 2024 · ee65d76 · ee65d76
2 parents dd0946e + b2f643b
commit ee65d76
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/minecraft_model_reader/api/resource_pack/java/resource_pack_manager.py b/minecraft_model_reader/api/resource_pack/java/resource_pack_manager.py
@@ -276,6 +276,16 @@ def _get_model(self, block: Block) -> BlockMesh:
                                     for prop_match in case["when"]["OR"]
                                 ):
                                     continue
+                            elif "AND" in case["when"]:
+                                if not all(
+                                    all(
+                                        block.properties.get(prop, None)
+                                        in self.parse_state_val(val)
+                                        for prop, val in prop_match.items()
+                                    )
+                                    for prop_match in case["when"]["AND"]
+                                ):
+                                    continue
                             elif not all(
                                 block.properties.get(prop, None)
                                 in self.parse_state_val(val)