tick kill aura on input post and remove submit util function

beanbag44 · beanbag44 · commit 87b55352e2c2 · 2025-12-21T19:26:16.000Z
diff --git a/src/main/kotlin/com/lambda/interaction/construction/simulation/context/InteractContext.kt b/src/main/kotlin/com/lambda/interaction/construction/simulation/context/InteractContext.kt
@@ -18,12 +18,10 @@
 package com.lambda.interaction.construction.simulation.context
 
 import com.lambda.context.Automated
-import com.lambda.graphics.esp.ShapeScope
 import com.lambda.graphics.mc.TransientRegionESP
 import com.lambda.interaction.managers.LogContext
 import com.lambda.interaction.managers.LogContext.Companion.LogContextBuilder
 import com.lambda.interaction.managers.LogContext.Companion.getLogContextBuilder
-import com.lambda.interaction.managers.Request.Companion.submit
 import com.lambda.interaction.managers.hotbar.HotbarRequest
 import com.lambda.interaction.managers.interacting.InteractRequest
 import com.lambda.interaction.managers.rotating.RotationRequest
@@ -63,9 +61,9 @@ data class InteractContext(
     }
 
     fun requestDependencies(request: InteractRequest): Boolean {
-        val hotbarRequest = submit(HotbarRequest(hotbarIndex, this), false)
+        val hotbarRequest = HotbarRequest(hotbarIndex, this).submit(queueIfMismatchedStage = false)
         val validRotation = if (request.interactConfig.rotate) {
-            submit(rotationRequest, false).done && currentDirIsValid
+            rotationRequest.submit(queueIfMismatchedStage = false).done && currentDirIsValid
         } else true
         return hotbarRequest.done && validRotation
     }
diff --git a/src/main/kotlin/com/lambda/interaction/managers/Request.kt b/src/main/kotlin/com/lambda/interaction/managers/Request.kt
@@ -37,9 +37,4 @@ abstract class Request : Automated {
     abstract val done: Boolean
 
     abstract fun submit(queueIfMismatchedStage: Boolean = true): Request
-
-    companion object {
-        fun submit(request: Request, queueIfClosed: Boolean = true) =
-            request.submit(queueIfClosed)
-    }
 }
diff --git a/src/main/kotlin/com/lambda/module/modules/combat/KillAura.kt b/src/main/kotlin/com/lambda/module/modules/combat/KillAura.kt
@@ -24,7 +24,6 @@ import com.lambda.context.SafeContext
 import com.lambda.event.events.PlayerPacketEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
-import com.lambda.interaction.managers.Request.Companion.submit
 import com.lambda.interaction.managers.hotbar.HotbarRequest
 import com.lambda.interaction.managers.rotating.RotationRequest
 import com.lambda.interaction.managers.rotating.visibilty.lookAtEntity
@@ -103,7 +102,7 @@ object KillAura : Module(
             lastOnGround = event.onGround
         }
 
-        listen<TickEvent.Pre> {
+        listen<TickEvent.Input.Post> {
             target?.let { entity ->
                 // Wait until the rotation has a hit result on the entity
                 if (rotate) runSafeAutomated {
@@ -115,13 +114,13 @@ object KillAura : Module(
                 }
 
                 if (swap) {
-	                val selection = selectStack().sortByDescending {
-		                damageMode.block(this, it)
-	                }
+                    val selection = selectStack().sortByDescending {
+                        damageMode.block(this, it)
+                    }
 
                     selection.bestItemMatch(player.hotbar)?.let { bestStack ->
                         val slotId = player.hotbar.indexOf(bestStack)
-                        if (!submit(HotbarRequest(slotId, this@KillAura, nowOrNothing = false)).done) return@listen
+                        if (!HotbarRequest(slotId, this@KillAura, nowOrNothing = false).submit().done) return@listen
                     }
                 }
 
diff --git a/src/main/kotlin/com/lambda/module/modules/debug/SilentSwap.kt b/src/main/kotlin/com/lambda/module/modules/debug/SilentSwap.kt
@@ -20,7 +20,6 @@ package com.lambda.module.modules.debug
 import com.lambda.config.groups.HotbarSettings
 import com.lambda.event.events.PlayerEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
-import com.lambda.interaction.managers.Request.Companion.submit
 import com.lambda.interaction.managers.hotbar.HotbarRequest
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
@@ -40,7 +39,7 @@ object SilentSwap : Module(
 
     init {
         listen<PlayerEvent.Attack.Block> {
-            if (!submit(HotbarRequest(0, this@SilentSwap)).done) {
+            if (!HotbarRequest(0, this@SilentSwap).submit().done) {
                 it.cancel()
                 return@listen
             }
diff --git a/src/main/kotlin/com/lambda/module/modules/movement/Speed.kt b/src/main/kotlin/com/lambda/module/modules/movement/Speed.kt
@@ -22,7 +22,6 @@ import com.lambda.event.events.ClientEvent
 import com.lambda.event.events.MovementEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
-import com.lambda.interaction.managers.Request.Companion.submit
 import com.lambda.interaction.managers.rotating.Rotation
 import com.lambda.interaction.managers.rotating.RotationConfig
 import com.lambda.interaction.managers.rotating.RotationMode
@@ -121,7 +120,7 @@ object Speed : Module(
                 intendedMoveYaw - 45.0f
             } else intendedMoveYaw
 
-            submit(RotationRequest(Rotation(targetYaw, player.pitch.toDouble()), this@Speed))
+            RotationRequest(Rotation(targetYaw, player.pitch.toDouble()), this@Speed).submit()
         }
 
         onEnable {
diff --git a/src/main/kotlin/com/lambda/module/modules/player/AntiAim.kt b/src/main/kotlin/com/lambda/module/modules/player/AntiAim.kt
@@ -21,7 +21,6 @@ import com.lambda.config.groups.RotationSettings
 import com.lambda.context.SafeContext
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
-import com.lambda.interaction.managers.Request.Companion.submit
 import com.lambda.interaction.managers.rotating.Rotation
 import com.lambda.interaction.managers.rotating.Rotation.Companion.rotationTo
 import com.lambda.interaction.managers.rotating.Rotation.Companion.wrap
@@ -162,7 +161,7 @@ object AntiAim : Module(
 
         listen<TickEvent.Pre>(priority = Int.MIN_VALUE) {
             if (currentYaw == wrap(player.yaw) && currentPitch == player.pitch) return@listen
-            submit(RotationRequest(Rotation(currentYaw, currentPitch), this@AntiAim))
+            RotationRequest(Rotation(currentYaw, currentPitch), this@AntiAim).submit()
         }
     }
 
diff --git a/src/main/kotlin/com/lambda/module/modules/player/Freecam.kt b/src/main/kotlin/com/lambda/module/modules/player/Freecam.kt
@@ -23,7 +23,6 @@ import com.lambda.event.events.PlayerEvent
 import com.lambda.event.events.RenderEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
-import com.lambda.interaction.managers.Request.Companion.submit
 import com.lambda.interaction.managers.rotating.Rotation
 import com.lambda.interaction.managers.rotating.RotationConfig
 import com.lambda.interaction.managers.rotating.RotationMode
@@ -114,11 +113,11 @@ object Freecam : Module(
         listen<TickEvent.Pre> {
             when (rotateMode) {
                 FreecamRotationMode.None -> return@listen
-                FreecamRotationMode.KeepRotation -> submit(RotationRequest(rotation, this@Freecam))
+                FreecamRotationMode.KeepRotation -> RotationRequest(rotation, this@Freecam).submit()
                 FreecamRotationMode.LookAtTarget ->
                     mc.crosshairTarget?.let {
                         runSafeAutomated {
-                            submit(RotationRequest(lookAt(it.pos), this@Freecam))
+                            RotationRequest(lookAt(it.pos), this@Freecam).submit()
                         }
                     }
             }
diff --git a/src/main/kotlin/com/lambda/module/modules/player/InventoryMove.kt b/src/main/kotlin/com/lambda/module/modules/player/InventoryMove.kt
@@ -21,7 +21,6 @@ import com.lambda.Lambda.mc
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.gui.LambdaScreen
-import com.lambda.interaction.managers.Request.Companion.submit
 import com.lambda.interaction.managers.rotating.Rotation
 import com.lambda.interaction.managers.rotating.RotationConfig
 import com.lambda.interaction.managers.rotating.RotationMode
@@ -81,7 +80,7 @@ object InventoryMove : Module(
             val yaw = (isKeyPressed(GLFW_KEY_RIGHT, GLFW_KEY_KP_6).toFloatSign() -
                     isKeyPressed(GLFW_KEY_LEFT, GLFW_KEY_KP_4).toFloatSign()) * speed
 
-            submit(RotationRequest(Rotation(player.yaw + yaw, (player.pitch + pitch).coerceIn(-90f, 90f)), this@InventoryMove))
+            RotationRequest(Rotation(player.yaw + yaw, (player.pitch + pitch).coerceIn(-90f, 90f)), this@InventoryMove).submit()
         }
     }
 
diff --git a/src/main/kotlin/com/lambda/module/modules/player/Replay.kt b/src/main/kotlin/com/lambda/module/modules/player/Replay.kt
@@ -34,7 +34,6 @@ import com.lambda.event.events.MovementEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.gui.components.ClickGuiLayout
-import com.lambda.interaction.managers.Request.Companion.submit
 import com.lambda.interaction.managers.rotating.Rotation
 import com.lambda.interaction.managers.rotating.RotationConfig
 import com.lambda.interaction.managers.rotating.RotationMode
@@ -186,7 +185,7 @@ object Replay : Module(
 
                 State.Playing -> {
                     buffer?.rotation?.removeFirstOrNull()?.let { rot ->
-                        submit(RotationRequest(rot, this@Replay))
+                        RotationRequest(rot, this@Replay).submit()
                     }
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,4 @@ abstract class Request : Automated {`
`37`	`37`	`abstract val done: Boolean`
`38`	`38`
`39`	`39`	`abstract fun submit(queueIfMismatchedStage: Boolean = true): Request`
`40`		`-`
`41`		`- companion object {`
`42`		`- fun submit(request: Request, queueIfClosed: Boolean = true) =`
`43`		`- request.submit(queueIfClosed)`
`44`		`- }`
`45`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ import com.lambda.config.groups.RotationSettings`
`21`	`21`	`import com.lambda.context.SafeContext`
`22`	`22`	`import com.lambda.event.events.TickEvent`
`23`	`23`	`import com.lambda.event.listener.SafeListener.Companion.listen`
`24`		`-import com.lambda.interaction.managers.Request.Companion.submit`
`25`	`24`	`import com.lambda.interaction.managers.rotating.Rotation`
`26`	`25`	`import com.lambda.interaction.managers.rotating.Rotation.Companion.rotationTo`
`27`	`26`	`import com.lambda.interaction.managers.rotating.Rotation.Companion.wrap`
`@@ -162,7 +161,7 @@ object AntiAim : Module(`
`162`	`161`
`163`	`162`	`listen<TickEvent.Pre>(priority = Int.MIN_VALUE) {`
`164`	`163`	`if (currentYaw == wrap(player.yaw) && currentPitch == player.pitch) return@listen`
`165`		`- submit(RotationRequest(Rotation(currentYaw, currentPitch), this@AntiAim))`
	`164`	`+ RotationRequest(Rotation(currentYaw, currentPitch), this@AntiAim).submit()`
`166`	`165`	`}`
`167`	`166`	`}`
`168`	`167`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ import com.lambda.Lambda.mc`
`21`	`21`	`import com.lambda.event.events.TickEvent`
`22`	`22`	`import com.lambda.event.listener.SafeListener.Companion.listen`
`23`	`23`	`import com.lambda.gui.LambdaScreen`
`24`		`-import com.lambda.interaction.managers.Request.Companion.submit`
`25`	`24`	`import com.lambda.interaction.managers.rotating.Rotation`
`26`	`25`	`import com.lambda.interaction.managers.rotating.RotationConfig`
`27`	`26`	`import com.lambda.interaction.managers.rotating.RotationMode`
`@@ -81,7 +80,7 @@ object InventoryMove : Module(`
`81`	`80`	`val yaw = (isKeyPressed(GLFW_KEY_RIGHT, GLFW_KEY_KP_6).toFloatSign() -`
`82`	`81`	`isKeyPressed(GLFW_KEY_LEFT, GLFW_KEY_KP_4).toFloatSign()) * speed`
`83`	`82`
`84`		`- submit(RotationRequest(Rotation(player.yaw + yaw, (player.pitch + pitch).coerceIn(-90f, 90f)), this@InventoryMove))`
	`83`	`+ RotationRequest(Rotation(player.yaw + yaw, (player.pitch + pitch).coerceIn(-90f, 90f)), this@InventoryMove).submit()`
`85`	`84`	`}`
`86`	`85`	`}`
`87`	`86`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ import com.lambda.event.events.MovementEvent`
`34`	`34`	`import com.lambda.event.events.TickEvent`
`35`	`35`	`import com.lambda.event.listener.SafeListener.Companion.listen`
`36`	`36`	`import com.lambda.gui.components.ClickGuiLayout`
`37`		`-import com.lambda.interaction.managers.Request.Companion.submit`
`38`	`37`	`import com.lambda.interaction.managers.rotating.Rotation`
`39`	`38`	`import com.lambda.interaction.managers.rotating.RotationConfig`
`40`	`39`	`import com.lambda.interaction.managers.rotating.RotationMode`
`@@ -186,7 +185,7 @@ object Replay : Module(`
`186`	`185`
`187`	`186`	`State.Playing -> {`
`188`	`187`	`buffer?.rotation?.removeFirstOrNull()?.let { rot ->`
`189`		`- submit(RotationRequest(rot, this@Replay))`
	`188`	`+ RotationRequest(rot, this@Replay).submit()`
`190`	`189`	`}`
`191`	`190`	`}`
`192`	`191`