Skip to content

Commit 87b5535

Browse files
beanbag44beanbag44
committed
tick kill aura on input post and remove submit util function
1 parent 4c30aaa commit 87b5535

9 files changed

Lines changed: 14 additions & 28 deletions

File tree

‎src/main/kotlin/com/lambda/interaction/construction/simulation/context/InteractContext.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@
1818
package com.lambda.interaction.construction.simulation.context
1919

2020
import com.lambda.context.Automated
21-
import com.lambda.graphics.esp.ShapeScope
2221
import com.lambda.graphics.mc.TransientRegionESP
2322
import com.lambda.interaction.managers.LogContext
2423
import com.lambda.interaction.managers.LogContext.Companion.LogContextBuilder
2524
import com.lambda.interaction.managers.LogContext.Companion.getLogContextBuilder
26-
import com.lambda.interaction.managers.Request.Companion.submit
2725
import com.lambda.interaction.managers.hotbar.HotbarRequest
2826
import com.lambda.interaction.managers.interacting.InteractRequest
2927
import com.lambda.interaction.managers.rotating.RotationRequest
@@ -63,9 +61,9 @@ data class InteractContext(
6361
}
6462

6563
fun requestDependencies(request: InteractRequest): Boolean {
66-
val hotbarRequest = submit(HotbarRequest(hotbarIndex, this), false)
64+
val hotbarRequest = HotbarRequest(hotbarIndex, this).submit(queueIfMismatchedStage = false)
6765
val validRotation = if (request.interactConfig.rotate) {
68-
submit(rotationRequest, false).done && currentDirIsValid
66+
rotationRequest.submit(queueIfMismatchedStage = false).done && currentDirIsValid
6967
} else true
7068
return hotbarRequest.done && validRotation
7169
}

‎src/main/kotlin/com/lambda/interaction/managers/Request.kt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,4 @@ abstract class Request : Automated {
3737
abstract val done: Boolean
3838

3939
abstract fun submit(queueIfMismatchedStage: Boolean = true): Request
40-
41-
companion object {
42-
fun submit(request: Request, queueIfClosed: Boolean = true) =
43-
request.submit(queueIfClosed)
44-
}
4540
}

‎src/main/kotlin/com/lambda/module/modules/combat/KillAura.kt‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import com.lambda.context.SafeContext
2424
import com.lambda.event.events.PlayerPacketEvent
2525
import com.lambda.event.events.TickEvent
2626
import com.lambda.event.listener.SafeListener.Companion.listen
27-
import com.lambda.interaction.managers.Request.Companion.submit
2827
import com.lambda.interaction.managers.hotbar.HotbarRequest
2928
import com.lambda.interaction.managers.rotating.RotationRequest
3029
import com.lambda.interaction.managers.rotating.visibilty.lookAtEntity
@@ -103,7 +102,7 @@ object KillAura : Module(
103102
lastOnGround = event.onGround
104103
}
105104

106-
listen<TickEvent.Pre> {
105+
listen<TickEvent.Input.Post> {
107106
target?.let { entity ->
108107
// Wait until the rotation has a hit result on the entity
109108
if (rotate) runSafeAutomated {
@@ -115,13 +114,13 @@ object KillAura : Module(
115114
}
116115

117116
if (swap) {
118-
val selection = selectStack().sortByDescending {
119-
damageMode.block(this, it)
120-
}
117+
val selection = selectStack().sortByDescending {
118+
damageMode.block(this, it)
119+
}
121120

122121
selection.bestItemMatch(player.hotbar)?.let { bestStack ->
123122
val slotId = player.hotbar.indexOf(bestStack)
124-
if (!submit(HotbarRequest(slotId, this@KillAura, nowOrNothing = false)).done) return@listen
123+
if (!HotbarRequest(slotId, this@KillAura, nowOrNothing = false).submit().done) return@listen
125124
}
126125
}
127126

‎src/main/kotlin/com/lambda/module/modules/debug/SilentSwap.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package com.lambda.module.modules.debug
2020
import com.lambda.config.groups.HotbarSettings
2121
import com.lambda.event.events.PlayerEvent
2222
import com.lambda.event.listener.SafeListener.Companion.listen
23-
import com.lambda.interaction.managers.Request.Companion.submit
2423
import com.lambda.interaction.managers.hotbar.HotbarRequest
2524
import com.lambda.module.Module
2625
import com.lambda.module.tag.ModuleTag
@@ -40,7 +39,7 @@ object SilentSwap : Module(
4039

4140
init {
4241
listen<PlayerEvent.Attack.Block> {
43-
if (!submit(HotbarRequest(0, this@SilentSwap)).done) {
42+
if (!HotbarRequest(0, this@SilentSwap).submit().done) {
4443
it.cancel()
4544
return@listen
4645
}

‎src/main/kotlin/com/lambda/module/modules/movement/Speed.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import com.lambda.event.events.ClientEvent
2222
import com.lambda.event.events.MovementEvent
2323
import com.lambda.event.events.TickEvent
2424
import com.lambda.event.listener.SafeListener.Companion.listen
25-
import com.lambda.interaction.managers.Request.Companion.submit
2625
import com.lambda.interaction.managers.rotating.Rotation
2726
import com.lambda.interaction.managers.rotating.RotationConfig
2827
import com.lambda.interaction.managers.rotating.RotationMode
@@ -121,7 +120,7 @@ object Speed : Module(
121120
intendedMoveYaw - 45.0f
122121
} else intendedMoveYaw
123122

124-
submit(RotationRequest(Rotation(targetYaw, player.pitch.toDouble()), this@Speed))
123+
RotationRequest(Rotation(targetYaw, player.pitch.toDouble()), this@Speed).submit()
125124
}
126125

127126
onEnable {

‎src/main/kotlin/com/lambda/module/modules/player/AntiAim.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import com.lambda.config.groups.RotationSettings
2121
import com.lambda.context.SafeContext
2222
import com.lambda.event.events.TickEvent
2323
import com.lambda.event.listener.SafeListener.Companion.listen
24-
import com.lambda.interaction.managers.Request.Companion.submit
2524
import com.lambda.interaction.managers.rotating.Rotation
2625
import com.lambda.interaction.managers.rotating.Rotation.Companion.rotationTo
2726
import com.lambda.interaction.managers.rotating.Rotation.Companion.wrap
@@ -162,7 +161,7 @@ object AntiAim : Module(
162161

163162
listen<TickEvent.Pre>(priority = Int.MIN_VALUE) {
164163
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()
166165
}
167166
}
168167

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import com.lambda.event.events.PlayerEvent
2323
import com.lambda.event.events.RenderEvent
2424
import com.lambda.event.events.TickEvent
2525
import com.lambda.event.listener.SafeListener.Companion.listen
26-
import com.lambda.interaction.managers.Request.Companion.submit
2726
import com.lambda.interaction.managers.rotating.Rotation
2827
import com.lambda.interaction.managers.rotating.RotationConfig
2928
import com.lambda.interaction.managers.rotating.RotationMode
@@ -114,11 +113,11 @@ object Freecam : Module(
114113
listen<TickEvent.Pre> {
115114
when (rotateMode) {
116115
FreecamRotationMode.None -> return@listen
117-
FreecamRotationMode.KeepRotation -> submit(RotationRequest(rotation, this@Freecam))
116+
FreecamRotationMode.KeepRotation -> RotationRequest(rotation, this@Freecam).submit()
118117
FreecamRotationMode.LookAtTarget ->
119118
mc.crosshairTarget?.let {
120119
runSafeAutomated {
121-
submit(RotationRequest(lookAt(it.pos), this@Freecam))
120+
RotationRequest(lookAt(it.pos), this@Freecam).submit()
122121
}
123122
}
124123
}

‎src/main/kotlin/com/lambda/module/modules/player/InventoryMove.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import com.lambda.Lambda.mc
2121
import com.lambda.event.events.TickEvent
2222
import com.lambda.event.listener.SafeListener.Companion.listen
2323
import com.lambda.gui.LambdaScreen
24-
import com.lambda.interaction.managers.Request.Companion.submit
2524
import com.lambda.interaction.managers.rotating.Rotation
2625
import com.lambda.interaction.managers.rotating.RotationConfig
2726
import com.lambda.interaction.managers.rotating.RotationMode
@@ -81,7 +80,7 @@ object InventoryMove : Module(
8180
val yaw = (isKeyPressed(GLFW_KEY_RIGHT, GLFW_KEY_KP_6).toFloatSign() -
8281
isKeyPressed(GLFW_KEY_LEFT, GLFW_KEY_KP_4).toFloatSign()) * speed
8382

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()
8584
}
8685
}
8786

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import com.lambda.event.events.MovementEvent
3434
import com.lambda.event.events.TickEvent
3535
import com.lambda.event.listener.SafeListener.Companion.listen
3636
import com.lambda.gui.components.ClickGuiLayout
37-
import com.lambda.interaction.managers.Request.Companion.submit
3837
import com.lambda.interaction.managers.rotating.Rotation
3938
import com.lambda.interaction.managers.rotating.RotationConfig
4039
import com.lambda.interaction.managers.rotating.RotationMode
@@ -186,7 +185,7 @@ object Replay : Module(
186185

187186
State.Playing -> {
188187
buffer?.rotation?.removeFirstOrNull()?.let { rot ->
189-
submit(RotationRequest(rot, this@Replay))
188+
RotationRequest(rot, this@Replay).submit()
190189
}
191190
}
192191

0 commit comments

Comments
 (0)