[Incomplete] progress from desktop

Author: SpecialBuilder32

gm4/plugins/resource_pack.py

@@ -919,21 +919,25 @@ def get_item_def_entry(self, config: ModelData, item: str):
         return self._item_def_map.get(item)
 
 class AdvancementIconTemplate(VanillaTemplate, TemplateOptions): # TODO make this inheritance work properly. Treat as single-vanilla forward or create new where needed
+    """Creates a model for advancement icons, either pointing to the vanilla model, or to a specified other item model"""
     name = "advancement"
     forward: Optional[str]
     tints: Optional[ListOption[int|tuple[float,float,float]]] # optional constant tints to apply to the item model
 
     # NOTE since advancements are all in the gm4 namespace, so are these models. This template ignores the 'model' field of ModelData
     def create_models(self, config: ModelData, models_container: NamespaceProxy[Model]) -> list[Model]:
         advancement_name = config.reference.split("/")[-1]
+
         if not self.forward:
+            # then we use the vanilla item's model and settings - inheriting from VanillaTemplate for this
             item = config.item.entries()[0]
-            self.forward = self.vanilla_jar.assets.item_models[add_namespace(item, "minecraft")].data.get("model", {}).get("model", "") # type: ignore ; json access is string
+            config_copy = config.copy(update={"model": MapOption(__root__={config.item.entries()[0]: f"gm4:gui/advancements/{advancement_name}"})})
+            TemplateOptions.create_models(self, config_copy, models_container)
 
         m = models_container[f"gm4:gui/advancements/{advancement_name}"] = Model({
             "parent": self.forward
         })
-        config.model = MapOption(__root__={config.item.entries()[0]: f"gm4:gui/advancements/{advancement_name}"})
+        # config.model = MapOption(__root__={config.item.entries()[0]: f"gm4:gui/advancements/{advancement_name}"})
         return [m]
 
     def get_item_def_entry(self, config: ModelData, item: str):

gm4_better_armour_stands/beet.yaml

@@ -38,6 +38,4 @@ meta:
     model_data:
       - item: armor_stand
         reference: gui/advancement/better_armour_stands
-        template:
-          name: advancement
-          forward: minecraft:item/armor_stand
+        template: advancement

gm4_better_fire/beet.yaml

@@ -39,6 +39,4 @@ meta:
         template: generated
       - item: bow
         reference: gui/advancement/better_fire
-        template:
-          name: advancement
-          forward: minecraft:item/bow
+        template: advancement