Split up right and left clicker

Kopamed · Jun 7, 2022 · 6f2e790 · 6f2e790
1 parent 9c962ac
commit 6f2e790
Show file tree

Hide file tree

Showing 13 changed files with 775 additions and 640 deletions.
diff --git a/build/libs/[1.8.9] BetterKeystrokes V-1.2.jar b/build/libs/[1.8.9] BetterKeystrokes V-1.2.jar
diff --git a/src/main/java/keystrokesmod/client/config/ConfigManager.java b/src/main/java/keystrokesmod/client/config/ConfigManager.java
@@ -109,6 +109,8 @@ public void setConfig(Config config){
                 module.applyConfigFromJson(
                         data.get(module.getName()).getAsJsonObject()
                 );
+            } else {
+                module.resetToDefaults();
             }
         }
     }

diff --git a/src/main/java/keystrokesmod/client/module/ModuleManager.java b/src/main/java/keystrokesmod/client/module/ModuleManager.java
@@ -26,7 +26,8 @@ public class ModuleManager {
    public ModuleManager() {
       if (initialized) return;
 
-      addModule(new AutoClicker());
+      addModule(new LeftClicker());
+      addModule(new RightClicker());
       addModule(new AimAssist());
       addModule(new BurstClicker());
       addModule(new ClickAssist());

diff --git a/src/main/java/keystrokesmod/client/module/modules/combat/AimAssist.java b/src/main/java/keystrokesmod/client/module/modules/combat/AimAssist.java
@@ -2,7 +2,6 @@
 
 import keystrokesmod.client.main.Raven;
 import keystrokesmod.client.module.Module;
-import keystrokesmod.client.module.ModuleManager;
 import keystrokesmod.client.module.setting.impl.SliderSetting;
 import keystrokesmod.client.module.setting.impl.TickSetting;
 import keystrokesmod.client.module.modules.world.AntiBot;
@@ -68,7 +67,7 @@ public void update() {
 
          if (!weaponOnly.isToggled() || Utils.Player.isPlayerHoldingWeapon()) {
 
-            Module autoClicker = Raven.moduleManager.getModuleByClazz(AutoClicker.class);
+            Module autoClicker = Raven.moduleManager.getModuleByClazz(RightClicker.class);
             //what if player clicking but mouse not down ????
             if ((clickAim.isToggled() && Utils.Client.autoClickerClicking()) || (Mouse.isButtonDown(0) && autoClicker != null && !autoClicker.isEnabled()) || !clickAim.isToggled()) {
                Entity en = this.getEnemy();