add rotation stage mask, and open requests for all stages in break, place, and hotbar managers

Author: beanbag44

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

@@ -21,7 +21,11 @@ import com.lambda.config.Configurable
 import com.lambda.interaction.request.Priority
 import com.lambda.interaction.request.rotation.RotationConfig
 import com.lambda.interaction.request.rotation.RotationMode
-import kotlin.math.*
+import kotlin.math.PI
+import kotlin.math.abs
+import kotlin.math.cos
+import kotlin.math.ln
+import kotlin.math.sqrt
 import kotlin.random.Random
 
 class RotationSettings(
@@ -37,6 +41,11 @@ class RotationSettings(
     /** How many ticks to wait before resetting the rotation */
     override val decayTicks by c.setting("Reset Rotation", 3, 1..10, 1, "Ticks before rotation is reset", " ticks") { rotate && vis() }
 
+    /**
+     * At what sub-tick stages rotations can be performed
+     */
+    override val rotationStageMask by c.setting("Rotation Stage Mask", setOf(*TickStage.entries.toTypedArray()), "The sub-tick stages at which rotations can be performed", vis)
+
     /** Whether the rotation is instant */
     var instant by c.setting("Instant Rotation", true, "Instantly rotate") { rotate && vis() }
 

common/src/main/kotlin/com/lambda/interaction/request/RequestHandler.kt

@@ -60,8 +60,8 @@ abstract class RequestHandler<R : Request>(
         openStages.forEach { stage ->
             when(stage) {
                 TickStage.TickStart -> openRequestsFor<TickEvent.Pre>(TickStage.TickStart)
-                TickStage.PostHotbar -> TODO()
-                TickStage.PostInteract -> TODO()
+                TickStage.PostHotbar -> { /*ToDo*/ }
+                TickStage.PostInteract -> { /*ToDo*/ }
                 TickStage.PreMovement -> openRequestsFor<MovementEvent.Player.Pre>(TickStage.PreMovement)
                 TickStage.PostMovement -> openRequestsFor<MovementEvent.Player.Post>(TickStage.PostMovement)
             }

common/src/main/kotlin/com/lambda/interaction/request/breaking/BreakManager.kt

@@ -68,8 +68,7 @@ import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.ChunkSectionPos
 
 object BreakManager : RequestHandler<BreakRequest>(
-    TickStage.TickStart,
-    TickStage.PostMovement,
+    *TickStage.entries.toTypedArray(),
     preOpen =  { activeRequest?.let { processRequest(it) } },
     onOpen = { preEvent() }
 ), PositionBlocking {

common/src/main/kotlin/com/lambda/interaction/request/hotbar/HotbarManager.kt

@@ -40,8 +40,7 @@ import com.lambda.threading.runSafe
  * @see InGameHudMixin.onTick
  */
 object HotbarManager : RequestHandler<HotbarRequest>(
-    TickStage.TickStart,
-    TickStage.PostMovement,
+    *TickStage.entries.toTypedArray(),
     postClose = { checkResetSwap() },
     onOpen = { preEvent() }
 ), Loadable {

common/src/main/kotlin/com/lambda/interaction/request/placing/PlaceManager.kt

@@ -68,8 +68,7 @@ import net.minecraft.util.math.Direction
 import net.minecraft.world.GameMode
 
 object PlaceManager : RequestHandler<PlaceRequest>(
-    TickStage.TickStart,
-    TickStage.PostMovement,
+    *TickStage.entries.toTypedArray(),
     preOpen =  { activeRequest?.let { processRequest(it) } },
     onOpen = { preEvent() }
 ), PositionBlocking {

common/src/main/kotlin/com/lambda/interaction/request/rotation/RotationConfig.kt

@@ -17,6 +17,7 @@
 
 package com.lambda.interaction.request.rotation
 
+import com.lambda.config.groups.TickStage
 import com.lambda.interaction.request.Priority
 import com.lambda.interaction.request.RequestConfig
 
@@ -49,6 +50,11 @@ abstract class RotationConfig(priority: Priority) : RequestConfig<RotationReques
      */
     abstract val decayTicks: Int
 
+    /**
+     * The sub-tick stages at which rotations can take place
+     */
+    abstract val rotationStageMask: Set<TickStage>
+
     val rotate: Boolean get() = rotationMode != RotationMode.None
 
     override fun requestInternal(request: RotationRequest) {
@@ -59,6 +65,7 @@ abstract class RotationConfig(priority: Priority) : RequestConfig<RotationReques
         override val turnSpeed get() = 360.0
         override val keepTicks get() = 1
         override val decayTicks get() = 1
+        override val rotationStageMask = setOf(*TickStage.entries.toTypedArray())
         override val rotationMode = mode
     }
 }

common/src/main/kotlin/com/lambda/interaction/request/rotation/RotationRequest.kt

@@ -26,6 +26,7 @@ data class RotationRequest(
     val target: RotationTarget,
     val prio: Priority,
     val mode: RotationMode,
+    val rotationConfig: RotationConfig,
     var keepTicks: Int = 3,
     var decayTicks: Int = 0,
     val turnSpeed: () -> Double = { 180.0 },
@@ -37,7 +38,7 @@ data class RotationRequest(
         target: RotationTarget,
         config: RotationConfig,
         speedMultiplier: Double = 1.0
-    ) : this(target, config.priority, config.rotationMode, config.keepTicks, config.decayTicks, config::turnSpeed, speedMultiplier)
+    ) : this(target, config.priority, config.rotationMode, config, config.keepTicks, config.decayTicks, config::turnSpeed, speedMultiplier)
 
     override val done: Boolean get() =
         mode == RotationMode.None || runSafe {