feat: progress

1. fix ElytraBot
2. fix AutoEat
3. fix conflict with
4. add log display

Author: m1919810

README.md

@@ -27,7 +27,9 @@
 
 但是该模组与以下模组均有关联,推荐同时安装
 
-- ViaFabricPlus
+注: 不是必须安装
+
+- ViaFabricPlus(强烈推荐安装)
 - Litematica
 - JsMacros
 - Baritone

src/main/java/me/matl114/accessors/hacks/PlayerInteractionAccess.java

@@ -6,6 +6,9 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
+import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
@@ -219,6 +222,10 @@ default boolean setStartFailBreakPos(@Nullable BlockPos pos) {
 
     public boolean sendFailBreakCurrentPos(@Nullable Direction direction);
 
+    public ActionResult simulateInteractBlock(Hand hand, BlockHitResult hitResult);
+
+    public ActionResult simulateInteractItem(Hand hand);
+
     /**
      * 把原版 {@link ClientPlayerInteractionManager} 视为本接口语义边界。
      */

src/main/java/me/matl114/events/Listener.java

@@ -666,7 +666,8 @@ public static EventChannel<Packet<?>> getPacketSendPoint() {
     @Getter
     @Cancelable
     @Modifiable
-    private static final EventChannel<Hand> prePlayerUseItem = new EventChannel<>();
+    @ExtraArgs({Hand.class})
+    private static final EventChannel<ActionResult> prePlayerUseItem = new EventChannel<>();
 
     @Getter
     @Modifiable

src/main/java/me/matl114/hacks/RenderTasks.java

@@ -524,6 +524,9 @@ public void render(MatrixStack stack, float partialTicks) {
     @Getter
     public static Hud hud;
 
+    @Getter
+    public static ModuleListHud moduleListHud;
+
     @Getter
     public static InvHud invHud;
 
@@ -555,6 +558,7 @@ private static void initModules(ModuleManager m) {
         freecam = new Freecam().register(m);
         renderOptimize = new RenderOptimize().register(m);
         hud = new Hud().register(m);
+        moduleListHud = new ModuleListHud().register(m);
         invHud = new InvHud().register(m);
         playerStatistic = new PlayerStatistic().register(m);
         equipmentHud = new EquipmentHud().register(m);

src/main/java/me/matl114/hacks/modules/combat/AttackArua.java

@@ -50,7 +50,8 @@ public AttackArua() {
     public final FlagRef doNotAttackWhenEat =
             flagBuilder(attBot.add("stop-attack-when-eat")).build();
 
-    public final FlagRef doNotAttackWhenSpear = flagBuilder(attBot.add("stop-attack-when-spear")).build();
+    public final FlagRef doNotAttackWhenSpear =
+            flagBuilder(attBot.add("stop-attack-when-spear")).build();
 
     @Override
     public void registerAll() {
@@ -60,6 +61,22 @@ public void registerAll() {
 
     private int interval;
 
+    public boolean checkEating() {
+        return doNotAttackWhenEat.get()
+                && mc.player.isUsingItem()
+                && VItem.getInstance().isEatable(mc.player.getActiveItem());
+    }
+
+    public boolean checkSpear() {
+        return doNotAttackWhenSpear.get()
+                && mc.player.isUsingItem()
+                && VItem.getInstance().isSpear(mc.player.getActiveItem());
+    }
+
+    public boolean checkUsing() {
+        return checkEating() || checkSpear();
+    }
+
     public void onTick(Event<ClientPlayerEntity> tickEvent) {
         if (mc.player == null) return;
         if (enable.get()) {
@@ -69,18 +86,11 @@ public void onTick(Event<ClientPlayerEntity> tickEvent) {
             interval += 1;
             int custom = customRate.get();
             if (custom <= interval) {
-                if (doNotAttackWhenEat.get()
-                        && mc.player.isUsingItem()
-                        && VItem.getInstance().isEatable(mc.player.getActiveItem())) {
-                    return;
-                }
-                if(doNotAttackWhenSpear.get() && mc.player.isUsingItem() && VItem.getInstance().isSpear(mc.player.getActiveItem())) {
-                    return;
-                }
+
                 if (attack.legalMode.get()
                         || ((holdingWeapon && cooldownWeapon.get()) || (!holdingWeapon && cooldownHand.get()))) {
                     // do not attack because of legal mode
-
+                    if (checkUsing()) return;
                     if (mc.player.getAttackCooldownProgress(0.5F) > 0.98) {
                         // ready for attack
                         // force attack