Release 1.16 (#647)

Co-authored-by: Tejas Lamba <[email protected]> Co-authored-by: TejasLamba2006 <[email protected]> Co-authored-by: Kg <[email protected]>
xia-mc · Jul 16, 2024 · 915911b · 915911b
1 parent 0eda294
commit 915911b
Show file tree

Hide file tree

Showing 27 changed files with 646 additions and 346 deletions.
diff --git a/src/main/java/keystrokesmod/Raven.java b/src/main/java/keystrokesmod/Raven.java
@@ -75,6 +75,7 @@ public void init(FMLInitializationEvent ignored) {
         FMLCommonHandler.instance().bus().register(ModuleManager.tower);
         FMLCommonHandler.instance().bus().register(ModuleManager.rotationHandler);
         FMLCommonHandler.instance().bus().register(ModuleManager.slotHandler);
+        FMLCommonHandler.instance().bus().register(ModuleManager.dynamicManager);
 
         try {
             ViaMCP.create();

diff --git a/src/main/java/keystrokesmod/clickgui/components/impl/ModuleComponent.java b/src/main/java/keystrokesmod/clickgui/components/impl/ModuleComponent.java
@@ -35,8 +35,13 @@ public ModuleComponent(Module mod, CategoryComponent p, int o) {
         this.o = o;
         this.settings = new ArrayList<>();
         this.po = false;
+        updateSetting();
+    }
+
+    public void updateSetting() {
         int y = o + 12;
         if (mod != null && !mod.getSettings().isEmpty()) {
+            this.settings.clear();
             for (Setting v : mod.getSettings()) {
                 this.settings.add(Component.fromSetting(v, this, y));
                 y += 12;

diff --git a/src/main/java/keystrokesmod/mixins/impl/client/MixinInventoryPlayer.java b/src/main/java/keystrokesmod/mixins/impl/client/MixinInventoryPlayer.java
@@ -15,7 +15,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(InventoryPlayer.class)
-public class MixinInventoryPlayer {
+public abstract class MixinInventoryPlayer {
 
     @Shadow public EntityPlayer player;
 

diff --git a/src/main/java/keystrokesmod/mixins/impl/client/MixinMinecraft.java b/src/main/java/keystrokesmod/mixins/impl/client/MixinMinecraft.java
@@ -1,24 +1,51 @@
 package keystrokesmod.mixins.impl.client;
 
 import keystrokesmod.event.PreTickEvent;
+import keystrokesmod.module.ModuleManager;
 import keystrokesmod.module.impl.combat.HitBox;
 import keystrokesmod.module.impl.combat.Reach;
+import keystrokesmod.module.impl.render.Animations;
 import keystrokesmod.module.impl.render.FreeLook;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.util.MovingObjectPosition;
 import net.minecraftforge.common.MinecraftForge;
 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(Minecraft.class)
-public class MixinMinecraft {
+@Mixin(value = Minecraft.class, priority = 1001)
+public abstract class MixinMinecraft {
+
+    @Shadow public GameSettings gameSettings;
+
+    @Shadow public EntityPlayerSP thePlayer;
+
+    @Shadow protected abstract void clickMouse();
+
+    @Shadow public MovingObjectPosition objectMouseOver;
 
     @Inject(method = "runTick", at = @At("HEAD"))
     private void runTickPre(CallbackInfo ci) {
         MinecraftForge.EVENT_BUS.post(new PreTickEvent());
     }
 
+    @Inject(method = "runTick", at = @At(value = "INVOKE",
+            target = "Lnet/minecraft/client/multiplayer/PlayerControllerMP;onStoppedUsingItem(Lnet/minecraft/entity/player/EntityPlayer;)V",
+            shift = At.Shift.BY, by = 2
+    ))
+    private void onRunTick$usingWhileDigging(CallbackInfo ci) {
+        if (ModuleManager.animations != null && ModuleManager.animations.isEnabled() && Animations.swingWhileDigging.isToggled()
+                && this.gameSettings.keyBindAttack.isKeyDown()) {
+            if (this.objectMouseOver != null && this.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {
+                clickMouse();
+            }
+        }
+    }
+
     /**
      * @author xia__mc
      * @reason to fix reach and hitBox won't work with autoClicker

diff --git a/src/main/java/keystrokesmod/mixins/impl/client/MixinPlayerControllerMP.java b/src/main/java/keystrokesmod/mixins/impl/client/MixinPlayerControllerMP.java
@@ -13,7 +13,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(PlayerControllerMP.class)
-public class MixinPlayerControllerMP {
+public abstract class MixinPlayerControllerMP {
 
     @Shadow private int currentPlayerItem;
 

diff --git a/src/main/java/keystrokesmod/module/Module.java b/src/main/java/keystrokesmod/module/Module.java
@@ -16,7 +16,7 @@
 import java.util.Iterator;
 
 public class Module {
-    protected ArrayList<Setting> settings;
+    protected final ArrayList<Setting> settings;
     private final String moduleName;
     private String prettyName;
     private final Module.category moduleCategory;
@@ -172,7 +172,9 @@ public ArrayList<Setting> getSettings() {
     }
 
     public void registerSetting(Setting setting) {
-        this.settings.add(setting);
+        synchronized (settings) {
+            this.settings.add(setting);
+        }
     }
 
     public void registerSetting(Setting @NotNull ... setting) {
@@ -182,7 +184,9 @@ public void registerSetting(Setting @NotNull ... setting) {
     }
 
     public void unregisterSetting(Setting setting) {
-        this.settings.remove(setting);
+        synchronized (settings) {
+            this.settings.remove(setting);
+        }
     }
 
     public Module.category moduleCategory() {

diff --git a/src/main/java/keystrokesmod/module/ModuleManager.java b/src/main/java/keystrokesmod/module/ModuleManager.java
@@ -11,7 +11,6 @@
 import keystrokesmod.module.impl.render.*;
 import keystrokesmod.module.impl.world.*;
 import keystrokesmod.utility.Utils;
-import keystrokesmod.utility.profile.Manager;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -20,6 +19,7 @@
 public class ModuleManager {
     static List<Module> modules = new ArrayList<>();
     public static List<Module> organizedModules = new ArrayList<>();
+
     public static Module longJump;
     public static Module blink;
     public static Module nameHider;
@@ -95,133 +95,151 @@ public class ModuleManager {
     public static Ambience ambience;
     public static KillAuraV2 killAuraV2;
     public static DynamicManager dynamicManager;
-    
+
     public void register() {
-        this.addModule(autoClicker = new AutoClicker());
-        this.addModule(longJump = new LongJump());
+
+        // client
+        this.addModule(commandChat = new CommandChat());
+        this.addModule(commandLine = new CommandLine());
+        this.addModule(dynamicManager = new DynamicManager());
+        this.addModule(new Gui());
+        // this.addModule(new NyaProxy());
+        this.addModule(new Settings());
+
+        // combat
         this.addModule(new AimAssist());
-        this.addModule(blink = new Blink());
+        this.addModule(autoClicker = new AutoClicker());
+        this.addModule(blockHit = new BlockHit());
         this.addModule(new BurstClicker());
         this.addModule(new ClickAssist());
-        this.addModule(tower = new Tower());
-        this.addModule(new DelayRemover());
+        this.addModule(criticals = new Criticals());
         this.addModule(hitBox = new HitBox());
-        this.addModule(new Radar());
-        this.addModule(new Settings());
+        this.addModule(hitSelect = new HitSelect());
+        this.addModule(infiniteAura = new InfiniteAura());
+        this.addModule(new JumpReset());
+        this.addModule(killAura = new KillAura());
+        this.addModule(killAuraV2 = new KillAuraV2());
+        this.addModule(moreKB = new MoreKB());
         this.addModule(reach = new Reach());
+        this.addModule(reduce = new Reduce());
         this.addModule(new RodAimbot());
-        this.addModule(speed = new Speed());
-        this.addModule(invManager = new InvManager());
-        this.addModule(scaffold = new Scaffold());
-        this.addModule(new AntiAFK());
-        this.addModule(new AutoTool());
+        this.addModule(timerRange = new TimerRange());
+        this.addModule(velocity = new Velocity());
+
+        // fun
+        this.addModule(new ExtraBobbing());
+        this.addModule(new FlameTrail());
+        this.addModule(new SlyPort());
+        this.addModule(new Spin());
+
+        // minigames
+        this.addModule(new AutoWho());
+        this.addModule(bedwars = new BedWars());
+        this.addModule(new BridgeInfo());
+        this.addModule(new DuelsStats());
+        this.addModule(murderMystery = new MurderMystery());
+        this.addModule(new SumoFences());
+
+        // movement
         this.addModule(fly = new Fly());
         this.addModule(new InvMove());
-        this.addModule(new Trajectories());
-        this.addModule(potions = new Potions());
-        this.addModule(new AutoSwap());
         this.addModule(keepSprint = new KeepSprint());
-        this.addModule(bedAura = new BedAura());
+        this.addModule(longJump = new LongJump());
+        this.addModule(motionModifier = new MotionModifier());
         this.addModule(noSlow = new NoSlow());
-        this.addModule(new Indicators());
-        this.addModule(new LatencyAlerts());
+        this.addModule(phase = new Phase());
+        this.addModule(speed = new Speed());
         this.addModule(sprint = new Sprint());
+        this.addModule(step = new Step());
         this.addModule(new StopMotion());
+        this.addModule(targetStrafe = new TargetStrafe());
         this.addModule(timer = new Timer());
         this.addModule(new VClip());
+
+        // other
+        this.addModule(new Anticheat());
+        this.addModule(autoPlay = new AutoPlay());
+        this.addModule(autoRespawn = new AutoRespawn());
+        this.addModule(clickRecorder = new ClickRecorder());
+        this.addModule(clientSpoofer = new ClientSpoofer());
+        this.addModule(new FakeChat());
+        this.addModule(new LatencyAlerts());
+        this.addModule(modSpoofer = new ModSpoofer());
+        this.addModule(motionSkidder = new MotionSkidder());
+        this.addModule(nameHider = new NameHider());
+        this.addModule(panic = new Panic());
+        this.addModule(pingSpoof = new PingSpoof());
+        this.addModule(recordClick = new RecordClick());
+        this.addModule(rotationHandler = new RotationHandler());
+        this.addModule(new ScreenshotHelper());
+        this.addModule(slotHandler = new SlotHandler());
+        this.addModule(staffDetector = new StaffDetector());
+
+        // player
+        this.addModule(new AntiAFK());
+        this.addModule(antiFireball = new AntiFireball());
+        this.addModule(antiVoid = new AntiVoid());
+        this.addModule(autoHeal = new AutoHeal());
         this.addModule(new AutoJump());
-        this.addModule(new AutoPlace());
-        this.addModule(fastPlace = new FastPlace());
+        this.addModule(new AutoPot());
+        this.addModule(new AutoSwap());
+        this.addModule(backtrack = new Backtrack());
+        this.addModule(blink = new Blink());
+        this.addModule(chestStealer = new ChestStealer());
+        this.addModule(new DelayRemover());
+        this.addModule(new FakeLag());
         this.addModule(new Freecam());
+        this.addModule(invManager = new InvManager());
         this.addModule(noFall = new NoFall());
-        this.addModule(safeWalk = new SafeWalk());
-        this.addModule(reduce = new Reduce());
-        this.addModule(velocity = new Velocity());
-        this.addModule(antiBot = new AntiBot());
+        this.addModule(new NoRotate());
+
+        // render
+        this.addModule(ambience = new Ambience());
+        this.addModule(animations = new Animations());
         this.addModule(antiShuffle = new AntiShuffle());
+        this.addModule(bedESP = new BedESP());
+        this.addModule(new BreakProgress());
         this.addModule(new Chams());
         this.addModule(new ChestESP());
-        this.addModule(new Nametags());
-        this.addModule(playerESP = new PlayerESP());
-        this.addModule(new Tracers());
+        this.addModule(customCape = new CustomCape());
+        this.addModule(customName = new CustomName());
+        this.addModule(freeLook = new FreeLook());
+        this.addModule(fullBright = new FullBright());
         this.addModule(hud = new HUD());
-        this.addModule(new Anticheat());
-        this.addModule(new BreakProgress());
-        this.addModule(moreKB = new MoreKB());
-        this.addModule(new Xray());
-        this.addModule(new BridgeInfo());
-        this.addModule(new TargetHUD());
-        this.addModule(new DuelsStats());
-        this.addModule(antiFireball = new AntiFireball());
-        this.addModule(bedESP = new BedESP());
-        this.addModule(murderMystery = new MurderMystery());
-        this.addModule(new keystrokesmod.script.Manager());
-        this.addModule(new SumoFences());
-        this.addModule(new ExtraBobbing());
-        this.addModule(killAura = new KillAura());
-        this.addModule(new FlameTrail());
-        this.addModule(new SlyPort());
+        this.addModule(new Indicators());
         this.addModule(new ItemESP());
         this.addModule(new MobESP());
-        this.addModule(new Spin());
-        this.addModule(new NoRotate());
-        this.addModule(new FakeChat());
-        this.addModule(nameHider = new NameHider());
-        this.addModule(new FakeLag());
-        this.addModule(new WaterBucket());
-        this.addModule(commandLine = new CommandLine());
-        this.addModule(bedwars = new BedWars());
-        this.addModule(fastMine = new FastMine());
-        this.addModule(new JumpReset());
-        this.addModule(new Manager());
-        this.addModule(new ViewPackets());
-        this.addModule(new AutoWho());
-        this.addModule(new Gui());
-        this.addModule(new Shaders());
-        this.addModule(motionSkidder = new MotionSkidder());
-        this.addModule(motionModifier = new MotionModifier());
-        this.addModule(antiVoid = new AntiVoid());
-        this.addModule(criticals = new Criticals());
-        this.addModule(timerRange = new TimerRange());
-        this.addModule(targetStrafe = new TargetStrafe());
-        this.addModule(autoHeal = new AutoHeal());
-        this.addModule(hitSelect = new HitSelect());
-        this.addModule(noHurtCam = new NoHurtCam());
-        this.addModule(noCameraClip = new NoCameraClip());
-        this.addModule(autoPlay = new AutoPlay());
-        this.addModule(customName = new CustomName());
-        this.addModule(commandChat = new CommandChat());
-        this.addModule(phase = new Phase());
-        this.addModule(pingSpoof = new PingSpoof());
+        this.addModule(new Nametags());
         this.addModule(noBackground = new NoBackground());
-        this.addModule(blockIn = new BlockIn());
-        this.addModule(backtrack = new Backtrack());
+        this.addModule(noCameraClip = new NoCameraClip());
+        this.addModule(noHurtCam = new NoHurtCam());
         this.addModule(particles = new Particles());
-        this.addModule(recordClick = new RecordClick());
-        this.addModule(clickRecorder = new ClickRecorder());
-        this.addModule(infiniteAura = new InfiniteAura());
-        this.addModule(legitScaffold = new LegitScaffold());
-        this.addModule(freeLook = new FreeLook());
-        this.addModule(step = new Step());
-        this.addModule(animations = new Animations());
-        this.addModule(chestStealer = new ChestStealer());
-        this.addModule(rotationHandler = new RotationHandler());
-        this.addModule(customCape = new CustomCape());
-        this.addModule(clientSpoofer = new ClientSpoofer());
-        this.addModule(blockHit = new BlockHit());
-        this.addModule(fullBright = new FullBright());
-        this.addModule(new AutoPot());
-        this.addModule(modSpoofer = new ModSpoofer());
-        this.addModule(panic = new Panic());
-        this.addModule(slotHandler = new SlotHandler());
-        this.addModule(staffDetector = new StaffDetector());
+        this.addModule(playerESP = new PlayerESP());
+        this.addModule(potions = new Potions());
+        this.addModule(new Radar());
+        this.addModule(new Shaders());
+        this.addModule(new TargetHUD());
+        this.addModule(new Tracers());
+        this.addModule(new Trajectories());
+        this.addModule(new Xray());
+
+        // world
+        this.addModule(antiBot = new AntiBot());
+        this.addModule(new AutoPlace());
+        this.addModule(new AutoTool());
         this.addModule(new AutoWeapon());
-        this.addModule(autoRespawn = new AutoRespawn());
-        this.addModule(ambience = new Ambience());
+        this.addModule(bedAura = new BedAura());
+        this.addModule(blockIn = new BlockIn());
         this.addModule(clutch = new Clutch());
-        this.addModule(killAuraV2 = new KillAuraV2());
-        this.addModule(dynamicManager = new DynamicManager());
-        this.addModule(new ScreenshotHelper());
+        this.addModule(fastMine = new FastMine());
+        this.addModule(fastPlace = new FastPlace());
+        this.addModule(legitScaffold = new LegitScaffold());
+        this.addModule(safeWalk = new SafeWalk());
+        this.addModule(scaffold = new Scaffold());
+        this.addModule(tower = new Tower());
+        this.addModule(new WaterBucket());
+
+        // enable
         antiBot.enable();
         commandChat.enable();
         modules.sort(Comparator.comparing(Module::getPrettyName));
@@ -263,4 +281,4 @@ public static void sort() {
             organizedModules.sort((o1, o2) -> Utils.mc.fontRendererObj.getStringWidth(o2.getPrettyName() + ((HUD.showInfo.isToggled() && !o2.getInfo().isEmpty()) ? " " + o2.getInfo() : "")) - Utils.mc.fontRendererObj.getStringWidth(o1.getPrettyName() + (HUD.showInfo.isToggled() && !(o1.getInfo().isEmpty()) ? " " + o1.getInfo() : "")));
         }
     }
-}
+}