Add RotationMode.NONE

Author: Avanatiker

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

@@ -42,6 +42,8 @@ interface RotationConfig {
      */
     val resetTicks: Int
 
+    val rotate: Boolean get() = rotationMode != RotationMode.NONE
+
     interface Instant : RotationConfig {
         override val turnSpeed get() = 360.0
         override val keepTicks get() = 1

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

@@ -26,56 +26,28 @@ class RotationSettings(
     c: Configurable,
     vis: () -> Boolean = { true },
 ) : RotationConfig {
-    /**
-     * The rotation mode
-     */
-    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 var rotationMode by c.setting("Mode", RotationMode.SYNC, "SILENT - server-side rotation, SYNC - server-side rotation; client-side movement, LOCK - Lock camera, NONE - No rotation", vis)
 
-    /**
-     * How many ticks to keep the rotation before resetting
-     */
-    override val keepTicks by c.setting("Keep Rotation", 3, 0..10, 1, "Ticks to keep rotation", " ticks", vis)
+    /** How many ticks to keep the rotation before resetting */
+    override val keepTicks by c.setting("Keep Rotation", 3, 0..10, 1, "Ticks to keep rotation", " ticks") { rotate && vis() }
 
-    /**
-     * How many ticks to wait before resetting the rotation
-     */
-    override val resetTicks by c.setting("Reset Rotation", 3, 1..10, 1, "Ticks before rotation is reset", " ticks", vis)
+    /** How many ticks to wait before resetting the rotation */
+    override val resetTicks by c.setting("Reset Rotation", 3, 1..10, 1, "Ticks before rotation is reset", " ticks") { rotate && vis() }
 
-    /**
-     * Whether the rotation is instant
-     */
-    var instant by c.setting("Instant Rotation", true, "Instantly rotate", vis)
+    /** Whether the rotation is instant */
+    var instant by c.setting("Instant Rotation", true, "Instantly rotate") { rotate && vis() }
 
     /**
      * The mean (average/base) value used to calculate rotation speed.
      * This value represents the center of the distribution.
      */
-    private var mean by c.setting(
-        "Mean",
-        40.0,
-        1.0..120.0,
-        0.1,
-        "Average rotation speed",
-        unit = "°"
-    ) { vis() && !instant }
+    private var mean by c.setting("Mean", 40.0, 1.0..120.0, 0.1, "Average rotation speed", unit = "°") { rotate && vis() && !instant }
 
     /**
      * The standard deviation for the Gaussian distribution used to calculate rotation speed.
      * This value represents the spread of rotation speed.
      */
-    private var spread by c.setting(
-        "Spread",
-        10.0,
-        0.0..60.0,
-        0.1,
-        "Spread of rotation speeds",
-        unit = "°"
-    ) { vis() && !instant }
+    private var spread by c.setting("Spread", 10.0, 0.0..60.0, 0.1, "Spread of rotation speeds", unit = "°") { rotate && vis() && !instant }
 
     /**
      * We must always provide turn speed to the interpolator because the player's yaw might exceed the -180 to 180 range.

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

@@ -69,16 +69,15 @@ object RotationManager : Loadable {
         var lastCtx: RotationContext? = null
 
         listen<RotationEvent.Update>(priority, alwaysListen) { event ->
-            val rotationContext = builder.onUpdate?.invoke(this, event.context)
-
-            rotationContext?.let {
-                event.context = it
+            builder.onUpdate?.invoke(this, event.context)?.let { context ->
+                if (!context.config.rotate) return@let
+                event.context = context
+                lastCtx = context
             }
-
-            lastCtx = rotationContext
         }
 
         listen<RotationEvent.Post> { event ->
+            if (!event.context.config.rotate) return@listen
             if (event.context == lastCtx) {
                 builder.onReceive?.invoke(this, event.context)
             }