From 17f96b1019e5dad1449c4a6503e7e06b1db80196 Mon Sep 17 00:00:00 2001 From: Bella Date: Tue, 11 Feb 2020 12:00:22 -0500 Subject: [PATCH] make nobreakanimation compatible --- .../kami/module/modules/combat/AutoFeetPlace.java | 4 ++++ .../me/zeroeightsix/kami/module/modules/combat/AutoTrap.java | 5 +++++ .../me/zeroeightsix/kami/module/modules/combat/Surround.java | 4 ++++ .../kami/module/modules/player/NoBreakAnimation.java | 2 +- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/combat/AutoFeetPlace.java b/src/main/java/me/zeroeightsix/kami/module/modules/combat/AutoFeetPlace.java index 6f375ac44..d7247ac1a 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/combat/AutoFeetPlace.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/combat/AutoFeetPlace.java @@ -4,6 +4,7 @@ import com.mojang.realmsclient.gui.ChatFormatting; import me.zeroeightsix.kami.command.Command; import me.zeroeightsix.kami.module.Module; import me.zeroeightsix.kami.module.ModuleManager; +import me.zeroeightsix.kami.module.modules.player.NoBreakAnimation; import me.zeroeightsix.kami.setting.Setting; import me.zeroeightsix.kami.setting.Settings; import me.zeroeightsix.kami.util.BlockInteractionHelper; @@ -261,6 +262,9 @@ public class AutoFeetPlace extends Module { mc.player.swingArm(EnumHand.MAIN_HAND); mc.rightClickDelayTimer = 4; + if (ModuleManager.getModuleByName("NoBreakAnimation").isEnabled()) { + ((NoBreakAnimation) ModuleManager.getModuleByName("NoBreakAnimation")).resetMining(); + } return true; } diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/combat/AutoTrap.java b/src/main/java/me/zeroeightsix/kami/module/modules/combat/AutoTrap.java index 9468c9cab..8dafc7f8d 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/combat/AutoTrap.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/combat/AutoTrap.java @@ -4,6 +4,7 @@ import com.mojang.realmsclient.gui.ChatFormatting; import me.zeroeightsix.kami.command.Command; import me.zeroeightsix.kami.module.Module; import me.zeroeightsix.kami.module.ModuleManager; +import me.zeroeightsix.kami.module.modules.player.NoBreakAnimation; import me.zeroeightsix.kami.setting.Setting; import me.zeroeightsix.kami.setting.Settings; import me.zeroeightsix.kami.util.BlockInteractionHelper; @@ -291,6 +292,10 @@ public class AutoTrap extends Module { mc.player.connection.sendPacket(new CPacketPlayerDigging(CPacketPlayerDigging.Action.START_DESTROY_BLOCK, neighbour, opposite)); } + if (ModuleManager.getModuleByName("NoBreakAnimation").isEnabled()) { + ((NoBreakAnimation) ModuleManager.getModuleByName("NoBreakAnimation")).resetMining(); + } + return true; } diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/combat/Surround.java b/src/main/java/me/zeroeightsix/kami/module/modules/combat/Surround.java index beaabe1c5..ca6dd4c8b 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/combat/Surround.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/combat/Surround.java @@ -3,6 +3,7 @@ package me.zeroeightsix.kami.module.modules.combat; import me.zeroeightsix.kami.command.Command; import me.zeroeightsix.kami.module.Module; import me.zeroeightsix.kami.module.ModuleManager; +import me.zeroeightsix.kami.module.modules.player.NoBreakAnimation; import me.zeroeightsix.kami.setting.Setting; import me.zeroeightsix.kami.setting.Settings; import me.zeroeightsix.kami.util.BlockInteractionHelper; @@ -198,6 +199,9 @@ public class Surround extends Module { mc.player.connection.sendPacket(new CPacketAnimation(mc.player.getActiveHand())); placeBlockExecute(blockPos); } + if (ModuleManager.getModuleByName("NoBreakAnimation").isEnabled()) { + ((NoBreakAnimation) ModuleManager.getModuleByName("NoBreakAnimation")).resetMining(); + } } private int findObiInHotbar() { diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/player/NoBreakAnimation.java b/src/main/java/me/zeroeightsix/kami/module/modules/player/NoBreakAnimation.java index f664f6838..c8811e13d 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/player/NoBreakAnimation.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/player/NoBreakAnimation.java @@ -67,7 +67,7 @@ public class NoBreakAnimation extends Module { this.lastFacing = lastFacing; } - public void resetMining() { // TODO: call in autofeetplace and autotrap when they are merged + public void resetMining() { isMining = false; lastPos = null; lastFacing = null;