Auto Attack: added random tick range

Author: Zergatul

common/java/com/zergatul/cheatutils/configs/AutoAttackConfig.java

@@ -6,15 +6,19 @@ public class AutoAttackConfig extends ModuleConfig implements ValidatableConfig
 
     public boolean limitRange;
     public double maxRange;
-    public double extraTicks;
+    public int extraTicksMin;
+    public int extraTicksMax;
 
     public AutoAttackConfig() {
         maxRange = 2.5;
+        extraTicksMin = 0;
+        extraTicksMax = 0;
     }
 
     @Override
     public void validate() {
         maxRange = MathUtils.clamp(maxRange, 0, 10);
-        extraTicks = MathUtils.clamp(extraTicks, -10, 10);
+        extraTicksMin = MathUtils.clamp(extraTicksMin, -10, 10);
+        extraTicksMax = MathUtils.clamp(extraTicksMax, extraTicksMin, 10);
     }
 }

common/java/com/zergatul/cheatutils/modules/automation/AutoAttack.java

@@ -16,6 +16,7 @@ public class AutoAttack implements Module {
     public static final AutoAttack instance = new AutoAttack();
 
     private final Minecraft mc = Minecraft.getInstance();
+    private int nextExtraTicks = Integer.MIN_VALUE;
 
     private AutoAttack() {
         Events.ClientTickEnd.add(this::onClientTickEnd);
@@ -43,18 +44,28 @@ private void onClientTickEnd() {
             return;
         }
 
-        if (mc.player.getAttackStrengthScale((float) -config.extraTicks) != 1) {
+        calculateNextExtraTicksIfRequired(config);
+
+        if (mc.player.getAttackStrengthScale(-nextExtraTicks) != 1) {
             return;
         }
 
         if (config.limitRange && mc.hitResult.getLocation().distanceToSqr(mc.player.getEyePosition()) > config.maxRange * config.maxRange) {
             return;
         }
 
+        nextExtraTicks = Integer.MIN_VALUE;
+
         Entity entity = ((EntityHitResult) mc.hitResult).getEntity();
         if (AttackRange.canHit(entity)) {
             mc.gameMode.attack(mc.player, entity);
             mc.player.swing(InteractionHand.MAIN_HAND);
         }
     }
+
+    private void calculateNextExtraTicksIfRequired(AutoAttackConfig config) {
+        if (nextExtraTicks == Integer.MIN_VALUE) {
+            nextExtraTicks = config.extraTicksMin + (int) Math.floor(Math.random() * (config.extraTicksMax - config.extraTicksMin + 1));
+        }
+    }
 }

common/resources/web/components/automation/AutoAttack.html

@@ -22,12 +22,32 @@
             </div>
         </fieldset>
 
-        <div class="flex-row">
-            <span class="field-description">Extra Ticks:</span>
-            <input type="text" class="w3" v-model="config.extraTicks" @change="update()">
-            <div class="section-description">
-                Wait additional ticks once cooldown passed. Can be negative, in this case module will attack before cooldown.
+        <fieldset>
+            <legend>
+                Extra Delay
+            </legend>
+            <table>
+                <tr>
+                    <td>
+                        <span class="field-description">Extra Ticks Min:</span>
+                    </td>
+                    <td>
+                        <input type="number" class="w3" v-model="config.extraTicksMin" @change="update()">
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span class="field-description">Extra Ticks Max:</span>
+                    </td>
+                    <td>
+                        <input type="number" class="w3" v-model="config.extraTicksMax" @change="update()">
+                    </td>
+                </tr>
+            </table>
+            <div class="section-description margin-vertical">
+                Wait additional random ticks amount in [min..max] range once cooldown passed.
+                Values can be negative, in this case module will attack before cooldown.
             </div>
-        </div>
+        </fieldset>
     </div>
 </div>