Refactor type hiearchy to make masking check types easier

Axionize · Dec 19, 2024 · 6d4ae16 · 6d4ae16
1 parent 4eada75
commit 6d4ae16
Show file tree

Hide file tree

Showing 117 changed files with 399 additions and 298 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     id("io.freefair.lombok") version "8.6"
     id("net.minecrell.plugin-yml.bukkit") version "0.6.0"
     id("com.diffplug.spotless") version "6.25.0"
+    kotlin("jvm")
 }
 
 spotless {
@@ -28,8 +29,6 @@ spotless {
 group = "ac.grim.grimac"
 version = "2.3.69"
 description = "Libre simulation anticheat designed for 1.21 with 1.8-1.21 support, powered by PacketEvents 2.0."
-java.sourceCompatibility = JavaVersion.VERSION_1_8
-java.targetCompatibility = JavaVersion.VERSION_1_8
 
 // Set to false for debug builds
 // You cannot live reload classes if the jar relocates dependencies
@@ -77,6 +76,7 @@ dependencies {
     compileOnly("com.viaversion:viaversion-api:5.1.1-SNAPSHOT")
     //
     compileOnly("io.netty:netty-all:4.1.85.Final")
+    implementation(kotlin("stdlib-jdk8"))
 }
 
 bukkit {
@@ -194,3 +194,6 @@ tasks.shadowJar {
         relocate("com.zaxxer", "ac.grim.rgimac.shaded.zaxxer")
     }
 }
+kotlin {
+    jvmToolchain(8)
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1 +1,9 @@
+pluginManagement {
+    plugins {
+        kotlin("jvm") version "2.0.21"
+    }
+}
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
 rootProject.name = "grimac"
diff --git a/src/main/java/ac/grim/grimac/checks/impl/aim/AimDuplicateLook.java b/src/main/java/ac/grim/grimac/checks/impl/aim/AimDuplicateLook.java
@@ -2,12 +2,12 @@
 
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.RotationCheck;
+import ac.grim.grimac.checks.type.interfaces.RotationCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.anticheat.update.RotationUpdate;
 
 @CheckData(name = "AimDuplicateLook")
-public class AimDuplicateLook extends Check implements RotationCheck {
+public class AimDuplicateLook extends Check implements RotationCheckI {
     public AimDuplicateLook(GrimPlayer playerData) {
         super(playerData);
     }

diff --git a/src/main/java/ac/grim/grimac/checks/impl/aim/AimModulo360.java b/src/main/java/ac/grim/grimac/checks/impl/aim/AimModulo360.java
@@ -2,15 +2,15 @@
 
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.RotationCheck;
+import ac.grim.grimac.checks.type.interfaces.RotationCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.anticheat.update.RotationUpdate;
 
 // Based on Kauri AimA,
 // I also discovered this flaw before open source Kauri, but did not want to open source its detection.
 // It works on clients who % 360 their rotation.
 @CheckData(name = "AimModulo360", decay = 0.005)
-public class AimModulo360 extends Check implements RotationCheck {
+public class AimModulo360 extends Check implements RotationCheckI {
 
     private float lastDeltaYaw;
 

diff --git a/src/main/java/ac/grim/grimac/checks/impl/aim/processor/AimProcessor.java b/src/main/java/ac/grim/grimac/checks/impl/aim/processor/AimProcessor.java
@@ -1,15 +1,15 @@
 package ac.grim.grimac.checks.impl.aim.processor;
 
 import ac.grim.grimac.checks.Check;
-import ac.grim.grimac.checks.type.RotationCheck;
+import ac.grim.grimac.checks.type.interfaces.RotationCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.anticheat.update.RotationUpdate;
 import ac.grim.grimac.utils.data.Pair;
 import ac.grim.grimac.utils.lists.RunningMode;
 import ac.grim.grimac.utils.math.GrimMath;
 
 
-public class AimProcessor extends Check implements RotationCheck {
+public class AimProcessor extends Check implements RotationCheckI {
 
     private static final int SIGNIFICANT_SAMPLES_THRESHOLD = 15;
     private static final int TOTAL_SAMPLES_THRESHOLD = 80;

diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsA.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsA.java
@@ -2,14 +2,14 @@
 
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.interfaces.PacketCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientHeldItemChange;
 
 @CheckData(name = "BadPacketsA", description = "Sent duplicate slot id")
-public class BadPacketsA extends Check implements PacketCheck {
+public class BadPacketsA extends Check implements PacketCheckI {
     int lastSlot = -1;
 
     public BadPacketsA(final GrimPlayer player) {

diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsB.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsB.java
@@ -2,14 +2,14 @@
 
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.interfaces.PacketCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientSteerVehicle;
 
 @CheckData(name = "BadPacketsB", description = "Sent impossible steer vehicle packet")
-public class BadPacketsB extends Check implements PacketCheck {
+public class BadPacketsB extends Check implements PacketCheckI {
     public BadPacketsB(GrimPlayer player) {
         super(player);
     }

diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsC.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsC.java
@@ -2,14 +2,14 @@
 
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.interfaces.PacketCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientInteractEntity;
 
 @CheckData(name = "BadPacketsC", description = "Interacted with self")
-public class BadPacketsC extends Check implements PacketCheck {
+public class BadPacketsC extends Check implements PacketCheckI {
     public BadPacketsC(GrimPlayer player) {
         super(player);
     }

diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsD.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsD.java
@@ -2,14 +2,14 @@
 
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.interfaces.PacketCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerFlying;
 
 @CheckData(name = "BadPacketsD")
-public class BadPacketsD extends Check implements PacketCheck {
+public class BadPacketsD extends Check implements PacketCheckI {
     public BadPacketsD(GrimPlayer player) {
         super(player);
     }

diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsE.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsE.java
@@ -2,15 +2,15 @@
 
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.interfaces.PacketCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerFlying;
 
 @CheckData(name = "BadPacketsE")
-public class BadPacketsE extends Check implements PacketCheck {
+public class BadPacketsE extends Check implements PacketCheckI {
     private int noReminderTicks;
 
     public BadPacketsE(GrimPlayer player) {

diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsF.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsF.java
@@ -2,14 +2,14 @@
 
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.interfaces.PacketCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientEntityAction;
 
 @CheckData(name = "BadPacketsF", description = "Sent duplicate sprinting status")
-public class BadPacketsF extends Check implements PacketCheck {
+public class BadPacketsF extends Check implements PacketCheckI {
     public boolean lastSprinting;
     public boolean exemptNext = true; // Support 1.14+ clients starting on either true or false sprinting, we don't know
 

diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsG.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsG.java
@@ -2,14 +2,14 @@
 
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.interfaces.PacketCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientEntityAction;
 
 @CheckData(name = "BadPacketsG", description = "Sent duplicate sneaking status")
-public class BadPacketsG extends Check implements PacketCheck {
+public class BadPacketsG extends Check implements PacketCheckI {
     private boolean lastSneaking, respawn;
 
     public BadPacketsG(GrimPlayer player) {

diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsI.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsI.java
@@ -2,14 +2,14 @@
 
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.interfaces.PacketCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerAbilities;
 
 @CheckData(name = "BadPacketsI", description = "Claimed to be flying while unable to fly")
-public class BadPacketsI extends Check implements PacketCheck {
+public class BadPacketsI extends Check implements PacketCheckI {
     public BadPacketsI(GrimPlayer player) {
         super(player);
     }

diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsJ.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsJ.java
@@ -2,13 +2,13 @@
 
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.interfaces.PacketCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 
 @CheckData(name = "BadPacketsJ", description = "Sent steer vehicle packets while not in a vehicle")
-public class BadPacketsJ extends Check implements PacketCheck {
+public class BadPacketsJ extends Check implements PacketCheckI {
     public BadPacketsJ(GrimPlayer player) {
         super(player);
     }

diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsK.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsK.java
@@ -2,14 +2,14 @@
 
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.interfaces.PacketCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.protocol.player.GameMode;
 
 @CheckData(name = "BadPacketsK", description = "Sent spectate packets while not in spectator mode")
-public class BadPacketsK extends Check implements PacketCheck {
+public class BadPacketsK extends Check implements PacketCheckI {
     public BadPacketsK(GrimPlayer player) {
         super(player);
     }

diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsL.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsL.java
@@ -2,7 +2,7 @@
 
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.interfaces.PacketCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
@@ -14,7 +14,7 @@
 import java.util.Locale;
 
 @CheckData(name = "BadPacketsL", description = "Sent impossible dig packet")
-public class BadPacketsL extends Check implements PacketCheck {
+public class BadPacketsL extends Check implements PacketCheckI {
 
     public BadPacketsL(GrimPlayer player) {
         super(player);

diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsN.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsN.java
@@ -2,11 +2,11 @@
 
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.interfaces.PacketCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 
 @CheckData(name = "BadPacketsN")
-public class BadPacketsN extends Check implements PacketCheck {
+public class BadPacketsN extends Check implements PacketCheckI {
     public BadPacketsN(final GrimPlayer player) {
         super(player);
     }

diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsO.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsO.java
@@ -2,7 +2,7 @@
 
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.interfaces.PacketCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.data.Pair;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
@@ -15,7 +15,7 @@
 import java.util.Queue;
 
 @CheckData(name = "BadPacketsO")
-public class BadPacketsO extends Check implements PacketCheck {
+public class BadPacketsO extends Check implements PacketCheckI {
     Queue<Pair<Long, Long>> keepaliveMap = new LinkedList<>();
 
     public BadPacketsO(GrimPlayer player) {

diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsP.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsP.java
@@ -2,7 +2,7 @@
 
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.interfaces.PacketCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.event.PacketSendEvent;
@@ -13,7 +13,7 @@
 
 
 @CheckData(name = "BadPacketsP", experimental = true)
-public class BadPacketsP extends Check implements PacketCheck {
+public class BadPacketsP extends Check implements PacketCheckI {
 
     public BadPacketsP(GrimPlayer playerData) {
         super(playerData);

diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsQ.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsQ.java
@@ -2,15 +2,15 @@
 
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.interfaces.PacketCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType.Play.Client;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientEntityAction;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientEntityAction.Action;
 
 @CheckData(name = "BadPacketsQ")
-public class BadPacketsQ extends Check implements PacketCheck {
+public class BadPacketsQ extends Check implements PacketCheckI {
     public BadPacketsQ(final GrimPlayer player) {
         super(player);
     }

diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsR.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsR.java
@@ -2,14 +2,14 @@
 
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.interfaces.PacketCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.protocol.player.GameMode;
 
 @CheckData(name = "BadPacketsR", decay = 0.25, experimental = true)
-public class BadPacketsR extends Check implements PacketCheck {
+public class BadPacketsR extends Check implements PacketCheckI {
     public BadPacketsR(final GrimPlayer player) {
         super(player);
     }

diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsS.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsS.java
@@ -2,11 +2,11 @@
 
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.interfaces.PacketCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 
 @CheckData(name = "BadPacketsS")
-public class BadPacketsS extends Check implements PacketCheck {
+public class BadPacketsS extends Check implements PacketCheckI {
     public BadPacketsS(GrimPlayer player) {
         super(player);
     }

diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsT.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsT.java
@@ -2,7 +2,7 @@
 
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.interfaces.PacketCheckI;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.data.packetentity.PacketEntity;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
@@ -13,7 +13,7 @@
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientInteractEntity;
 
 @CheckData(name = "BadPacketsT")
-public class BadPacketsT extends Check implements PacketCheck {
+public class BadPacketsT extends Check implements PacketCheckI {
     public BadPacketsT(final GrimPlayer player) {
         super(player);
     }