ref: typealias LambdaResource

Author: emyfops

common/src/main/kotlin/com/lambda/graphics/renderer/gui/font/LambdaAtlas.kt

@@ -24,8 +24,8 @@ import com.lambda.graphics.texture.TextureOwner.upload
 import com.lambda.http.Method
 import com.lambda.http.request
 import com.lambda.threading.runGameScheduled
-import com.lambda.util.LambdaResource
 import com.lambda.util.math.Vec2d
+import com.lambda.util.stream
 import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap
 import it.unimi.dsi.fastutil.objects.Object2DoubleArrayMap
 import it.unimi.dsi.fastutil.objects.Object2IntArrayMap
@@ -162,9 +162,7 @@ object LambdaAtlas : Loadable {
         characters: Int = 2048 // How many characters from that font should be used for the generation
     ) {
         val font = fontCache.computeIfAbsent(this) {
-            val resource = LambdaResource("fonts/$fontName.ttf")
-
-            Font.createFont(Font.TRUETYPE_FONT, resource.stream).deriveFont(64.0f)
+            Font.createFont(Font.TRUETYPE_FONT, "fonts/$fontName.ttf".stream).deriveFont(64.0f)
         }
 
         val textureSize = characters * 2

common/src/main/kotlin/com/lambda/graphics/shader/Shader.kt

@@ -34,8 +34,8 @@ class Shader(fragmentPath: String, vertexPath: String) {
     private val uniformCache: Object2IntMap<String> = Object2IntOpenHashMap()
 
     private val id = createShaderProgram(
-        loadShader(ShaderType.VERTEX_SHADER, LambdaResource("shaders/vertex/$vertexPath.vert")),
-        loadShader(ShaderType.FRAGMENT_SHADER, LambdaResource("shaders/fragment/$fragmentPath.frag"))
+        loadShader(ShaderType.VERTEX_SHADER, "shaders/vertex/$vertexPath.vert"),
+        loadShader(ShaderType.FRAGMENT_SHADER, "shaders/fragment/$fragmentPath.frag")
     )
 
     constructor(path: String) : this(path, path)

common/src/main/kotlin/com/lambda/graphics/shader/ShaderUtils.kt

@@ -19,6 +19,7 @@ package com.lambda.graphics.shader
 
 import com.google.common.collect.ImmutableList
 import com.lambda.util.LambdaResource
+import com.lambda.util.stream
 import com.mojang.blaze3d.platform.GlStateManager
 import org.apache.commons.io.IOUtils
 import org.joml.Matrix4f
@@ -42,7 +43,7 @@ object ShaderUtils {
         error?.let { err ->
             val builder = StringBuilder()
                 .append("Failed to compile ${type.name} shader").appendLine()
-                .append("Path: ${resource.path}").appendLine()
+                .append("Path: $resource").appendLine()
                 .append("Compiler output:").appendLine()
                 .append(err)
 

common/src/main/kotlin/com/lambda/graphics/texture/TextureOwner.kt

@@ -18,6 +18,7 @@
 package com.lambda.graphics.texture
 
 import com.lambda.util.LambdaResource
+import com.lambda.util.readImage
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap
 import java.awt.image.BufferedImage
 
@@ -42,5 +43,5 @@ object TextureOwner {
      * @param path  Lambda resource path containing the image data
      */
     fun Any.upload(path: String, mipmaps: Int = 1) =
-        Texture(LambdaResource.readImage(path), levels = mipmaps).also { textureMap[this@upload] = it }
+        Texture(path.readImage(), levels = mipmaps).also { textureMap[this@upload] = it }
 }

common/src/main/kotlin/com/lambda/util/LambdaResource.kt

@@ -17,14 +17,16 @@
 
 package com.lambda.util
 
+import com.lambda.Lambda
+import java.awt.image.BufferedImage
+import java.io.FileNotFoundException
 import java.io.InputStream
 import javax.imageio.ImageIO
 
-class LambdaResource(val path: String) {
-    val stream: InputStream?
-        get() = javaClass.getResourceAsStream("/assets/lambda/$path")
+typealias LambdaResource = String
 
-    companion object {
-        fun readImage(path: String) = ImageIO.read(LambdaResource(path).stream)
-    }
-}
+val LambdaResource.stream: InputStream
+    get() = Lambda::class.java.getResourceAsStream("/assets/lambda/$this")
+        ?: throw FileNotFoundException("File \"/assets/lambda/$this\" not found")
+
+fun LambdaResource.readImage(): BufferedImage = ImageIO.read(this.stream)