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

Author: Blade-kt

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

@@ -57,11 +57,11 @@ class Animation(initialValue: Double, val update: (Double) -> Double) {
 
         fun AnimationTicker.exp(min: () -> Double, max: () -> Double, speed: () -> Double, flag: () -> Boolean) =
             Animation(min()) {
-                val min = min()
-                val max = max()
-                val target = if (flag()) max else min
+                val minVal = min()
+                val maxVal = max()
+                val target = if (flag()) maxVal else minVal
 
-                if (abs(target - it) < CLAMP * abs(max - min)) target
+                if (abs(target - it) < CLAMP * abs(maxVal - minVal)) target
                 else lerp(speed(), it, target)
             }.apply(::register)
 

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

@@ -42,7 +42,7 @@ class NumberSlider <V> (
 
         slider.onSlide {
             settingDelegate = settingDelegate.typeConvert(
-                lerp(it, min, max).roundToStep(setting.step.toDouble())
+                lerp(it, min, max).roundToStep(setting.step).toDouble()
             )
         }
     }

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

@@ -48,7 +48,7 @@ object GuiSettings : Module(
     val shadeBackground by setting("Shade Background", true, visibility = { page == Page.Colors })
     val colorWidth by setting("Shade Width", 200.0, 10.0..1000.0, 10.0, visibility = { page == Page.Colors })
     val colorHeight by setting("Shade Height", 200.0, 10.0..1000.0, 10.0, visibility = { page == Page.Colors })
-    val colorSpeed by setting("Color Speed", 1.0, 0.1..10.0, 0.1, visibility = { page == Page.Colors })
+    val colorSpeed by setting("Color Speed", 1.0, 0.1..5.0, 0.1, visibility = { page == Page.Colors })
 
     val mainColor: Color get() = if (shade) Color.WHITE else primaryColor
 

common/src/main/kotlin/com/lambda/util/math/MathUtils.kt

@@ -40,22 +40,17 @@ object MathUtils {
     fun Double.ceilToInt() = ceil(this).toInt()
 
     fun <T : Number> T.roundToStep(step: T): T {
-        val stepD = step.toDouble()
-        if (stepD == 0.0) return this
-
-        var value = round(toDouble() / stepD) * stepD
-        value = value.roundToPlaces(stepD.decimals)
-        if (abs(value) == 0.0) value = 0.0
-
-        return typeConvert(value)
+        val valueBD = BigDecimal(toString())
+        val stepBD = BigDecimal(step.toString())
+        if (stepBD.compareTo(BigDecimal.ZERO) == 0) return this
+        val scaled = valueBD.divide(stepBD, stepBD.scale(), RoundingMode.HALF_UP)
+            .setScale(0, RoundingMode.HALF_UP)
+            .multiply(stepBD)
+            .setScale(stepBD.scale(), RoundingMode.HALF_UP)
+
+        return typeConvert(scaled.toDouble())
     }
 
-    private fun Double.roundToPlaces(places: Int) =
-        BigDecimal(this).setScale(places, RoundingMode.HALF_EVEN).toDouble()
-
-    private val Double.decimals: Int
-        get() = BigDecimal.valueOf(this).scale()
-
     fun <T : Number> T.typeConvert(valueIn: Double): T {
         @Suppress("UNCHECKED_CAST")
         return when (this) {