diff --git a/.gradle/8.8/checksums/checksums.lock b/.gradle/8.8/checksums/checksums.lock index 56a5a06..5c78718 100644 Binary files a/.gradle/8.8/checksums/checksums.lock and b/.gradle/8.8/checksums/checksums.lock differ diff --git a/.gradle/8.8/executionHistory/executionHistory.bin b/.gradle/8.8/executionHistory/executionHistory.bin index f343db5..32685f8 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 b6f671e..cbc62da 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 958f57a..fcced11 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 0ed8dab..aba5571 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 2773b2b..1d15fc8 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 94aed47..559d3bb 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 8d8bdeb..7729496 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 a9e85b0..a631b6b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,6 +5,7 @@ + @@ -13,13 +14,22 @@ - + + + + + + - + + + + + diff --git a/build/classes/java/main/keystrokesmod/mixin/impl/entity/MixinEntityPlayerSP.class b/build/classes/java/main/keystrokesmod/mixin/impl/entity/MixinEntityPlayerSP.class index 22ffdf8..a4494d7 100644 Binary files a/build/classes/java/main/keystrokesmod/mixin/impl/entity/MixinEntityPlayerSP.class and b/build/classes/java/main/keystrokesmod/mixin/impl/entity/MixinEntityPlayerSP.class differ diff --git a/build/classes/java/main/keystrokesmod/module/impl/combat/KillAura$KillAuraTarget.class b/build/classes/java/main/keystrokesmod/module/impl/combat/KillAura$KillAuraTarget.class index ef50670..68917a4 100644 Binary files a/build/classes/java/main/keystrokesmod/module/impl/combat/KillAura$KillAuraTarget.class and b/build/classes/java/main/keystrokesmod/module/impl/combat/KillAura$KillAuraTarget.class differ diff --git a/build/classes/java/main/keystrokesmod/module/impl/combat/KillAura.class b/build/classes/java/main/keystrokesmod/module/impl/combat/KillAura.class index 95d7785..a966733 100644 Binary files a/build/classes/java/main/keystrokesmod/module/impl/combat/KillAura.class and b/build/classes/java/main/keystrokesmod/module/impl/combat/KillAura.class differ diff --git a/build/classes/java/main/keystrokesmod/module/impl/movement/NoSlow.class b/build/classes/java/main/keystrokesmod/module/impl/movement/NoSlow.class index abb3ed7..5aa47cb 100644 Binary files a/build/classes/java/main/keystrokesmod/module/impl/movement/NoSlow.class and b/build/classes/java/main/keystrokesmod/module/impl/movement/NoSlow.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 39c6dc8..f6d1144 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 8d72bfb..2f79814 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/classes/java/main/keystrokesmod/utility/Utils.class b/build/classes/java/main/keystrokesmod/utility/Utils.class index 661829a..7a17a39 100644 Binary files a/build/classes/java/main/keystrokesmod/utility/Utils.class and b/build/classes/java/main/keystrokesmod/utility/Utils.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 9bd1d6b..4601dc6 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 d4497af..9d2583a 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 e3f1c2e..cbd7c8c 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/mixin/impl/entity/MixinEntityPlayerSP.java b/src/main/java/keystrokesmod/mixin/impl/entity/MixinEntityPlayerSP.java index be27e43..f30e7f4 100644 --- a/src/main/java/keystrokesmod/mixin/impl/entity/MixinEntityPlayerSP.java +++ b/src/main/java/keystrokesmod/mixin/impl/entity/MixinEntityPlayerSP.java @@ -285,7 +285,7 @@ public abstract class MixinEntityPlayerSP extends AbstractClientPlayer { this.setSprinting(true); } - if (this.isSprinting() && (!ModuleManager.sprint.omniSprint() && !ModuleManager.scaffold.sprint() && (this.movementInput.moveForward < f || !flag3)) || this.isCollidedHorizontally || ModuleManager.sprint.disableBackwards() || ModuleUtils.setSlow || (this.movementInput.moveForward == 0 && this.movementInput.moveStrafe == 0) || this.mc.gameSettings.keyBindSneak.isKeyDown() || (ModuleManager.scaffold != null && ModuleManager.scaffold.isEnabled && !ModuleManager.scaffold.sprint()) || (ModuleManager.wTap.isEnabled() && WTap.stopSprint) || ModuleManager.sprint.isEnabled() && ModuleManager.sprint.omniDirectional.getInput() > 0 && !ModuleManager.sprint.omniSprint()) { + if (this.isSprinting() && (!ModuleManager.sprint.omniSprint() && !ModuleManager.scaffold.sprint() && (this.movementInput.moveForward < f || !flag3)) || this.isCollidedHorizontally || ModuleManager.sprint.disableBackwards() || ModuleUtils.setSlow || ModuleManager.noSlow != null && NoSlow.disableSprintInAir.isToggled() && ModuleManager.noSlow.fn && !mc.thePlayer.onGround || (this.movementInput.moveForward == 0 && this.movementInput.moveStrafe == 0) || this.mc.gameSettings.keyBindSneak.isKeyDown() || (ModuleManager.scaffold != null && ModuleManager.scaffold.isEnabled && !ModuleManager.scaffold.sprint()) || (ModuleManager.wTap.isEnabled() && WTap.stopSprint) || ModuleManager.sprint.isEnabled() && ModuleManager.sprint.omniDirectional.getInput() > 0 && !ModuleManager.sprint.omniSprint()) { this.setSprinting(false); WTap.stopSprint = false; } diff --git a/src/main/java/keystrokesmod/module/impl/combat/KillAura.java b/src/main/java/keystrokesmod/module/impl/combat/KillAura.java index 40e7994..0ce7466 100644 --- a/src/main/java/keystrokesmod/module/impl/combat/KillAura.java +++ b/src/main/java/keystrokesmod/module/impl/combat/KillAura.java @@ -117,6 +117,8 @@ public class KillAura extends Module { public static boolean blinkOn, blinkChecked; public boolean targeting, rotating; private int cycle; + public int sAttacked; + private int lastSet; public ConcurrentLinkedQueue> delayedKnockBackPackets = new ConcurrentLinkedQueue<>(); @@ -167,6 +169,7 @@ public class KillAura extends Module { public void onDisable() { handleBlocking(false); hitMap.clear(); + lastSet = 0; if (blinkAutoBlock()) { // interact autoblock resetBlinkState(true); } @@ -180,6 +183,7 @@ public class KillAura extends Module { swapped = false; partialTicks = 0; delayTicks = 0; + sAttacked = 0; } @SubscribeEvent(priority = EventPriority.LOWEST) @@ -536,6 +540,7 @@ public class KillAura extends Module { public void onWorldJoin(EntityJoinWorldEvent e) { if (e.entity == mc.thePlayer) { hitMap.clear(); + lastSet = 0; hostileMobs.clear(); golems.clear(); } @@ -561,9 +566,11 @@ public class KillAura extends Module { } target = null; attackingEntity = null; + sAttacked = 0; } else { target = (EntityLivingBase) entity; + sAttacked++; } } @@ -663,8 +670,13 @@ public class KillAura extends Module { } if (!attackTargets.isEmpty()) { + + if (sAttacked == 0) { + ++lastSet; + } + // Switch aura - int ticksExisted = mc.thePlayer.ticksExisted; + int ticksExisted = lastSet; int switchDelayTicks = (int) (switchDelay.getInput() / 50); long noHitTicks = (long) Math.min(attackTargets.size(), targets.getInput()) * switchDelayTicks; for (KillAuraTarget auraTarget : attackTargets) { @@ -681,7 +693,7 @@ public class KillAura extends Module { for (KillAuraTarget auraTarget : attackTargets) { Integer firstHit = hitMap.get(auraTarget.entityId); if (firstHit == null || ticksExisted >= firstHit + noHitTicks) { - hitMap.put(auraTarget.entityId, ticksExisted); + hitMap.put(auraTarget.entityId, lastSet); setTarget(mc.theWorld.getEntityByID(auraTarget.entityId)); return; } @@ -715,6 +727,7 @@ public class KillAura extends Module { } if (!mc.thePlayer.isBlocking() || !disableWhileBlocking.isToggled()) { mc.playerController.attackEntity(mc.thePlayer, target); + sAttacked = 0; } } } diff --git a/src/main/java/keystrokesmod/module/impl/movement/NoSlow.java b/src/main/java/keystrokesmod/module/impl/movement/NoSlow.java index 83b74ad..ab87dbc 100644 --- a/src/main/java/keystrokesmod/module/impl/movement/NoSlow.java +++ b/src/main/java/keystrokesmod/module/impl/movement/NoSlow.java @@ -37,6 +37,7 @@ public class NoSlow extends Module { public static ButtonSetting disableBow; public static ButtonSetting disablePotions; public static ButtonSetting swordOnly; + public static ButtonSetting disableSprintInAir; private ButtonSetting renderTimer; private String[] swordMode = new String[] { "Vanilla", "Item mode", "Fake" }; @@ -58,6 +59,7 @@ public class NoSlow extends Module { private static boolean fix; private boolean didC; private boolean jumped, setCancelled; + public boolean fn; public NoSlow() { super("NoSlow", category.movement, 0); @@ -71,6 +73,7 @@ public class NoSlow extends Module { this.registerSetting(disableBow = new ButtonSetting("Disable bow", false)); this.registerSetting(disablePotions = new ButtonSetting("Disable potions", false)); this.registerSetting(swordOnly = new ButtonSetting("Sword only", false)); + this.registerSetting(disableSprintInAir = new ButtonSetting("Disable sprint in air", false)); } public void guiUpdate() { @@ -88,6 +91,7 @@ public class NoSlow extends Module { bl = false; } release(); + fn = false; } public void onUpdate() { @@ -163,6 +167,7 @@ public class NoSlow extends Module { @SubscribeEvent public void onPreMotion(PreMotionEvent e) { + fn = false; if (sword.getInput() == 2 && !ModuleManager.killAura.blockingClient) { if (Utils.holdingSword() && Utils.tabbedIn() && Mouse.isButtonDown(1)) { ReflectionUtils.setItemInUse(true); @@ -195,6 +200,7 @@ public class NoSlow extends Module { canFloat = true; } else if (canFloat && canFloat() && !requireJump && (!jumped || ++offsetDelay > 1)) { + fn = true; if (!mc.thePlayer.onGround) { if (mc.thePlayer.motionY < -0.0784000015258789 && !(mc.thePlayer.posY % 1 == 0)) { e.setPosY(e.getPosY() + 1e-3); diff --git a/src/main/java/keystrokesmod/module/impl/player/Scaffold.java b/src/main/java/keystrokesmod/module/impl/player/Scaffold.java index 5a1cce1..9ffa422 100644 --- a/src/main/java/keystrokesmod/module/impl/player/Scaffold.java +++ b/src/main/java/keystrokesmod/module/impl/player/Scaffold.java @@ -419,37 +419,37 @@ public class Scaffold extends Module { float sec = 77.5F; if (quad <= 5 || quad >= 85) { - yawAngle = 124.425F; + yawAngle = 123.425F; minOffset = 11; minPitch = first; } if (quad > 5 && quad <= 15 || quad >= 75 && quad < 85) { - yawAngle = 126.825F; + yawAngle = 125.825F; minOffset = 9; minPitch = first; } if (quad > 15 && quad <= 25 || quad >= 65 && quad < 75) { - yawAngle = 129.625F; + yawAngle = 128.625F; minOffset = 8; minPitch = first; } if (quad > 25 && quad <= 32 || quad >= 58 && quad < 65) { - yawAngle = 132.625F; + yawAngle = 131.625F; minOffset = 7; minPitch = sec; } if (quad > 32 && quad <= 38 || quad >= 52 && quad < 58) { - yawAngle = 134.825F; + yawAngle = 133.825F; minOffset = 6; minPitch = sec; } if (quad > 38 && quad <= 42 || quad >= 48 && quad < 52) { - yawAngle = 136.825F; + yawAngle = 135.825F; minOffset = 4; minPitch = sec; } if (quad > 42 && quad <= 45 || quad >= 45 && quad < 48) { - yawAngle = 139.125F; + yawAngle = 138.125F; minOffset = 3; minPitch = sec; } @@ -1239,7 +1239,7 @@ public class Scaffold extends Module { } private void handleMotion() { - if (handleFastScaffolds() > 0 || ModuleManager.tower.canTower() || motion.getInput() == 100) { + if (usingFastScaffold() || usingFloat() || ModuleManager.tower.canTower() || motion.getInput() == 100 || !mc.thePlayer.onGround) { return; } double input = (motion.getInput() / 100); diff --git a/src/main/java/keystrokesmod/utility/ModuleUtils.java b/src/main/java/keystrokesmod/utility/ModuleUtils.java index f4a1589..509ca8c 100644 --- a/src/main/java/keystrokesmod/utility/ModuleUtils.java +++ b/src/main/java/keystrokesmod/utility/ModuleUtils.java @@ -1,6 +1,7 @@ package keystrokesmod.utility; import keystrokesmod.event.*; +import keystrokesmod.module.Module; import keystrokesmod.module.impl.combat.Velocity; import keystrokesmod.module.impl.movement.Bhop; import keystrokesmod.module.impl.movement.LongJump; diff --git a/src/main/java/keystrokesmod/utility/Utils.java b/src/main/java/keystrokesmod/utility/Utils.java index da03281..635355f 100644 --- a/src/main/java/keystrokesmod/utility/Utils.java +++ b/src/main/java/keystrokesmod/utility/Utils.java @@ -1204,7 +1204,7 @@ public class Utils { } public static boolean isMining() { - return Mouse.isButtonDown(0) && mc.objectMouseOver != null && mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && mc.objectMouseOver.getBlockPos() != null; + return tabbedIn() && Mouse.isButtonDown(0) && mc.objectMouseOver != null && mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && mc.objectMouseOver.getBlockPos() != null; } public static float ae(float n, float n2, float n3) {