Merge branch '1.21.5' into feature/mouse-button-binds

Author: beanbag44

src/main/kotlin/com/lambda/module/modules/render/NoRender.kt

@@ -177,10 +177,9 @@ object NoRender : Module(
 
     @JvmStatic
     fun shouldAcceptFog(modifier: StatusEffectFogModifier) =
-        when {
-            isDisabled -> true
-            modifier.statusEffect == StatusEffects.BLINDNESS && noBlindness -> false
-            modifier.statusEffect == StatusEffects.DARKNESS && noDarkness -> false
+        when (modifier.statusEffect) {
+            StatusEffects.BLINDNESS if (noBlindness && isEnabled) -> false
+            StatusEffects.DARKNESS if (noDarkness && isEnabled) -> false
             else -> true
         }
 
@@ -189,4 +188,4 @@ object NoRender : Module(
         val remapped: String,
         val displayName: String
     )
-}
+}

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

@@ -24,7 +24,6 @@ import com.lambda.core.Loadable
 import com.lambda.event.events.WorldEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.graphics.texture.TextureUtils
-import com.lambda.network.LambdaAPI.cdn
 import com.lambda.network.api.v1.endpoints.getCape
 import com.lambda.network.api.v1.endpoints.getCapes
 import com.lambda.network.api.v1.endpoints.setCape
@@ -65,11 +64,11 @@ object CapeManager : ConcurrentHashMap<UUID, String>(), Loadable {
     val capeList = runBlocking {
         capes.resolveFile("capes.txt")
             .isOlderThan(24.hours) {
-                it.downloadIfNotPresent("$cdn/capes.txt")
+                it.downloadIfNotPresent("${LambdaAPI.capes}.txt")
                     .onFailure { err -> LOG.error("Could not download the cape list: $err") }
             }
             .ifNotExists {
-                it.downloadCompare("$cdn/capes.txt", -1)
+                it.downloadCompare("${LambdaAPI.capes}.txt", -1)
                     .onFailure { err -> LOG.error("Could not download the cape list: $err") }
             }
             .createIfNotExists()

src/main/kotlin/com/lambda/network/LambdaAPI.kt

@@ -47,8 +47,10 @@ object LambdaAPI : Configurable(LambdaConfig) {
     val authServer by setting("Auth Server", "auth.lambda-client.org")
     val apiUrl by setting("API Server", "https://api.lambda-client.org")
     val apiVersion by setting("API Version", ApiVersion.V1)
-    val mappings by setting("Mappings", "https://mappings.lambda-client.org")
-    val cdn by setting("CDN", "https://cdn.lambda-client.org")
+    val assets by setting("Assets", "https://raw.githubusercontent.com/Edouard127/lambda-assets/refs/heads/master")
+
+    val mappings get() = "$assets/mappings" // Folder containing mappings for our dynamic serializer
+    val capes get() = "$assets/capes" // Folder containing all the capes, add .txt to get the list of available capes
 
     @Suppress("Deprecation")
     const val GAME_VERSION = SharedConstants.VERSION_NAME
@@ -102,4 +104,4 @@ object LambdaAPI : Configurable(LambdaConfig) {
 
         override fun toString() = value
     }
-}
+}

src/main/kotlin/com/lambda/network/api/v1/models/Cape.kt

@@ -18,6 +18,7 @@
 package com.lambda.network.api.v1.models
 
 import com.google.gson.annotations.SerializedName
+import com.lambda.network.LambdaAPI
 import java.util.*
 
 class Cape(
@@ -28,7 +29,7 @@ class Cape(
     val id: String,
 ) {
     val url: String
-        get() = "https://cdn.lambda-client.org/$id.png"
+        get() = "${LambdaAPI.capes}/$id.png"
 
     override fun toString() = "Cape(uuid=$uuid, id=$id, url=$url)"
 }

src/main/kotlin/com/lambda/util/DynamicReflectionSerializer.kt

@@ -72,31 +72,26 @@ object DynamicReflectionSerializer : Loadable {
         org.slf4j.Logger::class,
         String::class,
     )
+
     private val skipFields = setOf(
         Codec::class,
     )
 
     private const val INDENT = 2
 
-    private val simpleMappings = runBlocking {
-        "${LambdaAPI.mappings}/${LambdaAPI.GAME_VERSION}"
-            .downloadIfNotPresent(cache.resolveFile("${LambdaAPI.GAME_VERSION}-simple"))
+    private val qualifiedMappings = runBlocking {
+        cache.resolveFile(LambdaAPI.GAME_VERSION)
+            .downloadIfNotPresent("${LambdaAPI.mappings}/${LambdaAPI.GAME_VERSION}")
             .map(::buildMappingsMap)
             .getOrElse {
                 LOG.error("Unable to download simplified deobfuscated qualifiers", it)
                 emptyMap()
             }
     }
 
-    private val qualifiedMappings = runBlocking {
-        "${LambdaAPI.mappings}/${LambdaAPI.GAME_VERSION}-qualified"
-            .downloadIfNotPresent(cache.resolveFile(LambdaAPI.GAME_VERSION))
-            .map(::buildMappingsMap)
-            .getOrElse {
-                LOG.error("Unable to download deobfuscated qualifiers", it)
-                emptyMap()
-            }
-    }
+    private val simpleMappings =
+        qualifiedMappings
+            .mapValues { (_, v) -> v.substringAfterLast('.') }
 
     val String.simpleRemappedName get() = simpleMappings.getOrDefault(this, this)
     val String.remappedName get() = qualifiedMappings.getOrDefault(this, this)
@@ -123,7 +118,7 @@ object DynamicReflectionSerializer : Loadable {
     }
 
     fun <T : Any> KClass<T>.dynamicName(remap: Boolean, simple: Boolean = true) =
-        if (remap)
+        if (remap && simple)
             if (simple) qualifiedName?.simpleRemappedName else qualifiedName?.remappedName
         else if (simple) simpleName else qualifiedName
 
@@ -216,5 +211,5 @@ object DynamicReflectionSerializer : Loadable {
             }
         }
 
-    override fun load() = "Loaded ${simpleMappings.size} deobfuscated qualifier"
+    override fun load() = "Loaded ${qualifiedMappings.size} deobfuscated qualifier"
 }