fix kill aura swapping after rotation is successful causing large hit delays when looking between lots of targets

Author: beanbag44

src/main/java/com/lambda/mixin/entity/ClientPlayInteractionManagerMixin.java

@@ -21,7 +21,6 @@
 import com.lambda.event.events.InventoryEvent;
 import com.lambda.event.events.PlayerEvent;
 import com.lambda.interaction.managers.inventory.InventoryManager;
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import net.minecraft.client.network.ClientPlayerEntity;
@@ -30,7 +29,6 @@
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.screen.slot.SlotActionType;
 import net.minecraft.stat.StatHandler;
 import net.minecraft.util.ActionResult;
@@ -51,6 +49,9 @@ public class ClientPlayInteractionManagerMixin {
     @Shadow
     public float currentBreakingProgress;
 
+    @Shadow
+    public int lastSelectedSlot;
+
     @Inject(method = "interactBlock", at = @At("HEAD"), cancellable = true)
     public void interactBlockHead(final ClientPlayerEntity player, final Hand hand, final BlockHitResult hitResult, final CallbackInfoReturnable<ActionResult> cir) {
         if (EventFlow.post(new PlayerEvent.Interact.Block(hand, hitResult)).isCanceled()) {
@@ -103,9 +104,9 @@ public void clickSlotHead(int syncId, int slotId, int button, SlotActionType act
      * }
      * }</pre>
      */
-    @ModifyExpressionValue(method = "syncSelectedSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerInventory;getSelectedSlot()I"))
-    public int overrideSelectedSlotSync(int original) {
-        return EventFlow.post(new InventoryEvent.HotbarSlot.Update(original)).getSlot();
+    @Inject(method = "syncSelectedSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayNetworkHandler;sendPacket(Lnet/minecraft/network/packet/Packet;)V", shift = At.Shift.BEFORE))
+    public void overrideSelectedSlotSync(CallbackInfo ci) {
+        EventFlow.post(new InventoryEvent.HotbarSlot.Update(lastSelectedSlot));
     }
 
     @Inject(method = "updateBlockBreakingProgress", at = @At("HEAD"), cancellable = true)

src/main/kotlin/com/lambda/event/events/InventoryEvent.kt

@@ -88,14 +88,7 @@ sealed class InventoryEvent {
          *
          * Updated slot id will come to the server if it defers from last reported slot.
          */
-        data class Update(var slot: Int) : HotbarSlot()
-
-        /**
-         * Represents an event triggered when the client sends slot update to the server.
-         *
-         * This event happens when last slot defers from the previous one
-         */
-        data class Changed(var slot: Int) : HotbarSlot()
+        data class Update(val slot: Int) : HotbarSlot()
 
         /**
          * Represents an event triggered when the server forces the player to change active hotbar slot.

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

@@ -21,7 +21,7 @@ import com.lambda.config.AutomationConfig.Companion.setDefaultAutomationConfig
 import com.lambda.config.applyEdits
 import com.lambda.config.groups.Targeting
 import com.lambda.context.SafeContext
-import com.lambda.event.events.PlayerPacketEvent
+import com.lambda.event.events.InventoryEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.managers.hotbar.HotbarRequest
@@ -67,10 +67,7 @@ object KillAura : Module(
 
     private var lastAttackTime = 0L
     private var hitDelay = 100.0
-
-    private var prevY = 0.0
-    private var lastY = 0.0
-    private var lastOnGround = true
+    private var cooldownFromSwap = false
 
     enum class Group(override val displayName: String) : NamedEnum {
         General("General"),
@@ -98,21 +95,17 @@ object KillAura : Module(
             }
         }
 
-        listen<PlayerPacketEvent.Pre>(Int.MIN_VALUE) { event ->
-            prevY = lastY
-            lastY = event.position.y
-            lastOnGround = event.onGround
-        }
+        listen<InventoryEvent.HotbarSlot.Update> { cooldownFromSwap = true }
 
         listen<TickEvent.Input.Post> {
             target?.let { entity ->
                 // Wait until the rotation has a hit result on the entity
+                var rotated = true
                 if (rotate) runSafeAutomated {
                     val rotationRequest = lookAtEntity(entity)?.rotation?.let { rotationRequest { rotation(it) } }?.submit() ?: return@listen
-                    val cantContinue = !rotationRequest.done || entity !== prevEntity || !validServerRot
+                    rotated = rotationRequest.done && entity === prevEntity && validServerRot
                     prevEntity = entity
                     validServerRot = rotationRequest.done
-                    if (cantContinue) return@listen
                 }
 
                 if (swap) {
@@ -126,12 +119,16 @@ object KillAura : Module(
                     }
                 }
 
+                if (!rotated) return@listen
+
                 // Cooldown check
                 when (attackMode) {
-                    AttackMode.Cooldown -> if (player.getAttackCooldownProgress(0.5f) + (cooldownShrink / 20f) < 1.0f) return@listen
+                    AttackMode.Cooldown -> if (player.getAttackCooldownProgress(0.5f) + (cooldownShrink / 20f) < 1.0f && !cooldownFromSwap) return@listen
                     AttackMode.Delay -> if (System.currentTimeMillis() - lastAttackTime < hitDelay) return@listen
                 }
 
+                cooldownFromSwap = false
+
                 // Attack
                 connection.sendPacket(PlayerInteractEntityC2SPacket.attack(target, player.isSneaking))
                 if (interaction.gameMode != GameMode.SPECTATOR) {
@@ -144,17 +141,5 @@ object KillAura : Module(
                 hitDelay = (hitDelay1..hitDelay2).random() * 50
             }
         }
-
-        onEnable { reset() }
-        onDisable { reset() }
-    }
-
-    private fun reset() {
-        lastY = 0.0
-        prevY = 0.0
-        lastOnGround = true
-
-        lastAttackTime = 0L
-        hitDelay = 100.0
     }
 }