B1.1.0

- [+] TargetStrafe - Strafes around the target. - [+] Blink mode for InvMove - [+] Module enable/disable sound. - [+] Fast option for Scaffold - [+] Alan34 mode for NoFall - [※] KillAura - fix sometimes fails to attack. - [※] fix HUD issue - [※] fix MultiPlayer issue +2 unverified changes.
xia-mc · Jun 8, 2024 · 537fce6 · 537fce6
1 parent bc14393
commit 537fce6
Show file tree

Hide file tree

Showing 43 changed files with 774 additions and 150 deletions.
diff --git a/src/main/java/keystrokesmod/clickgui/components/impl/CategoryComponent.java b/src/main/java/keystrokesmod/clickgui/components/impl/CategoryComponent.java
@@ -4,7 +4,7 @@
 import keystrokesmod.clickgui.components.Component;
 import keystrokesmod.module.Module;
 import keystrokesmod.module.impl.client.Gui;
-import keystrokesmod.utility.RenderUtils;
+import keystrokesmod.utility.render.RenderUtils;
 import keystrokesmod.utility.Timer;
 import keystrokesmod.utility.Utils;
 import keystrokesmod.utility.profile.Manager;

diff --git a/src/main/java/keystrokesmod/clickgui/components/impl/ModuleComponent.java b/src/main/java/keystrokesmod/clickgui/components/impl/ModuleComponent.java
@@ -7,7 +7,7 @@
 import keystrokesmod.module.setting.impl.ButtonSetting;
 import keystrokesmod.module.setting.impl.DescriptionSetting;
 import keystrokesmod.module.setting.impl.SliderSetting;
-import keystrokesmod.utility.RenderUtils;
+import keystrokesmod.utility.render.RenderUtils;
 import keystrokesmod.utility.profile.Manager;
 import keystrokesmod.utility.profile.ProfileModule;
 import net.minecraft.client.Minecraft;

diff --git a/src/main/java/keystrokesmod/mixins/impl/client/KeyBindingAccessor.java b/src/main/java/keystrokesmod/mixins/impl/client/KeyBindingAccessor.java
@@ -0,0 +1,11 @@
+package keystrokesmod.mixins.impl.client;
+
+import net.minecraft.client.settings.KeyBinding;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(KeyBinding.class)
+public interface KeyBindingAccessor {
+    @Accessor
+    void setPressed(boolean pressed);
+}
diff --git a/src/main/java/keystrokesmod/mixins/impl/network/MixinNetworkManager.java b/src/main/java/keystrokesmod/mixins/impl/network/MixinNetworkManager.java
@@ -1,20 +1,26 @@
 package keystrokesmod.mixins.impl.network;
 
 import io.netty.channel.ChannelHandlerContext;
+import keystrokesmod.Raven;
 import keystrokesmod.event.ReceivePacketEvent;
 import keystrokesmod.event.SendPacketEvent;
 import keystrokesmod.utility.PacketUtils;
 import net.minecraft.network.NetworkManager;
 import net.minecraft.network.Packet;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(NetworkManager.class)
-public class MixinNetworkManager {
+public abstract class MixinNetworkManager {
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+    @Shadow public abstract boolean isChannelOpen();
+
     @Inject(method = "sendPacket(Lnet/minecraft/network/Packet;)V", at = @At("HEAD"), cancellable = true)
     public void sendPacket(Packet<?> p_sendPacket_1_, CallbackInfo ci) {
+        if (Raven.mc.thePlayer == null || Raven.mc.theWorld == null || !this.isChannelOpen()) return;
         if (PacketUtils.skipSendEvent.contains(p_sendPacket_1_)) {
             PacketUtils.skipSendEvent.remove(p_sendPacket_1_);
             return;
@@ -29,6 +35,7 @@ public void sendPacket(Packet<?> p_sendPacket_1_, CallbackInfo ci) {
 
     @Inject(method = "channelRead0(Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/network/Packet;)V", at = @At("HEAD"), cancellable = true)
     public void receivePacket(ChannelHandlerContext p_channelRead0_1_, Packet<?> p_channelRead0_2_, CallbackInfo ci) {
+        if (Raven.mc.thePlayer == null || Raven.mc.theWorld == null || !this.isChannelOpen()) return;
         if (PacketUtils.skipReceiveEvent.contains(p_channelRead0_2_)) {
             PacketUtils.skipReceiveEvent.remove(p_channelRead0_2_);
             return;

diff --git a/src/main/java/keystrokesmod/module/Module.java b/src/main/java/keystrokesmod/module/Module.java
@@ -173,10 +173,10 @@ public void onDisable() {
     public void toggle() {
         if (this.isEnabled()) {
             this.disable();
-            mc.thePlayer.playSound("keystrokesmod.toggle.disable", 1, 1);
+            mc.thePlayer.playSound("keystrokesmod:toggle.disable", 1, 1);
         } else {
             this.enable();
-            mc.thePlayer.playSound("keystrokesmod.toggle.enable", 1, 1);
+            mc.thePlayer.playSound("keystrokesmod:toggle.enable", 1, 1);
         }
 
     }

diff --git a/src/main/java/keystrokesmod/module/ModuleManager.java b/src/main/java/keystrokesmod/module/ModuleManager.java
@@ -58,6 +58,7 @@ public class ModuleManager {
     public static AntiVoid antiVoid;
     public static Criticals criticals;
     public static TimerRange timerRange;
+    public static TargetStrafe targetStrafe;
 
     public void register() {
         this.addModule(autoClicker = new AutoClicker());
@@ -146,6 +147,7 @@ public void register() {
         this.addModule(antiVoid = new AntiVoid());
         this.addModule(criticals = new Criticals());
         this.addModule(timerRange = new TimerRange());
+        this.addModule(targetStrafe = new TargetStrafe());
         antiBot.enable();
         modules.sort(Comparator.comparing(Module::getName));
     }

diff --git a/src/main/java/keystrokesmod/module/impl/combat/KillAura.java b/src/main/java/keystrokesmod/module/impl/combat/KillAura.java
@@ -5,10 +5,10 @@
 import keystrokesmod.event.*;
 import keystrokesmod.module.Module;
 import keystrokesmod.module.ModuleManager;
-import keystrokesmod.module.impl.other.anticheats.utils.world.LevelUtils;
 import keystrokesmod.module.impl.world.AntiBot;
 import keystrokesmod.module.setting.impl.ButtonSetting;
 import keystrokesmod.module.setting.impl.SliderSetting;
+import keystrokesmod.script.classes.Vec3;
 import keystrokesmod.utility.*;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.entity.EntityLivingBase;
@@ -17,11 +17,13 @@
 import net.minecraft.network.Packet;
 import net.minecraft.network.play.client.*;
 import net.minecraft.network.play.server.S2FPacketSetSlot;
-import net.minecraft.util.*;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.MovingObjectPosition;
 import net.minecraftforge.client.event.MouseEvent;
 import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
+import org.jetbrains.annotations.NotNull;
 import org.lwjgl.input.Mouse;
 
 import java.util.*;
@@ -336,7 +338,7 @@ public void onReceivePacket(ReceivePacketEvent e) {
     }
 
     @SubscribeEvent
-    public void onMouse(final MouseEvent mouseEvent) {
+    public void onMouse(final @NotNull MouseEvent mouseEvent) {
         if (mouseEvent.button == 0 && mouseEvent.buttonstate) {
             if (target != null || swing) {
                 mouseEvent.setCanceled(true);
@@ -628,20 +630,15 @@ private boolean behindBlocks(float[] rotations) {
                 break;
             case 1:
                 try {
-                    return keystrokesmod.module.impl.other.anticheats.utils.world.BlockUtils.isFullBlock(
-                            LevelUtils.getClientLevel().getBlockState(
-                                    Objects.requireNonNull(rotationSmoothing.getInput() >= 4 && rotationMode.getInput() == 1 || rotationSmoothing.getInput() > 0 ?
-                                            RotationUtils.rayCast(
-                                                    attackRange.getInput(),
-                                                    prevRotations != null ? prevRotations[0] : mc.thePlayer.rotationYaw,
-                                                    prevRotations != null ? prevRotations[1] : mc.thePlayer.rotationPitch
-                                            )
-                                            : RotationUtils.rayCast(attackRange.getInput(), rotations[0], rotations[1])
-                                    ).getBlockPos()
-                            )
-                    );
-                } catch (NullPointerException e) {
-                    return false;
+                    MovingObjectPosition hitResult = RotationUtils.rayCast(
+                            new keystrokesmod.script.classes.Vec3(target).add(new keystrokesmod.script.classes.Vec3(0, target.getEyeHeight(), 0))
+                                    .distanceTo(new keystrokesmod.script.classes.Vec3(mc.thePlayer).add(new Vec3(0, mc.thePlayer.getEyeHeight(), 0))), rotations[0], rotations[1]);
+                    if (hitResult != null) {
+                        if (keystrokesmod.module.impl.other.anticheats.utils.world.BlockUtils.isFullBlock(mc.theWorld.getBlockState(hitResult.getBlockPos()))) {
+                            return true;
+                        }
+                    }
+                } catch (NullPointerException ignored) {
                 }
         }
         return false;

diff --git a/src/main/java/keystrokesmod/module/impl/minigames/BridgeInfo.java b/src/main/java/keystrokesmod/module/impl/minigames/BridgeInfo.java
@@ -3,7 +3,7 @@
 import keystrokesmod.module.Module;
 import keystrokesmod.module.setting.impl.ButtonSetting;
 import keystrokesmod.module.setting.impl.DescriptionSetting;
-import keystrokesmod.utility.RenderUtils;
+import keystrokesmod.utility.render.RenderUtils;
 import keystrokesmod.utility.Utils;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;

diff --git a/src/main/java/keystrokesmod/module/impl/minigames/MurderMystery.java b/src/main/java/keystrokesmod/module/impl/minigames/MurderMystery.java
@@ -2,7 +2,7 @@
 
 import keystrokesmod.module.Module;
 import keystrokesmod.module.setting.impl.ButtonSetting;
-import keystrokesmod.utility.RenderUtils;
+import keystrokesmod.utility.render.RenderUtils;
 import keystrokesmod.utility.Utils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;

diff --git a/src/main/java/keystrokesmod/module/impl/movement/Fly.java b/src/main/java/keystrokesmod/module/impl/movement/Fly.java
@@ -3,12 +3,11 @@
 import keystrokesmod.module.Module;
 import keystrokesmod.module.setting.impl.ButtonSetting;
 import keystrokesmod.module.setting.impl.SliderSetting;
-import keystrokesmod.utility.RenderUtils;
+import keystrokesmod.utility.render.RenderUtils;
 import keystrokesmod.utility.Utils;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 import org.apache.commons.lang3.RandomUtils;
-import org.lwjgl.input.Keyboard;
 
 public class Fly extends Module {
     private SliderSetting mode;

diff --git a/src/main/java/keystrokesmod/module/impl/movement/InvMove.java b/src/main/java/keystrokesmod/module/impl/movement/InvMove.java
@@ -1,39 +1,56 @@
 package keystrokesmod.module.impl.movement;
 
 import keystrokesmod.module.Module;
+import keystrokesmod.module.setting.impl.DescriptionSetting;
+import keystrokesmod.module.setting.impl.SliderSetting;
 import keystrokesmod.utility.Utils;
-import net.minecraft.client.gui.GuiChat;
+import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.settings.KeyBinding;
 import org.lwjgl.input.Keyboard;
 
+import static keystrokesmod.module.ModuleManager.blink;
+
 public class InvMove extends Module {
+    public static final String[] MODES = {"Normal", "Blink"};
+    private final SliderSetting mode;
+    private boolean blinking = false;
     public InvMove() {
         super("InvMove", category.movement);
+        this.registerSetting(new DescriptionSetting("Allow you move in inventory."));
+        this.registerSetting(mode = new SliderSetting("Mode", MODES, 0));
     }
 
+    @Override
     public void onUpdate() {
-        if (mc.currentScreen != null) {
-            if (mc.currentScreen instanceof GuiChat) {
-                return;
+        if (mc.currentScreen instanceof GuiContainer) {
+            if (!blinking) {
+                blink.enable();
             }
+            blinking = true;
 
             KeyBinding.setKeyBindState(mc.gameSettings.keyBindForward.getKeyCode(), Keyboard.isKeyDown(mc.gameSettings.keyBindForward.getKeyCode()));
             KeyBinding.setKeyBindState(mc.gameSettings.keyBindBack.getKeyCode(), Keyboard.isKeyDown(mc.gameSettings.keyBindBack.getKeyCode()));
             KeyBinding.setKeyBindState(mc.gameSettings.keyBindRight.getKeyCode(), Keyboard.isKeyDown(mc.gameSettings.keyBindRight.getKeyCode()));
             KeyBinding.setKeyBindState(mc.gameSettings.keyBindLeft.getKeyCode(), Keyboard.isKeyDown(mc.gameSettings.keyBindLeft.getKeyCode()));
             KeyBinding.setKeyBindState(mc.gameSettings.keyBindJump.getKeyCode(), Utils.jumpDown());
-            if (Keyboard.isKeyDown(208) && mc.thePlayer.rotationPitch < 90.0F) {
-                mc.thePlayer.rotationPitch += 6.0F;
-            }
-            if (Keyboard.isKeyDown(200) && mc.thePlayer.rotationPitch > -90.0F) {
-                mc.thePlayer.rotationPitch -= 6.0F;
-            }
-            if (Keyboard.isKeyDown(205)) {
-                mc.thePlayer.rotationYaw += 6.0F;
-            }
-            if (Keyboard.isKeyDown(203)) {
-                mc.thePlayer.rotationYaw -= 6.0F;
+        } else {
+            if (blinking && blink.isEnabled()) {
+                blink.disable();
             }
+            blinking = false;
         }
     }
+
+    @Override
+    public void onDisable() {
+        if (blinking && blink.isEnabled()) {
+            blink.disable();
+        }
+        blinking = false;
+    }
+
+    @Override
+    public String getInfo() {
+        return MODES[(int) mode.getInput()];
+    }
 }