Update 0.3, registering a model layer is no longer required, all models in the entity models folder will be loaded

Author: FoundationGames

gradle.properties

@@ -1,11 +1,11 @@
 org.gradle.jvmargs=-Xmx1G
 
-minecraft_version=1.21-pre4
-yarn_mappings=1.21-pre4+build.3
-loader_version=0.15.11
+minecraft_version=1.21
+yarn_mappings=1.21+build.9
+loader_version=0.16.10
 
-mod_version = 0.2.1+1.21
+mod_version = 0.3+1.21
 maven_group = io.github.foundationgames
 archives_base_name = jsonem
 
-fabric_version=0.99.5+1.21
+fabric_version=0.102.0+1.21

src/main/java/io/github/foundationgames/jsonem/JsonEM.java

@@ -18,6 +18,7 @@ public void onInitializeClient() {
         CONFIG.load();
     }
 
+    @Deprecated
     public static void registerModelLayer(EntityModelLayer layer) {
         EntityModelLayerRegistry.registerModelLayer(layer, () -> TexturedModelData.of(new ModelData(), 32, 32));
     }

src/main/java/io/github/foundationgames/jsonem/util/JsonEntityModelUtil.java

@@ -10,9 +10,10 @@
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.model.TexturedModelData;
 import net.minecraft.client.render.entity.model.EntityModelLayer;
-import net.minecraft.client.render.entity.model.EntityModelLayers;
+import net.minecraft.resource.ResourceFinder;
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.InvalidIdentifierException;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -36,20 +37,25 @@ public static Optional<TexturedModelData> readJson(InputStream data) {
     }
 
     public static void loadModels(ResourceManager manager, Map<EntityModelLayer, TexturedModelData> models) {
-        EntityModelLayers.getLayers().forEach(layer -> {
-            var modelLoc = Identifier.of(layer.getId().getNamespace(), "models/entity/"+layer.getId().getPath()+"/"+layer.getName()+".json");
-
-            var res = manager.getResource(modelLoc);
-
-            if (res.isPresent()) {
-                try {
-                    try (var in = res.get().getInputStream()) {
-                        var data = JsonEntityModelUtil.readJson(in);
-                        data.ifPresent(model -> models.put(layer, model));
-                    }
-                } catch (IOException e) {
-                    JsonEM.LOG.error(e);
+        ResourceFinder.json("models/entity").findResources(manager).forEach((id, res) -> {
+            try {
+                var fullPath = id.getPath().replaceFirst("models/entity/", "");
+                var splitPath = fullPath.split("/");
+
+                var dirs = new String[splitPath.length - 1];
+                System.arraycopy(splitPath, 0, dirs, 0, dirs.length);
+
+                var layerName = splitPath[splitPath.length - 1].replace(".json", "");
+                var modelName = String.join("/", dirs);
+
+                var layer = new EntityModelLayer(Identifier.of(id.getNamespace(), modelName), layerName);
+
+                try (var in = res.getInputStream()) {
+                    var data = JsonEntityModelUtil.readJson(in);
+                    data.ifPresent(model -> models.put(layer, model));
                 }
+            } catch (IOException | InvalidIdentifierException e) {
+                JsonEM.LOG.error(e);
             }
         });
     }