feat: better filter for modern links

Author: dayyeeet

README.md

@@ -1,4 +1,4 @@
-# solid-api ![Maven Central Version](https://img.shields.io/maven-central/v/io.github.solid-resourcepack/solid-api?style=flat) ![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/solid-resourcepack/solid-api)
+# solid-api ![Maven Central Version](https://img.shields.io/maven-central/v/io.github.solidpack/solid-api?style=flat) ![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/solidpack/solid-api)
 A (currently) read only API for minecraft resource packs.
 
 > Documentation is still work in progress
@@ -7,17 +7,17 @@ A (currently) read only API for minecraft resource packs.
 
 ### Gradle Kotlin
 ```kt
-implementation("io.github.solid-resourcepack:solid-api:VERSION")
+implementation("io.github.solidpack:solid-api:VERSION")
 ```
 ### Gradle Groovy
 ```groovy
-implementation 'io.github.solid-resourcepack:solid-api:VERSION'
+implementation 'io.github.solidpack:solid-api:VERSION'
 ```
 
 ### Maven
 ```xml
 <dependency>
-    <groupId>io.github.solid-resourcepack</groupId>
+    <groupId>io.github.solidpack</groupId>
     <artifactId>solid-api</artifactId>
     <version>VERSION</version>
 </dependency>

build.gradle.kts

@@ -8,8 +8,8 @@ plugins {
     `maven-publish`
 }
 
-group = "io.github.solid-resourcepack"
-version = "1.1.1"
+group = "io.github.solidpack"
+version = "1.1.2"
 
 repositories {
     mavenCentral()
@@ -56,9 +56,9 @@ centralPortal {
     password = project.findProperty("sonatypePassword") as? String
 
     pom {
-        name.set("Solid")
-        description.set("An API wrapper around unnamed/creative to make custom minecraft items/blocks with java edition resource packs easy for developers")
-        url.set("https://github.com/solid-resourcepack/solid")
+        name.set("Solid API")
+        description.set("A read only API to make working with custom minecraft items/blocks with java edition resource packs easy for developers")
+        url.set("https://github.com/solidpack/solid-api")
 
         developers {
             developer {
@@ -73,8 +73,8 @@ centralPortal {
             }
         }
         scm {
-            url.set("https://github.com/solid-resourcepack/solid")
-            connection.set("git:git@github.com:solid-resourcepack/solid.git")
+            url.set("https://github.com/solidpack/solid-api")
+            connection.set("git:git@github.com:solidpack/solid-api.git")
         }
     }
 }

src/main/kotlin/io/github/solid/resourcepack/api/link/ModelLinkCollector.kt

@@ -103,40 +103,50 @@ class ModelLinkCollector(private val packPath: Path) : ModelLinkHolder {
         return result
     }
 
-    private fun collectModern(basePaths: List<Path>, path: Path): List<ModelLink> {
+    private fun collectModern(basePaths: List<Path> = listOf(Paths.get("assets"))): List<ModelLink> {
         val result = mutableListOf<ModelLink>()
-        val items = path.resolve("items")
-        if (!items.exists()) return result
-        items.listDirectoryEntries("*.json").forEach itemForEach@{ definition ->
-            if (!definition.exists()) return@itemForEach
-            try {
-                val parsed = readModel<ModernResourcePackLink>(definition)
-                parsed?.collect()?.let {
-                    result.addAll(it.filter { m ->
-                        basePaths.any { basePath ->
-                            packPath.resolve(basePath).resolve(toModelPath(m.key)).exists() && m.key.namespace() == path.last().toString()
-                        }
-                    })
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
+        basePaths.map { packPath.resolve(it) }.forEach { baseDir ->
+            if (!baseDir.exists()) return@forEach
+            result.addAll(collectModernRecursively(basePaths, baseDir))
         }
         return result
     }
 
-    private fun collectModern(basePaths: List<Path> = listOf(Paths.get("assets"))): List<ModelLink> {
+    private fun collectModernRecursively(basePaths: List<Path>, currentDir: Path): List<ModelLink> {
         val result = mutableListOf<ModelLink>()
-        basePaths.map { packPath.resolve(it) }.forEach {
-            if (!it.exists()) return@forEach
-            it.listDirectoryEntries().filter { it.isDirectory() }.forEach { namespace ->
-                result.addAll(collectModern(basePaths, namespace))
+
+        val itemsDir = currentDir.resolve("items")
+        if (itemsDir.exists()) {
+            itemsDir.listDirectoryEntries("*.json").forEach itemForEach@{ definition ->
+                if (!definition.exists()) return@itemForEach
+                try {
+                    val parsed = readModel<ModernResourcePackLink>(definition)
+                    parsed?.collect()?.let {
+                        result.addAll(it.filter { m ->
+                            basePaths.any { basePath ->
+                                packPath.resolve(basePath).resolve(toModelPath(m.key)).exists() &&
+                                        m.key.namespace() == currentDir.last().toString()
+                            }
+                        })
+                    }
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
             }
         }
+
+        // Recurse into subdirectories
+        currentDir.listDirectoryEntries()
+            .filter { it.isDirectory() }
+            .forEach { subDir ->
+                result.addAll(collectModernRecursively(basePaths, subDir))
+            }
+
         return result
     }
 
 
+
     private fun MutableList<ModelLink>.combine(other: List<ModelLink>, check: (first: ModelLink, second: ModelLink) -> Boolean): List<ModelLink> {
         other.forEach { element ->
             val found = this.find { check(element, it) }?.let { this.indexOf(it) }