Scale slider fix

Author: bladekt

common/src/main/kotlin/com/lambda/graphics/animation/Animation.kt

@@ -13,7 +13,9 @@ class Animation(initialValue: Double, val update: (Double) -> Double) {
     operator fun getValue(thisRef: Any?, property: KProperty<*>) =
         lerp(prevValue, currValue, mc.partialTicks)
 
-    operator fun setValue(thisRef: Any?, property: KProperty<*>, valueIn: Double) {
+    operator fun setValue(thisRef: Any?, property: KProperty<*>, valueIn: Double) = setValue(valueIn)
+
+    fun setValue(valueIn: Double) {
         prevValue = valueIn
         currValue = valueIn
     }

common/src/main/kotlin/com/lambda/gui/api/LambdaGui.kt

@@ -26,6 +26,8 @@ abstract class LambdaGui(
     private var screenSize = Vec2d.ZERO
     override val rect get() = Rect(Vec2d.ZERO, screenSize)
 
+    val isOpen get() = mc.currentScreen == this
+
     val animation = AnimationTicker()
 
     private val renderListener = UnsafeListener(0, this, false) { event ->
@@ -45,6 +47,7 @@ abstract class LambdaGui(
      * No safe context required (TODO: let user open clickgui via main menu)
      */
     fun show() {
+        if (isOpen) return
         mc.currentScreen?.close()
 
         recordRenderCall { // wait for the previous screen to be closed

common/src/main/kotlin/com/lambda/gui/impl/clickgui/AbstractClickGui.kt

@@ -71,6 +71,7 @@ abstract class AbstractClickGui(name: String = "ClickGui") : LambdaGui(name, Cli
     }
 
     override fun close() {
+        if (!isOpen) return
         closing = true
     }
 }

common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/ModuleButton.kt

@@ -101,7 +101,7 @@ class ModuleButton(
                     )
 
                     val progress = transform(renderHeight, 0.0, 10.0, 0.0, 1.0).coerceIn(0.0, 1.0)
-                    val topColor = Color.BLACK.setAlpha(0.2 * progress)
+                    val topColor = Color.BLACK.setAlpha(0.2 * progress * showAnimation)
                     val bottomColor = Color.BLACK.setAlpha(0.0)
 
                     build(rect, 0.0, topColor, topColor, bottomColor, bottomColor)
@@ -119,7 +119,7 @@ class ModuleButton(
 
                     val progress = transform(renderHeight, 0.0, 10.0, 0.0, 1.0).coerceIn(0.0, 1.0) * show.toInt()
                     val topColor = Color.BLACK.setAlpha(0.0)
-                    val bottomColor = Color.BLACK.setAlpha(0.2 * progress)
+                    val bottomColor = Color.BLACK.setAlpha(0.2 * progress * showAnimation)
 
                     build(rect, 0.0, topColor, topColor, bottomColor, bottomColor)
                 }

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

@@ -18,23 +18,18 @@ object ClickGui : Module(
     val windowPadding by setting("Window Padding", 2.0, 0.0..10.0, 0.1)
     val buttonHeight by setting("Button Height", 11.0, 8.0..20.0, 0.1)
     val buttonStep by setting("Button Step", 0.0, 0.0..5.0, 0.1)
-    val windowBlur by setting("Window Blur", 30, 0..100, 1)
 
     // Animation
     val openSpeed by setting("Open Speed", 0.6, 0.1..1.0, 0.01)
     val closeSpeed by setting("Close Speed", 0.7, 0.1..1.0, 0.01)
 
     init {
         onEnable {
-            if (mc.currentScreen != LambdaClickGui) {
-                LambdaClickGui.show()
-            }
+            LambdaClickGui.show()
         }
 
         onDisable {
-            if (mc.currentScreen == LambdaClickGui) {
-                LambdaClickGui.close()
-            }
+            LambdaClickGui.close()
         }
 
         unsafeListener<ClientEvent.Shutdown> {

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

@@ -1,5 +1,11 @@
 package com.lambda.module.modules.client
 
+import com.lambda.event.events.ConnectionEvent
+import com.lambda.event.events.TickEvent
+import com.lambda.event.listener.UnsafeListener.Companion.unsafeListener
+import com.lambda.graphics.animation.Animation.Companion.exp
+import com.lambda.graphics.animation.AnimationTicker
+import com.lambda.gui.impl.clickgui.LambdaClickGui
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
 import java.awt.Color
@@ -12,17 +18,21 @@ object GuiSettings : Module(
     private val page by setting("Page", Page.General)
 
     // General
-    private val scaleSetting by setting("Scale", 1.0, 0.5..3.0, 0.01, visibility = { page == Page.General })
+    private val scaleSetting by setting("Scale", 100, 50..300, 1, visibility = { page == Page.General }).apply {
+        onValueChangeUnsafe { _, _ ->
+            lastChange = System.currentTimeMillis()
+        }
+    }
 
     // Colors
     val primaryColor by setting("Primary Color", Color(130, 200, 255), visibility = { page == Page.Colors })
-    val secondaryColor by setting("Secondary Color", Color(225, 130, 225), visibility = { page == Page.Colors && shade })
+    val secondaryColor by setting("Secondary Color", Color(225, 130, 225), visibility = { page == Page.Colors && (shade || shadeBackground) })
     val backgroundColor by setting("Background Color", Color(50, 50, 50), visibility = { page == Page.Colors })
     val shade by setting("Shade", true, visibility = { page == Page.Colors })
     val shadeBackground by setting("Shade Background", true, visibility = { page == Page.Colors })
-    val colorWidth by setting("Color Width", 400.0, 10.0..1000.0, 10.0, visibility = { page == Page.Colors && shade })
-    val colorHeight by setting("Color Height", 400.0, 10.0..1000.0, 10.0, visibility = { page == Page.Colors && shade })
-    val colorSpeed by setting("Color Speed", 1.0, 0.1..10.0, 0.1, visibility = { page == Page.Colors && shade })
+    val colorWidth by setting("Color Width", 400.0, 10.0..1000.0, 10.0, visibility = { page == Page.Colors && (shade || shadeBackground) })
+    val colorHeight by setting("Color Height", 400.0, 10.0..1000.0, 10.0, visibility = { page == Page.Colors && (shade || shadeBackground) })
+    val colorSpeed by setting("Color Speed", 1.0, 0.1..10.0, 0.1, visibility = { page == Page.Colors && (shade || shadeBackground) })
 
     val mainColor: Color get() = if (shade) Color.WHITE else primaryColor
 
@@ -34,5 +44,24 @@ object GuiSettings : Module(
         Colors
     }
 
-    val scale get() = scaleSetting * 2
+    private var targetScale = 2.0; get() {
+        val update = System.currentTimeMillis() - lastChange > 1000 || !LambdaClickGui.isOpen
+        if (update) field = scaleSetting / 100.0 * 2.0
+        return field
+    }
+
+    private val animation = with(AnimationTicker()) {
+        unsafeListener<TickEvent.Pre>(alwaysListen = true) {
+            tick()
+        }
+
+        exp({ targetScale }, 0.5).apply {
+            unsafeListener<ConnectionEvent.Connect>(alwaysListen = true) {
+                setValue(targetScale)
+            }
+        }
+    }
+
+    private var lastChange = 0L
+    val scale by animation
 }