Fix #327

Author: NichtStudioCode

nova/src/main/kotlin/xyz/xenondevs/nova/data/resources/builder/font/Font.kt

@@ -130,7 +130,7 @@ class Font(
         fun fromDisk(assetsDir: Path, fontFile: Path): Font {
             val id = readIdFromPath(assetsDir, fontFile)
             val providers = fontFile.parseJson().asJsonObject.getArray("providers")
-                .mapTo(ArrayList()) { FontProvider.fromDisk(assetsDir, it.asJsonObject) }
+                .mapTo(ArrayList()) { FontProvider.fromDisk(it.asJsonObject) }
 
             return Font(id, providers)
         }

nova/src/main/kotlin/xyz/xenondevs/nova/data/resources/builder/font/provider/FontProvider.kt

@@ -41,12 +41,12 @@ abstract class FontProvider internal constructor() {
 
     companion object {
 
-        fun fromDisk(assetsDir: Path, provider: JsonObject): FontProvider =
+        fun fromDisk(provider: JsonObject): FontProvider =
             when (val type = provider.getString("type")) {
                 "reference" -> ReferenceProvider.of(provider)
                 "space" -> SpaceProvider.of(provider)
-                "bitmap" -> MutableBitmapProvider.fromDisk(assetsDir, provider)
-                "unihex" -> UnihexProvider.fromDisk(assetsDir, provider)
+                "bitmap" -> MutableBitmapProvider.fromDisk(provider)
+                "unihex" -> UnihexProvider.fromDisk(provider)
                 else -> throw UnsupportedOperationException("Unsupported font provider type: $type")
             }
 

nova/src/main/kotlin/xyz/xenondevs/nova/data/resources/builder/font/provider/bitmap/BitmapProvider.kt

@@ -184,7 +184,6 @@ abstract class BitmapProvider<T> internal constructor() : FontProvider() {
      * An immutable [BitmapProvider] that lazily loads a single [BufferedImage] glyph.
      */
     private class SingleLazyLoaded(
-        private val assetsDir: Path,
         override val file: ResourcePath,
         codePoint: Int,
         override val height: Int,
@@ -194,7 +193,7 @@ abstract class BitmapProvider<T> internal constructor() : FontProvider() {
         override val glyphImageType = BitmapGlyphImageType.BUFFERED_IMAGE
 
         override val codePointGrid = CodePointGrid.single(codePoint)
-        override val glyphGrid by lazy { GlyphGrid.single(file.getPath(assetsDir, "textures").readImage()) }
+        override val glyphGrid by lazy { GlyphGrid.single(file.findInAssets("textures").readImage()) }
 
         // not necessary because the image is loaded from disk and cannot be changed
         override fun write(assetsDir: Path) = Unit
@@ -266,15 +265,14 @@ abstract class BitmapProvider<T> internal constructor() : FontProvider() {
         /**
          * Creates a immutable [BitmapProvider] with a single glyph, assuming the texture will exist.
          *
-         * @param assetsDir The assets directory to use for reading the bitmap image, if required later.
          * @param file The path where the texture will be read from and saved to.
          * @param codePoint The code point of the glyph.
          * @param height The height that glyphs will be rendered as. If this does not match the glyphs actual height,
          * the glyphs will be scaled, keeping the aspect ratio. This is the `height` property in json.
          * @param ascent The defined character ascent. This is the `ascent` property in json.
          */
-        fun single(assetsDir: Path, file: ResourcePath, codePoint: Int, height: Int, ascent: Int): BitmapProvider<BufferedImage> =
-            SingleLazyLoaded(assetsDir, file, codePoint, height, ascent)
+        fun single(file: ResourcePath, codePoint: Int, height: Int, ascent: Int): BitmapProvider<BufferedImage> =
+            SingleLazyLoaded(file, codePoint, height, ascent)
 
     }
 

nova/src/main/kotlin/xyz/xenondevs/nova/data/resources/builder/font/provider/bitmap/MutableBitmapProvider.kt

@@ -76,7 +76,6 @@ abstract class MutableBitmapProvider<T> : BitmapProvider<T>() {
      * A [MutableBitmapProvider] that is read lazily.
      */
     private class LazyLoaded(
-        private val assetsDir: Path,
         private val codePointRows: List<String>,
         override var file: ResourcePath,
         override var height: Int,
@@ -89,7 +88,7 @@ abstract class MutableBitmapProvider<T> : BitmapProvider<T>() {
         override val glyphGrid: ReferenceGlyphGrid by lazy(::loadGlyphGrid)
 
         private fun loadGlyphGrid(): ReferenceGlyphGrid {
-            val img = file.getPath(assetsDir, "textures").readImage()
+            val img = file.findInAssets("textures").readImage()
             val codePoints = codePointGrid
 
             require(img.width % codePoints.width == 0 && img.height % codePoints.height == 0) {
@@ -190,14 +189,13 @@ abstract class MutableBitmapProvider<T> : BitmapProvider<T>() {
         /**
          * Reads a [BitmapProvider] from disk.
          *
-         * @param assetsDir The assets directory to use for reading the bitmap image.
          * @param provider The json object containing the provider data. Might be modified by the resulting [BitmapProvider].
          */
-        fun fromDisk(assetsDir: Path, provider: JsonObject): MutableBitmapProvider<BufferedImage> {
+        fun fromDisk(provider: JsonObject): MutableBitmapProvider<BufferedImage> {
             val file = provider.getDeserialized<ResourcePath>("file")
             val height = provider.getIntOrNull("height") ?: 8
             val ascent = provider.getInt("ascent")
-            return LazyLoaded(assetsDir, provider.getArray("chars").getAllStrings(), file, height, ascent)
+            return LazyLoaded(provider.getArray("chars").getAllStrings(), file, height, ascent)
         }
 
     }

nova/src/main/kotlin/xyz/xenondevs/nova/data/resources/builder/font/provider/unihex/UnihexProvider.kt

@@ -223,7 +223,6 @@ abstract class UnihexProvider internal constructor(
     }
 
     private class LazyLoaded(
-        private val assetsDir: Path,
         hexFile: ResourcePath,
         sizeOverrides: List<SizeOverride>
     ) : UnihexProvider(hexFile) {
@@ -235,7 +234,7 @@ abstract class UnihexProvider internal constructor(
             val glyphs = UnihexGlyphs()
 
             // hexFile: zip file that contains .hex files
-            hexFile.getPath(assetsDir).useZip { zip ->
+            hexFile.findInAssets().useZip { zip ->
                 zip.walk()
                     .filter { it.extension == "hex" }
                     .forEach { glyphs.merge(UnihexGlyphs.readUnihexFile(it)) }
@@ -259,13 +258,12 @@ abstract class UnihexProvider internal constructor(
         /**
          * Reads a [UnihexProvider] from disk.
          *
-         * @param assetsDir The assets directory to use for reading the bitmap image.
          * @param provider The json object containing the provider data.
          */
-        fun fromDisk(assetsDir: Path, provider: JsonObject): UnihexProvider {
+        fun fromDisk(provider: JsonObject): UnihexProvider {
             val hexFile = provider.getDeserialized<ResourcePath>("hex_file")
             val sizeOverrides = provider.getDeserialized<List<SizeOverride>>("size_overrides")
-            return LazyLoaded(assetsDir, hexFile, sizeOverrides)
+            return LazyLoaded(hexFile, sizeOverrides)
         }
 
     }

nova/src/main/kotlin/xyz/xenondevs/nova/data/resources/builder/task/font/CustomFontContent.kt

@@ -9,7 +9,6 @@ import xyz.xenondevs.nova.data.resources.builder.font.provider.bitmap.BitmapProv
 import xyz.xenondevs.nova.data.resources.builder.task.PackTaskHolder
 import xyz.xenondevs.nova.util.component.adventure.font
 import xyz.xenondevs.nova.util.data.readImageDimensions
-import java.nio.file.Path
 
 private const val START_CODE_POINT: Int = 0xE000
 private const val END_CODE_POINT: Int = 0xF8FF
@@ -28,11 +27,11 @@ abstract class CustomFontContent internal constructor(
     private var currentCodePoint = END_CODE_POINT
     private var currentFontNum = -1
 
-    fun addEntry(charId: String, assetsDir: Path, image: ResourcePath, height: Int?, ascent: Int) {
-        addEntry(ResourcePath.of(charId), assetsDir, image, height, ascent)
+    fun addEntry(charId: String, image: ResourcePath, height: Int?, ascent: Int) {
+        addEntry(ResourcePath.of(charId), image, height, ascent)
     }
 
-    fun addEntry(charId: ResourcePath, assetsDir: Path, image: ResourcePath, height: Int?, ascent: Int) {
+    fun addEntry(charId: ResourcePath, image: ResourcePath, height: Int?, ascent: Int) {
         if (++currentCodePoint > 0xF8FF) {
             currentCodePoint = START_CODE_POINT
             val id = ResourcePath.of(fontNameTemplate.format(++currentFontNum))
@@ -43,7 +42,7 @@ abstract class CustomFontContent internal constructor(
         }
 
         currentFont += BitmapProvider.single(
-            assetsDir, image,
+            image,
             currentCodePoint,
             height ?: image.findInAssets("textures").readImageDimensions().height,
             ascent

nova/src/main/kotlin/xyz/xenondevs/nova/data/resources/builder/task/font/FontContent.kt

@@ -8,8 +8,9 @@ import xyz.xenondevs.nova.data.resources.builder.font.Font
 import xyz.xenondevs.nova.data.resources.builder.task.PackTask
 import xyz.xenondevs.nova.data.resources.builder.task.PackTaskHolder
 import java.nio.file.Path
+import kotlin.io.path.exists
 import kotlin.io.path.extension
-import kotlin.io.path.notExists
+import kotlin.io.path.listDirectoryEntries
 import kotlin.io.path.walk
 
 class FontContent internal constructor(private val builder: ResourcePackBuilder) : PackTaskHolder {
@@ -45,7 +46,7 @@ class FontContent internal constructor(private val builder: ResourcePackBuilder)
         return _customFonts.getOrPut(id) { Font(id) }
     }
 
-    fun add(font: Font){
+    fun add(font: Font) {
         _customFonts[font.id] = font
     }
 
@@ -71,20 +72,21 @@ class FontContent internal constructor(private val builder: ResourcePackBuilder)
 
     @PackTask(runAfter = ["ExtractTask#extractAll"])
     private fun discoverAllFonts() {
-        discoverFonts(MCASSETS_ASSETS_DIR, MCASSETS_ASSETS_DIR.resolve("minecraft/font/"), _vanillaFonts)
-        discoverFonts(ASSETS_DIR, ASSETS_DIR.resolve("minecraft/font/"), _customFonts)
-        builder.assetPacks.forEach { discoverFonts(ASSETS_DIR, ASSETS_DIR.resolve("${it.namespace}/font/"), _customFonts) }
+        discoverFonts(MCASSETS_ASSETS_DIR, _vanillaFonts)
+        discoverFonts(ASSETS_DIR, _customFonts)
     }
 
-    private fun discoverFonts(assetsDir: Path, fontDir: Path, map: MutableMap<ResourcePath, Font>) {
-        if (fontDir.notExists())
-            return
-        
-        fontDir.walk()
-            .filter { it.extension.equals("json", true) }
-            .forEach { path -> 
-                val font = Font.fromDisk(assetsDir, path)
-                map[font.id] = font
+    private fun discoverFonts(assetsDir: Path, map: MutableMap<ResourcePath, Font>) {
+        assetsDir.listDirectoryEntries()
+            .map { it.resolve("font") }
+            .filter { it.exists() }
+            .forEach { fontDir ->
+                fontDir.walk()
+                    .filter { it.extension.equals("json", true) }
+                    .forEach { path ->
+                        val font = Font.fromDisk(assetsDir, path)
+                        map[font.id] = font
+                    }
             }
     }
 

nova/src/main/kotlin/xyz/xenondevs/nova/data/resources/builder/task/font/GuiContent.kt

@@ -17,7 +17,7 @@ class GuiContent internal constructor(
     @PackTask(runBefore = ["FontContent#write"])
     private fun write() {
         builder.assetPacks.forEach { pack ->
-            pack.guisIndex?.forEach { (id, path) -> addEntry(id, ResourcePackBuilder.ASSETS_DIR, path, null, ASCENT) }
+            pack.guisIndex?.forEach { (id, path) -> addEntry(id, path, null, ASCENT) }
         }
 
         ResourceLookups.GUI_DATA_LOOKUP.set(fontCharLookup)

nova/src/main/kotlin/xyz/xenondevs/nova/data/resources/builder/task/font/TextureIconContent.kt

@@ -39,8 +39,7 @@ class TextureIconContent internal constructor(
             return
 
         val id = ResourcePath(path.namespace, path.path)
-        val assetsDir = if (path.namespace == "minecraft") ResourcePackBuilder.MCASSETS_ASSETS_DIR else ResourcePackBuilder.ASSETS_DIR
-        addEntry(id, assetsDir, path.copy(path = path.path + ".png"), HEIGHT, ASCENT)
+        addEntry(id, path.copy(path = path.path + ".png"), HEIGHT, ASCENT)
         added += path
     }
 

nova/src/main/kotlin/xyz/xenondevs/nova/data/resources/builder/task/font/WailaContent.kt

@@ -234,7 +234,7 @@ class WailaContent internal constructor(
                     val file = ResourcePackBuilder.PACK_DIR.resolve("assets/nova/textures/waila_generated/${id.namespace}/${id.name}.png")
                     file.parent.createDirectories()
                     renderer.renderModelToFile(path.toString(), file)
-                    addEntry(id.toString(), ASSETS_DIR, ResourcePath("nova", "waila_generated/${id.namespace}/${id.name}.png"), SIZE, ASCENT)
+                    addEntry(id.toString(), ResourcePath("nova", "waila_generated/${id.namespace}/${id.name}.png"), SIZE, ASCENT)
                     count++
                 } catch (e: Exception) {
                     LOGGER.log(Level.WARNING, "Failed to render $id ($path) ", e)
@@ -261,11 +261,11 @@ class WailaContent internal constructor(
         MATERIAL_TEXTURES.forEach { (material, texture) ->
             val name = material.name.lowercase()
             val path = ResourcePath.of("$texture.png")
-            addEntry(ResourcePath("minecraft", name), ASSETS_DIR, copyMCTexture(path), SIZE, ASCENT)
+            addEntry(ResourcePath("minecraft", name), copyMCTexture(path), SIZE, ASCENT)
         }
 
         TEXTURES.forEach {
-            addEntry(ResourcePath("minecraft", it), ASSETS_DIR, copyMCTexture(ResourcePath("minecraft", "block/$it.png")), SIZE, ASCENT)
+            addEntry(ResourcePath("minecraft", it), copyMCTexture(ResourcePath("minecraft", "block/$it.png")), SIZE, ASCENT)
         }
     }
 
@@ -284,7 +284,6 @@ class WailaContent internal constructor(
             val idNamespace = pack.namespace.takeUnless { it == "nova" } ?: "minecraft" // all textures form "nova" asset pack are for minecraft blocks
             addEntry(
                 ResourcePath(idNamespace, file.nameWithoutExtension),
-                ASSETS_DIR,
                 ResourcePath(pack.namespace, "waila/${file.name}"),
                 SIZE, ASCENT
             )