String identifier conversion

Author: emyfops

common/src/main/kotlin/com/lambda/network/CapeManager.kt

@@ -37,6 +37,7 @@ import com.lambda.util.FileUtils.downloadIfNotPresent
 import com.lambda.util.FileUtils.ifNotExists
 import com.lambda.util.FileUtils.isOlderThan
 import com.lambda.util.FolderRegister.capes
+import com.lambda.util.StringUtils.asIdentifier
 import com.lambda.util.extension.resolveFile
 import kotlinx.coroutines.runBlocking
 import net.minecraft.client.texture.NativeImage.read
@@ -57,7 +58,7 @@ object CapeManager : ConcurrentHashMap<UUID, String>(), Loadable {
     private val images = capes.walk()
         .filter { it.extension == "png" }
         .associate { it.nameWithoutExtension to NativeImageBackedTexture({ it.nameWithoutExtension }, read(it.inputStream())) }
-        .onEach { (key, value) -> mc.textureManager.registerTexture(key.toIdentifier(), value) }
+        .onEach { (key, value) -> mc.textureManager.registerTexture(key.asIdentifier, value) }
 
     private val fetchQueue = mutableListOf<UUID>()
 
@@ -100,7 +101,7 @@ object CapeManager : ConcurrentHashMap<UUID, String>(), Loadable {
             .downloadIfNotPresent(cape.url).getOrNull()
             ?.readBytes() ?: return@runIO
 
-        mc.textureManager.registerTexture(cape.id.toIdentifier(), NativeImageBackedTexture({ cape.id }, TextureUtils.readImage(bytes)))
+        mc.textureManager.registerTexture(cape.id.asIdentifier, NativeImageBackedTexture({ cape.id }, TextureUtils.readImage(bytes)))
 
         put(uuid, cape.id)
     }.invokeOnCompletion { block(it) }

common/src/main/kotlin/com/lambda/sound/LambdaSound.kt

@@ -17,21 +17,21 @@
 
 package com.lambda.sound
 
-import com.lambda.sound.SoundManager.toIdentifier
+import com.lambda.util.StringUtils.asIdentifier
 import net.minecraft.sound.SoundEvent
 import net.minecraft.util.Identifier
 
 enum class LambdaSound(val id: Identifier) {
-    BUTTON_CLICK("button_click".toIdentifier()),
+    BUTTON_CLICK("button_click".asIdentifier),
 
-    BOOLEAN_SETTING_ON("bool_on".toIdentifier()),
-    BOOLEAN_SETTING_OFF("bool_off".toIdentifier()),
+    BOOLEAN_SETTING_ON("bool_on".asIdentifier),
+    BOOLEAN_SETTING_OFF("bool_off".asIdentifier),
 
-    MODULE_ON("module_on".toIdentifier()),
-    MODULE_OFF("module_off".toIdentifier()),
+    MODULE_ON("module_on".asIdentifier),
+    MODULE_OFF("module_off".asIdentifier),
 
-    SETTINGS_OPEN("settings_open".toIdentifier()),
-    SETTINGS_CLOSE("settings_close".toIdentifier());
+    SETTINGS_OPEN("settings_open".asIdentifier),
+    SETTINGS_CLOSE("settings_close".asIdentifier);
 
     val event: SoundEvent = SoundEvent.of(id)
 }

common/src/main/kotlin/com/lambda/sound/SoundManager.kt

@@ -17,12 +17,10 @@
 
 package com.lambda.sound
 
-import com.lambda.Lambda
 import com.lambda.Lambda.mc
 import com.lambda.util.math.random
 import net.minecraft.client.sound.PositionedSoundInstance
 import net.minecraft.sound.SoundEvent
-import net.minecraft.util.Identifier
 
 object SoundManager {
     fun playSound(event: SoundEvent, pitch: Double = 1.0) {
@@ -38,6 +36,4 @@ object SoundManager {
             PositionedSoundInstance.master(event, actualPitch.toFloat())
         )
     }
-
-    fun String.toIdentifier() = Identifier.of(Lambda.MOD_ID, this)
 }

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

@@ -17,7 +17,9 @@
 
 package com.lambda.util
 
+import com.lambda.Lambda
 import com.lambda.Lambda.gson
+import net.minecraft.util.Identifier
 import java.security.MessageDigest
 import kotlin.io.encoding.Base64
 import kotlin.io.encoding.ExperimentalEncodingApi
@@ -37,6 +39,17 @@ object StringUtils {
      */
     fun String.capitalize() = replaceFirstChar { it.titlecase() }
 
+    /**
+     * Returns a Minecraft [net.minecraft.util.Identifier] from a string with the given namespace
+     */
+    fun String.toIdentifier(namespace: String = Lambda.MOD_ID): Identifier =
+        Identifier.of(namespace, this)
+
+    /**
+     * Returns a [Lambda] Minecraft [Identifier] from a string
+     */
+    val String.asIdentifier: Identifier get() = toIdentifier()
+
     /**
      * Find similar strings in a set of words.
      *