Improved rotation settings. No range but Gaussian distribution

Author: Avanatiker

common/src/main/kotlin/com/lambda/config/groups/IRotationConfig.kt

@@ -26,6 +26,20 @@ interface IRotationConfig {
      */
     val resetTicks: Int
 
+    /**
+     * If true, rotation will be instant without any transition. If false, rotation will transition over time.
+     */
+    val instant: Boolean
+
+    /**
+     * The mean (average) value for the Gaussian distribution used to calculate rotation speed.
+     * This value represents the center of the distribution.
+     */
     val mean: Double
+
+    /**
+     * The standard deviation for the Gaussian distribution used to calculate rotation speed.
+     * This value represents the spread or dispersion of the distribution.
+     */
     val derivation: Double
 }

common/src/main/kotlin/com/lambda/config/groups/RotationSettings.kt

@@ -2,10 +2,7 @@ package com.lambda.config.groups
 
 import com.lambda.config.Configurable
 import com.lambda.interaction.rotation.RotationMode
-import kotlin.math.PI
-import kotlin.math.cos
-import kotlin.math.ln
-import kotlin.math.sqrt
+import kotlin.math.*
 import kotlin.random.Random
 
 class RotationSettings(
@@ -15,18 +12,22 @@ class RotationSettings(
     override var rotationMode by c.setting("Mode", RotationMode.SYNC, "SILENT - server-side rotation, SYNC - server-side rotation; client-side movement, LOCK - Lock camera", vis)
     override val keepTicks by c.setting("Keep Rotation", 3, 1..10, 1, "Ticks to keep rotation", " ticks", vis)
     override val resetTicks by c.setting("Reset Rotation", 3, 1..10, 1, "Ticks before rotation is reset", " ticks", vis)
-    override var mean by c.setting("Mean", 90.0, 1.0..180.0, 0.1, "Average rotation speed", "", vis)
-    override var derivation by c.setting("Standard Deviation", 10.0, 0.0..100.0, 0.1, "Spread of rotation speeds", "", vis)
+    override var instant by c.setting("Instant Rotation", false, "Instantly rotate", vis)
+    override var mean by c.setting("Mean", 20.0, 1.0..80.0, 0.1, "Average rotation speed") { vis() && !instant }
+    override var derivation by c.setting("Standard Deviation", 5.0, 0.0..20.0, 0.1, "Spread of rotation speeds") { vis() && !instant }
 
-    override val turnSpeed get() = nextGaussian(mean, derivation)
+    override val turnSpeed get() = abs(nextGaussian(mean, derivation))
 
     var speedMultiplier = 1.0
 
-    private fun nextGaussian(mean: Double = 0.0, standardDeviation: Double = 1.0): Double {
+    private fun nextGaussian(
+        mean: Double = 0.0,
+        deviation: Double = 1.0
+    ): Double {
         val u1 = Random.nextDouble()
         val u2 = Random.nextDouble()
 
         val randStdNormal = sqrt(-2.0 * ln(u1)) * cos(2.0 * PI * u2)
-        return mean + standardDeviation * randStdNormal
+        return mean + deviation * randStdNormal
     }
 }

common/src/main/kotlin/com/lambda/interaction/RotationManager.kt

@@ -80,6 +80,10 @@ object RotationManager : Loadable {
         currentRotation = currentContext?.let { context ->
             val rotationTo = if (keepTicks >= 0) context.rotation else player.rotation
 
+            if (context.config.instant) {
+                return@let rotationTo
+            }
+
             var speedMultiplier = (context.config as? RotationSettings)?.speedMultiplier ?: 1.0
             if (keepTicks < 0) speedMultiplier = 1.0
 

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

@@ -1,23 +1,13 @@
 package com.lambda.module.modules.client
 
-import com.lambda.config.groups.IRotationConfig
-import com.lambda.interaction.rotation.RotationMode
+import com.lambda.config.groups.RotationSettings
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
-import com.lambda.util.math.MathUtils.random
 
 object Baritone : Module(
     name = "Baritone",
     description = "Baritone configuration",
     defaultTags = setOf(ModuleTag.CLIENT)
 ) {
-    private val r1 by setting("Turn Speed 1", 70.0, 1.0..180.0, 0.1)
-    private val r2 by setting("Turn Speed 2", 110.0, 1.0..180.0, 0.1)
-
-    val rotation = object : IRotationConfig {
-        override val rotationMode = RotationMode.SYNC
-        override val turnSpeed get() = random(r1, r2)
-        override val keepTicks = 3
-        override val resetTicks = 3
-    }
+    val rotation = RotationSettings(this)
 }

common/src/main/kotlin/com/lambda/module/modules/player/Freecam.kt

@@ -32,10 +32,12 @@ object Freecam : Module(
 ) {
     private val speed by setting("Speed", 0.5f, 0.1f..1.0f, 0.1f)
     private val sprint by setting("Sprint Multiplier", 3.0f, 0.1f..10.0f, 0.1f, description = "Set below 1.0 to fly slower on sprint.")
+    private val reach by setting("Reach", 5.0, 1.0..100.0, 1.0, "Freecam reach distance")
     private val rotateToTarget by setting("Rotate to target", true)
-    private val reach by setting("Reach", 4.0, 1.0..100.0, 0.1)
 
-    private val rotationConfig = RotationSettings(this).apply {
+    private val rotationConfig = RotationSettings(this) {
+        rotateToTarget
+    }.apply {
         rotationMode = RotationMode.LOCK
     }
 

common/src/main/kotlin/com/lambda/module/modules/player/Replay.kt

@@ -56,15 +56,14 @@ object Replay : Module(
     private val cycle by setting("Cycle Play Mode", KeyCode.B, description = "REPLAY: Replay the recording once. CONTINUE: Replay the recording and continue recording. LOOP: Loop the recording.")
     private val check by setting("Set Checkpoint", KeyCode.V, description = "Create a checkpoint while recording.")
 
-    private val loops by setting("Loops", -1, -1..10, 1, description = "Number of times to loop the replay. -1 for infinite.", unit = "repeats")
+    private val loops by setting("Loops", -1, -1..10, 1, description = "Number of times to loop the replay. -1 for infinite.", unit = " repeats")
     private val velocityCheck by setting("Velocity check", true, description = "Check if the player is moving before starting a recording.")
     private val cancelOnDeviation by setting("Cancel on deviation", true)
     private val deviationThreshold by setting("Deviation threshold", 0.1, 0.1..5.0, 0.1, description = "The threshold for the deviation to cancel the replay.") { cancelOnDeviation }
 
     private val rotationConfig = RotationSettings(this).apply {
         rotationMode = RotationMode.LOCK
-        r1 = 1000.0
-        r2 = 1001.0
+        instant = true
     }
 
     enum class State {