Merge branch 'refs/heads/1.21.5' into improvement/breakmanager-again

Author: beanbag44

src/main/kotlin/com/lambda/Lambda.kt

@@ -27,8 +27,10 @@ import com.lambda.config.serializer.ItemStackSerializer
 import com.lambda.config.serializer.KeyCodeSerializer
 import com.lambda.config.serializer.OptionalSerializer
 import com.lambda.core.Loader
+import com.lambda.module.modules.client.ClickGui
 import com.lambda.threading.recordRenderCall
 import com.lambda.util.KeyCode
+import com.lambda.util.WindowIcons.setLambdaWindowIcon
 import com.mojang.authlib.GameProfile
 import net.fabricmc.api.ClientModInitializer
 import net.fabricmc.loader.api.FabricLoader
@@ -75,6 +77,7 @@ object Lambda : ClientModInitializer {
     override fun onInitializeClient() {
         recordRenderCall {
             LOG.info("$MOD_NAME $VERSION initialized in ${Loader.initialize()} ms\n")
+            if (ClickGui.setLambdaWindowIcon) setLambdaWindowIcon()
         }
     }
 }

src/main/kotlin/com/lambda/config/settings/CharSetting.kt

@@ -43,7 +43,9 @@ class CharSetting(
     description,
     visibility
 ) {
-    override fun invoke(p1: ImGuiBuilder) {}
+    override fun ImGuiBuilder.buildLayout() {
+
+    }
 
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {
         required(word(name)) { parameter ->

src/main/kotlin/com/lambda/config/settings/FunctionSetting.kt

@@ -34,7 +34,7 @@ open class FunctionSetting<T>(
     description,
     visibility
 ) {
-    override fun invoke(p1: ImGuiBuilder) = with(p1) {
+    override fun ImGuiBuilder.buildLayout() {
         button(name) { value() }
         lambdaTooltip(description)
     }

src/main/kotlin/com/lambda/config/settings/NumericSetting.kt

@@ -57,7 +57,7 @@ abstract class NumericSetting<T>(
      */
     protected abstract fun ImGuiBuilder.buildSlider()
 
-    override fun invoke(p1: ImGuiBuilder) = with(p1) {
+    override fun ImGuiBuilder.buildLayout() {
         val showReset = isModified
         val resetButtonText = "R"
         val valueString = this@NumericSetting.toString()

src/main/kotlin/com/lambda/config/settings/StringSetting.kt

@@ -44,7 +44,7 @@ class StringSetting(
     description,
     visibility
 ) {
-    override fun invoke(p1: ImGuiBuilder) = with(p1) {
+    override fun ImGuiBuilder.buildLayout() {
         if (multiline) {
             inputTextMultiline(name, ::value, flags = flags)
         } else {

src/main/kotlin/com/lambda/config/settings/collections/ListSetting.kt

@@ -44,7 +44,7 @@ class ListSetting<T : Any>(
     private val strListType =
         TypeToken.getParameterized(MutableList::class.java, String::class.java).type
 
-    override fun invoke(p1: ImGuiBuilder) = with(p1) {
+    override fun ImGuiBuilder.buildLayout() {
         combo("##$name", "$name: ${value.size} item(s)") {
             immutableList
                 .forEach {

src/main/kotlin/com/lambda/config/settings/collections/MapSetting.kt

@@ -36,5 +36,5 @@ class MapSetting<K, V>(
     description,
     visibility
 ) {
-    override fun invoke(p1: ImGuiBuilder) = with(p1) {}
+    override fun ImGuiBuilder.buildLayout() {}
 }

src/main/kotlin/com/lambda/config/settings/collections/SetSetting.kt

@@ -44,7 +44,7 @@ class SetSetting<T : Any>(
     private val strSetType =
         TypeToken.getParameterized(Set::class.java, String::class.java).type
 
-    override fun invoke(p1: ImGuiBuilder) = with(p1) {
+    override fun ImGuiBuilder.buildLayout() {
         combo("##$name", "$name: ${value.size} item(s)") {
             immutableSet
                 .forEach {

src/main/kotlin/com/lambda/config/settings/comparable/BooleanSetting.kt

@@ -41,7 +41,7 @@ class BooleanSetting(
     description,
     visibility
 ) {
-    override fun invoke(p1: ImGuiBuilder) = with(p1) {
+    override fun ImGuiBuilder.buildLayout() {
         checkbox(name, ::value)
         lambdaTooltip(description)
     }

src/main/kotlin/com/lambda/config/settings/comparable/EnumSetting.kt

@@ -51,7 +51,7 @@ class EnumSetting<T : Enum<T>>(
         value = value.enumValues[to % value.enumValues.size]
     }
 
-    override fun invoke(p1: ImGuiBuilder) = with(p1) {
+    override fun ImGuiBuilder.buildLayout() {
         val values = value.enumValues
         val currentDisplay = value.displayValue