Add a setting to AttributeSwap to allow swapping without hitting an entity

Useful for quickly using the lunge enchantment. Closes #6012

Author: Wide-Cat

src/main/java/meteordevelopment/meteorclient/events/entity/player/DoAttackEvent.java

@@ -0,0 +1,16 @@
+/*
+ * This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
+ * Copyright (c) Meteor Development.
+ */
+
+package meteordevelopment.meteorclient.events.entity.player;
+
+import meteordevelopment.meteorclient.events.Cancellable;
+
+public class DoAttackEvent extends Cancellable {
+    private static final DoAttackEvent INSTANCE = new DoAttackEvent();
+
+    public static DoAttackEvent get() {
+        return INSTANCE;
+    }
+}

src/main/java/meteordevelopment/meteorclient/mixin/MinecraftClientMixin.java

@@ -12,6 +12,7 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
 import meteordevelopment.meteorclient.MeteorClient;
+import meteordevelopment.meteorclient.events.entity.player.DoAttackEvent;
 import meteordevelopment.meteorclient.events.entity.player.DoItemUseEvent;
 import meteordevelopment.meteorclient.events.entity.player.ItemUseCrosshairTargetEvent;
 import meteordevelopment.meteorclient.events.game.GameLeftEvent;
@@ -116,9 +117,10 @@ private void onTick(CallbackInfo info) {
         Profilers.get().pop();
     }
 
-    @Inject(method = "doAttack", at = @At("HEAD"))
+    @Inject(method = "doAttack", at = @At("HEAD"), cancellable = true)
     private void onAttack(CallbackInfoReturnable<Boolean> cir) {
         CPSUtils.onAttack();
+        if (MeteorClient.EVENT_BUS.post(DoAttackEvent.get()).isCancelled()) cir.cancel();
     }
 
     @Inject(method = "doItemUse", at = @At("HEAD"))

src/main/java/meteordevelopment/meteorclient/systems/modules/combat/AttributeSwap.java

@@ -6,6 +6,7 @@
 package meteordevelopment.meteorclient.systems.modules.combat;
 
 import meteordevelopment.meteorclient.events.entity.player.AttackEntityEvent;
+import meteordevelopment.meteorclient.events.entity.player.DoAttackEvent;
 import meteordevelopment.meteorclient.events.world.TickEvent;
 import meteordevelopment.meteorclient.settings.*;
 import meteordevelopment.meteorclient.systems.modules.Categories;
@@ -27,6 +28,7 @@
 import net.minecraft.item.TridentItem;
 import net.minecraft.registry.tag.EntityTypeTags;
 import net.minecraft.registry.tag.ItemTags;
+import net.minecraft.util.hit.HitResult;
 
 public class AttributeSwap extends Module {
     private final SettingGroup sgGeneral = settings.getDefaultGroup();
@@ -47,8 +49,15 @@ public class AttributeSwap extends Module {
         .name("target-slot")
         .description("Hotbar slot to swap to (1-9).")
         .defaultValue(1)
-        .min(1)
-        .sliderRange(1, 9)
+        .range(1, 9)
+        .visible(() -> mode.get() == Mode.Simple)
+        .build()
+    );
+
+    private final Setting<Boolean> swapOnMiss = sgGeneral.add(new BoolSetting.Builder()
+        .name("swap-on-miss")
+        .description("Whether to swap on a missed attack. Useful for quickly lunging with spears.")
+        .defaultValue(false)
         .visible(() -> mode.get() == Mode.Simple)
         .build()
     );
@@ -276,21 +285,31 @@ public void onDeactivate() {
     }
 
     @EventHandler
-    private void onAttack(AttackEntityEvent event) {
-        if (!canSwapByWeapon()) return;
+    private void onAttack(DoAttackEvent event) {
+        if (!canSwapByWeapon() || mode.get() == Mode.Smart || !swapOnMiss.get()) return;
+        if (mc.crosshairTarget.getType() == HitResult.Type.BLOCK) return;
+
+        doSwap(targetSlot.get() - 1);
+    }
+
+    @EventHandler
+    private void onAttackEntity(AttackEntityEvent event) {
+        if (!canSwapByWeapon() || (mode.get() == Mode.Simple && swapOnMiss.get())) return;
         performSwap(event.entity);
     }
 
     private void performSwap(Entity target) {
         if (awaitingBack) return;
 
-        int slotIndex;
-
         if (mode.get() == Mode.Simple) {
-            slotIndex = targetSlot.get() - 1;
+            doSwap(targetSlot.get() - 1);
         } else {
-            slotIndex = getSmartSlot(target);
+            doSwap(getSmartSlot(target));
         }
+    }
+
+    private void doSwap(int slotIndex) {
+        if (awaitingBack) return;
 
         if (slotIndex < 0 || slotIndex > 8) return;
         if (slotIndex == mc.player.getInventory().getSelectedSlot()) return;