From 133ffafe8587fc0f77821efaab0279f2d1d7881d Mon Sep 17 00:00:00 2001 From: jackh Date: Mon, 7 Apr 2025 09:28:20 -0700 Subject: [PATCH] Latest release --- .../module/impl/combat/KillAura.java | 81 +++++++++++++------ .../module/impl/player/AntiVoid.java | 48 +++++++---- .../module/impl/player/Blink.java | 13 ++- .../module/impl/player/NoFall.java | 15 ++-- .../module/impl/player/Scaffold.java | 48 +++++++---- .../keystrokesmod/utility/ModuleUtils.java | 16 ++-- 6 files changed, 147 insertions(+), 74 deletions(-) diff --git a/src/main/java/keystrokesmod/module/impl/combat/KillAura.java b/src/main/java/keystrokesmod/module/impl/combat/KillAura.java index e4c4ca0..7b11b94 100644 --- a/src/main/java/keystrokesmod/module/impl/combat/KillAura.java +++ b/src/main/java/keystrokesmod/module/impl/combat/KillAura.java @@ -224,9 +224,6 @@ public class KillAura extends Module { if (disable && ++disableTicks >= 2) { disable = false; } - if (lastAttack > 0) { - --lastAttack; - } if (target == null || !manualBlock() && manualBlock.isToggled()) { if (ModuleUtils.swapTick == 0 && !ModuleUtils.isBlocked) { interactTicks = cycleCount2 = 1; @@ -490,6 +487,9 @@ public class KillAura extends Module { return; } handleTarget(); + if (lastAttack > 0) { + --lastAttack; + } if (target == null) { if (rotated) { resetYaw(e); @@ -840,7 +840,7 @@ public class KillAura extends Module { attackingEntity = target; if (!mc.thePlayer.isBlocking() || !disableWhileBlocking.isToggled()) { mc.playerController.attackEntity(mc.thePlayer, target); - lastAttack = (int) (switchDelay.getInput() / 50); + lastAttack = (int) switchDelay.getInput(); } } } @@ -1080,28 +1080,61 @@ public class KillAura extends Module { } break; case 7: // delay - if (interactTicks >= 2) { + if (interactTicks >= 3) { interactTicks = 0; } interactTicks++; - switch (interactTicks) { - case 1: - if (ModuleUtils.isBlocked) { - blinking.set(true); - setSwapSlot(); - swapped = true; - } - break; - case 2: - if (swapped) { - setCurrentSlot(); - swapped = false; - } - handleInteractAndAttack(distance, true, true, swung); - sendBlockPacket(); - releasePackets(); - blinking.set(false); - break; + if (firstCycle) { + switch (interactTicks) { + case 1: + if (ModuleUtils.isBlocked) { + blinking.set(true); + setSwapSlot(); + swapped = true; + } + break; + case 2: + if (swapped) { + setCurrentSlot(); + swapped = false; + } + handleInteractAndAttack(distance, true, true, swung); + sendBlockPacket(); + releasePackets(); // release + blinking.set(false); + interactTicks = 0; + ++cycleCount2; + if (cycleCount2 > 5) { + firstCycle = false; + cycleCount2 = 0; + } + break; + } + } + else { + switch (interactTicks) { + case 1: + if (ModuleUtils.isBlocked) { + blinking.set(true); + setSwapSlot(); + swapped = true; + } + break; + case 2: + if (swapped) { + setCurrentSlot(); + swapped = false; + } + handleInteractAndAttack(distance, true, true, swung); + sendBlockPacket(); + releasePackets(); // release + blinking.set(false); + break; + case 3: + firstCycle = true; + interactTicks = 0; + break; + } } break; } @@ -1423,7 +1456,7 @@ public class KillAura extends Module { } public void sendDigPacket() { - if (!Utils.holdingSword() || !ModuleUtils.isBlocked) { + if (!Utils.holdingSword() || !ModuleUtils.isBlocked || ModuleManager.scaffold.isEnabled) { return; } mc.thePlayer.sendQueue.addToSendQueue(new C07PacketPlayerDigging(C07PacketPlayerDigging.Action.RELEASE_USE_ITEM, BlockPos.ORIGIN, DOWN)); diff --git a/src/main/java/keystrokesmod/module/impl/player/AntiVoid.java b/src/main/java/keystrokesmod/module/impl/player/AntiVoid.java index 0e56980..018f4cc 100644 --- a/src/main/java/keystrokesmod/module/impl/player/AntiVoid.java +++ b/src/main/java/keystrokesmod/module/impl/player/AntiVoid.java @@ -35,12 +35,11 @@ import java.util.concurrent.ConcurrentLinkedQueue; public class AntiVoid extends Module { private static SliderSetting distance; private ButtonSetting renderTimer, disableLJ, disablePractice; - private ConcurrentLinkedQueue blinkedPackets = new ConcurrentLinkedQueue<>(); + public ConcurrentLinkedQueue blinkedPackets = new ConcurrentLinkedQueue<>(); private int color = new Color(0, 187, 255, 255).getRGB(); - private int blinkTicks; - public boolean started; - private boolean wait; - private double y; + public int blinkTicks; + public boolean started, wait; + public double y; public AntiVoid() { super("AntiVoid", category.player); this.registerSetting(distance = new SliderSetting("Distance", "", 5, 1, 10, 0.5)); @@ -72,6 +71,9 @@ public class AntiVoid extends Module { if (!started && (Utils.isReplay() || Utils.spectatorCheck() || Utils.isBedwarsPractice() && disablePractice.isToggled())) { return; } + if (mc.thePlayer.ticksExisted <= 10) { + return; + } if (packet.getClass().getSimpleName().startsWith("S")) { return; } @@ -86,6 +88,11 @@ public class AntiVoid extends Module { } if (!e.isCanceled()) { started = true; + + if (ModuleManager.blink.isEnabled()) { + return; + } + blinkedPackets.add(packet); e.setCanceled(true); } @@ -98,6 +105,7 @@ public class AntiVoid extends Module { @SubscribeEvent public void onPreUpdate(PreUpdateEvent e) { + if (!Utils.overVoid() || mc.thePlayer.onGround) { release(); } @@ -108,6 +116,10 @@ public class AntiVoid extends Module { else if (started) { ++blinkTicks; + if (ModuleManager.blink.isEnabled()) { + return; + } + if (mc.thePlayer.posY <= y - distance.getInput()) { posPacket(); release(); @@ -118,7 +130,7 @@ public class AntiVoid extends Module { @SubscribeEvent public void onRenderTick(TickEvent.RenderTickEvent ev) { - if (!Utils.nullCheck() || !renderTimer.isToggled() || blinkTicks == 0 || blinkTicks >= 99999) { + if (!Utils.nullCheck() || !renderTimer.isToggled() || blinkTicks == 0 || blinkTicks >= 99999 || ModuleManager.blink.isEnabled()) { return; } if (ev.phase == TickEvent.Phase.END) { @@ -135,15 +147,17 @@ public class AntiVoid extends Module { mc.fontRendererObj.drawString(text, display[0] / 2 - width + widthOffset, display[1] / 2 + 8, color, true); } - private void posPacket() { + public void posPacket() { PacketUtils.sendPacketNoEvent(new C03PacketPlayer.C06PacketPlayerPosLook(mc.thePlayer.posX, -0.55, mc.thePlayer.posZ, mc.thePlayer.rotationYaw, mc.thePlayer.rotationPitch, mc.thePlayer.onGround)); } - private void release() { - synchronized (blinkedPackets) { - for (Packet packet : blinkedPackets) { - Raven.packetsHandler.handlePacket(packet); - PacketUtils.sendPacketNoEvent(packet); + public void release() { + if (!ModuleManager.blink.isEnabled()) { + synchronized (blinkedPackets) { + for (Packet packet : blinkedPackets) { + Raven.packetsHandler.handlePacket(packet); + PacketUtils.sendPacketNoEvent(packet); + } } } blinkedPackets.clear(); @@ -152,13 +166,17 @@ public class AntiVoid extends Module { } public boolean dist() { - double minMotion = 0.06; - int dist1 = 2; - int dist2 = 5; + double minMotion = 0.08; + int dist1 = 4; + int dist2 = 6; int dist3 = 7; int dist4 = 9; // 1x1 + if (mc.thePlayer.isCollidedHorizontally) { + return false; + } + if (Utils.distanceToGround(mc.thePlayer, (int) mc.thePlayer.posX, (int) mc.thePlayer.posZ) > dist1) { return true; } diff --git a/src/main/java/keystrokesmod/module/impl/player/Blink.java b/src/main/java/keystrokesmod/module/impl/player/Blink.java index fe40935..6d4b2ef 100644 --- a/src/main/java/keystrokesmod/module/impl/player/Blink.java +++ b/src/main/java/keystrokesmod/module/impl/player/Blink.java @@ -74,6 +74,15 @@ public class Blink extends Module { } public void onDisable() { + if (ModuleManager.antiVoid.started) { + if (mc.thePlayer.posY <= ModuleManager.antiVoid.y - 3) { + ModuleManager.antiVoid.posPacket(); + } + ModuleManager.antiVoid.wait = true; + ModuleManager.antiVoid.started = false; + ModuleManager.antiVoid.blinkedPackets.clear(); + ModuleManager.antiVoid.blinkTicks = 0; + } synchronized (blinkedPackets) { for (Packet packet : blinkedPackets) { Raven.packetsHandler.handlePacket(packet); @@ -92,10 +101,6 @@ public class Blink extends Module { this.disable(); return; } - if (ModuleManager.antiVoid.started) { - disable(); - return; - } if (ModuleManager.killAura.isTargeting || ModuleManager.killAura.justUnTargeted) { return; } diff --git a/src/main/java/keystrokesmod/module/impl/player/NoFall.java b/src/main/java/keystrokesmod/module/impl/player/NoFall.java index 81ed88f..5052598 100644 --- a/src/main/java/keystrokesmod/module/impl/player/NoFall.java +++ b/src/main/java/keystrokesmod/module/impl/player/NoFall.java @@ -392,13 +392,16 @@ public class NoFall extends Module { public boolean dist() { - double minMotion = 0.06; - // 1x1 + double minMotion = 0.08; + int dist1 = 4; + int dist2 = 6; + int dist3 = 7; + int dist4 = 9; + //1x1 - int dist1 = 0; - int dist2 = 1; - int dist3 = 2; - int dist4 = 4; + if (mc.thePlayer.isCollidedHorizontally) { + return false; + } if (Utils.distanceToGround(mc.thePlayer, (int) mc.thePlayer.posX, (int) mc.thePlayer.posZ) > dist1) { return true; diff --git a/src/main/java/keystrokesmod/module/impl/player/Scaffold.java b/src/main/java/keystrokesmod/module/impl/player/Scaffold.java index b156d17..4400f64 100644 --- a/src/main/java/keystrokesmod/module/impl/player/Scaffold.java +++ b/src/main/java/keystrokesmod/module/impl/player/Scaffold.java @@ -55,7 +55,7 @@ public class Scaffold extends Module { private ButtonSetting prioritizeSprintWithSpeed; private String[] rotationModes = new String[] { "§cDisabled", "Simple", "Offset", "Precise" }; - private String[] fakeRotationModes = new String[] { "§cDisabled", "Strict", "Smooth", "Spin" }; + private String[] fakeRotationModes = new String[] { "§cDisabled", "None", "Strict", "Smooth", "Spin" }; private String[] sprintModes = new String[] { "§cDisabled", "Vanilla", "Float" }; private String[] fastScaffoldModes = new String[] { "§cDisabled", "Jump A", "Jump B", "Jump B Low", "Jump E", "Keep-Y", "Keep-Y Low" }; private String[] multiPlaceModes = new String[] { "§cDisabled", "1 extra", "2 extra", "3 extra", "4 extra" }; @@ -121,6 +121,7 @@ public class Scaffold extends Module { private int randomF, yawChanges, dynamic; private boolean getVTR; private float VTRY; + private float normalYaw, normalPitch; //fake rotations private float fakeYaw, fakePitch; private float fakeYaw1, fakeYaw2; @@ -200,6 +201,8 @@ public class Scaffold extends Module { if (!Utils.nullCheck()) { return; } + normalYaw = mc.thePlayer.rotationYaw; + normalPitch = mc.thePlayer.rotationPitch; if (!isEnabled) { return; } @@ -329,36 +332,44 @@ public class Scaffold extends Module { long strokeDelay = 250; + float first = 74.25F; + float sec = 79.25F; + if (quad <= 5 || quad >= 85) { - yawAngle = 125.625F; - minOffset = 11; + yawAngle = 123.625F; + minOffset = 9; + minPitch = first; } if (quad > 5 && quad <= 15 || quad >= 75 && quad < 85) { - yawAngle = 127.625F; - minOffset = 11; + yawAngle = 126.625F; + minOffset = 9; + minPitch = first; } if (quad > 15 && quad <= 25 || quad >= 65 && quad < 75) { - yawAngle = 129.625F; - minOffset = 9; + yawAngle = 128.625F; + minOffset = 8; + minPitch = first; } if (quad > 25 && quad <= 32 || quad >= 58 && quad < 65) { - yawAngle = 132.625F; + yawAngle = 131.425F; minOffset = 8; + minPitch = sec; } if (quad > 32 && quad <= 38 || quad >= 52 && quad < 58) { - yawAngle = 134.625F; + yawAngle = 133.825F; minOffset = 7; + minPitch = sec; } if (quad > 38 && quad <= 42 || quad >= 48 && quad < 52) { - yawAngle = 136.625F; + yawAngle = 136.825F; minOffset = 5; + minPitch = sec; } if (quad > 42 && quad <= 45 || quad >= 45 && quad < 48) { - yawAngle = 140F; + yawAngle = 140.325F; minOffset = 4; - + minPitch = sec; } - minPitch = 80.25F; //Utils.print("" + minOffset); //float offsetAmountD = ((((float) offsetAmount.getInput() / 10) - 10) * -2) - (((float) offsetAmount.getInput() / 10) - 10); //yawAngle += offsetAmountD; @@ -380,7 +391,7 @@ public class Scaffold extends Module { if (firstStroke > 0 && (System.currentTimeMillis() - firstStroke) > strokeDelay) { firstStroke = 0; } - if (enabledOffGround && Utils.distanceToGround(mc.thePlayer) > 2) { + if (enabledOffGround && Utils.fallDist() > 2) { if (blockRotations != null) { yaw = blockRotations[0]; pitch = blockRotations[1]; @@ -399,7 +410,7 @@ public class Scaffold extends Module { blockYaw = blockRotations[0]; pitch = blockRotations[1]; yawOffset = blockYawOffset; - if (pitch < minPitch && ModuleManager.tower.activeTicks <= 3) { + if (pitch < minPitch) { pitch = minPitch; } } else { @@ -598,6 +609,9 @@ public class Scaffold extends Module { //Fake rotations if (fakeRotation.getInput() > 0) { if (fakeRotation.getInput() == 1) { + RotationUtils.setFakeRotations(normalYaw, normalPitch); + } + else if (fakeRotation.getInput() == 2) { fakeYaw = fakeYaw1; if (blockRotations != null) { fakePitch = blockRotations[1] + 5; @@ -605,7 +619,7 @@ public class Scaffold extends Module { fakePitch = 80f; } } - else if (fakeRotation.getInput() == 2) { + else if (fakeRotation.getInput() == 3) { fakeYaw2 = mc.thePlayer.rotationYaw - hardcodedYaw(); float yawDifference = getAngleDifference(lastEdge2, fakeYaw2); float smoothingFactor = (1.0f - (65.0f / 100.0f)); @@ -619,7 +633,7 @@ public class Scaffold extends Module { fakePitch = 80f; } } - else if (fakeRotation.getInput() == 3) { + else if (fakeRotation.getInput() == 4) { fakeYaw += 25.71428571428571F; fakePitch = 90F; } diff --git a/src/main/java/keystrokesmod/utility/ModuleUtils.java b/src/main/java/keystrokesmod/utility/ModuleUtils.java index 37c9320..bcb46cc 100644 --- a/src/main/java/keystrokesmod/utility/ModuleUtils.java +++ b/src/main/java/keystrokesmod/utility/ModuleUtils.java @@ -6,10 +6,7 @@ import keystrokesmod.module.impl.movement.Bhop; import keystrokesmod.module.impl.movement.LongJump; import keystrokesmod.module.impl.render.HUD; import keystrokesmod.utility.command.CommandManager; -import net.minecraft.block.Block; -import net.minecraft.block.BlockAir; -import net.minecraft.block.BlockSlab; -import net.minecraft.block.BlockSnow; +import net.minecraft.block.*; import net.minecraft.client.Minecraft; import keystrokesmod.module.ModuleManager; import net.minecraft.client.settings.KeyBinding; @@ -138,6 +135,9 @@ public class ModuleUtils { if (!Utils.nullCheck()) { return; } + if (e.isCanceled()) { + return; + } if (e.getPacket() instanceof S27PacketExplosion) { firstDamage = false; @@ -366,7 +366,7 @@ public class ModuleUtils { } break; case 3: // 8 tick - if (!ModuleManager.bhop.isNormalPos) { + if (!ModuleManager.bhop.isNormalPos || (block instanceof BlockStairs)) { resetLowhop(); break; } @@ -381,13 +381,13 @@ public class ModuleUtils { if (inAirTicks == 3) { mc.thePlayer.motionY = 0.08842400075912; } - if (inAirTicks == 4 && g1) { + if (inAirTicks == 4) { mc.thePlayer.motionY = -0.19174457909538; } - if (inAirTicks == 5 && g1) { + if (inAirTicks == 5) { mc.thePlayer.motionY = -0.26630949469659; } - if (inAirTicks == 6 && g1) { + if (inAirTicks == 6) { mc.thePlayer.motionY = -0.26438340940798; } if (inAirTicks == 7 && g1) {