interaction tick stage checks

Author: beanbag44

src/main/kotlin/com/lambda/config/groups/InteractSettings.kt

@@ -18,6 +18,7 @@
 package com.lambda.config.groups
 
 import com.lambda.config.Configurable
+import com.lambda.event.events.TickEvent
 import com.lambda.interaction.request.interacting.InteractConfig
 import com.lambda.util.NamedEnum
 
@@ -28,6 +29,7 @@ class InteractSettings(
 ) : InteractConfig {
     override val rotate by c.setting("Rotate For Interact", true, "Rotates the player to look at the block when interacting", visibility = vis).group(groupPath)
     override val swingHand by c.setting("Swing On Interact", true, "Swings the players hand after interacting", visibility = vis).group(groupPath)
+    override val interactStageMask by c.setting("Interact Stage Mask", setOf(TickEvent.Input.Post, TickEvent.Player.Post), description = "The sub-tick timing at which interact actions are performed", visibility = vis).group(groupPath)
     override val interactSwingType by c.setting("Interact Swing Type", BuildConfig.SwingType.Vanilla, "The style of swing") { vis() && swingHand }.group(groupPath)
     override val interactConfirmationMode by c.setting("Interact Confirmation Mode", InteractionConfig.InteractConfirmationMode.InteractThenAwait, "The style of confirmation for interactions", visibility = vis).group(groupPath)
 }

src/main/kotlin/com/lambda/config/groups/PlaceSettings.kt

@@ -32,11 +32,11 @@ class PlaceSettings(
     override val rotateForPlace by c.setting("Rotate For Place", true, "Rotate towards block while placing", visibility = vis).group(groupPath)
     override val airPlace by c.setting("Air Place", AirPlaceMode.None, "Allows for placing blocks without adjacent faces", visibility = vis).group(groupPath)
     override val axisRotateSetting by c.setting("Axis Rotate", true, "Overrides the Rotate For Place setting and rotates the player on each axis to air place rotational blocks") { vis() && airPlace.isEnabled }.group(groupPath)
-    override val placeStageMask by c.setting("Place Sequence Mode", setOf(TickEvent.Input.Post, TickEvent.Player.Post), description = "The sub-tick timing at which break actions are performed", visibility = vis).group(groupPath)
+    override val placeStageMask by c.setting("Place Stage mask", setOf(TickEvent.Input.Post, TickEvent.Player.Post), description = "The sub-tick timing at which place actions are performed", visibility = vis).group(groupPath)
     override val placeConfirmationMode by c.setting("Place Confirmation", PlaceConfirmationMode.PlaceThenAwait, "Wait for block placement confirmation", visibility = vis).group(groupPath)
     override val maxPendingPlacements by c.setting("Max Pending Placements", 5, 0..30, 1, "The maximum amount of pending placements", visibility = vis).group(groupPath)
     override val placementsPerTick by c.setting("Places Per Tick", 1, 1..30, 1, "Maximum instant block places per tick", visibility = vis).group(groupPath)
     override val swing by c.setting("Swing On Place", true, "Swings the players hand when placing", visibility = vis).group(groupPath)
     override val swingType by c.setting("Place Swing Type", BuildConfig.SwingType.Vanilla, "The style of swing") { vis() && swing }.group(groupPath)
     override val sounds by c.setting("Place Sounds", true, "Plays the placing sounds", visibility = vis).group(groupPath)
-}
+}

src/main/kotlin/com/lambda/interaction/request/interacting/InteractConfig.kt

@@ -19,11 +19,13 @@ package com.lambda.interaction.request.interacting
 
 import com.lambda.config.groups.BuildConfig
 import com.lambda.config.groups.InteractionConfig
+import com.lambda.event.Event
 import com.lambda.interaction.request.RequestConfig
 
 interface InteractConfig : RequestConfig {
     val rotate: Boolean
     val swingHand: Boolean
+    val interactStageMask: Set<Event>
     val interactSwingType: BuildConfig.SwingType
     val interactConfirmationMode: InteractionConfig.InteractConfirmationMode
 }

src/main/kotlin/com/lambda/interaction/request/interacting/InteractionManager.kt

@@ -113,6 +113,7 @@ object InteractionManager : RequestHandler<InteractRequest>(
                 logger.warning("Dependencies failed for interaction", ctx, request)
                 return
             }
+            if (tickStage !in request.interactStageMask) return
 
             if (request.interactConfirmationMode != InteractionConfig.InteractConfirmationMode.None) {
                 InteractionInfo(ctx, request.pendingInteractionsList, request).startPending()

src/main/kotlin/com/lambda/interaction/request/placing/PlaceConfig.kt

@@ -57,5 +57,4 @@ interface PlaceConfig : RequestConfig {
         PlaceThenAwait("Place now, confirm later", "Show placement right away, then wait for server confirmation to verify."),
         AwaitThenPlace("Confirm first, then place", "Wait for server response before showing placement; most accurate, adds a short delay.")
     }
-
 }

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

@@ -157,7 +157,7 @@ object PlaceManager : RequestHandler<PlaceRequest>(
                 return
             }
             if (!validSneak(player)) return
-            if (tickStage !in request.build.placing.placeStageMask) return
+            if (tickStage !in request.placeStageMask) return
 
             val actionResult = placeBlock(ctx, request, Hand.MAIN_HAND)
             if (!actionResult.isAccepted) {