Update GhostHand to prevent it from interacting every tick

closes #5605
closes #5297

Author: Wide-Cat

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

@@ -0,0 +1,21 @@
+/*
+ * 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;
+
+/**
+ * Some of our other injections coming from {@link net.minecraft.client.MinecraftClient#doItemUse()}
+ * (e.g. InteractItemEvent) are called twice because the method loops over the Mainhand and the Offhand. This event is
+ * only called once, before any interaction logic is called.
+ */
+public class DoItemUseEvent extends Cancellable {
+    private static final DoItemUseEvent INSTANCE = new DoItemUseEvent();
+
+    public static DoItemUseEvent 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.DoItemUseEvent;
 import meteordevelopment.meteorclient.events.entity.player.ItemUseCrosshairTargetEvent;
 import meteordevelopment.meteorclient.events.game.GameLeftEvent;
 import meteordevelopment.meteorclient.events.game.OpenScreenEvent;
@@ -44,7 +45,6 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.resource.ReloadableResourceManagerImpl;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.profiler.Profilers;
 import org.jetbrains.annotations.Nullable;
@@ -84,10 +84,6 @@ public abstract class MinecraftClientMixin implements IMinecraftClient {
     @Nullable
     public ClientPlayerEntity player;
 
-    @Shadow
-    @Final
-    private ReloadableResourceManagerImpl resourceManager;
-
     @Shadow
     @Final
     @Mutable
@@ -182,6 +178,11 @@ private void onDoItemUseHand(CallbackInfo ci, @Local ItemStack itemStack) {
         }
     }
 
+    @Inject(method = "doItemUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Hand;values()[Lnet/minecraft/util/Hand;"), cancellable = true)
+    private void onDoItemUseBeforeHands(CallbackInfo ci) {
+        if (MeteorClient.EVENT_BUS.post(DoItemUseEvent.get()).isCancelled()) ci.cancel();
+    }
+
     @ModifyExpressionValue(method = "doItemUse", at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;crosshairTarget:Lnet/minecraft/util/hit/HitResult;", ordinal = 1))
     private HitResult doItemUseMinecraftClientCrosshairTargetProxy(HitResult original) {
         return MeteorClient.EVENT_BUS.post(ItemUseCrosshairTargetEvent.get(original)).target;
@@ -260,6 +261,7 @@ private boolean handleInputEventsModifyIsUsingItem(boolean original) {
     private void handleInputEventsInjectStopUsingItem(CallbackInfo info) {
         if (Modules.get().get(Multitask.class).attackingEntities() && player.isUsingItem()) {
             if (!options.useKey.isPressed() && HB$stopUsingItem()) interactionManager.stopUsingItem(player);
+            //noinspection StatementWithEmptyBody
             while (options.useKey.wasPressed());
         }
     }

src/main/java/meteordevelopment/meteorclient/systems/modules/player/GhostHand.java

@@ -6,10 +6,11 @@
 package meteordevelopment.meteorclient.systems.modules.player;
 
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
-import meteordevelopment.meteorclient.events.world.TickEvent;
+import meteordevelopment.meteorclient.events.entity.player.DoItemUseEvent;
 import meteordevelopment.meteorclient.systems.modules.Categories;
 import meteordevelopment.meteorclient.systems.modules.Module;
 import meteordevelopment.orbit.EventHandler;
+import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
@@ -26,7 +27,7 @@ public GhostHand() {
     }
 
     @EventHandler
-    private void onTick(TickEvent.Pre event) {
+    private void onTick(DoItemUseEvent event) {
         if (!mc.options.useKey.isPressed() || mc.player.isSneaking()) return;
 
         if (mc.world.getBlockState(BlockPos.ofFloored(mc.player.raycast(mc.player.getBlockInteractionRange(), mc.getRenderTickCounter().getTickProgress(true), false).getPos())).hasBlockEntity()) return;
@@ -44,8 +45,14 @@ private void onTick(TickEvent.Pre event) {
             posList.add(pos);
 
             if (mc.world.getBlockState(pos).hasBlockEntity()) {
-                mc.interactionManager.interactBlock(mc.player, Hand.MAIN_HAND, new BlockHitResult(new Vec3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5), Direction.UP, pos, true));
-                return;
+                for (Hand hand : Hand.values()) {
+                    ActionResult result = mc.interactionManager.interactBlock(mc.player, hand, new BlockHitResult(new Vec3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5), Direction.UP, pos, true));
+                    if (result instanceof ActionResult.Success || result instanceof ActionResult.Fail) {
+                        mc.player.swingHand(hand);
+                        event.cancel();
+                        return;
+                    }
+                }
             }
         }
     }