diff --git a/.gradle/8.8/executionHistory/executionHistory.bin b/.gradle/8.8/executionHistory/executionHistory.bin index 7f04cc1..f343db5 100644 Binary files a/.gradle/8.8/executionHistory/executionHistory.bin and b/.gradle/8.8/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.8/executionHistory/executionHistory.lock b/.gradle/8.8/executionHistory/executionHistory.lock index 284b108..b6f671e 100644 Binary files a/.gradle/8.8/executionHistory/executionHistory.lock and b/.gradle/8.8/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.8/fileHashes/fileHashes.bin b/.gradle/8.8/fileHashes/fileHashes.bin index 9526806..958f57a 100644 Binary files a/.gradle/8.8/fileHashes/fileHashes.bin and b/.gradle/8.8/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.8/fileHashes/fileHashes.lock b/.gradle/8.8/fileHashes/fileHashes.lock index f99b2f0..0ed8dab 100644 Binary files a/.gradle/8.8/fileHashes/fileHashes.lock and b/.gradle/8.8/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.8/fileHashes/resourceHashesCache.bin b/.gradle/8.8/fileHashes/resourceHashesCache.bin index 3212fa7..2773b2b 100644 Binary files a/.gradle/8.8/fileHashes/resourceHashesCache.bin and b/.gradle/8.8/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index ee28ada..94aed47 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index e06fabe..8d8bdeb 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b4497ad..a9e85b0 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,7 +5,6 @@ - @@ -14,35 +13,13 @@ - - - - - - - - + - - - - - - - - - - - + - - - - - diff --git a/build/classes/java/main/keystrokesmod/module/impl/player/AntiAFK.class b/build/classes/java/main/keystrokesmod/module/impl/player/AntiAFK.class index a3bbcad..fb1a35c 100644 Binary files a/build/classes/java/main/keystrokesmod/module/impl/player/AntiAFK.class and b/build/classes/java/main/keystrokesmod/module/impl/player/AntiAFK.class differ diff --git a/build/classes/java/main/keystrokesmod/module/impl/player/Scaffold.class b/build/classes/java/main/keystrokesmod/module/impl/player/Scaffold.class index 7e7daf4..39c6dc8 100644 Binary files a/build/classes/java/main/keystrokesmod/module/impl/player/Scaffold.class and b/build/classes/java/main/keystrokesmod/module/impl/player/Scaffold.class differ diff --git a/build/classes/java/main/keystrokesmod/utility/ModuleUtils.class b/build/classes/java/main/keystrokesmod/utility/ModuleUtils.class index f21b588..8d72bfb 100644 Binary files a/build/classes/java/main/keystrokesmod/utility/ModuleUtils.class and b/build/classes/java/main/keystrokesmod/utility/ModuleUtils.class differ diff --git a/build/intermediates/raven-bS-13-non-obfuscated-with-deps.jar b/build/intermediates/raven-bS-13-non-obfuscated-with-deps.jar index 9d6c1bd..9bd1d6b 100644 Binary files a/build/intermediates/raven-bS-13-non-obfuscated-with-deps.jar and b/build/intermediates/raven-bS-13-non-obfuscated-with-deps.jar differ diff --git a/build/intermediates/raven-bS-13-without-deps.jar b/build/intermediates/raven-bS-13-without-deps.jar index 8bf61bd..d4497af 100644 Binary files a/build/intermediates/raven-bS-13-without-deps.jar and b/build/intermediates/raven-bS-13-without-deps.jar differ diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index dcdb685..e3f1c2e 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/src/main/java/keystrokesmod/module/impl/player/AntiAFK.java b/src/main/java/keystrokesmod/module/impl/player/AntiAFK.java index 5d6966d..1e41271 100644 --- a/src/main/java/keystrokesmod/module/impl/player/AntiAFK.java +++ b/src/main/java/keystrokesmod/module/impl/player/AntiAFK.java @@ -1,5 +1,6 @@ package keystrokesmod.module.impl.player; +import keystrokesmod.event.PreUpdateEvent; import keystrokesmod.mixin.impl.accessor.IAccessorMinecraft; import keystrokesmod.module.Module; import keystrokesmod.module.setting.impl.ButtonSetting; @@ -8,6 +9,7 @@ import keystrokesmod.utility.RotationUtils; import keystrokesmod.utility.Utils; import net.minecraft.client.gui.GuiChat; import net.minecraft.client.settings.KeyBinding; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class AntiAFK extends Module { private SliderSetting afk; @@ -20,9 +22,9 @@ public class AntiAFK extends Module { private ButtonSetting randomizePitch; private SliderSetting minDelay; private SliderSetting maxDelay; - private String[] afkModes = new String[]{"None", "Wander", "Lateral shuffle", "Forward", "Backward"}; + private String[] afkModes = new String[]{"None", "Wander", "Lateral shuffle", "Forward", "Backward", "Lobby"}; private String[] spinModes = new String[]{"None", "Random", "Right", "Left"}; - private int ticks; + private int ticks, afkTicks; private boolean c; public boolean stop = false; public AntiAFK() { @@ -44,6 +46,16 @@ public class AntiAFK extends Module { this.c = Utils.getRandom().nextBoolean(); } + @SubscribeEvent + public void onPreUpdate(PreUpdateEvent e) { + if (!Utils.isMoving()) { + ++afkTicks; + } + else { + afkTicks = 0; + } + } + public void onUpdate() { if (stop) { return; @@ -76,6 +88,16 @@ public class AntiAFK extends Module { KeyBinding.setKeyBindState(mc.gameSettings.keyBindBack.getKeyCode(), true); break; } + case 5: { + if (afkTicks >= 1000) { + mc.thePlayer.capabilities.isFlying = false; + if (mc.thePlayer.onGround) { + mc.thePlayer.jump(); + } + afkTicks = 0; + } + break; + } } switch ((int) spin.getInput()) { case 1: { diff --git a/src/main/java/keystrokesmod/module/impl/player/Scaffold.java b/src/main/java/keystrokesmod/module/impl/player/Scaffold.java index db59260..5a1cce1 100644 --- a/src/main/java/keystrokesmod/module/impl/player/Scaffold.java +++ b/src/main/java/keystrokesmod/module/impl/player/Scaffold.java @@ -486,7 +486,10 @@ public class Scaffold extends Module { if (firstStroke > 0 && (System.currentTimeMillis() - firstStroke) > strokeDelay) { firstStroke = 0; } - if (enabledOffGround && Utils.fallDist() > 2) { + if (Utils.fallDist() <= 2 && Utils.getHorizontalSpeed() > 0.1) { + enabledOffGround = false; + } + if (enabledOffGround) { if (blockRotations != null) { yaw = blockRotations[0]; pitch = blockRotations[1]; @@ -497,9 +500,6 @@ public class Scaffold extends Module { e.setRotations(yaw, pitch); break; } - else { - enabledOffGround = false; - } if (blockRotations != null) { blockYaw = blockRotations[0]; diff --git a/src/main/java/keystrokesmod/utility/ModuleUtils.java b/src/main/java/keystrokesmod/utility/ModuleUtils.java index 944d083..f4a1589 100644 --- a/src/main/java/keystrokesmod/utility/ModuleUtils.java +++ b/src/main/java/keystrokesmod/utility/ModuleUtils.java @@ -50,6 +50,7 @@ public class ModuleUtils { public static boolean lastTickOnGround, lastTickPos1, lastYDif; private boolean thisTickOnGround, thisTickPos1; public static boolean firstDamage; + private int ft; public static boolean isBlocked; @@ -187,13 +188,14 @@ public class ModuleUtils { public void onPreUpdate(PreUpdateEvent e) { if (bhopBoostConditions()) { - if (firstDamage) { + if (firstDamage && ++ft >= 2) { Utils.setSpeed(Utils.getHorizontalSpeed()); firstDamage = false; + ft = 0; } } if (veloBoostConditions()) { - if (firstDamage) { + if (firstDamage && ++ft >= 2) { double added = 0; if (Utils.getHorizontalSpeed() <= Velocity.minExtraSpeed.getInput()) { added = Velocity.extraSpeedBoost.getInput() / 100; @@ -203,6 +205,7 @@ public class ModuleUtils { } Utils.setSpeed((Utils.getHorizontalSpeed() * (Velocity.reverseHorizontal.getInput() / 100)) * (1 + added)); firstDamage = false; + ft = 0; } }