fix clicker CPS

CubeWhyMC · Aug 1, 2023 · 49f570e · 49f570e
1 parent 0d9bb77
commit 49f570e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/main/java/org/cubewhy/lunarcn/utils/ClickUtils.java b/src/main/java/org/cubewhy/lunarcn/utils/ClickUtils.java
@@ -0,0 +1,7 @@
+package org.cubewhy.lunarcn.utils;
+
+public class ClickUtils {
+    public static long getRandomClickCPS(int min, int max) {
+        return (long) (Math.random() * (1000 / min - 1000 / max + 1) + 1000 / max);
+    }
+}
diff --git a/src/main/kotlin/org/cubewhy/lunarcn/module/impl/cheats/AutoClicker.kt b/src/main/kotlin/org/cubewhy/lunarcn/module/impl/cheats/AutoClicker.kt
@@ -5,6 +5,7 @@ import org.cubewhy.lunarcn.event.events.TickEvent
 import org.cubewhy.lunarcn.module.Module
 import org.cubewhy.lunarcn.module.ModuleCategory
 import org.cubewhy.lunarcn.module.ModuleInfo
+import org.cubewhy.lunarcn.utils.ClickUtils
 import org.cubewhy.lunarcn.utils.MSTimer
 import org.cubewhy.lunarcn.value.BooleanValue
 import org.cubewhy.lunarcn.value.IntValue
@@ -35,7 +36,7 @@ class AutoClicker : Module() {
         if (minCPS.value > maxCPS.value) {
             maxCPS.value = minCPS.value // min can't > max
         }
-        if (targetClick.value && mc.pointedEntity != null || Mouse.isButtonDown(0)) {
+        if ((targetClick.value && mc.pointedEntity != null) || Mouse.isButtonDown(0)) {
             handleClickLeft() // click the mouse
         }
     }
@@ -44,12 +45,7 @@ class AutoClicker : Module() {
      * Click the mouse with the cps
      * */
     private fun handleClickLeft() {
-        val cps = Random.nextInt(minCPS.value, maxCPS.value)
-        delay = if (getLeftCPS() >= cps) {
-            100
-        } else {
-            30
-        }
+        delay = ClickUtils.getRandomClickCPS(minCPS.value, maxCPS.value)
 
         if (timer.hasTimePassed(delay)) {
             mc.clickMouse() // click mouse