Merge remote-tracking branch 'origin/refactor/ui' into refactor/ui

Author: Blade-kt

common/src/main/kotlin/com/lambda/gui/impl/clickgui/module/settings/EnumSlider.kt

@@ -27,6 +27,9 @@ class EnumSlider <T : Enum<T>>(
     owner: Layout,
     setting: EnumSetting<T>
 ) : SettingSlider<T, EnumSetting<T>>(owner, setting) {
+    override val settingValue: String
+        get() = settingDelegate.name
+
     init {
         slider.progress {
             transform(

common/src/main/kotlin/com/lambda/gui/impl/clickgui/module/settings/NumberSlider.kt

@@ -31,6 +31,9 @@ class NumberSlider <V> (
     private val min = setting.range.start.toDouble()
     private val max = setting.range.endInclusive.toDouble()
 
+    override val settingValue: String
+        get() = "${setting.value}${setting.unit}"
+
     init {
         slider.progress {
             transform(

common/src/main/kotlin/com/lambda/gui/impl/clickgui/module/settings/SettingSlider.kt

@@ -31,6 +31,8 @@ import com.lambda.util.math.lerp
 abstract class SettingSlider <V : Any, T: AbstractSetting<V>>(
     owner: Layout, setting: T
 ) : SettingLayout<V, T>(owner, setting, false) {
+    abstract val settingValue: String
+
     private var changeAnimation by animation.exp(0.0, 1.0, 0.5) { true }
 
     private val sliderHeight = 3.0
@@ -62,7 +64,7 @@ abstract class SettingSlider <V : Any, T: AbstractSetting<V>>(
 
                 onUpdate {
                     lastValue = text
-                    text = settingDelegate.toString()
+                    text = settingValue
                     if (lastValue != text) changeAnimation = 0.0
 
                     offsetX = textField.offsetX

common/src/main/kotlin/com/lambda/module/Module.kt

@@ -31,6 +31,7 @@ import com.lambda.event.listener.Listener
 import com.lambda.event.listener.SafeListener
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.event.listener.UnsafeListener
+import com.lambda.module.hud.ModuleList
 import com.lambda.module.tag.ModuleTag
 import com.lambda.sound.LambdaSound
 import com.lambda.sound.SoundManager.playSoundRandomly
@@ -116,9 +117,9 @@ abstract class Module(
 ) : Nameable, Muteable, Configurable(ModuleConfig) {
     private val isEnabledSetting = setting("Enabled", enabledByDefault, visibility = { false })
     private val keybindSetting = setting("Keybind", defaultKeybind)
-    private val isVisible = setting("Visible", true)
+    val isVisible = setting("Visible", true) { ModuleList.isEnabled }
     val reset by setting("Reset", { settings.forEach { it.reset() }; this@Module.info("Settings set to default") })
-    val customTags = setting("Tags", setOf<ModuleTag>(), visibility = { false })
+    val customTags = setting("Tags", setOf<ModuleTag>()) { false }
 
     var isEnabled by isEnabledSetting
     val isDisabled get() = !isEnabled

common/src/main/kotlin/com/lambda/module/hud/ModuleList.kt

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2024 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.module.hud
+
+import com.lambda.graphics.renderer.gui.font.FontRenderer.drawString
+import com.lambda.module.HudModule
+import com.lambda.module.ModuleRegistry
+import com.lambda.module.tag.ModuleTag
+import com.lambda.task.TaskFlow
+import com.lambda.util.math.Vec2d
+
+object ModuleList : HudModule(
+    name = "ModuleList",
+    defaultTags = setOf(ModuleTag.CLIENT),
+) {
+    override val width = 200.0
+    override val height = 200.0
+
+    init {
+        onRender {
+            val enabled = ModuleRegistry.modules
+                .filter { it.isEnabled }
+                .filter { it.isVisible.value }
+            drawString(enabled.joinToString("\n") { "${it.name} [${it.keybind.name}]" }, Vec2d.ZERO)
+        }
+    }
+}

common/src/main/kotlin/com/lambda/module/modules/client/RenderSettings.kt

@@ -31,8 +31,8 @@ object RenderSettings : Module(
     private val page by setting("Page", Page.Font)
 
     // Font
-    val textFont by setting("Text Font", LambdaFont.FiraSansRegular)
-    val emojiFont by setting("Emoji Font", LambdaEmoji.Twemoji)
+    val textFont by setting("Text Font", LambdaFont.FiraSansRegular) { page == Page.Font }
+    val emojiFont by setting("Emoji Font", LambdaEmoji.Twemoji) { page == Page.Font }
     val shadow by setting("Shadow", true) { page == Page.Font }
     val shadowBrightness by setting("Shadow Brightness", 0.35, 0.0..0.5, 0.01) { page == Page.Font && shadow }
     val shadowShift by setting("Shadow Shift", 1.0, 0.0..2.0, 0.05) { page == Page.Font && shadow }
@@ -43,8 +43,8 @@ object RenderSettings : Module(
     val sdfMax by setting("SDF Max", 1.0, 0.0..1.0, 0.01, visibility = { page == Page.Font })
 
     // ESP
-    val uploadsPerTick by setting("Uploads", 16, 1..256, 1, unit = " chunk/tick") { page == Page.ESP }
-    val rebuildsPerTick by setting("Rebuilds", 64, 1..256, 1, unit = " chunk/tick") { page == Page.ESP }
+    val uploadsPerTick by setting("Uploads", 16, 1..256, 1, unit = " chunks/tick") { page == Page.ESP }
+    val rebuildsPerTick by setting("Rebuilds", 64, 1..256, 1, unit = " chunks/tick") { page == Page.ESP }
     val updateFrequency by setting("Update Frequency", 2, 1..10, 1, "Frequency of block updates", unit = " ticks") { page == Page.ESP }
     val outlineWidth by setting("Outline Width", 1.0, 0.1..5.0, 0.1, "Width of block outlines", unit = "px") { page == Page.ESP }