diff --git a/.gradle/8.8/checksums/checksums.lock b/.gradle/8.8/checksums/checksums.lock index 4788df3..2935ded 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 bd59c39..abcdb4b 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 1b5aba3..5eedf0e 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 55f933b..0e8752a 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 8fd5e79..1bf23de 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 3a2f5e6..ea36f15 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 62dc5a9..659a62c 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 6f3c95b..b28f1c8 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 ec334a7..052f997 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,529 +5,22 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/classes/java/main/keystrokesmod/module/impl/player/BedAura.class b/build/classes/java/main/keystrokesmod/module/impl/player/BedAura.class index b847d22..139538a 100644 Binary files a/build/classes/java/main/keystrokesmod/module/impl/player/BedAura.class and b/build/classes/java/main/keystrokesmod/module/impl/player/BedAura.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 c0e9df9..541a826 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/intermediates/raven-bS-13-non-obfuscated-with-deps.jar b/build/intermediates/raven-bS-13-non-obfuscated-with-deps.jar index 3b96c30..74bfb1f 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 c8f6325..b672a70 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 a539b53..99fc579 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/BedAura.java b/src/main/java/keystrokesmod/module/impl/player/BedAura.java index 31f6b46..04f5078 100644 --- a/src/main/java/keystrokesmod/module/impl/player/BedAura.java +++ b/src/main/java/keystrokesmod/module/impl/player/BedAura.java @@ -42,7 +42,6 @@ public class BedAura extends Module { private ButtonSetting cancelKnockback; private ButtonSetting disableBreakEffects; public ButtonSetting groundSpoof; - public ButtonSetting ignoreSlow; private ButtonSetting onlyWhileVisible; private ButtonSetting renderOutline; private ButtonSetting sendAnimations; @@ -65,7 +64,7 @@ public class BedAura extends Module { private BlockPos previousBlockBroken; private BlockPos rotateLastBlock; private boolean spoofGround, firstStop; - private boolean isBreaking, startPacket, stopPacket; + private boolean isBreaking, startPacket, stopPacket, ignoreSlow; public BedAura() { super("BedAura", category.player, 0); @@ -79,7 +78,6 @@ public class BedAura extends Module { this.registerSetting(cancelKnockback = new ButtonSetting("Cancel knockback", false)); this.registerSetting(disableBreakEffects = new ButtonSetting("Disable break effects", false)); this.registerSetting(groundSpoof = new ButtonSetting("Ground spoof", false)); - this.registerSetting(ignoreSlow = new ButtonSetting("Ignore slow", false)); this.registerSetting(onlyWhileVisible = new ButtonSetting("Only while visible", false)); this.registerSetting(renderOutline = new ButtonSetting("Render block outline", true)); this.registerSetting(sendAnimations = new ButtonSetting("Send animations", false)); @@ -176,13 +174,6 @@ public class BedAura extends Module { @SubscribeEvent public void onPreMotion(PreMotionEvent e) { - if (groundSpoof.isToggled() && !mc.thePlayer.isInWater() && spoofGround) { - e.setOnGround(true); - if (Raven.debug) { - Utils.sendModuleMessage(this, "&7ground spoof (&3" + mc.thePlayer.ticksExisted + "&7)."); - } - } - spoofGround = false; if (startPacket) { mc.thePlayer.sendQueue.addToSendQueue(new C07PacketPlayerDigging(C07PacketPlayerDigging.Action.START_DESTROY_BLOCK, packetPos, EnumFacing.UP)); @@ -199,7 +190,14 @@ public class BedAura extends Module { } } - startPacket = stopPacket = false; + if (groundSpoof.isToggled() && !mc.thePlayer.isInWater() && spoofGround) { + e.setOnGround(true); + if (Raven.debug) { + Utils.sendModuleMessage(this, "&7ground spoof (&3" + mc.thePlayer.ticksExisted + "&7)."); + } + } + + startPacket = stopPacket = spoofGround = false; } @SubscribeEvent(priority = EventPriority.HIGHEST) @@ -332,7 +330,7 @@ public class BedAura extends Module { private double getEfficiency(BlockPos pos) { Block block = BlockUtils.getBlock(pos); ItemStack tool = (mode.getInput() == 2 && Utils.getTool(block) != -1) ? mc.thePlayer.inventory.getStackInSlot(Utils.getTool(block)) : mc.thePlayer.getHeldItem(); - double efficiency = BlockUtils.getBlockHardness(block, tool, false, ignoreSlow.isToggled() || groundSpoof.isToggled()); + double efficiency = BlockUtils.getBlockHardness(block, tool, false, ignoreSlow); if (breakProgressMap.get(pos) != null) { efficiency = breakProgressMap.get(pos); @@ -363,6 +361,7 @@ public class BedAura extends Module { breakTick = false; currentBlock = null; bedPos = null; + ignoreSlow = false; } public void setPacketSlot(int slot) { @@ -380,7 +379,10 @@ public class BedAura extends Module { stopAutoblock = true; isBreaking = true; breakTick = true; - spoofGround = true; + if (mc.thePlayer.motionY > -0.5) { + ignoreSlow = true; + spoofGround = true; + } } private void stopBreak(ClientRotationEvent e, BlockPos blockPos) { @@ -390,7 +392,10 @@ public class BedAura extends Module { stopAutoblock = true; isBreaking = false; breakTick = true; - spoofGround = true; + if (ignoreSlow) { + spoofGround = true; + } + ignoreSlow = false; } private void swing() { @@ -466,7 +471,7 @@ public class BedAura extends Module { } } - double progress = vanillaProgress = (float) (BlockUtils.getBlockHardness(block, (mode.getInput() == 2 && Utils.getTool(block) != -1) ? mc.thePlayer.inventory.getStackInSlot(Utils.getTool(block)) : mc.thePlayer.getHeldItem(), false, ignoreSlow.isToggled() || groundSpoof.isToggled()) * breakSpeed.getInput()); + double progress = vanillaProgress = (float) (BlockUtils.getBlockHardness(block, (mode.getInput() == 2 && Utils.getTool(block) != -1) ? mc.thePlayer.inventory.getStackInSlot(Utils.getTool(block)) : mc.thePlayer.getHeldItem(), false, ignoreSlow) * breakSpeed.getInput()); if (lastProgress != 0 && breakProgress >= lastProgress - vanillaProgress) { if (mode.getInput() == 2 && ModuleManager.killAura.autoBlockOverride()) { if (Raven.debug) { diff --git a/src/main/java/keystrokesmod/module/impl/player/Scaffold.java b/src/main/java/keystrokesmod/module/impl/player/Scaffold.java index 705cc66..d5ee098 100644 --- a/src/main/java/keystrokesmod/module/impl/player/Scaffold.java +++ b/src/main/java/keystrokesmod/module/impl/player/Scaffold.java @@ -408,8 +408,8 @@ public class Scaffold extends Module { long strokeDelay = 250; - float first = 74.5F; - float sec = 78.5F; + float first = 73.5F; + float sec = 77.5F; if (quad <= 5 || quad >= 85) { yawAngle = 124.425F;