Merge pull request #508 from antihack3r/patch-1

antobot code cleanery

src/main/java/thunder/hack/features/modules/combat/AntiBot.java

@@ -21,37 +21,34 @@ public final class AntiBot extends Module {
     public Setting<Boolean> onlyAura = new Setting<>("OnlyAura", true);
     private final Setting<Mode> mode = new Setting("Mode", Mode.UUIDCheck);
     public Setting<Integer> checkticks = new Setting("checkTicks", 3, 0, 10, v -> mode.getValue() == Mode.MotionCheck);
-    private final Timer timer = new Timer();
-    private int botsNumber = 0;
+    private final Timer clearTimer = new Timer();
     private int ticks = 0;
 
-
     public AntiBot() {
         super("AntiBot", Category.COMBAT);
     }
 
     @EventHandler
     public void onSync(EventSync e) {
-        if (!onlyAura.getValue()) mc.world.getPlayers().forEach(this::isABot);
-        else if (Aura.target instanceof PlayerEntity ent) isABot(ent);
+        if (!onlyAura.getValue()) mc.world.getPlayers().forEach(this::markAsBot);
+        else if (Aura.target instanceof PlayerEntity ent) this.markAsBot(ent);
 
-        bots.forEach(b -> {
-            if (remove.getValue())
-                try {
-                    mc.world.removeEntity(b.getId(), Entity.RemovalReason.KILLED);
-                } catch (Exception ignored) {
-                }
-        });
+        if (remove.getValue())
+            bots.forEach(b -> {
+                    try {
+                        mc.world.removeEntity(b.getId(), Entity.RemovalReason.KILLED);
+                    } catch (Exception ignored) {
+                    }
+            });
 
-        if (timer.passedMs(10000)) {
+        if (clearTimer.passedMs(10000)) {
             bots.clear();
-            botsNumber = 0;
             ticks = 0;
-            timer.reset();
+            clearTimer.reset();
         }
     }
 
-    private void isABot(PlayerEntity ent) {
+    private void markAsBot(PlayerEntity ent) {
         if (bots.contains(ent))
             return;
 
@@ -60,38 +57,37 @@ private void isABot(PlayerEntity ent) {
                 if (!ent.getUuid().equals(UUID.nameUUIDFromBytes(("OfflinePlayer:" + ent.getName().getString()).getBytes(StandardCharsets.UTF_8))) && ent instanceof OtherClientPlayerEntity
                         && (FakePlayer.fakePlayer == null || ent.getId() != FakePlayer.fakePlayer.getId())
                         && !ent.getName().getString().contains("-")) {
-                    sendMessage(ent.getName().getString() + " is a bot!");
-                    ++botsNumber;
-                    bots.add(ent);
+                    this.addBot(ent);
                 }
             }
             case MotionCheck -> {
-                double speed = (ent.getX() - ent.prevX) * (ent.getX() - ent.prevX) + (ent.getZ() - ent.prevZ) * (ent.getZ() - ent.prevZ);
-                if (speed > 0.5 && !bots.contains(ent)) {
-                    if (ticks >= checkticks.getValue()) {
-                        sendMessage(ent.getName().getString() + " is a bot!");
-                        ++botsNumber;
-                        bots.add(ent);
-                    }
+                double diffX = ent.getX() - ent.prevX;
+                double diffZ = ent.getZ() - ent.prevZ;
+
+                if ((diffX * diffX) + (diffZ * diffZ) > 0.5D) {
+                    if (ticks >= checkticks.getValue())
+                        this.addBot(ent);
                     ticks++;
                 }
             }
             case ZeroPing -> {
-                if (NameTags.getEntityPing(ent) <= 0) {
-                    sendMessage(ent.getName().getString() + " is a bot!");
-                    ++botsNumber;
-                    bots.add(ent);
-                }
+                if (NameTags.getEntityPing(ent) <= 0)
+                    this.addBot(ent);
             }
         }
     }
 
+    private void addBot(PlayerEntity entity) {
+        this.sendMessage(entity.getName().getString() + " is a bot!");
+        bots.add(entity);
+    }
+
     @Override
     public String getDisplayInfo() {
-        return String.valueOf(botsNumber);
+        return String.valueOf(bots.size());
     }
 
     public enum Mode {
         UUIDCheck, MotionCheck, ZeroPing
     }
-}
+}