New DTN Data-Driven DogModel System!

Created a dedicated format to represent DTN Model in json. See DTNModelCodec for more info.
Allows DTN to get dog models from jsons in the format above located at assets/<namespace>/doggytalents/dog_models.
This allow adding models through resourcepacks, in which the model is provided at the path above with namespace being the pack's namespace. This pack will be compatible with all supported DTN version regardless of MC Version.

Author: DashieDev

src/main/java/doggytalents/client/ClientSetup.java

@@ -18,6 +18,7 @@
 import doggytalents.client.entity.model.SyncedRenderFunctionWithHeadModel;
 import doggytalents.client.entity.model.TorchDogModel;
 import doggytalents.client.entity.model.animation.DTNAnimationLoader;
+import doggytalents.client.entity.model.animation.DTNModelLoader;
 import doggytalents.client.entity.model.animation.DogAnimationRegistry;
 import doggytalents.client.entity.model.dog.DogModel;
 import doggytalents.client.entity.model.dog.NullDogModel;
@@ -442,6 +443,7 @@ public static void registerOverlay(RegisterGuiLayersEvent e) {
     }
 
     public static void addClientReloadListeners(final RegisterClientReloadListenersEvent event) {
+        event.registerReloadListener(DTNModelLoader.INSTANCE);
         event.registerReloadListener(DogTextureManager.INSTANCE);
         event.registerReloadListener(DogRandomNameRegistry.getInstance());
         event.registerReloadListener(DTNAnimationLoader.INSTANCE);

src/main/java/doggytalents/client/DogTextureManager.java

@@ -201,14 +201,20 @@ public RegsiterResult getSkinFromSkinJson(ResourceManager resMan, DogTextureMana
             } else {
                 text_rl = Util.getResource("textures/entity/dog/custom/" + id + ".png");
             }
+
             DogSkin skin;
-            if (use_model == null || use_model.equals("default") || use_model.equals("")) {
+            final boolean use_default_model = 
+                use_model == null || use_model.equals("default") || use_model.equals("");
+            if (!use_default_model) {
+                skin = new DogSkin(text_rl, true).setName(name);
+                prep.dogSkinWithCustomModel.add(Pair.of(skin, use_model));
+            } else {
                 skin = new DogSkin(text_rl).setName(name);
-            } else if (use_model.equals("variant")) {
-                var dogModel = DogModelRegistry.getDogModelHolder(use_model);
-                skin = (dogModel == null) ?
-                    new DogSkin(text_rl).setName(name)
-                    : new DogSkin(text_rl, dogModel).setName(name);
+            }
+
+            final boolean is_legacy_variant_model =
+                "variant".equals(use_model);
+            if (is_legacy_variant_model){
                 var tailOptional = skinObject.get("tail_id");
                 if (tailOptional != null) {
                     skin.setTail(tailOptional.getAsByte());
@@ -217,10 +223,6 @@ public RegsiterResult getSkinFromSkinJson(ResourceManager resMan, DogTextureMana
                 if (earOptional != null) {
                     skin.setEar(earOptional.getAsByte());
                 }
-            } else {
-                var dogModel = DogModelRegistry.getDogModelHolder(use_model);
-                if (dogModel == null)  skin = new DogSkin(text_rl).setName(name);
-                else skin = new DogSkin(text_rl, dogModel).setName(name);
             }
 
             readSkinExtraInfo(skin, skinObject);
@@ -288,10 +290,28 @@ protected void apply(DogTextureManager.DogSkinLoadResult loadResult, ResourceMan
         var skin_list = new ArrayList<DogSkin>();
 
         skin_list.add(DogSkin.CLASSICAL);
+
+        //Model resolution
+        for (var entry : loadResult.dogSkinWithCustomModel) {
+            var skin = entry.getLeft();
+            var model_id = entry.getRight();
+            var model = DogModelRegistry.getDogModelHolder(model_id);
+            if (model != null) {
+                skin.setCustomModel(model);
+            } else {
+                DogTextureManager.LOGGER.warn(
+                    "Skin [ {} ] refers to the missing model: [ {} ]",
+                    skin.getPath().getPath(), model_id    
+                );
+            }
+        }
 
         for (var entry : loadResult.dogSkinsAndHash) {
             var skin = entry.getLeft();
             var hash = entry.getRight();
+            if (skin.useCustomModel() && skin.getCustomModel() == null) {
+                continue;
+            }
             if (isDogSkinBlacklisted(skin)) {
                 ++skipping_cnt;
                 continue;
@@ -348,10 +368,12 @@ public String getName() {
     protected static class DogSkinLoadResult {
 
         public final List<Pair<DogSkin, String>> dogSkinsAndHash;
+        public final List<Pair<DogSkin, String>> dogSkinWithCustomModel;
         private final Set<String> registeredHash;
 
         public DogSkinLoadResult() {
             this.dogSkinsAndHash = new ArrayList<>();
+            this.dogSkinWithCustomModel = new ArrayList<>();
             this.registeredHash = new HashSet<>();
         }