Deobfuscate and document purpose of misunderstood code in traverseBlocks()

(cherry picked from commit 335c33b109)

.github/workflows/codeql-analysis.yml

@@ -1,71 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
-  schedule:
-    - cron: '30 15 * * 2'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'java' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
-
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
-
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-      #    and modify them (or add more) to build your code if your project
-      #    uses a compiled language
-
-      #- run: |
-      #   make bootstrap
-      #   make release
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3

.github/workflows/gradle-publish.yml

@@ -1,38 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created
-# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle
-
-name: Gradle Package
-
-on:
-  [push, workflow_dispatch]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 17
-      uses: actions/setup-java@v4
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-        server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
-        settings-path: ${{ github.workspace }} # location for the settings.xml file
-
-    - name: Build with Gradle
-      uses: gradle/actions/setup-gradle@v3
-      with:
-        arguments: build
-    - name: Upload a Build Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        path: /home/runner/work/Grim/Grim/build/libs/**.jar

.github/workflows/gradle.yml

@@ -0,0 +1,95 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
+
+name: Java CI with Gradle
+
+on:
+  push:
+    branches: [ "2.0" ]
+  pull_request:
+    branches: [ "2.0" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
+      # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda
+
+      - name: Build with Gradle Wrapper
+        run: ./gradlew build
+
+      - name: Get current datetime
+        id: datetime
+        run: echo "datetime=$(date +'%Y-%m-%d-%H%M%S')" >> $GITHUB_OUTPUT
+
+      - name: Delete previous dev release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          previous_release_id=$(curl -s -H "Authorization: token $GITHUB_TOKEN" \
+            "https://api.github.com/repos/${{ github.repository }}/releases/tags/dev" | jq -r .id)
+          if [ "$previous_release_id" != "null" ]; then
+            curl -X DELETE -H "Authorization: token $GITHUB_TOKEN" \
+              "https://api.github.com/repos/${{ github.repository }}/releases/$previous_release_id"
+            git push --delete origin dev || true
+          fi
+      - name: Create new dev release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: dev
+          release_name: Dev Build ${{ steps.datetime.outputs.datetime }}
+          body: |
+            This is an automated dev build of the master branch.
+            Build date: ${{ steps.datetime.outputs.datetime }}
+          draft: false
+          prerelease: true
+
+      - name: Find JAR file
+        id: find_jar
+        run: |
+          JAR_PATH=$(find ./build/libs -name "*.jar" | head -n 1)
+          echo "jar_path=$JAR_PATH" >> $GITHUB_OUTPUT
+          echo "jar_name=$(basename $JAR_PATH)" >> $GITHUB_OUTPUT
+      - name: Upload artifact
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ${{ steps.find_jar.outputs.jar_path }}
+          asset_name: GrimAC-${{ steps.datetime.outputs.datetime }}-dev.jar
+          asset_content_type: application/java-archive
+
+  dependency-submission:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'

README.md

@@ -7,7 +7,7 @@ GrimAC is an open source Minecraft anticheat designed for 1.21 and supports 1.8-
 ### Compiling through terminal/command prompt
 1. git clone https://github.com/GrimAnticheat/Grim.git (or click the green code button, download ZIP, then unzip it.)
 2. cd Grim
-3. ./gradlew build
+3. gradlew build
 4. The final jar is located in build/libs
 
 ### API Information

build.gradle.kts

@@ -6,38 +6,14 @@ plugins {
     id("com.github.johnrengelman.shadow") version "8.1.1"
     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"
-}
-
-spotless {
-    java {
-        endWithNewline()
-        indentWithSpaces(4)
-        removeUnusedImports()
-        trimTrailingWhitespace()
-        targetExclude("build/generated/**/*")
-    }
-
-    kotlinGradle {
-        endWithNewline()
-        indentWithSpaces(4)
-        trimTrailingWhitespace()
-    }
 }
 
 group = "ac.grim.grimac"
-version = "2.3.69"
+version = "2.3.67"
 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
-// Checks Project properties -> environment variable -> defaults true
-val relocate: Boolean = project.findProperty("relocate")?.toString()?.toBoolean()
-    ?: System.getenv("RELOCATE_JAR")?.toBoolean()
-    ?: true
-
 repositories {
     mavenLocal()
     maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") // Spigot
@@ -53,28 +29,24 @@ repositories {
     maven("https://repo.opencollab.dev/maven-releases/") // Cumulus (for Floodgate)
     maven("https://repo.codemc.io/repository/maven-releases/") // PacketEvents
     maven("https://repo.codemc.io/repository/maven-snapshots/")
-    maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
     mavenCentral()
     // FastUtil, Discord-Webhooks
 }
 
 dependencies {
-    implementation("com.github.retrooper:packetevents-spigot:2.7.0-SNAPSHOT")
+    implementation("com.github.retrooper:packetevents-spigot:2.5.0-SNAPSHOT")
     implementation("co.aikar:acf-paper:0.5.1-SNAPSHOT")
     implementation("club.minnced:discord-webhooks:0.8.0") // Newer versions include kotlin-stdlib, which leads to incompatibility with plugins that use Kotlin
-    implementation("it.unimi.dsi:fastutil:8.5.15")
+    implementation("it.unimi.dsi:fastutil:8.5.13")
     implementation("github.scarsz:configuralize:1.4.0")
-    implementation("com.zaxxer:HikariCP:4.0.3")
 
-    //implementation("com.github.grimanticheat:grimapi:1193c4fa41")
-    // Used for local testing:
-    implementation("ac.grim.grimac:GrimAPI:1.0")
-//    implementation("com.github.grimanticheat:grimapi:fc5634e444")
+    implementation("com.github.grimanticheat:grimapi:1193c4fa41")
+    // Used for local testing: implementation("ac.grim.grimac:grimapi:1.0")
 
     implementation("org.jetbrains:annotations:24.1.0")
-    compileOnly("org.geysermc.floodgate:api:2.2.3-SNAPSHOT")
+    compileOnly("org.geysermc.floodgate:api:2.0-SNAPSHOT")
     compileOnly("org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT")
-    compileOnly("com.viaversion:viaversion-api:5.1.1-SNAPSHOT")
+    compileOnly("com.viaversion:viaversion-api:4.9.4-SNAPSHOT")
     //
     compileOnly("io.netty:netty-all:4.1.85.Final")
 }
@@ -83,7 +55,6 @@ bukkit {
     name = "GrimAC"
     author = "GrimAC"
     main = "ac.grim.grimac.GrimAC"
-    website = "https://grim.ac/"
     apiVersion = "1.13"
     foliaSupported = true
 
@@ -144,22 +115,11 @@ bukkit {
             description = "Exempt from all checks"
             default = Permission.Default.FALSE
         }
-
-        register("grim.verbose") {
-            description = "Receive verbose alerts for violations. Requires grim.alerts"
-            default = Permission.Default.OP
-        }
-
-        register("grim.verbose.enable-on-join") {
-            description = "Enable verbose alerts on join. Requires grim.alerts and grim.alerts.enable-on-join"
-            default = Permission.Default.FALSE
-        }
     }
 }
 
 tasks.build {
     dependsOn(tasks.shadowJar)
-    dependsOn(tasks.spotlessApply)
 }
 
 tasks.withType<JavaCompile> {
@@ -173,24 +133,21 @@ publishing.publications.create<MavenPublication>("maven") {
 tasks.shadowJar {
     minimize()
     archiveFileName.set("${project.name}-${project.version}.jar")
-    if (relocate) {
-        relocate("io.github.retrooper.packetevents", "ac.grim.grimac.shaded.io.github.retrooper.packetevents")
-        relocate("com.github.retrooper.packetevents", "ac.grim.grimac.shaded.com.github.retrooper.packetevents")
-        relocate("co.aikar.commands", "ac.grim.grimac.shaded.acf")
-        relocate("co.aikar.locale", "ac.grim.grimac.shaded.locale")
-        relocate("club.minnced", "ac.grim.grimac.shaded.discord-webhooks")
-        relocate("github.scarsz.configuralize", "ac.grim.grimac.shaded.configuralize")
-        relocate("com.github.puregero", "ac.grim.grimac.shaded.com.github.puregero")
-        relocate("com.google.code.gson", "ac.grim.grimac.shaded.gson")
-        relocate("alexh", "ac.grim.grimac.shaded.maps")
-        relocate("it.unimi.dsi.fastutil", "ac.grim.grimac.shaded.fastutil")
-        relocate("net.kyori", "ac.grim.grimac.shaded.kyori")
-        relocate("okhttp3", "ac.grim.grimac.shaded.okhttp3")
-        relocate("okio", "ac.grim.grimac.shaded.okio")
-        relocate("org.yaml.snakeyaml", "ac.grim.grimac.shaded.snakeyaml")
-        relocate("org.json", "ac.grim.grimac.shaded.json")
-        relocate("org.intellij", "ac.grim.grimac.shaded.intellij")
-        relocate("org.jetbrains", "ac.grim.grimac.shaded.jetbrains")
-        relocate("com.zaxxer", "ac.grim.rgimac.shaded.zaxxer")
-    }
+    relocate("io.github.retrooper.packetevents", "ac.grim.grimac.shaded.io.github.retrooper.packetevents")
+    relocate("com.github.retrooper.packetevents", "ac.grim.grimac.shaded.com.github.retrooper.packetevents")
+    relocate("co.aikar.commands", "ac.grim.grimac.shaded.acf")
+    relocate("co.aikar.locale", "ac.grim.grimac.shaded.locale")
+    relocate("club.minnced", "ac.grim.grimac.shaded.discord-webhooks")
+    relocate("github.scarsz.configuralize", "ac.grim.grimac.shaded.configuralize")
+    relocate("com.github.puregero", "ac.grim.grimac.shaded.com.github.puregero")
+    relocate("com.google.code.gson", "ac.grim.grimac.shaded.gson")
+    relocate("alexh", "ac.grim.grimac.shaded.maps")
+    relocate("it.unimi.dsi.fastutil", "ac.grim.grimac.shaded.fastutil")
+    relocate("net.kyori", "ac.grim.grimac.shaded.kyori")
+    relocate("okhttp3", "ac.grim.grimac.shaded.okhttp3")
+    relocate("okio", "ac.grim.grimac.shaded.okio")
+    relocate("org.yaml.snakeyaml", "ac.grim.grimac.shaded.snakeyaml")
+    relocate("org.json", "ac.grim.grimac.shaded.json")
+    relocate("org.intellij", "ac.grim.grimac.shaded.intellij")
+    relocate("org.jetbrains", "ac.grim.grimac.shaded.jetbrains")
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -1,9 +1 @@
-pluginManagement {
-    plugins {
-        kotlin("jvm") version "2.0.21"
-    }
-}
-plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
-}
 rootProject.name = "grimac"

src/main/java/ac/grim/grimac/GrimAPI.java

@@ -1,30 +1,30 @@
 package ac.grim.grimac;
 
+import ac.grim.grimac.api.GrimAbstractAPI;
 import ac.grim.grimac.manager.*;
-import ac.grim.grimac.manager.config.BaseConfigManager;
-import ac.grim.grimac.manager.violationdatabase.ViolationDatabaseManager;
 import ac.grim.grimac.utils.anticheat.PlayerDataManager;
 import lombok.Getter;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.ServicePriority;
 import org.bukkit.plugin.java.JavaPlugin;
 
 @Getter
 public enum GrimAPI {
     INSTANCE;
 
-    private final BaseConfigManager configManager = new BaseConfigManager();
     private final AlertManagerImpl alertManager = new AlertManagerImpl();
     private final SpectateManager spectateManager = new SpectateManager();
     private final DiscordManager discordManager = new DiscordManager();
     private final PlayerDataManager playerDataManager = new PlayerDataManager();
     private final TickManager tickManager = new TickManager();
     private final GrimExternalAPI externalAPI = new GrimExternalAPI(this);
-    private ViolationDatabaseManager violationDatabaseManager;
     private InitManager initManager;
+    private ConfigManager configManager;
     private JavaPlugin plugin;
 
     public void load(final JavaPlugin plugin) {
         this.plugin = plugin;
-        this.violationDatabaseManager = new ViolationDatabaseManager(plugin);
+        this.configManager = new ConfigManager();
         initManager = new InitManager();
         initManager.load();
     }
@@ -32,6 +32,7 @@ public enum GrimAPI {
     public void start(final JavaPlugin plugin) {
         this.plugin = plugin;
         initManager.start();
+        Bukkit.getServicesManager().register(GrimAbstractAPI.class, externalAPI, plugin, ServicePriority.Normal);
     }
 
     public void stop(final JavaPlugin plugin) {

src/main/java/ac/grim/grimac/GrimExternalAPI.java

@@ -1,34 +1,25 @@
 package ac.grim.grimac;
 
+import ac.grim.grimac.api.AbstractCheck;
 import ac.grim.grimac.api.GrimAbstractAPI;
 import ac.grim.grimac.api.GrimUser;
 import ac.grim.grimac.api.alerts.AlertManager;
-import ac.grim.grimac.api.config.ConfigManager;
-import ac.grim.grimac.api.events.GrimReloadEvent;
-import ac.grim.grimac.manager.config.ConfigManagerFileImpl;
 import ac.grim.grimac.manager.init.Initable;
 import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.anticheat.LogUtil;
-import ac.grim.grimac.utils.common.ConfigReloadObserver;
 import com.github.retrooper.packetevents.netty.channel.ChannelHelper;
 import io.github.retrooper.packetevents.util.SpigotReflectionUtil;
-import io.github.retrooper.packetevents.util.folia.FoliaScheduler;
 import lombok.Getter;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.ServicePriority;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
 //This is used for grim's external API. It has its own class just for organization.
-
-public class GrimExternalAPI implements GrimAbstractAPI, ConfigReloadObserver, Initable {
+public class GrimExternalAPI implements GrimAbstractAPI, Initable {
 
     private final GrimAPI api;
 
@@ -50,8 +41,7 @@ public class GrimExternalAPI implements GrimAbstractAPI, ConfigReloadObserver, I
     @Getter
     private final Map<String, Function<GrimUser, String>> variableReplacements = new ConcurrentHashMap<>();
 
-    @Getter
-    private final Map<String, String> staticReplacements = new ConcurrentHashMap<>();
+    @Getter private final Map<String, String> staticReplacements = new ConcurrentHashMap<>();
 
     public String replaceVariables(GrimUser user, String content, boolean colors) {
         if (colors) content = ChatColor.translateAlternateColorCodes('&', content);
@@ -66,20 +56,12 @@ public class GrimExternalAPI implements GrimAbstractAPI, ConfigReloadObserver, I
 
     @Override
     public void registerVariable(String string, Function<GrimUser, String> replacement) {
-        if (replacement == null) {
-            variableReplacements.remove(string);
-        } else {
-            variableReplacements.put(string, replacement);
-        }
+        variableReplacements.put(string, replacement);
     }
 
     @Override
     public void registerVariable(String variable, String replacement) {
-        if (replacement == null) {
-            staticReplacements.remove(variable);
-        } else {
-            staticReplacements.put(variable, replacement);
-        }
+        staticReplacements.put(variable, replacement);
     }
 
     @Override
@@ -88,20 +70,34 @@ public class GrimExternalAPI implements GrimAbstractAPI, ConfigReloadObserver, I
         return description.getVersion();
     }
 
-    private final Map<String, Function<Object, Object>> functions = new ConcurrentHashMap<>();
-
     @Override
     public void registerFunction(String key, Function<Object, Object> function) {
-        if (function == null) {
-            functions.remove(key);
-        } else {
-            functions.put(key, function);
-        }
+
     }
 
     @Override
     public Function<Object, Object> getFunction(String key) {
-        return functions.get(key);
+        return null;
+    }
+
+    @Override
+    public void reload() {
+        GrimAPI.INSTANCE.getConfigManager().reload();
+        //Reload checks for all players
+        for (GrimPlayer grimPlayer : GrimAPI.INSTANCE.getPlayerDataManager().getEntries()) {
+            ChannelHelper.runInEventLoop(grimPlayer.user.getChannel(), () -> {
+                grimPlayer.onReload();
+                grimPlayer.updatePermissions();
+                grimPlayer.punishmentManager.reload();
+                for (AbstractCheck value : grimPlayer.checkManager.allChecks.values()) {
+                    value.reload();
+                }
+            });
+        }
+        //Restart
+        GrimAPI.INSTANCE.getDiscordManager().start();
+        GrimAPI.INSTANCE.getSpectateManager().start();
+        GrimAPI.INSTANCE.getExternalAPI().start();
     }
 
     @Override
@@ -109,113 +105,17 @@ public class GrimExternalAPI implements GrimAbstractAPI, ConfigReloadObserver, I
         return GrimAPI.INSTANCE.getAlertManager();
     }
 
-    @Override
-    public ConfigManager getConfigManager() {
-        return configManager;
-    }
-
-    @Override
-    public boolean hasStarted() {
-        // TODO implement this
-        throw new UnsupportedOperationException("Not implemented yet");
-    }
-
-    private ConfigManager configManager = null;
-    private final ConfigManagerFileImpl configManagerFile = new ConfigManagerFileImpl();
-    private boolean started = false;
-
-    // on load, load the config & register the service
-    public void load() {
-        reload(configManagerFile);
-        Bukkit.getServicesManager().register(GrimAbstractAPI.class, this, GrimAPI.INSTANCE.getPlugin(), ServicePriority.Normal);
-    }
-
-    // handles any config loading that's needed to be done after load
     @Override
     public void start() {
-        started = true;
-        try {
-            GrimAPI.INSTANCE.getConfigManager().start();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        variableReplacements.put("%player%", GrimUser::getName);
+        variableReplacements.put("%uuid%", user -> user.getUniqueId().toString());
+        variableReplacements.put("%ping%", user -> user.getTransactionPing() + "");
+        variableReplacements.put("%brand%", GrimUser::getBrand);
+        variableReplacements.put("%h_sensitivity%", user -> ((int) Math.round(user.getHorizontalSensitivity() * 200)) + "");
+        variableReplacements.put("%v_sensitivity%", user -> ((int) Math.round(user.getVerticalSensitivity() * 200)) + "");
+        variableReplacements.put("%fast_math%", user -> !user.isVanillaMath() + "");
+        variableReplacements.put("%tps%", user -> String.format("%.2f", SpigotReflectionUtil.getTPS()));
+        variableReplacements.put("%version%", GrimUser::getVersionName);
+        variableReplacements.put("%prefix%", user -> ChatColor.translateAlternateColorCodes('&', GrimAPI.INSTANCE.getConfigManager().getConfig().getStringElse("prefix", "&bGrim &8»")));
     }
-
-    @Override
-    public void reload(ConfigManager config) {
-        if (config.isLoadedAsync() && started) {
-            FoliaScheduler.getAsyncScheduler().runNow(GrimAPI.INSTANCE.getPlugin(),
-                    o -> successfulReload(config));
-        } else {
-            successfulReload(config);
-        }
-    }
-
-    @Override
-    public CompletableFuture<Boolean> reloadAsync(ConfigManager config) {
-        if (config.isLoadedAsync() && started) {
-            CompletableFuture<Boolean> future = new CompletableFuture<>();
-            FoliaScheduler.getAsyncScheduler().runNow(GrimAPI.INSTANCE.getPlugin(),
-                    o -> future.complete(successfulReload(config)));
-            return future;
-        }
-        return CompletableFuture.completedFuture(successfulReload(config));
-    }
-
-    private boolean successfulReload(ConfigManager config) {
-        try {
-            config.reload();
-            GrimAPI.INSTANCE.getConfigManager().load(config);
-            if (started) GrimAPI.INSTANCE.getConfigManager().start();
-            onReload(config);
-            if (started) FoliaScheduler.getAsyncScheduler().runNow(GrimAPI.INSTANCE.getPlugin(),
-                    o -> Bukkit.getPluginManager().callEvent(new GrimReloadEvent(true)));
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if (started) FoliaScheduler.getAsyncScheduler().runNow(GrimAPI.INSTANCE.getPlugin(),
-                o -> Bukkit.getPluginManager().callEvent(new GrimReloadEvent(false)));
-        return false;
-    }
-
-    @Override
-    public void onReload(ConfigManager newConfig) {
-        if (newConfig == null) {
-            LogUtil.warn("ConfigManager not set. Using default config file manager.");
-            configManager = configManagerFile;
-        } else {
-            configManager = newConfig;
-        }
-        // Update variables
-        updateVariables();
-        // Restart
-        GrimAPI.INSTANCE.getDiscordManager().start();
-        GrimAPI.INSTANCE.getSpectateManager().start();
-        // Don't reload players if the plugin hasn't started yet
-        if (!started) return;
-        // Reload checks for all players
-        for (GrimPlayer grimPlayer : GrimAPI.INSTANCE.getPlayerDataManager().getEntries()) {
-            ChannelHelper.runInEventLoop(grimPlayer.user.getChannel(), () -> {
-                grimPlayer.updatePermissions();
-                grimPlayer.reload(configManager);
-            });
-        }
-    }
-
-    private void updateVariables() {
-        variableReplacements.putIfAbsent("%player%", GrimUser::getName);
-        variableReplacements.putIfAbsent("%uuid%", user -> user.getUniqueId().toString());
-        variableReplacements.putIfAbsent("%ping%", user -> user.getTransactionPing() + "");
-        variableReplacements.putIfAbsent("%brand%", GrimUser::getBrand);
-        variableReplacements.putIfAbsent("%h_sensitivity%", user -> ((int) Math.round(user.getHorizontalSensitivity() * 200)) + "");
-        variableReplacements.putIfAbsent("%v_sensitivity%", user -> ((int) Math.round(user.getVerticalSensitivity() * 200)) + "");
-        variableReplacements.putIfAbsent("%fast_math%", user -> !user.isVanillaMath() + "");
-        variableReplacements.putIfAbsent("%tps%", user -> String.format("%.2f", SpigotReflectionUtil.getTPS()));
-        variableReplacements.putIfAbsent("%version%", GrimUser::getVersionName);
-        // static variables
-        staticReplacements.putIfAbsent("%prefix%", ChatColor.translateAlternateColorCodes('&', GrimAPI.INSTANCE.getConfigManager().getPrefix()));
-        staticReplacements.putIfAbsent("%grim_version%", getGrimVersion());
-    }
-
 }

src/main/java/ac/grim/grimac/checks/Check.java

@@ -2,26 +2,18 @@ package ac.grim.grimac.checks;
 
 import ac.grim.grimac.GrimAPI;
 import ac.grim.grimac.api.AbstractCheck;
-import ac.grim.grimac.api.config.ConfigManager;
-import ac.grim.grimac.api.dynamic.DefaultUnloadedBehavior;
-import ac.grim.grimac.api.dynamic.UnloadedBehavior;
 import ac.grim.grimac.api.events.FlagEvent;
 import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.common.ConfigReloadObserver;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.protocol.packettype.PacketTypeCommon;
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerFlying;
-import io.github.retrooper.packetevents.util.folia.FoliaScheduler;
+import github.scarsz.configuralize.DynamicConfig;
 import lombok.Getter;
 import lombok.Setter;
 import org.bukkit.Bukkit;
 
-import java.lang.reflect.Method;
-
 // Class from https://github.com/Tecnio/AntiCheatBase/blob/master/src/main/java/me/tecnio/anticheat/check/Check.java
 @Getter
-public class Check implements AbstractCheck, ConfigReloadObserver {
+public class Check implements AbstractCheck {
     protected final GrimPlayer player;
 
     public double violations;
@@ -31,29 +23,17 @@ public class Check implements AbstractCheck, ConfigReloadObserver {
     private String checkName;
     private String configName;
     private String alternativeName;
-    private String displayName;
     private String description;
 
     private boolean experimental;
     @Setter
     private boolean isEnabled;
-    private boolean exempted;
 
     @Override
     public boolean isExperimental() {
         return experimental;
     }
 
-    @Override
-    public UnloadedBehavior getUnloadedBehavior() {
-        return DefaultUnloadedBehavior.INSTANCE;
-    }
-
-    @Override
-    public int getMask() {
-        throw new UnsupportedOperationException("Override this method to show which check types your check is!");
-    }
-
     public Check(final GrimPlayer player) {
         this.player = player;
 
@@ -70,21 +50,13 @@ public class Check implements AbstractCheck, ConfigReloadObserver {
             this.alternativeName = checkData.alternativeName();
             this.experimental = checkData.experimental();
             this.description = checkData.description();
-            this.displayName = this.checkName;
         }
-        //
+
         reload();
     }
 
     public boolean shouldModifyPackets() {
-        return isEnabled && !player.disableGrim && !player.noModifyPacketPermission && !exempted;
-    }
-
-    public void updateExempted() {
-        if (player.bukkitPlayer == null || checkName == null) return;
-        FoliaScheduler.getEntityScheduler().run(player.bukkitPlayer, GrimAPI.INSTANCE.getPlugin(),
-                t -> exempted = player.bukkitPlayer.hasPermission("grim.exempt." + checkName.toLowerCase()),
-                () -> {});
+        return isEnabled && !player.disableGrim && !player.noModifyPacketPermission;
     }
 
     public final boolean flagAndAlert(String verbose) {
@@ -100,7 +72,7 @@ public class Check implements AbstractCheck, ConfigReloadObserver {
     }
 
     public final boolean flag() {
-        if (player.disableGrim || (experimental && !player.isExperimentalChecks()) || exempted)
+        if (player.disableGrim || (experimental && !GrimAPI.INSTANCE.getConfigManager().isExperimentalChecks()))
             return false; // Avoid calling event if disabled
 
         FlagEvent event = new FlagEvent(player, this);
@@ -126,25 +98,21 @@ public class Check implements AbstractCheck, ConfigReloadObserver {
         violations = Math.max(0, violations - decay);
     }
 
-    public void reload(ConfigManager configuration) {
-        decay = configuration.getDoubleElse(configName + ".decay", decay);
-        setbackVL = configuration.getDoubleElse(configName + ".setbackvl", setbackVL);
-        displayName = configuration.getStringElse(configName + ".displayname", checkName);
+    public void reload() {
+        decay = getConfig().getDoubleElse(configName + ".decay", decay);
+        setbackVL = getConfig().getDoubleElse(configName + ".setbackvl", setbackVL);
 
         if (setbackVL == -1) setbackVL = Double.MAX_VALUE;
-        updateExempted();
-        onReload(configuration);
-    }
-
-    @Override
-    public void onReload(ConfigManager config) {
-
     }
 
     public boolean alert(String verbose) {
         return player.punishmentManager.handleAlert(player, verbose, this);
     }
 
+    public DynamicConfig getConfig() {
+        return GrimAPI.INSTANCE.getConfigManager().getConfig();
+    }
+
     public boolean setbackIfAboveSetbackVL() {
         if (getViolations() > setbackVL) {
             return player.getSetbackTeleportUtil().executeViolationSetback();
@@ -165,64 +133,5 @@ public class Check implements AbstractCheck, ConfigReloadObserver {
                 packetType == PacketType.Play.Client.WINDOW_CONFIRMATION;
     }
 
-    public boolean isFlying(PacketTypeCommon packetType) {
-        return WrapperPlayClientPlayerFlying.isFlying(packetType);
-    }
-
-    public boolean isUpdate(PacketTypeCommon packetType) {
-        return isFlying(packetType)
-                || packetType == PacketType.Play.Client.CLIENT_TICK_END
-                || isTransaction(packetType);
-    }
-
-    public boolean isTickPacket(PacketTypeCommon packetType) {
-        if (isTickPacketIncludingNonMovement(packetType)) {
-            if (isFlying(packetType)) {
-                return !player.packetStateData.lastPacketWasTeleport && !player.packetStateData.lastPacketWasOnePointSeventeenDuplicate;
-            }
-            return true;
-        }
-        return false;
-    }
-
-    public boolean isTickPacketIncludingNonMovement(PacketTypeCommon packetType) {
-        // On 1.21.2+ fall back to the TICK_END packet IF the player did not send a movement packet for their tick
-        // TickTimer checks to see if player did not send a tick end packet before new flying packet is sent
-        if (player.getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_21_2)
-                && !player.packetStateData.didSendMovementBeforeTickEnd) {
-            if (packetType == PacketType.Play.Client.CLIENT_TICK_END) {
-                return true;
-            }
-        }
-
-        return isFlying(packetType);
-    }
-
-    public interface UnloadedCheckHandler<T extends Check> {
-        // Return what the check's methods should return when unloaded
-        Object handleUnloadedCall(Method method, Object[] args);
-    }
-
-    // Default behavior - do nothing and return false/0/null
-    public static final UnloadedCheckHandler<?> DEFAULT_HANDLER = (method, args) -> {
-        // Return appropriate "no-op" value based on return type
-        Class<?> returnType = method.getReturnType();
-        if (returnType == boolean.class) return false;
-        if (returnType == int.class) return 0;
-        if (returnType == void.class) return null;
-        // etc...
-        return null;
-    };
-
-    private UnloadedCheckHandler<?> unloadedHandler = DEFAULT_HANDLER;
-
-    public void setUnloadedHandler(UnloadedCheckHandler<?> handler) {
-        this.unloadedHandler = handler;
-    }
-
-    @Override
-    public void reload() {
-        reload(GrimAPI.INSTANCE.getConfigManager().getConfig());
-    }
-
 }
+

src/main/java/ac/grim/grimac/checks/impl/aim/AimDuplicateLook.java

@@ -1,12 +1,13 @@
 package ac.grim.grimac.checks.impl.aim;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractRotationCheck;
+import ac.grim.grimac.checks.type.RotationCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.anticheat.update.RotationUpdate;
 
 @CheckData(name = "AimDuplicateLook")
-public class AimDuplicateLook extends AbstractRotationCheck {
+public class AimDuplicateLook extends Check implements RotationCheck {
     public AimDuplicateLook(GrimPlayer playerData) {
         super(playerData);
     }

src/main/java/ac/grim/grimac/checks/impl/aim/AimModulo360.java

@@ -1,7 +1,8 @@
 package ac.grim.grimac.checks.impl.aim;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractRotationCheck;
+import ac.grim.grimac.checks.type.RotationCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.anticheat.update.RotationUpdate;
 
@@ -9,9 +10,8 @@ import ac.grim.grimac.utils.anticheat.update.RotationUpdate;
 // 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 AbstractRotationCheck {
-
-    private float lastDeltaYaw;
+public class AimModulo360 extends Check implements RotationCheck {
+    float lastDeltaYaw;
 
     public AimModulo360(GrimPlayer playerData) {
         super(playerData);
@@ -19,17 +19,12 @@ public class AimModulo360 extends AbstractRotationCheck {
 
     @Override
     public void process(final RotationUpdate rotationUpdate) {
-        if (player.packetStateData.lastPacketWasTeleport) {
-            lastDeltaYaw = rotationUpdate.getDeltaXRot();
-            return;
-        }
-
+        lastDeltaYaw = rotationUpdate.getDeltaXRot();
+        if (player.packetStateData.lastPacketWasTeleport) return;
         if (player.xRot < 360 && player.xRot > -360 && Math.abs(rotationUpdate.getDeltaXRot()) > 320 && Math.abs(lastDeltaYaw) < 30) {
             flagAndAlert();
         } else {
             reward();
         }
-
-        lastDeltaYaw = rotationUpdate.getDeltaXRot();
     }
 }

src/main/java/ac/grim/grimac/checks/impl/aim/processor/AimProcessor.java

@@ -1,6 +1,7 @@
 package ac.grim.grimac.checks.impl.aim.processor;
 
-import ac.grim.grimac.checks.type.abstracts.AbstractRotationCheck;
+import ac.grim.grimac.checks.Check;
+import ac.grim.grimac.checks.type.RotationCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.anticheat.update.RotationUpdate;
 import ac.grim.grimac.utils.data.Pair;
@@ -8,7 +9,7 @@ import ac.grim.grimac.utils.lists.RunningMode;
 import ac.grim.grimac.utils.math.GrimMath;
 
 
-public class AimProcessor extends AbstractRotationCheck {
+public class AimProcessor extends Check implements RotationCheck {
 
     private static final int SIGNIFICANT_SAMPLES_THRESHOLD = 15;
     private static final int TOTAL_SAMPLES_THRESHOLD = 80;
@@ -58,15 +59,15 @@ public class AimProcessor extends AbstractRotationCheck {
 
         if (this.xRotMode.size() > SIGNIFICANT_SAMPLES_THRESHOLD) {
             Pair<Double, Integer> modeX = this.xRotMode.getMode();
-            if (modeX.second() > SIGNIFICANT_SAMPLES_THRESHOLD) {
-                this.modeX = modeX.first();
+            if (modeX.getSecond() > SIGNIFICANT_SAMPLES_THRESHOLD) {
+                this.modeX = modeX.getFirst();
                 this.sensitivityX = convertToSensitivity(this.modeX);
             }
         }
         if (this.yRotMode.size() > SIGNIFICANT_SAMPLES_THRESHOLD) {
             Pair<Double, Integer> modeY = this.yRotMode.getMode();
-            if (modeY.second() > SIGNIFICANT_SAMPLES_THRESHOLD) {
-                this.modeY = modeY.first();
+            if (modeY.getSecond() > SIGNIFICANT_SAMPLES_THRESHOLD) {
+                this.modeY = modeY.getFirst();
                 this.sensitivityY = convertToSensitivity(this.modeY);
             }
         }
@@ -80,4 +81,4 @@ public class AimProcessor extends AbstractRotationCheck {
         double var9 = Math.cbrt(var11);
         return (var9 - 0.2f) / 0.6f;
     }
-}
+}

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsA.java

@@ -1,14 +1,15 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 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 AbstractPacketCheck {
+@CheckData(name = "BadPacketsA")
+public class BadPacketsA extends Check implements PacketCheck {
     int lastSlot = -1;
 
     public BadPacketsA(final GrimPlayer player) {

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsB.java

@@ -1,14 +1,15 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 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 AbstractPacketCheck {
+@CheckData(name = "BadPacketsB")
+public class BadPacketsB extends Check implements PacketCheck {
     public BadPacketsB(GrimPlayer player) {
         super(player);
     }

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsC.java

@@ -1,14 +1,15 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 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 AbstractPacketCheck {
+@CheckData(name = "BadPacketsC")
+public class BadPacketsC extends Check implements PacketCheck {
     public BadPacketsC(GrimPlayer player) {
         super(player);
     }

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsD.java

@@ -1,14 +1,15 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 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 AbstractPacketCheck {
+public class BadPacketsD extends Check implements PacketCheck {
     public BadPacketsD(GrimPlayer player) {
         super(player);
     }

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsE.java

@@ -1,15 +1,15 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 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 AbstractPacketCheck {
+public class BadPacketsE extends Check implements PacketCheck {
     private int noReminderTicks;
 
     public BadPacketsE(GrimPlayer player) {
@@ -23,12 +23,10 @@ public class BadPacketsE extends AbstractPacketCheck {
             noReminderTicks = 0;
         } else if (WrapperPlayClientPlayerFlying.isFlying(event.getPacketType())) {
             noReminderTicks++;
-        } else if (event.getPacketType() == PacketType.Play.Client.STEER_VEHICLE
-                || (player.getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_21_2) && player.compensatedEntities.getSelf().inVehicle())) {
+        } else if (event.getPacketType() == PacketType.Play.Client.STEER_VEHICLE) {
             noReminderTicks = 0; // Exempt vehicles
         }
 
-
         if (noReminderTicks > 20) {
             flagAndAlert("ticks=" + noReminderTicks); // ban?  I don't know how this would false
         }

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsF.java

@@ -1,14 +1,15 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 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 AbstractPacketCheck {
+@CheckData(name = "BadPacketsF")
+public class BadPacketsF extends Check implements PacketCheck {
     public boolean lastSprinting;
     public boolean exemptNext = true; // Support 1.14+ clients starting on either true or false sprinting, we don't know
 

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsG.java

@@ -1,15 +1,17 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 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 AbstractPacketCheck {
-    private boolean lastSneaking, respawn;
+@CheckData(name = "BadPacketsG")
+public class BadPacketsG extends Check implements PacketCheck {
+    boolean wasTeleport;
+    boolean lastSneaking;
 
     public BadPacketsG(GrimPlayer player) {
         super(player);
@@ -17,12 +19,13 @@ public class BadPacketsG extends AbstractPacketCheck {
 
     @Override
     public void onPacketReceive(PacketReceiveEvent event) {
+        wasTeleport = player.packetStateData.lastPacketWasTeleport || wasTeleport;
+
         if (event.getPacketType() == PacketType.Play.Client.ENTITY_ACTION) {
             WrapperPlayClientEntityAction packet = new WrapperPlayClientEntityAction(event);
 
             if (packet.getAction() == WrapperPlayClientEntityAction.Action.START_SNEAKING) {
-                // The player may send two START_SNEAKING packets if they respawned
-                if (lastSneaking && !respawn) {
+                if (lastSneaking && !wasTeleport) {
                     if (flagAndAlert("state=true") && shouldModifyPackets()) {
                         event.setCancelled(true);
                         player.onPacketCancel();
@@ -30,9 +33,8 @@ public class BadPacketsG extends AbstractPacketCheck {
                 } else {
                     lastSneaking = true;
                 }
-                respawn = false;
             } else if (packet.getAction() == WrapperPlayClientEntityAction.Action.STOP_SNEAKING) {
-                if (!lastSneaking && !respawn) {
+                if (!lastSneaking && !wasTeleport) {
                     if (flagAndAlert("state=false") && shouldModifyPackets()) {
                         event.setCancelled(true);
                         player.onPacketCancel();
@@ -40,13 +42,7 @@ public class BadPacketsG extends AbstractPacketCheck {
                 } else {
                     lastSneaking = false;
                 }
-                respawn = false;
             }
         }
     }
-
-    public void handleRespawn() {
-        // Clients could potentially not send a STOP_SNEAKING packet when they die, so we need to track it
-        respawn = true;
-    }
 }

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsH.java

@@ -1,7 +1,8 @@
-package ac.grim.grimac.checks.impl.packetorder;
+package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
@@ -9,16 +10,17 @@ import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientInteractEntity;
+import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerFlying;
 
-@CheckData(name = "PacketOrderB")
-public class PacketOrderB extends AbstractPacketCheck {
+@CheckData(name = "BadPacketsH")
+public class BadPacketsH extends Check implements PacketCheck {
 
     // 1.9 packet order: INTERACT -> ANIMATION
     // 1.8 packet order: ANIMATION -> INTERACT
     // I personally think 1.8 made much more sense. You swing and THEN you hit!
     private boolean sentAnimation = player.getClientVersion().isNewerThan(ClientVersion.V_1_8);
 
-    public PacketOrderB(final GrimPlayer player) {
+    public BadPacketsH(final GrimPlayer player) {
         super(player);
     }
 
@@ -42,7 +44,7 @@ public class PacketOrderB extends AbstractPacketCheck {
             if (player.getClientVersion().isOlderThan(ClientVersion.V_1_9)
                     && PacketEvents.getAPI().getServerManager().getVersion().isNewerThan(ServerVersion.V_1_8)) return;
 
-            if (!sentAnimation && flagAndAlert() && shouldModifyPackets()) {
+            if (!sentAnimation && flagAndAlert()) {
                 event.setCancelled(true);
                 player.onPacketCancel();
             }

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsI.java

@@ -1,14 +1,15 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 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 AbstractPacketCheck {
+@CheckData(name = "BadPacketsI")
+public class BadPacketsI extends Check implements PacketCheck {
     public BadPacketsI(GrimPlayer player) {
         super(player);
     }

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsJ.java

@@ -1,13 +1,14 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 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 AbstractPacketCheck {
+@CheckData(name = "BadPacketsJ")
+public class BadPacketsJ extends Check implements PacketCheck {
     public BadPacketsJ(GrimPlayer player) {
         super(player);
     }

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsK.java

@@ -1,14 +1,15 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 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 AbstractPacketCheck {
+@CheckData(name = "BadPacketsK")
+public class BadPacketsK extends Check implements PacketCheck {
     public BadPacketsK(GrimPlayer player) {
         super(player);
     }

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsL.java

@@ -1,7 +1,8 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
@@ -12,8 +13,9 @@ import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPl
 
 import java.util.Locale;
 
-@CheckData(name = "BadPacketsL", description = "Sent impossible dig packet")
-public class BadPacketsL extends AbstractPacketCheck {
+// checks for impossible dig packets
+@CheckData(name = "BadPacketsL")
+public class BadPacketsL extends Check implements PacketCheck {
 
     public BadPacketsL(GrimPlayer player) {
         super(player);

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsM.java

@@ -0,0 +1,61 @@
+package ac.grim.grimac.checks.impl.badpackets;
+
+import ac.grim.grimac.checks.Check;
+import ac.grim.grimac.checks.CheckData;
+import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.player.GrimPlayer;
+import ac.grim.grimac.utils.data.packetentity.PacketEntity;
+import com.github.retrooper.packetevents.event.PacketReceiveEvent;
+import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
+import com.github.retrooper.packetevents.protocol.packettype.PacketType;
+import com.github.retrooper.packetevents.protocol.player.ClientVersion;
+import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientInteractEntity;
+
+@CheckData(name = "BadPacketsM", experimental = true)
+public class BadPacketsM extends Check implements PacketCheck {
+    public BadPacketsM(final GrimPlayer player) {
+        super(player);
+    }
+
+    // 1.7 players do not send INTERACT_AT, so we cannot check them
+    private final boolean exempt = player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_7_10);
+    private boolean sentInteractAt = false;
+
+    @Override
+    public void onPacketReceive(PacketReceiveEvent event) {
+        if (event.getPacketType() == PacketType.Play.Client.INTERACT_ENTITY && !exempt) {
+
+            final WrapperPlayClientInteractEntity wrapper = new WrapperPlayClientInteractEntity(event);
+
+            final PacketEntity entity = player.compensatedEntities.entityMap.get(wrapper.getEntityId());
+
+            // For armor stands, vanilla clients send:
+            //  - when renaming the armor stand or in spectator mode: INTERACT_AT + INTERACT
+            //  - in all other cases: only INTERACT
+            // Just exempt armor stands to be safe
+            if (entity != null && entity.getType() == EntityTypes.ARMOR_STAND) return;
+
+            switch (wrapper.getAction()) {
+                // INTERACT_AT then INTERACT
+                case INTERACT:
+                    if (!sentInteractAt) {
+                        if (flagAndAlert("Missed Interact-At") && shouldModifyPackets()) {
+                            event.setCancelled(true);
+                            player.onPacketCancel();
+                        }
+                    }
+                    sentInteractAt = false;
+                    break;
+                case INTERACT_AT:
+                    if (sentInteractAt) {
+                        if (flagAndAlert("Missed Interact") && shouldModifyPackets()) {
+                            event.setCancelled(true);
+                            player.onPacketCancel();
+                        }
+                    }
+                    sentInteractAt = true;
+                    break;
+            }
+        }
+    }
+}

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsN.java

@@ -1,11 +1,12 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
 
 @CheckData(name = "BadPacketsN")
-public class BadPacketsN extends AbstractPacketCheck {
+public class BadPacketsN extends Check implements PacketCheck {
     public BadPacketsN(final GrimPlayer player) {
         super(player);
     }

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsO.java

@@ -1,7 +1,8 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.data.Pair;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
@@ -14,7 +15,7 @@ import java.util.LinkedList;
 import java.util.Queue;
 
 @CheckData(name = "BadPacketsO")
-public class BadPacketsO extends AbstractPacketCheck {
+public class BadPacketsO extends Check implements PacketCheck {
     Queue<Pair<Long, Long>> keepaliveMap = new LinkedList<>();
 
     public BadPacketsO(GrimPlayer player) {
@@ -38,7 +39,7 @@ public class BadPacketsO extends AbstractPacketCheck {
             boolean hasID = false;
 
             for (Pair<Long, Long> iterator : keepaliveMap) {
-                if (iterator.first() == id) {
+                if (iterator.getFirst() == id) {
                     hasID = true;
                     break;
                 }
@@ -54,7 +55,7 @@ public class BadPacketsO extends AbstractPacketCheck {
                 do {
                     data = keepaliveMap.poll();
                     if (data == null) break;
-                } while (data.first() != id);
+                } while (data.getFirst() != id);
             }
         }
     }

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsP.java

@@ -1,18 +1,17 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.event.PacketSendEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientClickWindow;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientClickWindow.WindowClickType;
 import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerOpenWindow;
 
-
 @CheckData(name = "BadPacketsP", experimental = true)
-public class BadPacketsP extends AbstractPacketCheck {
+public class BadPacketsP extends Check implements PacketCheck {
 
     public BadPacketsP(GrimPlayer playerData) {
         super(playerData);
@@ -34,39 +33,35 @@ public class BadPacketsP extends AbstractPacketCheck {
     public void onPacketReceive(PacketReceiveEvent event) {
         if (event.getPacketType() == PacketType.Play.Client.CLICK_WINDOW) {
             WrapperPlayClientClickWindow wrapper = new WrapperPlayClientClickWindow(event);
-            WindowClickType clickType = wrapper.getWindowClickType();
+            int clickType = wrapper.getWindowClickType().ordinal();
             int button = wrapper.getButton();
 
-            // TODO: Adjust for containers
-            boolean flag;
+            boolean flag = false;
+
+            //TODO: Adjust for containers
             switch (clickType) {
-                case PICKUP:
-                case QUICK_MOVE:
-                case THROW:
-                    flag = button != 0 && button != 1;
+                case 0:
+                case 1:
+                case 4:
+                    if (button != 0 && button != 1) flag = true;
                     break;
-                case SWAP:
-                    flag = (button > 8 || button < 0) && button != 40;
+                case 2:
+                    if ((button > 8 || button < 0) && button != 40) flag = true;
                     break;
-                case CLONE:
-                    flag = button != 2;
+                case 3:
+                    if (button != 2) flag = true;
                     break;
-                case QUICK_CRAFT:
-                    flag = button == 3 || button == 7 || button > 10 || button < 0;
+                case 5:
+                    if (button == 3 || button == 7 || button > 10 || button < 0) flag = true;
                     break;
-                case PICKUP_ALL:
-                    flag = button != 0;
+                case 6:
+                    if (button != 0) flag = true;
                     break;
-                case UNKNOWN:
-                    flag = false;
-                    break;
-                default:
-                    throw new IllegalStateException("Impossible clickType; Compiler does not know this is unreachable!");
             }
 
-            // Allowing this to false flag to debug and find issues faster
+            //Allowing this to false flag to debug and find issues faster
             if (flag) {
-                if (flagAndAlert("clickType=" + clickType.toString().toLowerCase() + ", button=" + button + (wrapper.getWindowId() == containerId ? ", container=" + containerType : "")) && shouldModifyPackets()) {
+                if (flagAndAlert("clickType=" + clickType + " button=" + button + (wrapper.getWindowId() == containerId ? " container=" + containerType : "")) && shouldModifyPackets()) {
                     event.setCancelled(true);
                     player.onPacketCancel();
                 }

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsQ.java

@@ -1,7 +1,8 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType.Play.Client;
@@ -9,7 +10,7 @@ import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientEn
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientEntityAction.Action;
 
 @CheckData(name = "BadPacketsQ")
-public class BadPacketsQ extends AbstractPacketCheck {
+public class BadPacketsQ extends Check implements PacketCheck {
     public BadPacketsQ(final GrimPlayer player) {
         super(player);
     }

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsR.java

@@ -1,14 +1,15 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 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 AbstractPacketCheck {
+public class BadPacketsR extends Check implements PacketCheck {
     public BadPacketsR(final GrimPlayer player) {
         super(player);
     }
@@ -40,8 +41,7 @@ public class BadPacketsR extends AbstractPacketCheck {
         if ((event.getPacketType() == PacketType.Play.Client.PLAYER_POSITION_AND_ROTATION ||
                 event.getPacketType() == PacketType.Play.Client.PLAYER_POSITION) && !player.compensatedEntities.getSelf().inVehicle()) {
             positions++;
-        } else if ((event.getPacketType() == PacketType.Play.Client.STEER_VEHICLE || event.getPacketType() == PacketType.Play.Client.VEHICLE_MOVE)
-                && player.inVehicle()) {
+        } else if (event.getPacketType() == PacketType.Play.Client.STEER_VEHICLE && player.compensatedEntities.getSelf().inVehicle()) {
             positions++;
         }
     }

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsS.java

@@ -1,11 +1,12 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
 
 @CheckData(name = "BadPacketsS")
-public class BadPacketsS extends AbstractPacketCheck {
+public class BadPacketsS extends Check implements PacketCheck {
     public BadPacketsS(GrimPlayer player) {
         super(player);
     }

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsT.java

@@ -1,7 +1,8 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.data.packetentity.PacketEntity;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
@@ -12,7 +13,7 @@ import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientInteractEntity;
 
 @CheckData(name = "BadPacketsT")
-public class BadPacketsT extends AbstractPacketCheck {
+public class BadPacketsT extends Check implements PacketCheck {
     public BadPacketsT(final GrimPlayer player) {
         super(player);
     }
@@ -48,7 +49,7 @@ public class BadPacketsT extends AbstractPacketCheck {
                 //  27/12/2023 - Dynamic values for more than just one entity type?
                 //  28/12/2023 - Player-only is fine
                 //  30/12/2023 - Expansions differ in 1.9+
-                final float scale = (float) packetEntity.getAttributeValue(Attributes.SCALE);
+                final float scale = (float) packetEntity.getAttributeValue(Attributes.GENERIC_SCALE);
                 if (targetVector.y > (minVerticalDisplacement * scale) && targetVector.y < (maxVerticalDisplacement * scale)
                         && Math.abs(targetVector.x) < (maxHorizontalDisplacement * scale)
                         && Math.abs(targetVector.z) < (maxHorizontalDisplacement * scale)) {

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsU.java

@@ -1,10 +1,12 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.item.ItemStack;
+import com.github.retrooper.packetevents.protocol.item.type.ItemType;
 import com.github.retrooper.packetevents.protocol.item.type.ItemTypes;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
@@ -13,8 +15,8 @@ import com.github.retrooper.packetevents.util.Vector3f;
 import com.github.retrooper.packetevents.util.Vector3i;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerBlockPlacement;
 
-@CheckData(name = "BadPacketsU", description = "Sent impossible use item packet", experimental = true)
-public class BadPacketsU extends AbstractPacketCheck {
+@CheckData(name = "BadPacketsU", experimental = true)
+public class BadPacketsU extends Check implements PacketCheck {
     public BadPacketsU(GrimPlayer player) {
         super(player);
     }

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsV.java

@@ -0,0 +1,31 @@
+package ac.grim.grimac.checks.impl.badpackets;
+
+import ac.grim.grimac.checks.Check;
+import ac.grim.grimac.checks.CheckData;
+import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.player.GrimPlayer;
+import com.github.retrooper.packetevents.event.PacketReceiveEvent;
+import com.github.retrooper.packetevents.protocol.item.ItemStack;
+import com.github.retrooper.packetevents.protocol.packettype.PacketType;
+import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientInteractEntity;
+
+@CheckData(name = "BadPacketsV", experimental = true)
+public class BadPacketsV extends Check implements PacketCheck {
+    public BadPacketsV(GrimPlayer player) {
+        super(player);
+    }
+
+    @Override
+    public void onPacketReceive(PacketReceiveEvent event) {
+        if (event.getPacketType() == PacketType.Play.Client.INTERACT_ENTITY) {
+            WrapperPlayClientInteractEntity interactEntity = new WrapperPlayClientInteractEntity(event);
+            if (interactEntity.getAction() != WrapperPlayClientInteractEntity.InteractAction.ATTACK) return;
+            if (!player.packetStateData.isSlowedByUsingItem()) return;
+            ItemStack itemInUse = player.getInventory().getItemInHand(player.packetStateData.eatingHand);
+            if (flagAndAlert("UseItem=" + itemInUse.getType().getName().getKey()) && shouldModifyPackets()) {
+                event.setCancelled(true);
+                player.onPacketCancel();
+            }
+        }
+    }
+}

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsW.java

@@ -1,11 +1,12 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
 
-@CheckData(name = "BadPacketsW", description = "Interacted with non-existent entity", experimental = true)
-public class BadPacketsW extends AbstractPacketCheck {
+@CheckData(name = "BadPacketsW", experimental = true)
+public class BadPacketsW extends Check implements PacketCheck {
     public BadPacketsW(GrimPlayer player) {
         super(player);
     }

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsX.java

@@ -1,92 +1,45 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
-import ac.grim.grimac.GrimAPI;
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractBlockBreakCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.anticheat.update.BlockBreak;
-import ac.grim.grimac.utils.change.BlockModification;
+import ac.grim.grimac.utils.nmsutil.BlockBreakSpeed;
+import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.item.type.ItemTypes;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.protocol.player.DiggingAction;
 import com.github.retrooper.packetevents.protocol.world.states.type.StateType;
 import com.github.retrooper.packetevents.protocol.world.states.type.StateTypes;
-import com.github.retrooper.packetevents.util.Vector3i;
+import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerDigging;
 
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-@CheckData(name = "BadPacketsX")
-public class BadPacketsX extends AbstractBlockBreakCheck {
+@CheckData(name = "BadPacketsX", experimental = true)
+public class BadPacketsX extends Check implements PacketCheck {
     public BadPacketsX(GrimPlayer player) {
         super(player);
     }
 
-    private int lastTick;
-    private boolean didLastFlag;
-    private Vector3i lastBreakLoc;
-    private StateType lastBlockType;
-
     public final boolean noFireHitbox = player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_15_2);
 
-    @Override
-    public void onBlockBreak(BlockBreak blockBreak) {
-        if (blockBreak.action != DiggingAction.START_DIGGING && blockBreak.action != DiggingAction.FINISHED_DIGGING)
+    public final void handle(PacketReceiveEvent event, WrapperPlayClientPlayerDigging dig, StateType block) {
+        if (dig.getAction() != DiggingAction.START_DIGGING && dig.getAction() != DiggingAction.FINISHED_DIGGING)
             return;
 
-        final StateType block = blockBreak.block.getType();
+        final boolean invalid;
 
-        // Fixes false from breaking kelp underwater
-        // The client sends two start digging packets to the server both in the same tick. BadPacketsX gets called twice, doesn't false the first time, but falses the second
-        // One ends up breaking the kelp, the other ends up doing nothing besides falsing this check because we think they're trying to mine water
-        // I am explicitly making this patch as narrow and specific as possible to potentially discover other blocks that exhibit similar behaviour
-        int newTick = GrimAPI.INSTANCE.getTickManager().currentTick;
-        if (lastTick == newTick
-                && lastBreakLoc.equals(blockBreak.position)
-                && !didLastFlag
-                && lastBlockType.getHardness() == 0.0F
-                && lastBlockType.getBlastResistance() == 0.0F
-                && block == StateTypes.WATER
-        ) return;
+        if (dig.getAction() == DiggingAction.FINISHED_DIGGING) {
+            invalid = BlockBreakSpeed.getBlockDamage(player, dig.getBlockPosition()) >= 1 || block.getHardness() == -1.0f;
+        } else invalid = (block == StateTypes.LIGHT && !(player.getInventory().getHeldItem().is(ItemTypes.LIGHT) || player.getInventory().getOffHand().is(ItemTypes.LIGHT)))
+                || block.isAir()
+                || block == StateTypes.WATER
+                || block == StateTypes.LAVA
+                || block == StateTypes.BUBBLE_COLUMN
+                || block == StateTypes.MOVING_PISTON
+                || (block == StateTypes.FIRE && noFireHitbox);
 
-        // prevents rare false on rapidly breaking short grass
-        List<StateType> previousBlockStates = player.blockHistory.modificationQueue.stream()
-                .filter((blockModification) -> blockModification.getLocation().equals(blockBreak.position)
-                        && newTick - blockModification.getTick() < 2
-                        && (blockModification.getCause() == BlockModification.Cause.START_DIGGING || blockModification.getCause() == BlockModification.Cause.HANDLE_NETTY_SYNC_TRANSACTION))
-                .flatMap(mod -> Stream.of(mod.getOldBlockContents().getType()))
-                .collect(Collectors.toList());
-
-        previousBlockStates.add(0, block);
-
-        boolean invalid = false;
-        for (StateType possibleBlockState : previousBlockStates) {
-            // the block does not have a hitbox
-            invalid = (possibleBlockState == StateTypes.LIGHT && !(player.getInventory().getHeldItem().is(ItemTypes.LIGHT) || player.getInventory().getOffHand().is(ItemTypes.LIGHT)))
-                    || possibleBlockState.isAir()
-                    || possibleBlockState == StateTypes.WATER
-                    || possibleBlockState == StateTypes.LAVA
-                    || possibleBlockState == StateTypes.BUBBLE_COLUMN
-                    || possibleBlockState == StateTypes.MOVING_PISTON
-                    || possibleBlockState == StateTypes.FIRE && noFireHitbox
-                    // or the client claims to have broken an unbreakable block
-                    || possibleBlockState.getHardness() == -1.0f && blockBreak.action == DiggingAction.FINISHED_DIGGING;
-            if (!invalid) {
-                break;
-            }
+        if (invalid && flagAndAlert("block=" + block.getName() + ", type=" + dig.getAction()) && shouldModifyPackets()) {
+            event.setCancelled(true);
+            player.onPacketCancel();
         }
-
-        if (invalid && flagAndAlert("block=" + block.getName() + ", type=" + blockBreak.action)) {
-            didLastFlag = true;
-            if (shouldModifyPackets()) {
-                blockBreak.cancel();
-            }
-        } else {
-            didLastFlag = false;
-        }
-        lastTick = newTick;
-        lastBreakLoc = blockBreak.position;
-        lastBlockType = block;
     }
 }

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsY.java

@@ -1,14 +1,18 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 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 = "BadPacketsY", description = "Sent out of bounds slot id")
-public class BadPacketsY extends AbstractPacketCheck {
+/**
+ * Checks for out of bounds slot changes
+ */
+@CheckData(name = "BadPacketsY")
+public class BadPacketsY extends Check implements PacketCheck {
     public BadPacketsY(GrimPlayer player) {
         super(player);
     }

src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsZ.java

@@ -1,27 +1,27 @@
 package ac.grim.grimac.checks.impl.badpackets;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractBlockBreakCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.anticheat.MessageUtil;
-import ac.grim.grimac.utils.anticheat.update.BlockBreak;
-import com.github.retrooper.packetevents.PacketEvents;
-import com.github.retrooper.packetevents.manager.server.ServerVersion;
+import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.protocol.player.DiggingAction;
 import com.github.retrooper.packetevents.util.Vector3i;
+import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerDigging;
 
+import static ac.grim.grimac.events.packets.patch.ResyncWorldUtil.resyncPosition;
 import static ac.grim.grimac.utils.nmsutil.BlockBreakSpeed.getBlockDamage;
 
-@CheckData(name = "BadPacketsZ")
-public class BadPacketsZ extends AbstractBlockBreakCheck {
+@CheckData(name = "BadPacketsZ", experimental = true)
+public class BadPacketsZ extends Check implements PacketCheck {
     public BadPacketsZ(final GrimPlayer player) {
         super(player);
     }
 
     private boolean lastBlockWasInstantBreak = false;
     private Vector3i lastBlock, lastCancelledBlock, lastLastBlock = null;
-    private final int exemptedY = player.getClientVersion().isOlderThan(ClientVersion.V_1_8) ? 255 : (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_14) ? -1 : 4095);
+    private final int exemptedY = player.getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_8) ? 4095 : 255;
 
     // The client sometimes sends a wierd cancel packet
     private boolean shouldExempt(final Vector3i pos) {
@@ -33,14 +33,21 @@ public class BadPacketsZ extends AbstractBlockBreakCheck {
         if (player.getClientVersion().isOlderThan(ClientVersion.V_1_14_4) && pos.y != exemptedY)
             return false;
 
+        // the client only sends this packet if the last block was an instant break
+        if (getBlockDamage(player, lastBlock) < 1)
+            return false;
+
         // and if this block is not an instant break
         return player.getClientVersion().isOlderThan(ClientVersion.V_1_14_4) || getBlockDamage(player, pos) < 1;
     }
 
-    @Override
-    public void onBlockBreak(BlockBreak blockBreak) {
-        if (blockBreak.action == DiggingAction.START_DIGGING) {
-            final Vector3i pos = blockBreak.position;
+    private String formatted(Vector3i vec) {
+        return vec == null ? "null" : vec.x + ", " + vec.y + ", " + vec.z;
+    }
+
+    public void handle(PacketReceiveEvent event, WrapperPlayClientPlayerDigging dig) {
+        if (dig.getAction() == DiggingAction.START_DIGGING) {
+            final Vector3i pos = dig.getBlockPosition();
 
             lastBlockWasInstantBreak = getBlockDamage(player, pos) >= 1;
             lastCancelledBlock = null;
@@ -48,11 +55,11 @@ public class BadPacketsZ extends AbstractBlockBreakCheck {
             lastBlock = pos;
         }
 
-        if (blockBreak.action == DiggingAction.CANCELLED_DIGGING) {
-            final Vector3i pos = blockBreak.position;
+        if (dig.getAction() == DiggingAction.CANCELLED_DIGGING) {
+            final Vector3i pos = dig.getBlockPosition();
 
             if (shouldExempt(pos)) {
-                lastCancelledBlock = pos;
+                lastCancelledBlock = null;
                 lastLastBlock = null;
                 lastBlock = null;
                 return;
@@ -61,9 +68,11 @@ public class BadPacketsZ extends AbstractBlockBreakCheck {
             if (!pos.equals(lastBlock)) {
                 // https://github.com/GrimAnticheat/Grim/issues/1512
                 if (player.getClientVersion().isOlderThan(ClientVersion.V_1_14_4) || (!lastBlockWasInstantBreak && pos.equals(lastCancelledBlock))) {
-                    if (flagAndAlert("action=CANCELLED_DIGGING" + ", last=" + MessageUtil.toUnlabledString(lastBlock) + ", pos=" + MessageUtil.toUnlabledString(pos))) {
+                    if (flagAndAlert("action=CANCELLED_DIGGING" + ", last=" + formatted(lastBlock) + ", pos=" + formatted(pos))) {
                         if (shouldModifyPackets()) {
-                            blockBreak.cancel();
+                            event.setCancelled(true);
+                            player.onPacketCancel();
+                            resyncPosition(player, pos);
                         }
                     }
                 }
@@ -75,14 +84,16 @@ public class BadPacketsZ extends AbstractBlockBreakCheck {
             return;
         }
 
-        if (blockBreak.action == DiggingAction.FINISHED_DIGGING) {
-            final Vector3i pos = blockBreak.position;
+        if (dig.getAction() == DiggingAction.FINISHED_DIGGING) {
+            final Vector3i pos = dig.getBlockPosition();
 
             // when a player looks away from the mined block, they send a cancel, and if they look at it again, they don't send another start. (thanks mojang!)
             if (!pos.equals(lastCancelledBlock) && (!lastBlockWasInstantBreak || player.getClientVersion().isOlderThan(ClientVersion.V_1_14_4)) && !pos.equals(lastBlock)) {
-                if (flagAndAlert("action=FINISHED_DIGGING" + ", last=" + MessageUtil.toUnlabledString(lastBlock) + ", pos=" + MessageUtil.toUnlabledString(pos))) {
+                if (flagAndAlert("action=FINISHED_DIGGING" + ", last=" + formatted(lastBlock) + ", pos=" + formatted(pos))) {
                     if (shouldModifyPackets()) {
-                        blockBreak.cancel();
+                        event.setCancelled(true);
+                        player.onPacketCancel();
+                        resyncPosition(player, pos);
                     }
                 }
             }

src/main/java/ac/grim/grimac/checks/impl/baritone/Baritone.java

@@ -3,7 +3,7 @@ package ac.grim.grimac.checks.impl.baritone;
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
 import ac.grim.grimac.checks.impl.aim.processor.AimProcessor;
-import ac.grim.grimac.checks.type.interfaces.RotationCheckI;
+import ac.grim.grimac.checks.type.RotationCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.anticheat.update.RotationUpdate;
 import ac.grim.grimac.utils.data.HeadRotation;
@@ -11,7 +11,7 @@ import ac.grim.grimac.utils.math.GrimMath;
 
 // This check has been patched by Baritone for a long time and it also seems to false with cinematic camera now, so it is disabled.
 @CheckData(name = "Baritone")
-public class Baritone extends Check implements RotationCheckI {
+public class Baritone extends Check implements RotationCheck {
     public Baritone(GrimPlayer playerData) {
         super(playerData);
     }

src/main/java/ac/grim/grimac/checks/impl/combat/HitboxBlock.java

@@ -1,12 +0,0 @@
-package ac.grim.grimac.checks.impl.combat;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
-import ac.grim.grimac.player.GrimPlayer;
-
-@CheckData(name = "HitboxBlock", configName = "HitboxBlock", setback = 20)
-public class HitboxBlock extends AbstractPacketCheck {
-    public HitboxBlock(GrimPlayer player) {
-        super(player);
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/combat/HitboxEntity.java

@@ -1,12 +0,0 @@
-package ac.grim.grimac.checks.impl.combat;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
-import ac.grim.grimac.player.GrimPlayer;
-
-@CheckData(name = "HitboxEntity", configName = "HitboxEntity", setback = 30)
-public class HitboxEntity extends AbstractPacketCheck {
-    public HitboxEntity(GrimPlayer player) {
-        super(player);
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/combat/HitboxMiss.java

@@ -1,12 +0,0 @@
-package ac.grim.grimac.checks.impl.combat;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
-import ac.grim.grimac.player.GrimPlayer;
-
-@CheckData(name = "HitboxMiss", configName = "HitboxMiss", setback = 10)
-public class HitboxMiss extends AbstractPacketCheck {
-    public HitboxMiss(GrimPlayer player) {
-        super(player);
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/combat/MultiInteractA.java

@@ -1,70 +0,0 @@
-package ac.grim.grimac.checks.impl.combat;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPostPredictionCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
-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.WrapperPlayClientInteractEntity;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerFlying;
-
-import java.util.ArrayList;
-
-@CheckData(name = "MultiInteractA", description = "Interacted with multiple entities in the same tick", experimental = true)
-public class MultiInteractA extends AbstractPostPredictionCheck {
-    public MultiInteractA(final GrimPlayer player) {
-        super(player);
-    }
-
-    private final ArrayList<String> flags = new ArrayList<>();
-    private int lastEntity;
-    private boolean lastSneaking;
-    private boolean hasInteracted = false;
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (event.getPacketType() == PacketType.Play.Client.INTERACT_ENTITY) {
-            WrapperPlayClientInteractEntity packet = new WrapperPlayClientInteractEntity(event);
-            int entity = packet.getEntityId();
-            boolean sneaking = packet.isSneaking().orElse(false);
-
-            if (hasInteracted && entity != lastEntity) {
-                String verbose = "lastEntity=" + lastEntity + ", entity=" + entity
-                        + ", lastSneaking=" + lastSneaking + ", sneaking=" + sneaking;
-                if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8)) {
-                    if (flagAndAlert(verbose) && shouldModifyPackets()) {
-                        event.setCancelled(true);
-                        player.onPacketCancel();
-                    }
-                } else {
-                    flags.add(verbose);
-                }
-            }
-
-            lastEntity = entity;
-            lastSneaking = sneaking;
-            hasInteracted = true;
-        }
-
-        if (WrapperPlayClientPlayerFlying.isFlying(event.getPacketType()) && player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8) && !player.packetStateData.lastPacketWasTeleport) {
-            hasInteracted = false;
-        }
-    }
-
-    @Override
-    public void onPredictionComplete(PredictionComplete predictionComplete) {
-        // we don't need to check pre-1.9 players here (no tick skipping)
-        if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8)) return;
-
-        if (player.isTickingReliablyFor(3) && !player.uncertaintyHandler.lastVehicleSwitch.hasOccurredSince(0)) {
-            for (String verbose : flags) {
-                flagAndAlert(verbose);
-            }
-        }
-
-        flags.clear();
-        hasInteracted = false;
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/combat/MultiInteractB.java

@@ -1,71 +0,0 @@
-package ac.grim.grimac.checks.impl.combat;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPostPredictionCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.anticheat.MessageUtil;
-import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
-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.util.Vector3f;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientInteractEntity;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerFlying;
-
-import java.util.ArrayList;
-
-@CheckData(name = "MultiInteractB", experimental = true)
-public class MultiInteractB extends AbstractPostPredictionCheck {
-    public MultiInteractB(final GrimPlayer player) {
-        super(player);
-    }
-
-    private final ArrayList<String> flags = new ArrayList<>();
-    private Vector3f lastPos;
-    private boolean hasInteracted = false;
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (event.getPacketType() == PacketType.Play.Client.INTERACT_ENTITY) {
-            Vector3f pos = new WrapperPlayClientInteractEntity(event).getTarget().orElse(null);
-
-            if (pos == null) {
-                return;
-            }
-
-            if (hasInteracted && !pos.equals(lastPos)) {
-                String verbose = "pos=" + MessageUtil.toUnlabledString(pos) + ", lastPos=" + MessageUtil.toUnlabledString(lastPos);
-                if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8)) {
-                    if (flagAndAlert(verbose) && shouldModifyPackets()) {
-                        event.setCancelled(true);
-                        player.onPacketCancel();
-                    }
-                } else {
-                    flags.add(verbose);
-                }
-            }
-
-            lastPos = pos;
-            hasInteracted = true;
-        }
-
-        if (WrapperPlayClientPlayerFlying.isFlying(event.getPacketType()) && player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8) && !player.packetStateData.lastPacketWasTeleport) {
-            hasInteracted = false;
-        }
-    }
-
-    @Override
-    public void onPredictionComplete(PredictionComplete predictionComplete) {
-        // we don't need to check pre-1.9 players here (no tick skipping)
-        if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8)) return;
-
-        if (player.isTickingReliablyFor(3) && !player.uncertaintyHandler.lastVehicleSwitch.hasOccurredSince(0)) {
-            for (String verbose : flags) {
-                flagAndAlert(verbose);
-            }
-        }
-
-        flags.clear();
-        hasInteracted = false;
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/combat/Reach.java

@@ -15,15 +15,12 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package ac.grim.grimac.checks.impl.combat;
 
-import ac.grim.grimac.api.config.ConfigManager;
+import ac.grim.grimac.GrimAPI;
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
-import ac.grim.grimac.checks.type.interfaces.PacketCheckI;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.collisions.datatypes.SimpleCollisionBox;
-import ac.grim.grimac.utils.data.BlockHitData;
-import ac.grim.grimac.utils.data.EntityHitData;
 import ac.grim.grimac.utils.data.HitData;
 import ac.grim.grimac.utils.data.Pair;
 import ac.grim.grimac.utils.data.packetentity.PacketEntity;
@@ -42,24 +39,24 @@ import com.github.retrooper.packetevents.util.Vector3d;
 import com.github.retrooper.packetevents.util.Vector3i;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientInteractEntity;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerFlying;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 // You may not copy the check unless you are licensed under GPL
 @CheckData(name = "Reach", configName = "Reach", setback = 10)
-public class Reach extends AbstractPacketCheck {
+public class Reach extends Check implements PacketCheck {
     // Only one flag per reach attack, per entity, per tick.
     // We store position because lastX isn't reliable on teleports.
-    private final Int2ObjectMap<Vector3d> playerAttackQueue = new Int2ObjectOpenHashMap<>();
+    private final Map<Integer, Vector3d> playerAttackQueue = new HashMap<>();
     // Used to prevent falses in the wall hit check
     private final Set<Vector3i> blocksChangedThisTick = new HashSet<>();
 
@@ -68,13 +65,8 @@ public class Reach extends AbstractPacketCheck {
             EntityTypes.CHEST_BOAT,
             EntityTypes.SHULKER);
 
-    private static final double ENTITY_HITBOX_REACH_EPSILON = 1E-12;
-
-    private boolean ignoreNonPlayerTargets;
-    private boolean skipBlockCheck;
-    private boolean skipEntityCheck;
     private boolean cancelImpossibleHits;
-    public double reachThreshold;
+    private double threshold;
     private double cancelBuffer; // For the next 4 hits after using reach, we aggressively cancel reach
 
     public Reach(GrimPlayer player) {
@@ -105,11 +97,7 @@ public class Reach extends AbstractPacketCheck {
                 }
                 return;
             }
-
-            if (ignoreNonPlayerTargets && !entity.getType().equals(EntityTypes.PLAYER)) {
-                return;
-            }
-
+            
             // Dead entities cause false flags (https://github.com/GrimAnticheat/Grim/issues/546)
             if (entity.isDead) return;
 
@@ -135,7 +123,9 @@ public class Reach extends AbstractPacketCheck {
 
         // If the player set their look, or we know they have a new tick
         final boolean isFlying = WrapperPlayClientPlayerFlying.isFlying(event.getPacketType());
-        if (isUpdate(event.getPacketType())) {
+        if (isFlying ||
+                event.getPacketType() == PacketType.Play.Client.PONG ||
+                event.getPacketType() == PacketType.Play.Client.WINDOW_CONFIRMATION) {
             tickBetterReachCheckWithAngle(isFlying);
         }
     }
@@ -164,21 +154,20 @@ public class Reach extends AbstractPacketCheck {
             if (reachEntity.getType() == EntityTypes.END_CRYSTAL) {
                 targetBox = new SimpleCollisionBox(reachEntity.trackedServerPosition.getPos().subtract(1, 0, 1), reachEntity.trackedServerPosition.getPos().add(1, 2, 1));
             }
-            return ReachUtils.getMinReachToBox(player, targetBox) > player.compensatedEntities.getSelf().getAttributeValue(Attributes.ENTITY_INTERACTION_RANGE);
+            return ReachUtils.getMinReachToBox(player, targetBox) > player.compensatedEntities.getSelf().getAttributeValue(Attributes.PLAYER_ENTITY_INTERACTION_RANGE);
         }
     }
 
     private void tickBetterReachCheckWithAngle(boolean isFlying) {
-        for (Int2ObjectMap.Entry<Vector3d> attack : playerAttackQueue.int2ObjectEntrySet()) {
-            PacketEntity reachEntity = player.compensatedEntities.entityMap.get(attack.getIntKey());
+        for (Map.Entry<Integer, Vector3d> attack : playerAttackQueue.entrySet()) {
+            PacketEntity reachEntity = player.compensatedEntities.entityMap.get(attack.getKey().intValue());
             if (reachEntity != null) {
-                Pair<Class<? extends PacketCheckI>, String> result = checkReach(reachEntity, attack.getValue(), false);
+                String result = checkReach(reachEntity, attack.getValue(), false);
                 if (result != null) {
-                    PacketCheckI check = player.checkManager.getPacketCheck(result.first());
                     if (reachEntity.getType() == EntityTypes.PLAYER) {
-                        ((Check)check).flagAndAlert(result.second());
+                        flagAndAlert(result);
                     } else {
-                        ((Check) check).flagAndAlert(result.second() + "type=" + reachEntity.getType().getName().getKey());
+                        flagAndAlert(result + " type=" + reachEntity.getType().getName().getKey());
                     }
                 }
             }
@@ -189,7 +178,7 @@ public class Reach extends AbstractPacketCheck {
         if (isFlying) blocksChangedThisTick.clear();
     }
 
-    private Pair<Class<? extends PacketCheckI>, String> checkReach(PacketEntity reachEntity, Vector3d from, boolean isPrediction) {
+    private String checkReach(PacketEntity reachEntity, Vector3d from, boolean isPrediction) {
         SimpleCollisionBox targetBox = reachEntity.getPossibleCollisionBoxes();
 
         if (reachEntity.getType() == EntityTypes.END_CRYSTAL) { // Hardcode end crystal box
@@ -202,7 +191,7 @@ public class Reach extends AbstractPacketCheck {
             targetBox.expand(0.1f);
         }
 
-        targetBox.expand(reachThreshold);
+        targetBox.expand(threshold);
 
         // This is better than adding to the reach, as 0.03 can cause a player to miss their target
         // Adds some more than 0.03 uncertainty in some cases, but a good trade off for simplicity
@@ -231,19 +220,14 @@ public class Reach extends AbstractPacketCheck {
             }
         }
 
-        // We raytrace for > the player's reach distance so in the case a player is hacking
-        // We can return in the flag the distance of the reach hit instead of a generic "player failed reach check"
         // +3 would be 3 + 3 = 6, which is the pre-1.20.5 behaviour, preventing "Missed Hitbox"
-        final double distance = player.compensatedEntities.getSelf().getAttributeValue(Attributes.ENTITY_INTERACTION_RANGE) + 3;
-        double[] possibleEyeHeights = player.getPossibleEyeHeights();
-//        possibleEyeHeights = new double[]{possibleEyeHeights[0]};
-//        double realMinDistance = 0;
+        final double distance = player.compensatedEntities.getSelf().getAttributeValue(Attributes.PLAYER_ENTITY_INTERACTION_RANGE) + 3;
         for (Vector lookVec : possibleLookDirs) {
-            for (double eye : possibleEyeHeights) {
+            for (double eye : player.getPossibleEyeHeights()) {
                 Vector eyePos = new Vector(from.getX(), from.getY() + eye, from.getZ());
                 Vector endReachPos = eyePos.clone().add(new Vector(lookVec.getX() * distance, lookVec.getY() * distance, lookVec.getZ() * distance));
 
-                Vector intercept = ReachUtils.calculateIntercept(targetBox, eyePos, endReachPos).first();
+                Vector intercept = ReachUtils.calculateIntercept(targetBox, eyePos, endReachPos).getFirst();
 
                 if (ReachUtils.isVecInside(targetBox, eyePos)) {
                     minDistance = 0;
@@ -252,29 +236,21 @@ public class Reach extends AbstractPacketCheck {
 
                 if (intercept != null) {
                     minDistance = Math.min(eyePos.distance(intercept), minDistance);
-//                    if (eye == possibleEyeHeights[0]) {
-//                        realMinDistance = minDistance;
-//                    }
                 }
             }
         }
 
+        final boolean experimentalChecks = true; //GrimAPI.INSTANCE.getConfigManager().isExperimentalChecks(); // TODO fix for undraft
         HitData foundHitData = null;
         // If the entity is within range of the player (we'll flag anyway if not, so no point checking blocks in this case)
         // Ignore when could be hitting through a moving shulker, piston blocks. They are just too glitchy/uncertain to check.
-        if (!skipEntityCheck || !skipBlockCheck) {
-            if (minDistance <= distance - 3 && !player.compensatedWorld.isNearHardEntity(player.boundingBox.copy().expand(4))) {
-                final @Nullable Pair<Double, HitData> hitResult = didRayTraceHit(reachEntity, possibleLookDirs, from, minDistance);
-
-                // if the hitResult is closer to the player than the target entity box, they shouldn't have hit the target entity
-                // We are checking if the diff > epsilon because the hit distance returned is slightly different due to floating point shennanigans
-                // - This filters out when the ray trace hits the target entity without having to do an expensive .equals()
-                // - You may have to adjust the epsilon if you increase the reach threshold, especially by a lot
-                // ...but there is literally no reason you would ever want to increase it, only decrease, so that doesn't matter.
-                if (hitResult != null && (minDistance * minDistance) - hitResult.first() > ENTITY_HITBOX_REACH_EPSILON) { // returned double is distanceSq
-                    minDistance = Double.MIN_VALUE;
-                    foundHitData = hitResult.second();
-                }
+        if (experimentalChecks && minDistance <= 3 && !player.compensatedWorld.isNearHardEntity(player.boundingBox.copy().expand(4))) {
+            final @Nullable Pair<Double, HitData> targetBlock = getTargetBlock(player, possibleLookDirs, from, minDistance);
+            // And if the target block is closer to the player than the entity box, they should hit the block instead
+            // So, this hit is invalid.
+            if (targetBlock != null && targetBlock.getFirst() < (minDistance * minDistance)) { // targetBlock is squared
+                minDistance = Double.MIN_VALUE;
+                foundHitData = targetBlock.getSecond();
             }
         }
 
@@ -282,17 +258,13 @@ public class Reach extends AbstractPacketCheck {
         if ((!blacklisted.contains(reachEntity.getType()) && reachEntity.isLivingEntity()) || reachEntity.getType() == EntityTypes.END_CRYSTAL) {
             if (minDistance == Double.MIN_VALUE && foundHitData != null) {
                 cancelBuffer = 1;
-                if (foundHitData instanceof BlockHitData) {
-                    return new Pair<>(HitboxBlock.class, "Hit block=" + ((BlockHitData) foundHitData).getState().getType().getName() + " ");
-                } else { // entity hit data
-                    return new Pair<>(HitboxEntity.class, "Hit entity=" + ((EntityHitData) foundHitData).getEntity().getType().getName() + " ");
-                }
+                return "Hit block block=" + foundHitData.getState().getType().getName();
             } else if (minDistance == Double.MAX_VALUE) {
                 cancelBuffer = 1;
-                return new Pair<>(HitboxMiss.class, "");
-            } else if (minDistance > player.compensatedEntities.getSelf().getAttributeValue(Attributes.ENTITY_INTERACTION_RANGE)) {
+                return "Missed hitbox";
+            } else if (minDistance > player.compensatedEntities.getSelf().getAttributeValue(Attributes.PLAYER_ENTITY_INTERACTION_RANGE)) {
                 cancelBuffer = 1;
-                return new Pair<>(Reach.class, String.format("%.5f", minDistance) + " blocks");
+                return String.format("%.5f", minDistance) + " blocks";
             } else {
                 cancelBuffer = Math.max(0, cancelBuffer - 0.25);
             }
@@ -310,71 +282,40 @@ public class Reach extends AbstractPacketCheck {
         blocksChangedThisTick.add(vector3i);
     }
 
-    // Checks if it was possible to hit a target entity
+    // Returns a pair so we can check the block type in the flag
     @Nullable
-    private Pair<Double, HitData> didRayTraceHit(PacketEntity targetEntity, List<Vector> possibleLookDirs, Vector3d from, double minDistance) {
-        HitData bestHitData = null;
-        double bestDistanceSq = Double.MAX_VALUE;
-        double bestBlockingEntityDistanceSq = Double.MAX_VALUE;
-        HitData bestBlockingEntityHit = null;
-
+    private Pair<Double, HitData> getTargetBlock(GrimPlayer player, List<Vector> possibleLookDirs, Vector3d from, double minDistance) {
         // Check every possible look direction and every possible eye height
         // IF *NONE* of them allow the player to hit the entity, this is an invalid hit
+        HitData bestHitData = null;
+        double min = Double.MAX_VALUE;
         for (Vector lookVec : possibleLookDirs) {
             for (double eye : player.getPossibleEyeHeights()) {
                 Vector eyes = new Vector(from.getX(), from.getY() + eye, from.getZ());
-                // this function is completely 0.03 aware
-                final HitData hitResult = BlockRayTrace.getNearestHitResult(player, targetEntity, eyes, lookVec, minDistance, skipBlockCheck, skipEntityCheck);
-
-                if (hitResult == null)
-                    if (skipEntityCheck)
-                        return null;
-                    else
-                        continue;
-
-                double distanceSquared = eyes.distanceSquared(hitResult.getBlockHitLocation());
-
-                // Check if the hit result is the target entity
-                if (hitResult instanceof EntityHitData && ((EntityHitData) hitResult).getEntity().equals(targetEntity)) {
-                    return new Pair<>(distanceSquared, hitResult); // Legitimate hit
+                final double reach = player.compensatedEntities.getSelf().getAttributeValue(Attributes.PLAYER_BLOCK_INTERACTION_RANGE);
+                final HitData hitResult = BlockRayTrace.getNearestReachHitResult(player, eyes, lookVec, minDistance, reach);
+                if (hitResult == null) {
+                    return null;
                 }
 
-                // Check for potential blocking entities
-                if (hitResult instanceof EntityHitData) {
-                    // Consider entities that are blocking the path to the target
-                    if (distanceSquared < bestBlockingEntityDistanceSq) {
-                        bestBlockingEntityDistanceSq = distanceSquared;
-                        bestBlockingEntityHit = hitResult;
-                    }
-                } else if (hitResult instanceof BlockHitData) {
-                    // don't false on recently rapidly changed blocks
-                    if (distanceSquared < (minDistance * minDistance) && blocksChangedThisTick.contains(((BlockHitData) hitResult).getPosition())) {
-                        return null;
-                    }
-                    // Check if block is closer than any blocking entity found
-                    if (bestBlockingEntityHit == null && distanceSquared < bestDistanceSq) {
-                        bestDistanceSq = distanceSquared;
-                        bestHitData = hitResult;
-                    }
+                final double distance = eyes.distanceSquared(hitResult.getBlockHitLocation());
+                // Block changes are uncertain, can't check this tick
+                if (distance < (minDistance * minDistance) && blocksChangedThisTick.contains(hitResult.getPosition())) {
+                    return null;
                 }
+
+                bestHitData = hitResult;
+                min = Math.min(min, distance);
             }
         }
 
-        // Prefer returning the entity that blocks the path to the target entity
-        if (bestBlockingEntityHit != null) {
-            return new Pair<>(bestBlockingEntityDistanceSq, bestBlockingEntityHit);
-        }
-
-        // If no blocking entity, return the closest block
-        return bestHitData == null ? null : new Pair<>(bestDistanceSq, bestHitData);
+        return bestHitData == null ? null : Pair.of(min, bestHitData);
     }
 
     @Override
-    public void onReload(ConfigManager config) {
-        this.ignoreNonPlayerTargets = config.getBooleanElse("Reach.ignore-non-player-targets", false);
-        this.skipBlockCheck = config.getBooleanElse("Reach.skip-block-check", false);
-        this.skipEntityCheck = config.getBooleanElse("Reach.skip-entity-check", true);
-        this.cancelImpossibleHits = config.getBooleanElse("Reach.block-impossible-hits", true);
-        this.reachThreshold = config.getDoubleElse("Reach.threshold", 0.0005);
+    public void reload() {
+        super.reload();
+        this.cancelImpossibleHits = getConfig().getBooleanElse("Reach.block-impossible-hits", true);
+        this.threshold = getConfig().getDoubleElse("Reach.threshold", 0.0005);
     }
 }

src/main/java/ac/grim/grimac/checks/impl/crash/CrashA.java

@@ -1,13 +1,14 @@
 package ac.grim.grimac.checks.impl.crash;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPrePredictionCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerFlying;
 
 @CheckData(name = "CrashA")
-public class CrashA extends AbstractPrePredictionCheck {
+public class CrashA extends Check implements PacketCheck {
     private static final double HARD_CODED_BORDER = 2.9999999E7D;
 
     public CrashA(GrimPlayer player) {

src/main/java/ac/grim/grimac/checks/impl/crash/CrashB.java

@@ -1,14 +1,15 @@
 package ac.grim.grimac.checks.impl.crash;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPrePredictionCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 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 = "CrashB", description = "Sent creative mode inventory click packets while not in creative mode")
-public class CrashB extends AbstractPrePredictionCheck {
+@CheckData(name = "CrashB")
+public class CrashB extends Check implements PacketCheck {
     public CrashB(GrimPlayer player) {
         super(player);
     }
@@ -17,6 +18,7 @@ public class CrashB extends AbstractPrePredictionCheck {
     public void onPacketReceive(PacketReceiveEvent event) {
         if (event.getPacketType() == PacketType.Play.Client.CREATIVE_INVENTORY_ACTION) {
             if (player.gamemode != GameMode.CREATIVE) {
+                player.getSetbackTeleportUtil().executeViolationSetback();
                 event.setCancelled(true);
                 player.onPacketCancel();
                 flagAndAlert(); // Could be transaction split, no need to setback though

src/main/java/ac/grim/grimac/checks/impl/crash/CrashC.java

@@ -1,14 +1,15 @@
 package ac.grim.grimac.checks.impl.crash;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPrePredictionCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.world.Location;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerFlying;
 
-@CheckData(name = "CrashC", description = "Sent non-finite position or rotation")
-public class CrashC extends AbstractPrePredictionCheck {
+@CheckData(name = "CrashC")
+public class CrashC extends Check implements PacketCheck {
     public CrashC(GrimPlayer playerData) {
         super(playerData);
     }

src/main/java/ac/grim/grimac/checks/impl/crash/CrashD.java

@@ -1,7 +1,8 @@
 package ac.grim.grimac.checks.impl.crash;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPrePredictionCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.inventory.inventory.MenuType;
 import com.github.retrooper.packetevents.PacketEvents;
@@ -12,8 +13,8 @@ import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientClickWindow;
 import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerOpenWindow;
 
-@CheckData(name = "CrashD", description = "Clicking slots in lectern window")
-public class CrashD extends AbstractPrePredictionCheck {
+@CheckData(name = "CrashD", experimental = false)
+public class CrashD extends Check implements PacketCheck {
 
     public CrashD(GrimPlayer playerData) {
         super(playerData);

src/main/java/ac/grim/grimac/checks/impl/crash/CrashE.java

@@ -1,15 +1,16 @@
 package ac.grim.grimac.checks.impl.crash;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
 import ac.grim.grimac.checks.impl.exploit.ExploitA;
-import ac.grim.grimac.checks.type.abstracts.AbstractPrePredictionCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 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.WrapperPlayClientSettings;
 
 @CheckData(name = "CrashE", experimental = false)
-public class CrashE extends AbstractPrePredictionCheck {
+public class CrashE extends Check implements PacketCheck {
 
     public CrashE(GrimPlayer playerData) {
         super(playerData);

src/main/java/ac/grim/grimac/checks/impl/crash/CrashF.java

@@ -1,14 +1,15 @@
 package ac.grim.grimac.checks.impl.crash;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPrePredictionCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 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.WrapperPlayClientClickWindow;
 
 @CheckData(name = "CrashF")
-public class CrashF extends AbstractPrePredictionCheck {
+public class CrashF extends Check implements PacketCheck {
 
     public CrashF(GrimPlayer playerData) {
         super(playerData);

src/main/java/ac/grim/grimac/checks/impl/crash/CrashG.java

@@ -1,8 +1,8 @@
 package ac.grim.grimac.checks.impl.crash;
 
-import ac.grim.grimac.api.GrimUser;
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPrePredictionCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
@@ -13,8 +13,8 @@ import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPl
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerDigging;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientUseItem;
 
-@CheckData(name = "CrashG", description = "Sent negative sequence id")
-public class CrashG extends AbstractPrePredictionCheck {
+@CheckData(name = "CrashG")
+public class CrashG extends Check implements PacketCheck {
 
     public CrashG(GrimPlayer player) {
         super(player);
@@ -22,6 +22,8 @@ public class CrashG extends AbstractPrePredictionCheck {
 
     @Override
     public void onPacketReceive(final PacketReceiveEvent event) {
+        if (!isSupportedVersion()) return;
+
         if (event.getPacketType() == PacketType.Play.Client.PLAYER_BLOCK_PLACEMENT) {
             WrapperPlayClientPlayerBlockPlacement place = new WrapperPlayClientPlayerBlockPlacement(event);
             if (place.getSequence() < 0) {
@@ -51,10 +53,8 @@ public class CrashG extends AbstractPrePredictionCheck {
 
     }
 
-    @Override
-    public boolean supportsPlayer(GrimUser player) {
-        // TODO make this a part of GrimUser interface
-        // TODO server version check when we bypass via for listening for packets
-        return ((GrimPlayer) player).getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_19) && PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_19);
+    private boolean isSupportedVersion() {
+        return player.getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_19) && PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_19);
     }
+
 }

src/main/java/ac/grim/grimac/checks/impl/crash/CrashH.java

@@ -1,14 +1,15 @@
 package ac.grim.grimac.checks.impl.crash;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPrePredictionCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 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.WrapperPlayClientTabComplete;
 
 @CheckData(name = "CrashH")
-public class CrashH extends AbstractPrePredictionCheck {
+public class CrashH extends Check implements PacketCheck {
 
     public CrashH(GrimPlayer player) {
         super(player);

src/main/java/ac/grim/grimac/checks/impl/exploit/ExploitA.java

@@ -1,7 +1,8 @@
 package ac.grim.grimac.checks.impl.exploit;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPrePredictionCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
@@ -11,7 +12,7 @@ import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientNa
 import java.util.regex.Pattern;
 
 @CheckData(name = "ExploitA", experimental = true)
-public class ExploitA extends AbstractPrePredictionCheck {
+public class ExploitA extends Check implements PacketCheck {
 
     public ExploitA(GrimPlayer playerData) {
         super(playerData);

src/main/java/ac/grim/grimac/checks/impl/exploit/ExploitB.java

@@ -1,7 +1,8 @@
 package ac.grim.grimac.checks.impl.exploit;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPrePredictionCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
@@ -10,7 +11,7 @@ import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientTabComplete;
 
 @CheckData(name = "ExploitB", experimental = true)
-public class ExploitB extends AbstractPrePredictionCheck {
+public class ExploitB extends Check implements PacketCheck {
 
     public ExploitB(GrimPlayer playerData) {
         super(playerData);

src/main/java/ac/grim/grimac/checks/impl/exploit/ExploitC.java

@@ -1,31 +0,0 @@
-package ac.grim.grimac.checks.impl.exploit;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPrePredictionCheck;
-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.WrapperPlayClientEditBook;
-
-@CheckData(name = "ExploitC", description = "Too long book title")
-public class ExploitC extends AbstractPrePredictionCheck {
-    public ExploitC(GrimPlayer playerData) {
-        super(playerData);
-    }
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (event.getPacketType() == PacketType.Play.Client.EDIT_BOOK) {
-            final String title = new WrapperPlayClientEditBook(event).getTitle();
-
-            if (title == null) return; // book was not signed
-
-            if (title.length() > 15) {
-                if (flagAndAlert("title=" + title) && shouldModifyPackets()) {
-                    event.setCancelled(true);
-                    player.onPacketCancel();
-                }
-            }
-        }
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/flight/FlightA.java

@@ -1,12 +1,13 @@
 package ac.grim.grimac.checks.impl.flight;
 
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.Check;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerFlying;
 
 // This check catches 100% of cheaters.
-public class FlightA extends AbstractPacketCheck {
+public class FlightA extends Check implements PacketCheck {
     public FlightA(GrimPlayer player) {
         super(player);
     }

src/main/java/ac/grim/grimac/checks/impl/groundspoof/NoFallA.java

@@ -1,7 +1,8 @@
 package ac.grim.grimac.checks.impl.groundspoof;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.predictionengine.GhostBlockDetector;
 import ac.grim.grimac.utils.collisions.datatypes.SimpleCollisionBox;
@@ -17,7 +18,7 @@ import java.util.List;
 // Catches NoFalls for LOOK and GROUND packets
 // This check runs AFTER the predictions
 @CheckData(name = "NoFall", configName = "nofall", setback = 10)
-public class NoFallA extends AbstractPacketCheck {
+public class NoFallA extends Check implements PacketCheck {
 
     public boolean flipPlayerGroundStatus = false;
 
@@ -42,10 +43,7 @@ public class NoFallA extends AbstractPacketCheck {
                 if (!isNearGround(wrapper.isOnGround())) { // If player isn't near ground
                     // 1.8 boats have a mind on their own... only flag if they're not near a boat or are on 1.9+
                     if (!GhostBlockDetector.isGhostBlock(player) && flagWithSetback()) alert("");
-                    if (shouldModifyPackets()) {
-                        wrapper.setOnGround(false);
-                        event.markForReEncode(true);
-                    }
+                    if (shouldModifyPackets()) wrapper.setOnGround(false);
                 }
             }
         }
@@ -61,16 +59,10 @@ public class NoFallA extends AbstractPacketCheck {
             // Also flip teleports because I don't trust vanilla's handling of teleports and ground
             if (flipPlayerGroundStatus) {
                 flipPlayerGroundStatus = false;
-                if (shouldModifyPackets()) {
-                    wrapper.setOnGround(!wrapper.isOnGround());
-                    event.markForReEncode(true);
-                }
+                if (shouldModifyPackets()) wrapper.setOnGround(!wrapper.isOnGround());
             }
             if (player.packetStateData.lastPacketWasTeleport) {
-                if (shouldModifyPackets()) {
-                    wrapper.setOnGround(false);
-                    event.markForReEncode(true);
-                }
+                if (shouldModifyPackets()) wrapper.setOnGround(false);
             }
         }
     }

src/main/java/ac/grim/grimac/checks/impl/inventory/InventoryA.java

@@ -1,47 +0,0 @@
-package ac.grim.grimac.checks.impl.inventory;
-
-import ac.grim.grimac.api.CheckType;
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.InventoryCheck;
-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;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientInteractEntity.InteractAction;
-
-@CheckData(name = "InventoryA", setback = 3, description = "Attacked an entity while inventory is open")
-public class InventoryA extends InventoryCheck {
-    public InventoryA(GrimPlayer player) {
-        super(player);
-    }
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        super.onPacketReceive(event);
-
-        if (event.getPacketType() == PacketType.Play.Client.INTERACT_ENTITY) {
-            WrapperPlayClientInteractEntity wrapper = new WrapperPlayClientInteractEntity(event);
-
-            if (wrapper.getAction() != InteractAction.ATTACK) return;
-
-            // Is not possible to attack while the inventory is open.
-            if (player.hasInventoryOpen) {
-                if (flagAndAlert()) {
-                    // Cancel the packet
-                    if (shouldModifyPackets()) {
-                        event.setCancelled(true);
-                        player.onPacketCancel();
-                    }
-                    closeInventory();
-                }
-            } else {
-                reward();
-            }
-        }
-    }
-
-    @Override
-    public int getMask() {
-        return CheckType.PACKET.getMask();
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/inventory/InventoryB.java

@@ -1,39 +0,0 @@
-package ac.grim.grimac.checks.impl.inventory;
-
-import ac.grim.grimac.api.CheckType;
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.InventoryCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import com.github.retrooper.packetevents.event.PacketReceiveEvent;
-import com.github.retrooper.packetevents.protocol.player.DiggingAction;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerDigging;
-
-@CheckData(name = "InventoryB", setback = 3, description = "Started digging blocks while inventory is open")
-public class InventoryB extends InventoryCheck {
-    public InventoryB(GrimPlayer player) {
-        super(player);
-    }
-
-    public void handle(PacketReceiveEvent event, WrapperPlayClientPlayerDigging wrapper) {
-        if (wrapper.getAction() != DiggingAction.START_DIGGING) return;
-
-        // Is not possible to start digging a block while the inventory is open.
-        if (player.hasInventoryOpen) {
-            if (flagAndAlert()) {
-                // Cancel the packet
-                if (shouldModifyPackets()) {
-                    event.setCancelled(true);
-                    player.onPacketCancel();
-                }
-                closeInventory();
-            }
-        } else {
-            reward();
-        }
-    }
-
-    @Override
-    public int getMask() {
-        return CheckType.PACKET.getMask();
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/inventory/InventoryC.java

@@ -1,28 +0,0 @@
-package ac.grim.grimac.checks.impl.inventory;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.InventoryCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.anticheat.update.BlockPlace;
-
-@CheckData(name = "InventoryC", setback = 3, description = "Placed a block while inventory is open")
-public class InventoryC extends InventoryCheck {
-
-    public InventoryC(GrimPlayer player) {
-        super(player);
-    }
-
-    public void onBlockPlace(final BlockPlace place) {
-        // It is not possible to place a block while the inventory is open
-        if (player.hasInventoryOpen) {
-            if (flagAndAlert()) {
-                if (shouldModifyPackets()) {
-                    place.resync();
-                }
-                closeInventory();
-            }
-        } else {
-            reward();
-        }
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/inventory/InventoryD.java

@@ -1,90 +0,0 @@
-package ac.grim.grimac.checks.impl.inventory;
-
-import ac.grim.grimac.api.CheckType;
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.InventoryCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
-import ac.grim.grimac.utils.data.VectorData;
-import ac.grim.grimac.utils.data.VectorData.MoveVectorData;
-import ac.grim.grimac.utils.data.VehicleData;
-
-import java.util.StringJoiner;
-
-@CheckData(name = "InventoryD", setback = 1, decay = 0.25)
-public class InventoryD extends InventoryCheck {
-    private int horseJumpVerbose;
-
-    public InventoryD(GrimPlayer player) {
-        super(player);
-    }
-
-    @Override
-    public void onPredictionComplete(final PredictionComplete predictionComplete) {
-        if (!predictionComplete.isChecked() ||
-                predictionComplete.getData().isTeleport() ||
-                player.getSetbackTeleportUtil().blockOffsets ||
-                player.packetStateData.lastPacketWasTeleport ||
-                player.packetStateData.isSlowedByUsingItem() ||
-                System.currentTimeMillis() - player.lastBlockPlaceUseItem < 50L) {
-            return;
-        }
-
-        if (player.hasInventoryOpen) {
-            boolean inVehicle = player.compensatedEntities.getSelf().inVehicle();
-            boolean isJumping, isMoving;
-
-            if (inVehicle) {
-                VehicleData vehicle = player.vehicleData;
-
-                // Will flag once if player open anything with pressed space bar
-                isJumping = vehicle.nextHorseJump > 0 && horseJumpVerbose++ >= 1;
-                isMoving = vehicle.nextVehicleForward != 0 || vehicle.nextVehicleHorizontal != 0;
-            } else {
-                MoveVectorData move = findMovement(player.predictedVelocity);
-
-                isJumping = player.predictedVelocity.isJump();
-                isMoving = move != null && (move.x != 0 || move.z != 0);
-            }
-
-            if (!isMoving && !isJumping) {
-                reward();
-                return;
-            }
-
-            if (flag()) {
-                closeInventory();
-
-                StringJoiner joiner = new StringJoiner(" ");
-
-                if (isMoving) joiner.add("moving");
-                if (isJumping) joiner.add("jumping");
-                if (inVehicle) joiner.add("inVehicle");
-
-                alert(joiner.toString());
-            }
-        } else {
-            horseJumpVerbose = 0;
-        }
-    }
-
-    private MoveVectorData findMovement(VectorData vectorData) {
-        if (vectorData instanceof MoveVectorData) {
-            return (MoveVectorData) vectorData;
-        }
-
-        while (vectorData != null) {
-            vectorData = vectorData.lastVector;
-            if (vectorData instanceof MoveVectorData) {
-                return (MoveVectorData) vectorData;
-            }
-        }
-
-        return null;
-    }
-
-    @Override
-    public int getMask() {
-        return CheckType.POST_PREDICTION.getMask();
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/inventory/InventoryE.java

@@ -1,54 +0,0 @@
-package ac.grim.grimac.checks.impl.inventory;
-
-import ac.grim.grimac.api.CheckType;
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.InventoryCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import com.github.retrooper.packetevents.event.PacketReceiveEvent;
-import com.github.retrooper.packetevents.event.PacketSendEvent;
-import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-
-@CheckData(name = "InventoryE", setback = 3, description = "Sent a held item change packet while inventory is open")
-public class InventoryE extends InventoryCheck {
-    private long lastTransaction = Long.MAX_VALUE; // Impossible transaction ID
-
-    public InventoryE(GrimPlayer player) {
-        super(player);
-    }
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        super.onPacketReceive(event);
-
-        if (event.getPacketType() == PacketType.Play.Client.HELD_ITEM_CHANGE) {
-            // It is not possible to change hotbar slots with held item change while the inventory is open
-            // A container click packet would be sent instead
-            if (player.hasInventoryOpen) {
-                if (this.lastTransaction < player.lastTransactionReceived.get()
-                        && flagAndAlert()) {
-                    // Cancel the packet
-                    if (shouldModifyPackets()) {
-                        event.setCancelled(true);
-                        player.onPacketCancel();
-                        player.getInventory().needResend = true;
-                    }
-                    closeInventory();
-                }
-            } else {
-                reward();
-            }
-        }
-    }
-
-    @Override
-    public void onPacketSend(PacketSendEvent event) {
-        if (event.getPacketType() == PacketType.Play.Server.HELD_ITEM_CHANGE) {
-            this.lastTransaction = player.lastTransactionSent.get();
-        }
-    }
-
-    @Override
-    public int getMask() {
-        return CheckType.PACKET.getMask();
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/inventory/InventoryF.java

@@ -1,50 +0,0 @@
-package ac.grim.grimac.checks.impl.inventory;
-
-import ac.grim.grimac.api.CheckType;
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.InventoryCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.inventory.InventoryDesyncStatus;
-import com.github.retrooper.packetevents.PacketEvents;
-import com.github.retrooper.packetevents.event.PacketReceiveEvent;
-import com.github.retrooper.packetevents.manager.server.ServerVersion;
-import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-
-@CheckData(name = "InventoryF", setback = 3, description = "Sent a click window packet without a open inventory", experimental = true)
-public class InventoryF extends InventoryCheck {
-
-    public InventoryF(GrimPlayer player) {
-        super(player);
-    }
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        // Exempt on 1.9+ server version due to the Via hack done in PacketPlayerWindow, the exemption can be deleted
-        // once we are ahead of ViaVersion
-        if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_9)
-                || player.getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_9)) return;
-
-        super.onPacketReceive(event);
-
-        if (event.getPacketType() == PacketType.Play.Client.CLICK_WINDOW) {
-            if (!player.hasInventoryOpen && player.inventoryDesyncStatus == InventoryDesyncStatus.NOT_DESYNCED) {
-                if (flagAndAlert()) {
-                    // Cancel the packet
-                    if (shouldModifyPackets()) {
-                        event.setCancelled(true);
-                        player.onPacketCancel();
-                    }
-                    closeInventory();
-                }
-            } else {
-                reward();
-            }
-        }
-    }
-
-    @Override
-    public int getMask() {
-        return CheckType.PACKET.getMask();
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/inventory/InventoryG.java

@@ -1,46 +0,0 @@
-package ac.grim.grimac.checks.impl.inventory;
-
-import ac.grim.grimac.api.CheckType;
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.InventoryCheck;
-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 = "InventoryG", setback = 3, description = "Sent a entity action packet while inventory is open", experimental = true)
-public class InventoryG extends InventoryCheck {
-
-    public InventoryG(GrimPlayer player) {
-        super(player);
-    }
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (player.packetStateData.lastPacketWasTeleport) return;
-        super.onPacketReceive(event);
-
-        if (event.getPacketType() == PacketType.Play.Client.ENTITY_ACTION) {
-            WrapperPlayClientEntityAction wrapper = new WrapperPlayClientEntityAction(event);
-            WrapperPlayClientEntityAction.Action action = wrapper.getAction();
-
-            if (action == WrapperPlayClientEntityAction.Action.STOP_SNEAKING
-                    || action == WrapperPlayClientEntityAction.Action.STOP_SPRINTING) {
-                return;
-            }
-
-            if (player.hasInventoryOpen) {
-                if (flagAndAlert()) {
-                    closeInventory();
-                }
-            } else {
-                reward();
-            }
-        }
-    }
-
-    @Override
-    public int getMask() {
-        return CheckType.PACKET.getMask();
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/misc/ClientBrand.java

@@ -1,17 +1,17 @@
 package ac.grim.grimac.checks.impl.misc;
 
 import ac.grim.grimac.GrimAPI;
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.impl.exploit.ExploitA;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 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.WrapperPlayClientPluginMessage;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
-public class ClientBrand extends AbstractPacketCheck {
+public class ClientBrand extends Check implements PacketCheck {
     String brand = "vanilla";
     boolean hasBrand = false;
 
@@ -38,7 +38,6 @@ public class ClientBrand extends AbstractPacketCheck {
                 System.arraycopy(data, 1, minusLength, 0, minusLength.length);
 
                 brand = new String(minusLength).replace(" (Velocity)", ""); //removes velocity's brand suffix
-                brand = ChatColor.stripColor(brand); //strip color codes from client brand
                 if (player.checkManager.getPrePredictionCheck(ExploitA.class).checkString(brand)) brand = "sent log4j";
                 if (!GrimAPI.INSTANCE.getConfigManager().isIgnoredClient(brand)) {
                     String message = GrimAPI.INSTANCE.getConfigManager().getConfig().getStringElse("client-brand-format", "%prefix% &f%player% joined using %brand%");

src/main/java/ac/grim/grimac/checks/impl/misc/FastBreak.java

@@ -1,25 +1,36 @@
 package ac.grim.grimac.checks.impl.misc;
 
+import ac.grim.grimac.GrimAPI;
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractBlockBreakCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.anticheat.update.BlockBreak;
 import ac.grim.grimac.utils.math.GrimMath;
 import ac.grim.grimac.utils.nmsutil.BlockBreakSpeed;
+import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
+import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.protocol.player.DiggingAction;
 import com.github.retrooper.packetevents.protocol.world.states.WrappedBlockState;
 import com.github.retrooper.packetevents.protocol.world.states.type.StateTypes;
 import com.github.retrooper.packetevents.util.Vector3i;
+import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerDigging;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerFlying;
+import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerAcknowledgeBlockChanges;
+import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerBlockChange;
+import io.github.retrooper.packetevents.util.folia.FoliaScheduler;
+import org.bukkit.Chunk;
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
 
 // Based loosely off of Hawk BlockBreakSpeedSurvival
 // Also based loosely off of NoCheatPlus FastBreak
 // Also based off minecraft wiki: https://minecraft.wiki/w/Breaking#Instant_breaking
-@CheckData(name = "FastBreak", description = "Breaking blocks too quickly")
-public class FastBreak extends AbstractBlockBreakCheck {
+@CheckData(name = "FastBreak", experimental = false)
+public class FastBreak extends Check implements PacketCheck {
     public FastBreak(GrimPlayer playerData) {
         super(playerData);
     }
@@ -38,62 +49,6 @@ public class FastBreak extends AbstractBlockBreakCheck {
     double blockBreakBalance = 0;
     double blockDelayBalance = 0;
 
-    @Override
-    public void onBlockBreak(BlockBreak blockBreak) {
-        if (blockBreak.action == DiggingAction.START_DIGGING) {
-            WrappedBlockState block = blockBreak.block;
-
-            // Exempt all blocks that do not exist in the player version
-            if (WrappedBlockState.getDefaultState(player.getClientVersion(), block.getType()).getType() == StateTypes.AIR) {
-                return;
-            }
-
-            startBreak = System.currentTimeMillis() - (targetBlock == null ? 50 : 0); // ???
-            targetBlock = blockBreak.position;
-
-            maximumBlockDamage = BlockBreakSpeed.getBlockDamage(player, targetBlock);
-
-            double breakDelay = System.currentTimeMillis() - lastFinishBreak;
-
-            if (breakDelay >= 275) { // Reduce buffer if "close enough"
-                blockDelayBalance *= 0.9;
-            } else { // Otherwise, increase buffer
-                blockDelayBalance += 300 - breakDelay;
-            }
-
-            if (blockDelayBalance > 1000) { // If more than a second of advantage
-                flagAndAlert("Delay=" + breakDelay);
-                if (shouldModifyPackets()) {
-                    blockBreak.cancel();
-                }
-            }
-
-            clampBalance();
-        }
-
-        if (blockBreak.action == DiggingAction.FINISHED_DIGGING && targetBlock != null) {
-            double predictedTime = Math.ceil(1 / maximumBlockDamage) * 50;
-            double realTime = System.currentTimeMillis() - startBreak;
-            double diff = predictedTime - realTime;
-
-            clampBalance();
-
-            if (diff < 25) {  // Reduce buffer if "close enough"
-                blockBreakBalance *= 0.9;
-            } else { // Otherwise, increase buffer
-                blockBreakBalance += diff;
-            }
-
-            if (blockBreakBalance > 1000) { // If more than a second of advantage
-                if (flagAndAlert("Diff=" + diff + ",Balance=" + blockBreakBalance) && shouldModifyPackets()) {
-                    blockBreak.cancel();
-                }
-            }
-
-            lastFinishBreak = System.currentTimeMillis();
-        }
-    }
-
     @Override
     public void onPacketReceive(PacketReceiveEvent event) {
         // Find the most optimal block damage using the animation packet, which is sent at least once a tick when breaking blocks
@@ -101,6 +56,95 @@ public class FastBreak extends AbstractBlockBreakCheck {
         if ((player.getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_9) ? event.getPacketType() == PacketType.Play.Client.ANIMATION : WrapperPlayClientPlayerFlying.isFlying(event.getPacketType())) && targetBlock != null) {
             maximumBlockDamage = Math.max(maximumBlockDamage, BlockBreakSpeed.getBlockDamage(player, targetBlock));
         }
+
+        if (event.getPacketType() == PacketType.Play.Client.PLAYER_DIGGING) {
+            WrapperPlayClientPlayerDigging digging = new WrapperPlayClientPlayerDigging(event);
+            final Vector3i blockPosition = digging.getBlockPosition();
+
+            if (digging.getAction() == DiggingAction.START_DIGGING) {
+                WrappedBlockState block = player.compensatedWorld.getWrappedBlockStateAt(blockPosition);
+                
+                // Exempt all blocks that do not exist in the player version
+                if (WrappedBlockState.getDefaultState(player.getClientVersion(), block.getType()).getType() == StateTypes.AIR) {
+                    return;
+                }
+            
+                startBreak = System.currentTimeMillis() - (targetBlock == null ? 50 : 0); // ???
+                targetBlock = blockPosition;
+                
+                maximumBlockDamage = BlockBreakSpeed.getBlockDamage(player, targetBlock);
+
+                double breakDelay = System.currentTimeMillis() - lastFinishBreak;
+
+                if (breakDelay >= 275) { // Reduce buffer if "close enough"
+                    blockDelayBalance *= 0.9;
+                } else { // Otherwise, increase buffer
+                    blockDelayBalance += 300 - breakDelay;
+                }
+
+                if (blockDelayBalance > 1000) { // If more than a second of advantage
+                    flagAndAlert("Delay=" + breakDelay);
+                    if (shouldModifyPackets()) {
+                        event.setCancelled(true); // Cancelling start digging will cause server to reject block break
+                        player.onPacketCancel();
+                    }
+                }
+
+                clampBalance();
+            }
+
+            if (digging.getAction() == DiggingAction.FINISHED_DIGGING && targetBlock != null) {
+                double predictedTime = Math.ceil(1 / maximumBlockDamage) * 50;
+                double realTime = System.currentTimeMillis() - startBreak;
+                double diff = predictedTime - realTime;
+
+                clampBalance();
+
+                if (diff < 25) {  // Reduce buffer if "close enough"
+                    blockBreakBalance *= 0.9;
+                } else { // Otherwise, increase buffer
+                    blockBreakBalance += diff;
+                }
+
+                if (blockBreakBalance > 1000) { // If more than a second of advantage
+                    FoliaScheduler.getEntityScheduler().execute(player.bukkitPlayer, GrimAPI.INSTANCE.getPlugin(), () -> {
+                        Player bukkitPlayer = player.bukkitPlayer;
+                        if (bukkitPlayer == null || !bukkitPlayer.isOnline()) return;
+
+                        if (bukkitPlayer.getLocation().distance(new Location(bukkitPlayer.getWorld(), blockPosition.getX(), blockPosition.getY(), blockPosition.getZ())) < 64) {
+                            final int chunkX = blockPosition.getX() >> 4;
+                            final int chunkZ = blockPosition.getZ() >> 4;
+                            if (!bukkitPlayer.getWorld().isChunkLoaded(chunkX, chunkZ)) return; // Don't load chunks sync
+
+                            Chunk chunk = bukkitPlayer.getWorld().getChunkAt(chunkX, chunkZ);
+                            Block block = chunk.getBlock(blockPosition.getX() & 15, blockPosition.getY(), blockPosition.getZ() & 15);
+
+                            int blockId;
+
+                            if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_13)) {
+                                // Cache this because strings are expensive
+                                blockId = WrappedBlockState.getByString(PacketEvents.getAPI().getServerManager().getVersion().toClientVersion(), block.getBlockData().getAsString(false)).getGlobalId();
+                            } else {
+                                blockId = (block.getType().getId() << 4) | block.getData();
+                            }
+
+                            player.user.sendPacket(new WrapperPlayServerBlockChange(blockPosition, blockId));
+
+                            if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_19)) { // Via will handle this for us pre-1.19
+                                player.user.sendPacket(new WrapperPlayServerAcknowledgeBlockChanges(digging.getSequence())); // Make 1.19 clients apply the changes
+                            }
+                        }
+                    }, null, 0);
+
+                    if (flagAndAlert("Diff=" + diff + ",Balance=" + blockBreakBalance) && shouldModifyPackets()) {
+                        event.setCancelled(true);
+                        player.onPacketCancel();
+                    }
+                }
+
+                lastFinishBreak = System.currentTimeMillis();
+            }
+        }
     }
 
     private void clampBalance() {

src/main/java/ac/grim/grimac/checks/impl/misc/GhostBlockMitigation.java

@@ -1,6 +1,5 @@
 package ac.grim.grimac.checks.impl.misc;
 
-import ac.grim.grimac.api.config.ConfigManager;
 import ac.grim.grimac.checks.type.BlockPlaceCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.anticheat.update.BlockPlace;
@@ -64,9 +63,10 @@ public class GhostBlockMitigation extends BlockPlaceCheck {
     }
 
     @Override
-    public void onReload(ConfigManager config) {
-        allow = config.getBooleanElse("exploit.allow-building-on-ghostblocks", true);
-        distance = config.getIntElse("exploit.distance-to-check-for-ghostblocks", 2);
+    public void reload() {
+        super.reload();
+        allow = getConfig().getBooleanElse("exploit.allow-building-on-ghostblocks", true);
+        distance = getConfig().getIntElse("exploit.distance-to-check-for-ghostblocks", 2);
 
         if (distance < 2 || distance > 4) distance = 2;
     }

src/main/java/ac/grim/grimac/checks/impl/misc/TransactionOrder.java

@@ -0,0 +1,17 @@
+package ac.grim.grimac.checks.impl.misc;
+
+import ac.grim.grimac.checks.Check;
+import ac.grim.grimac.checks.CheckData;
+import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.player.GrimPlayer;
+
+import java.util.ArrayList;
+
+@CheckData(name = "TransactionOrder", experimental = false)
+public class TransactionOrder extends Check implements PacketCheck {
+
+    public TransactionOrder(GrimPlayer player) {
+        super(player);
+    }
+
+}

src/main/java/ac/grim/grimac/checks/impl/movement/EntityControl.java

@@ -1,11 +1,12 @@
 package ac.grim.grimac.checks.impl.movement;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPostPredictionCheck;
+import ac.grim.grimac.checks.type.PostPredictionCheck;
 import ac.grim.grimac.player.GrimPlayer;
 
 @CheckData(name = "Entity control", configName = "EntityControl")
-public class EntityControl extends AbstractPostPredictionCheck {
+public class EntityControl extends Check implements PostPredictionCheck {
     public EntityControl(GrimPlayer player) {
         super(player);
     }

src/main/java/ac/grim/grimac/checks/impl/movement/NegativeTimerCheck.java

@@ -1,15 +1,13 @@
 package ac.grim.grimac.checks.impl.movement;
 
-import ac.grim.grimac.api.CheckType;
-import ac.grim.grimac.api.config.ConfigManager;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.interfaces.PostPredictionCheckI;
+import ac.grim.grimac.checks.type.PostPredictionCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 
-@CheckData(name = "NegativeTimer", configName = "NegativeTimer", setback = -1, experimental = true)
-public class NegativeTimerCheck extends TimerCheck implements PostPredictionCheckI {
+@CheckData(name = "NegativeTimer", configName = "NegativeTimer", setback = 10, experimental = true)
+public class NegativeTimerCheck extends TimerCheck implements PostPredictionCheck {
 
     public NegativeTimerCheck(GrimPlayer player) {
         super(player);
@@ -25,7 +23,7 @@ public class NegativeTimerCheck extends TimerCheck implements PostPredictionChec
 
         if (timerBalanceRealTime < lastMovementPlayerClock - clockDrift) {
             int lostMS = (int) ((System.nanoTime() - timerBalanceRealTime) / 1e6);
-            if (flagAndAlert("-" + lostMS)) setbackIfAboveSetbackVL();
+            flagAndAlert("-" + lostMS);
             timerBalanceRealTime += 50e6;
         }
     }
@@ -37,12 +35,8 @@ public class NegativeTimerCheck extends TimerCheck implements PostPredictionChec
     }
 
     @Override
-    public void onReload(ConfigManager config) {
-        clockDrift = (long) (config.getDoubleElse(getConfigName() + ".drift", 1200.0) * 1e6);
-    }
-
-    @Override
-    public int getMask() {
-        return CheckType.POST_PREDICTION.getMask();
+    public void reload() {
+        super.reload();
+        clockDrift = (long) (getConfig().getDoubleElse(getConfigName() + ".drift", 1200.0) * 1e6);
     }
 }

src/main/java/ac/grim/grimac/checks/impl/movement/NoSlowA.java

@@ -1,14 +1,14 @@
 package ac.grim.grimac.checks.impl.movement;
 
-import ac.grim.grimac.api.config.ConfigManager;
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPostPredictionCheck;
+import ac.grim.grimac.checks.type.PostPredictionCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 
-@CheckData(name = "NoSlowA (Prediction)", configName = "NoSlowA", description = "Was not slowed while using an item", setback = 5)
-public class NoSlowA extends AbstractPostPredictionCheck {
+@CheckData(name = "NoSlowA (Prediction)", configName = "NoSlowA", setback = 5)
+public class NoSlowA extends Check implements PostPredictionCheck {
     double offsetToFlag;
     double bestOffset = 1;
     // The player sends that they switched items the next tick if they switch from an item that can be used
@@ -33,7 +33,8 @@ public class NoSlowA extends AbstractPostPredictionCheck {
             }
 
             if (bestOffset > offsetToFlag) {
-                if (flaggedLastTick && flagWithSetback()) {
+                if (flaggedLastTick) {
+                    flagWithSetback();
                     alert("");
                 }
                 flaggedLastTick = true;
@@ -50,7 +51,8 @@ public class NoSlowA extends AbstractPostPredictionCheck {
     }
 
     @Override
-    public void onReload(ConfigManager config) {
-        offsetToFlag = config.getDoubleElse("NoSlowA.threshold", 0.001);
+    public void reload() {
+        super.reload();
+        offsetToFlag = getConfig().getDoubleElse("NoSlowA.threshold", 0.001);
     }
 }

src/main/java/ac/grim/grimac/checks/impl/movement/NoSlowB.java

@@ -1,13 +1,14 @@
 package ac.grim.grimac.checks.impl.movement;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerFlying;
 
-@CheckData(name = "NoSlowB", description = "Sprinting with too low hunger", setback = 5)
-public class NoSlowB extends AbstractPacketCheck {
+@CheckData(name = "NoSlowB", setback = 5)
+public class NoSlowB extends Check implements PacketCheck {
 
     public NoSlowB(GrimPlayer player) {
         super(player);
@@ -34,4 +35,4 @@ public class NoSlowB extends AbstractPacketCheck {
             }
         }
     }
-}
+}

src/main/java/ac/grim/grimac/checks/impl/movement/NoSlowC.java

@@ -1,20 +1,18 @@
 package ac.grim.grimac.checks.impl.movement;
 
-import ac.grim.grimac.api.CheckType;
 import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.interfaces.PacketCheckI;
-import ac.grim.grimac.checks.type.interfaces.PostPredictionCheckI;
+import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.PostPredictionCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-import ac.grim.grimac.utils.enums.FluidTag;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientEntityAction;
 
-@CheckData(name = "NoSlowC", description = "Sprinting while sneaking", setback = 5, experimental = true)
-public class NoSlowC extends Check implements PostPredictionCheckI, PacketCheckI {
+@CheckData(name = "NoSlowC", setback = 5, experimental = true)
+public class NoSlowC extends Check implements PostPredictionCheck, PacketCheck {
     public NoSlowC(GrimPlayer player) {
         super(player);
     }
@@ -34,26 +32,22 @@ public class NoSlowC extends Check implements PostPredictionCheckI, PacketCheckI
     public void onPredictionComplete(final PredictionComplete predictionComplete) {
         if (!predictionComplete.isChecked()) return;
 
-        if (player.isSlowMovement && player.sneakingSpeedMultiplier < 0.8f) {
+        if (player.isSlowMovement) {
             ClientVersion client = player.getClientVersion();
 
             // https://bugs.mojang.com/browse/MC-152728
-            if (startedSprintingBeforeSlowMovement && client.isNewerThanOrEquals(ClientVersion.V_1_14_2) && client.isOlderThan(ClientVersion.V_1_21_4)) {
+            if (startedSprintingBeforeSlowMovement && client.isNewerThanOrEquals(ClientVersion.V_1_14_2)) {
                 reward();
                 return;
             }
+
             if (player.isSprinting
-                // you can sneak and swim in 1.13 - 1.14.1
-                && (!player.isSwimming || client.isNewerThan(ClientVersion.V_1_14_1) || client.isOlderThan(ClientVersion.V_1_13))
-                && (player.fluidOnEyes != FluidTag.WATER || client.isOlderThan(ClientVersion.V_1_21_4))
+                    // you can sneak and swim in 1.13 - 1.14.1
+                    && (!player.isSwimming || client.isNewerThan(ClientVersion.V_1_14_1) || client.isOlderThan(ClientVersion.V_1_13))
+                    && player.sneakingSpeedMultiplier < 0.8f
             ) {
                 if (flagWithSetback()) alert("");
             } else reward();
         }
     }
-
-    @Override
-    public int getMask() {
-        return CheckType.POST_PREDICTION.getMask();
-    }
 }

src/main/java/ac/grim/grimac/checks/impl/movement/NoSlowD.java

@@ -1,7 +1,9 @@
 package ac.grim.grimac.checks.impl.movement;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPostPredictionCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.PostPredictionCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
@@ -9,8 +11,8 @@ import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientEntityAction;
 
-@CheckData(name = "NoSlowD", description = "Sprinting while using an item", setback = 5, experimental = true)
-public class NoSlowD extends AbstractPostPredictionCheck {
+@CheckData(name = "NoSlowD", setback = 5, experimental = true)
+public class NoSlowD extends Check implements PostPredictionCheck, PacketCheck {
     public NoSlowD(GrimPlayer player) {
         super(player);
     }
@@ -32,16 +34,14 @@ public class NoSlowD extends AbstractPostPredictionCheck {
         if (!predictionComplete.isChecked()) return;
 
         if (player.packetStateData.isSlowedByUsingItem()) {
-            ClientVersion client = player.getClientVersion();
-
             // https://bugs.mojang.com/browse/MC-152728
-            if (startedSprintingBeforeUse && client.isNewerThanOrEquals(ClientVersion.V_1_14_2) && client.isOlderThan(ClientVersion.V_1_21_4)) {
+            if (startedSprintingBeforeUse && player.getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_14_2)) {
                 reward();
                 flaggedLastTick = false;
                 return;
             }
 
-            if (player.isSprinting && (!player.isSwimming || client.isOlderThan(ClientVersion.V_1_21_4))) {
+            if (player.isSprinting) {
                 if (flaggedLastTick && flagWithSetback()) alert("");
                 flaggedLastTick = true;
             } else {

src/main/java/ac/grim/grimac/checks/impl/movement/NoSlowE.java

@@ -1,7 +1,9 @@
 package ac.grim.grimac.checks.impl.movement;
 
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPostPredictionCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
+import ac.grim.grimac.checks.type.PostPredictionCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
@@ -10,8 +12,8 @@ import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientEn
 
 import static com.github.retrooper.packetevents.protocol.potion.PotionTypes.BLINDNESS;
 
-@CheckData(name = "NoSlowE", description = "Started sprinting while having blindness", setback = 5, experimental = true)
-public class NoSlowE extends AbstractPostPredictionCheck {
+@CheckData(name = "NoSlowE", setback = 5, experimental = true)
+public class NoSlowE extends Check implements PostPredictionCheck, PacketCheck {
     public NoSlowE(GrimPlayer player) {
         super(player);
     }

src/main/java/ac/grim/grimac/checks/impl/movement/PredictionRunner.java

@@ -1,10 +1,11 @@
 package ac.grim.grimac.checks.impl.movement;
 
-import ac.grim.grimac.checks.type.abstracts.AbstractPositionCheck;
+import ac.grim.grimac.checks.Check;
+import ac.grim.grimac.checks.type.PositionCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.anticheat.update.PositionUpdate;
 
-public class PredictionRunner extends AbstractPositionCheck {
+public class PredictionRunner extends Check implements PositionCheck {
     public PredictionRunner(GrimPlayer playerData) {
         super(playerData);
     }

src/main/java/ac/grim/grimac/checks/impl/movement/SetbackBlocker.java

@@ -1,13 +1,15 @@
 package ac.grim.grimac.checks.impl.movement;
 
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
+import ac.grim.grimac.checks.Check;
+import ac.grim.grimac.checks.type.PacketCheck;
 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.util.Vector3d;
+import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientInteractEntity;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerFlying;
 
-public class SetbackBlocker extends AbstractPacketCheck {
+public class SetbackBlocker extends Check implements PacketCheck {
     public SetbackBlocker(GrimPlayer playerData) {
         super(playerData);
     }

src/main/java/ac/grim/grimac/checks/impl/movement/TickTimer.java

@@ -1,44 +0,0 @@
-package ac.grim.grimac.checks.impl.movement;
-
-import ac.grim.grimac.api.GrimUser;
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPrePredictionCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import com.github.retrooper.packetevents.PacketEvents;
-import com.github.retrooper.packetevents.event.PacketReceiveEvent;
-import com.github.retrooper.packetevents.manager.server.ServerVersion;
-import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-
-
-@CheckData(name = "TickTimer", setback = 1)
-public class TickTimer extends AbstractPrePredictionCheck {
-
-    private boolean receivedTickEnd = true;
-    private int flyingPackets = 0;
-
-    public TickTimer(GrimPlayer player) {
-        super(player);
-    }
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (!player.supportsEndTick()) return;
-        if (isFlying(event.getPacketType()) && !player.packetStateData.lastPacketWasTeleport) {
-            if (!receivedTickEnd) flagAndAlert("type=flying, packets=" + flyingPackets);
-            receivedTickEnd = false;
-            flyingPackets++;
-        } else if (event.getPacketType() == PacketType.Play.Client.CLIENT_TICK_END) {
-            receivedTickEnd = true;
-            if (flyingPackets > 1) flagAndAlert("type=end, packets=" + flyingPackets);
-            flyingPackets = 0;
-        }
-    }
-
-    @Override
-    public boolean supportsPlayer(GrimUser player) {
-        // TODO make this a part of GrimUser interface and remove the server version check when we bypass via
-        // TODO server version check when we bypass via for listening for packets
-        return ((GrimPlayer) player).getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_21_2) && PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_21_2);
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/movement/TimerCheck.java

@@ -1,27 +1,27 @@
 package ac.grim.grimac.checks.impl.movement;
 
-import ac.grim.grimac.api.CheckType;
-import ac.grim.grimac.api.config.ConfigManager;
+import ac.grim.grimac.checks.Check;
 import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPrePredictionCheck;
+import ac.grim.grimac.checks.type.PacketCheck;
 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.packettype.PacketTypeCommon;
+import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerFlying;
 
 @CheckData(name = "Timer", configName = "TimerA", setback = 10)
-public class TimerCheck extends AbstractPrePredictionCheck {
+public class TimerCheck extends Check implements PacketCheck {
     long timerBalanceRealTime = 0;
 
     // Default value is real time minus max keep-alive time
     long knownPlayerClockTime = (long) (System.nanoTime() - 6e10);
     long lastMovementPlayerClock = (long) (System.nanoTime() - 6e10);
 
-    // How long should the player be able to fall back behind their ping? (nanos)
+    // How long should the player be able to fall back behind their ping?
     // Default: 120 milliseconds
-    long clockDrift;
-    // At what ping should we start to limit the balance advantage? (nanos)
-    long limitAbuseOverPing;
+    long clockDrift = (long) 120e6;
+
+    long limitAbuseOverPing = 1000;
 
     boolean hasGottenMovementAfterTransaction = false;
 
@@ -72,31 +72,35 @@ public class TimerCheck extends AbstractPrePredictionCheck {
         doCheck(event);
     }
 
+
     public void doCheck(final PacketReceiveEvent event) {
-        if (timerBalanceRealTime > System.nanoTime()) {
+        final double transactionPing = player.getTransactionPing();
+        // Limit using transaction ping if over 1000ms (default)
+        final boolean needsAdjustment = limitAbuseOverPing != -1 && transactionPing >= limitAbuseOverPing;
+        final boolean wouldFailNormal = timerBalanceRealTime > System.nanoTime();
+        final boolean failsAdjusted = needsAdjustment && (timerBalanceRealTime + ((transactionPing * 1e6) - clockDrift - 50e6)) > System.nanoTime();
+        if (wouldFailNormal || failsAdjusted) {
             if (flag()) {
                 // Cancel the packet
                 // Only cancel if not an adjustment setback
-                if (shouldModifyPackets()) {
+                if (wouldFailNormal && shouldModifyPackets()) {
                     event.setCancelled(true);
                     player.onPacketCancel();
                 }
 
                 if (isAboveSetbackVl()) player.getSetbackTeleportUtil().executeNonSimulatingSetback();
 
-                alert("");
+                if (wouldFailNormal) {
+                    // Only alert if we would fail without adjusted limit
+                    alert("");
+                }
             }
 
             // Reset the violation by 1 movement
             timerBalanceRealTime -= 50e6;
         }
 
-        // Limit using transaction ping if over 1000ms (default)
-        long playerClock = lastMovementPlayerClock;
-        if (System.nanoTime() - playerClock > limitAbuseOverPing) {
-            playerClock = System.nanoTime() - limitAbuseOverPing;
-        }
-        timerBalanceRealTime = Math.max(timerBalanceRealTime, playerClock - clockDrift);
+        timerBalanceRealTime = Math.max(timerBalanceRealTime, lastMovementPlayerClock - clockDrift);
     }
 
     public boolean checkForTransaction(PacketTypeCommon packetType) {
@@ -106,17 +110,14 @@ public class TimerCheck extends AbstractPrePredictionCheck {
 
     public boolean shouldCountPacketForTimer(PacketTypeCommon packetType) {
         // If not flying, or this was a teleport, or this was a duplicate 1.17 mojang stupidity packet
-        return isTickPacket(packetType);
+        return WrapperPlayClientPlayerFlying.isFlying(packetType) &&
+                !player.packetStateData.lastPacketWasTeleport && !player.packetStateData.lastPacketWasOnePointSeventeenDuplicate;
     }
 
     @Override
-    public void onReload(ConfigManager config) {
-        clockDrift = (long) (config.getDoubleElse(getConfigName() + ".drift", 120.0) * 1e6);
-        limitAbuseOverPing = (long) (config.getDoubleElse(getConfigName() + ".ping-abuse-limit-threshold", 1000) * 1e6);
-    }
-
-    @Override
-    public int getMask() {
-        return CheckType.PRE_PREDICTION.getMask();
+    public void reload() {
+        super.reload();
+        clockDrift = (long) (getConfig().getDoubleElse(getConfigName() + ".drift", 120.0) * 1e6);
+        limitAbuseOverPing = (long) (getConfig().getDoubleElse(getConfigName() + ".ping-abuse-limit-threshold", 1000));
     }
 }

src/main/java/ac/grim/grimac/checks/impl/movement/VehiclePredictionRunner.java

@@ -1,13 +1,12 @@
 package ac.grim.grimac.checks.impl.movement;
 
-import ac.grim.grimac.api.CheckType;
 import ac.grim.grimac.checks.Check;
-import ac.grim.grimac.checks.type.interfaces.VehicleCheckI;
+import ac.grim.grimac.checks.type.VehicleCheck;
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.anticheat.update.PositionUpdate;
 import ac.grim.grimac.utils.anticheat.update.VehiclePositionUpdate;
 
-public class VehiclePredictionRunner extends Check implements VehicleCheckI {
+public class VehiclePredictionRunner extends Check implements VehicleCheck {
     public VehiclePredictionRunner(GrimPlayer playerData) {
         super(playerData);
     }
@@ -18,9 +17,4 @@ public class VehiclePredictionRunner extends Check implements VehicleCheckI {
         // We don't do vehicle setbacks because vehicle netcode sucks.
         player.movementCheckRunner.processAndCheckMovementPacket(new PositionUpdate(vehicleUpdate.getFrom(), vehicleUpdate.getTo(), false, null, null, vehicleUpdate.isTeleport()));
     }
-
-    @Override
-    public int getMask() {
-        return CheckType.VEHICLE.getMask();
-    }
 }

src/main/java/ac/grim/grimac/checks/impl/multiactions/MultiActionsA.java

@@ -1,28 +0,0 @@
-package ac.grim.grimac.checks.impl.multiactions;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
-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.InteractionHand;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientInteractEntity;
-
-@CheckData(name = "MultiActionsA", description = "Attacked while using an item", experimental = true)
-public class MultiActionsA extends AbstractPacketCheck {
-    public MultiActionsA(GrimPlayer player) {
-        super(player);
-    }
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (player.packetStateData.isSlowedByUsingItem() && (player.packetStateData.lastSlotSelected == player.packetStateData.getSlowedByUsingItemSlot() || player.packetStateData.eatingHand == InteractionHand.OFF_HAND) && event.getPacketType() == PacketType.Play.Client.INTERACT_ENTITY) {
-            if (new WrapperPlayClientInteractEntity(event).getAction() == WrapperPlayClientInteractEntity.InteractAction.ATTACK) {
-                if (flagAndAlert() && shouldModifyPackets()) {
-                    event.setCancelled(true);
-                    player.onPacketCancel();
-                }
-            }
-        }
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/multiactions/MultiActionsB.java

@@ -1,50 +0,0 @@
-package ac.grim.grimac.checks.impl.multiactions;
-
-import ac.grim.grimac.api.GrimUser;
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import com.github.retrooper.packetevents.PacketEvents;
-import com.github.retrooper.packetevents.event.PacketReceiveEvent;
-import com.github.retrooper.packetevents.manager.server.ServerVersion;
-import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-import com.github.retrooper.packetevents.protocol.player.DiggingAction;
-import com.github.retrooper.packetevents.protocol.player.InteractionHand;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerDigging;
-
-import static ac.grim.grimac.events.packets.patch.ResyncWorldUtil.resyncPosition;
-
-@CheckData(name = "MultiActionsB", description = "Breaking blocks while using an item", experimental = true)
-public class MultiActionsB extends AbstractPacketCheck {
-    public MultiActionsB(GrimPlayer player) {
-        super(player);
-    }
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (player.packetStateData.isSlowedByUsingItem() && (player.packetStateData.lastSlotSelected == player.packetStateData.getSlowedByUsingItemSlot() || player.packetStateData.eatingHand == InteractionHand.OFF_HAND) && event.getPacketType() == PacketType.Play.Client.PLAYER_DIGGING) {
-            // this is vanilla on 1.7
-            if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_7_10)) {
-                return;
-            }
-
-            final WrapperPlayClientPlayerDigging packet = new WrapperPlayClientPlayerDigging(event);
-
-            if (packet.getAction() == DiggingAction.START_DIGGING || packet.getAction() == DiggingAction.CANCELLED_DIGGING || packet.getAction() == DiggingAction.FINISHED_DIGGING) {
-                if (flagAndAlert() && shouldModifyPackets()) {
-                    event.setCancelled(true);
-                    player.onPacketCancel();
-                    resyncPosition(player, packet.getBlockPosition());
-                }
-            }
-        }
-    }
-
-    @Override
-    public boolean supportsPlayer(GrimUser player) {
-        // TODO make this a part of GrimUser interface
-        // TODO server version check when we bypass via for listening for packets
-        return ((GrimPlayer) player).getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_8) && PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_8);
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/multiactions/MultiActionsC.java

@@ -1,44 +0,0 @@
-package ac.grim.grimac.checks.impl.multiactions;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import com.github.retrooper.packetevents.event.PacketReceiveEvent;
-import com.github.retrooper.packetevents.event.PacketSendEvent;
-import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-
-@CheckData(name = "MultiActionsC", description = "Clicked in inventory while performing other actions", experimental = true)
-public class MultiActionsC extends AbstractPacketCheck {
-    public MultiActionsC(GrimPlayer player) {
-        super(player);
-    }
-
-    private boolean serverOpenedInventoryThisTick;
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (event.getPacketType() == PacketType.Play.Client.CLICK_WINDOW) {
-            String verbose = player.isSprinting && !player.isSwimming && !serverOpenedInventoryThisTick ? "sprinting" : "";
-
-            if (player.packetStateData.isSlowedByUsingItem()) {
-                verbose += (verbose.isEmpty() ? "" : ", ") + "using";
-            }
-
-            if (!verbose.isEmpty() && flagAndAlert(verbose) && shouldModifyPackets()) {
-                event.setCancelled(true);
-                player.onPacketCancel();
-            }
-        }
-
-        if (isTickPacket(event.getPacketType())) {
-            serverOpenedInventoryThisTick = false;
-        }
-    }
-
-    @Override
-    public void onPacketSend(PacketSendEvent event) {
-        if (event.getPacketType() == PacketType.Play.Server.OPEN_WINDOW) {
-            player.latencyUtils.addRealTimeTask(player.lastTransactionSent.get(), () -> serverOpenedInventoryThisTick = true);
-        }
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/multiactions/MultiActionsD.java

@@ -1,30 +0,0 @@
-package ac.grim.grimac.checks.impl.multiactions;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import com.github.retrooper.packetevents.event.PacketReceiveEvent;
-import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-
-@CheckData(name = "MultiActionsD", description = "Closed inventory while performing other actions", experimental = true)
-public class MultiActionsD extends AbstractPacketCheck {
-    public MultiActionsD(GrimPlayer player) {
-        super(player);
-    }
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (event.getPacketType() == PacketType.Play.Client.CLOSE_WINDOW) {
-            String verbose = player.isSprinting && !player.isSwimming ? "sprinting" : "";
-
-            if (player.packetStateData.isSlowedByUsingItem()) {
-                verbose += (verbose.isEmpty() ? "" : ", ") + "using";
-            }
-
-            if (!verbose.isEmpty() && flagAndAlert(verbose) && shouldModifyPackets()) {
-                event.setCancelled(true);
-                player.onPacketCancel();
-            }
-        }
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/multiactions/MultiActionsE.java

@@ -1,41 +0,0 @@
-package ac.grim.grimac.checks.impl.multiactions;
-
-import ac.grim.grimac.api.GrimUser;
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import com.github.retrooper.packetevents.PacketEvents;
-import com.github.retrooper.packetevents.event.PacketReceiveEvent;
-import com.github.retrooper.packetevents.manager.server.ServerVersion;
-import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-import com.github.retrooper.packetevents.protocol.player.InteractionHand;
-
-@CheckData(name = "MultiActionsE", description = "Swinging while using an item", experimental = true)
-public class MultiActionsE extends AbstractPacketCheck {
-    public MultiActionsE(GrimPlayer player) {
-        super(player);
-    }
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (player.packetStateData.isSlowedByUsingItem() && (player.packetStateData.lastSlotSelected == player.packetStateData.getSlowedByUsingItemSlot() || player.packetStateData.eatingHand == InteractionHand.OFF_HAND) && event.getPacketType() == PacketType.Play.Client.ANIMATION) {
-            // this is possible to false on 1.7
-            if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_7_10)) {
-                return;
-            }
-
-            if (flagAndAlert() && shouldModifyPackets()) {
-                event.setCancelled(true);
-                player.onPacketCancel();
-            }
-        }
-    }
-
-    @Override
-    public boolean supportsPlayer(GrimUser player) {
-        // TODO make this a part of GrimUser interface
-        // TODO server version check when we bypass via for listening for packets
-        return ((GrimPlayer) player).getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_8) && PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_8);
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/multiactions/MultiActionsF.java

@@ -1,92 +0,0 @@
-package ac.grim.grimac.checks.impl.multiactions;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.BlockPlaceCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.anticheat.update.BlockPlace;
-import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
-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.protocol.player.DiggingAction;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerDigging;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerFlying;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static ac.grim.grimac.events.packets.patch.ResyncWorldUtil.resyncPosition;
-
-@CheckData(name = "MultiActionsF", description = "Interacting with a block and an entity in the same tick", experimental = true)
-public class MultiActionsF extends BlockPlaceCheck {
-    public MultiActionsF(GrimPlayer player) {
-        super(player);
-    }
-
-    private final List<String> flags = new ArrayList<>();
-    boolean entity, block;
-
-    @Override
-    public void onBlockPlace(BlockPlace place) {
-        block = true;
-        if (entity) {
-            if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8)) {
-                if (flagAndAlert("place") && shouldModifyPackets() && shouldCancel()) {
-                    place.resync();
-                }
-            } else {
-                flags.add("place");
-            }
-        }
-    }
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (event.getPacketType() == PacketType.Play.Client.INTERACT_ENTITY) {
-            entity = true;
-            if (block) {
-                if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8)) {
-                    if (flagAndAlert("entity") && shouldModifyPackets()) {
-                        event.setCancelled(true);
-                        player.onPacketCancel();
-                    }
-                } else {
-                    flags.add("entity");
-                }
-            }
-        }
-
-        if (event.getPacketType() == PacketType.Play.Client.PLAYER_DIGGING) {
-            WrapperPlayClientPlayerDigging packet = new WrapperPlayClientPlayerDigging(event);
-            if (packet.getAction() == DiggingAction.START_DIGGING || packet.getAction() == DiggingAction.FINISHED_DIGGING) {
-                block = true;
-                if (entity) {
-                    if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8)) {
-                        if (flagAndAlert("dig") && shouldModifyPackets()) {
-                            event.setCancelled(true);
-                            player.onPacketCancel();
-                            resyncPosition(player, packet.getBlockPosition());
-                        }
-                    } else {
-                        flags.add("dig");
-                    }
-                }
-            }
-        }
-
-        if (WrapperPlayClientPlayerFlying.isFlying(event.getPacketType()) && !player.packetStateData.lastPacketWasTeleport && !player.packetStateData.lastPacketWasOnePointSeventeenDuplicate) {
-            block = entity = false;
-        }
-    }
-
-    @Override
-    public void onPredictionComplete(PredictionComplete predictionComplete) {
-        if (player.getClientVersion().isNewerThan(ClientVersion.V_1_8) && player.isTickingReliablyFor(3) && !player.uncertaintyHandler.lastVehicleSwitch.hasOccurredSince(0)) {
-            for (String verbose : flags) {
-                flagAndAlert(verbose);
-            }
-        }
-
-        flags.clear();
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/packetorder/PacketOrderA.java

@@ -1,51 +0,0 @@
-package ac.grim.grimac.checks.impl.packetorder;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPostPredictionCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
-import com.github.retrooper.packetevents.event.PacketReceiveEvent;
-import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientClickWindow;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientClickWindow.WindowClickType;
-
-@CheckData(name = "PacketOrderA", experimental = true)
-public class PacketOrderA extends AbstractPostPredictionCheck {
-    public PacketOrderA(final GrimPlayer player) {
-        super(player);
-    }
-
-    private int invalid;
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (event.getPacketType() == PacketType.Play.Client.CLICK_WINDOW) {
-            final WindowClickType clickType = new WrapperPlayClientClickWindow(event).getWindowClickType();
-
-            if ((clickType == WindowClickType.PICKUP || clickType == WindowClickType.PICKUP_ALL) && player.packetOrderProcessor.isQuickMoveClicking()
-                    || clickType == WindowClickType.QUICK_MOVE && player.packetOrderProcessor.isPickUpClicking()) {
-                if (!player.canSkipTicks()) {
-                    if (flagAndAlert() && shouldModifyPackets()) {
-                        event.setCancelled(true);
-                        player.onPacketCancel();
-                    }
-                } else {
-                    invalid++;
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onPredictionComplete(PredictionComplete predictionComplete) {
-        if (!player.canSkipTicks()) return;
-
-        if (player.isTickingReliablyFor(3) && !player.uncertaintyHandler.lastVehicleSwitch.hasOccurredSince(0)) {
-            for (; invalid >= 1; invalid--) {
-                flagAndAlert();
-            }
-        }
-
-        invalid = 0;
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/packetorder/PacketOrderC.java

@@ -1,90 +0,0 @@
-package ac.grim.grimac.checks.impl.packetorder;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.data.packetentity.PacketEntity;
-import com.github.retrooper.packetevents.event.PacketReceiveEvent;
-import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
-import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
-import com.github.retrooper.packetevents.protocol.player.InteractionHand;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientInteractEntity;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerFlying;
-
-@CheckData(name = "PacketOrderC", experimental = true)
-public class PacketOrderC extends AbstractPacketCheck {
-    public PacketOrderC(final GrimPlayer player) {
-        super(player);
-    }
-
-    // 1.7 players do not send INTERACT_AT, so we cannot check them
-    private final boolean exempt = player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_7_10);
-    private boolean sentInteractAt = false;
-    private int requiredEntity;
-    private InteractionHand requiredHand;
-    private boolean requiredSneaking;
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (exempt) {
-            return;
-        }
-
-        if (event.getPacketType() == PacketType.Play.Client.INTERACT_ENTITY) {
-            final WrapperPlayClientInteractEntity packet = new WrapperPlayClientInteractEntity(event);
-
-            final PacketEntity entity = player.compensatedEntities.entityMap.get(packet.getEntityId());
-
-            // For armor stands, vanilla clients send:
-            //  - when renaming the armor stand or in spectator mode: INTERACT_AT + INTERACT
-            //  - in all other cases: only INTERACT
-            // Just exempt armor stands to be safe
-            if (entity != null && entity.getType() == EntityTypes.ARMOR_STAND) return;
-
-            final boolean sneaking = packet.isSneaking().orElse(false);
-
-            switch (packet.getAction()) {
-                // INTERACT_AT then INTERACT
-                case INTERACT:
-                    if (!sentInteractAt) {
-                        if (flagAndAlert("Skipped Interact-At") && shouldModifyPackets()) {
-                            event.setCancelled(true);
-                            player.onPacketCancel();
-                        }
-                    } else if (packet.getEntityId() != requiredEntity || packet.getHand() != requiredHand || sneaking != requiredSneaking) {
-                        String verbose = "requiredEntity=" + requiredEntity + ", entity=" + packet.getEntityId()
-                                + ", requiredHand=" + requiredHand + ", hand=" + packet.getHand()
-                                + ", requiredSneaking=" + requiredSneaking + ", sneaking=" + sneaking;
-                        if (flagAndAlert(verbose) && shouldModifyPackets()) {
-                            event.setCancelled(true);
-                            player.onPacketCancel();
-                        }
-                    }
-
-                    sentInteractAt = false;
-                    break;
-                case INTERACT_AT:
-                    if (sentInteractAt) {
-                        if (flagAndAlert("Skipped Interact") && shouldModifyPackets()) {
-                            event.setCancelled(true);
-                            player.onPacketCancel();
-                        }
-                    }
-
-                    requiredHand = packet.getHand();
-                    requiredEntity = packet.getEntityId();
-                    requiredSneaking = sneaking;
-                    sentInteractAt = true;
-                    break;
-            }
-        }
-
-        if (WrapperPlayClientPlayerFlying.isFlying(event.getPacketType())) {
-            if (sentInteractAt) {
-                sentInteractAt = false;
-                flagAndAlert("Skipped Interact (Tick)");
-            }
-        }
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/packetorder/PacketOrderD.java

@@ -1,12 +0,0 @@
-package ac.grim.grimac.checks.impl.packetorder;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPacketCheck;
-import ac.grim.grimac.player.GrimPlayer;
-
-@CheckData(name = "PacketOrderD")
-public class PacketOrderD extends AbstractPacketCheck {
-    public PacketOrderD(GrimPlayer player) {
-        super(player);
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/packetorder/PacketOrderE.java

@@ -1,64 +0,0 @@
-package ac.grim.grimac.checks.impl.packetorder;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPostPredictionCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
-import com.github.retrooper.packetevents.event.PacketReceiveEvent;
-import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-
-@CheckData(name = "PacketOrderE", experimental = true)
-public class PacketOrderE extends AbstractPostPredictionCheck {
-    public PacketOrderE(final GrimPlayer player) {
-        super(player);
-    }
-
-    private int invalid;
-    private boolean setback;
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (event.getPacketType() == PacketType.Play.Client.HELD_ITEM_CHANGE) {
-            if (player.packetOrderProcessor.isAttacking()
-                    || player.packetOrderProcessor.isRightClicking()
-                    || player.packetOrderProcessor.isOpeningInventory()
-                    || player.packetOrderProcessor.isReleasing()
-                    || player.packetOrderProcessor.isSneaking()
-                    || player.packetOrderProcessor.isSprinting()
-                    || player.packetOrderProcessor.isLeavingBed()
-                    || player.packetOrderProcessor.isStartingToGlide()
-                    || player.packetOrderProcessor.isJumpingWithMount()
-            ) {
-                if (player.canSkipTicks() || flagAndAlert()) {
-                    invalid++;
-
-                    if (player.packetOrderProcessor.isUsing()) {
-                        setback = true;
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onPredictionComplete(PredictionComplete predictionComplete) {
-        if (!player.canSkipTicks()) {
-            if (setback) {
-                setback = false;
-                setbackIfAboveSetbackVL();
-            }
-            return;
-        }
-
-        if (player.isTickingReliablyFor(3) && !player.uncertaintyHandler.lastVehicleSwitch.hasOccurredSince(0)) {
-            for (; invalid >= 1; invalid--) {
-                if (flagAndAlert() && setback) {
-                    setback = false;
-                    setbackIfAboveSetbackVL();
-                }
-            }
-        }
-
-        invalid = 0;
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/packetorder/PacketOrderF.java

@@ -1,58 +0,0 @@
-package ac.grim.grimac.checks.impl.packetorder;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPostPredictionCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
-import com.github.retrooper.packetevents.event.PacketReceiveEvent;
-import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-import com.github.retrooper.packetevents.protocol.player.DiggingAction;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientClientStatus;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerDigging;
-
-@CheckData(name = "PacketOrderF", experimental = true)
-public class PacketOrderF extends AbstractPostPredictionCheck {
-    public PacketOrderF(GrimPlayer player) {
-        super(player);
-    }
-
-    private int invalid;
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (event.getPacketType() == PacketType.Play.Client.INTERACT_ENTITY
-                || event.getPacketType() == PacketType.Play.Client.PLAYER_BLOCK_PLACEMENT
-                || event.getPacketType() == PacketType.Play.Client.USE_ITEM
-                || event.getPacketType() == PacketType.Play.Client.PICK_ITEM
-                || event.getPacketType() == PacketType.Play.Client.PLAYER_DIGGING
-                || (event.getPacketType() == PacketType.Play.Client.CLIENT_STATUS
-                && new WrapperPlayClientClientStatus(event).getAction() == WrapperPlayClientClientStatus.Action.OPEN_INVENTORY_ACHIEVEMENT)
-        ) if (player.packetOrderProcessor.isSprinting() || player.packetOrderProcessor.isSneaking()) {
-            if (!player.canSkipTicks()) {
-                if (flagAndAlert() && shouldModifyPackets()) {
-                    if (event.getPacketType() == PacketType.Play.Client.PLAYER_DIGGING
-                            && new WrapperPlayClientPlayerDigging(event).getAction() == DiggingAction.RELEASE_USE_ITEM
-                    ) return; // don't cause a noslow
-
-                    event.setCancelled(true);
-                    player.onPacketCancel();
-                }
-            } else {
-                invalid++;
-            }
-        }
-    }
-
-    @Override
-    public void onPredictionComplete(PredictionComplete predictionComplete) {
-        if (!player.canSkipTicks()) return;
-
-        if (player.isTickingReliablyFor(3) && !player.uncertaintyHandler.lastVehicleSwitch.hasOccurredSince(0)) {
-            for (; invalid >= 1; invalid--) {
-                flagAndAlert();
-            }
-        }
-
-        invalid = 0;
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/packetorder/PacketOrderG.java

@@ -1,66 +0,0 @@
-package ac.grim.grimac.checks.impl.packetorder;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPostPredictionCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
-import com.github.retrooper.packetevents.event.PacketReceiveEvent;
-import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-import com.github.retrooper.packetevents.protocol.player.DiggingAction;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientClientStatus;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerDigging;
-
-@CheckData(name = "PacketOrderG", experimental = true)
-public class PacketOrderG extends AbstractPostPredictionCheck {
-    public PacketOrderG(GrimPlayer player) {
-        super(player);
-    }
-
-    private int invalid;
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (event.getPacketType() == PacketType.Play.Client.PLAYER_DIGGING
-                || (event.getPacketType() == PacketType.Play.Client.CLIENT_STATUS
-                && new WrapperPlayClientClientStatus(event).getAction() == WrapperPlayClientClientStatus.Action.OPEN_INVENTORY_ACHIEVEMENT)
-        ) {
-            if (event.getPacketType() == PacketType.Play.Client.PLAYER_DIGGING) {
-                final DiggingAction action = new WrapperPlayClientPlayerDigging(event).getAction();
-                if (action == DiggingAction.RELEASE_USE_ITEM
-                        || action == DiggingAction.START_DIGGING
-                        || action == DiggingAction.CANCELLED_DIGGING
-                        || action == DiggingAction.FINISHED_DIGGING
-                ) return;
-            }
-
-            if (player.packetOrderProcessor.isAttacking()
-                    || player.packetOrderProcessor.isReleasing()
-                    || player.packetOrderProcessor.isRightClicking()
-                    || player.packetOrderProcessor.isPicking()
-                    || player.packetOrderProcessor.isDigging()
-            ) {
-                if (!player.canSkipTicks()) {
-                    if (flagAndAlert() && shouldModifyPackets()) {
-                        event.setCancelled(true);
-                        player.onPacketCancel();
-                    }
-                } else {
-                    invalid++;
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onPredictionComplete(PredictionComplete predictionComplete) {
-        if (!player.canSkipTicks()) return;
-
-        if (player.isTickingReliablyFor(3) && !player.uncertaintyHandler.lastVehicleSwitch.hasOccurredSince(0)) {
-            for (; invalid >= 1; invalid--) {
-                flagAndAlert();
-            }
-        }
-
-        invalid = 0;
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/packetorder/PacketOrderH.java

@@ -1,61 +0,0 @@
-package ac.grim.grimac.checks.impl.packetorder;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPostPredictionCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
-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.WrapperPlayClientEntityAction;
-
-@CheckData(name = "PacketOrderH", experimental = true)
-public class PacketOrderH extends AbstractPostPredictionCheck {
-    public PacketOrderH(final GrimPlayer player) {
-        super(player);
-    }
-
-    private int invalid;
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (event.getPacketType() == PacketType.Play.Client.ENTITY_ACTION) {
-            switch (new WrapperPlayClientEntityAction(event).getAction()) {
-                case START_SPRINTING:
-                case STOP_SPRINTING:
-                    if (player.getClientVersion().isOlderThan(ClientVersion.V_1_21_2) && player.packetOrderProcessor.isSneaking()) {
-                        if (!player.canSkipTicks()) {
-                            flagAndAlert();
-                        } else {
-                            invalid++;
-                        }
-                    }
-                    break;
-
-                case START_SNEAKING:
-                case STOP_SNEAKING:
-                    if (player.getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_21_2) && player.packetOrderProcessor.isSprinting()) {
-                        if (!player.canSkipTicks()) {
-                            flagAndAlert();
-                        } else {
-                            invalid++;
-                        }
-                    }
-                    break;
-            }
-        }
-    }
-
-    @Override
-    public void onPredictionComplete(PredictionComplete predictionComplete) {
-        if (!player.canSkipTicks()) return;
-
-        if (player.isTickingReliablyFor(3) && !player.uncertaintyHandler.lastVehicleSwitch.hasOccurredSince(0)) {
-            for (; invalid >= 1; invalid--) {
-                flagAndAlert();
-            }
-        }
-
-        invalid = 0;
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/packetorder/PacketOrderI.java

@@ -1,131 +0,0 @@
-package ac.grim.grimac.checks.impl.packetorder;
-
-import ac.grim.grimac.api.config.ConfigManager;
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPostPredictionCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
-import ac.grim.grimac.utils.nmsutil.BlockBreakSpeed;
-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.protocol.player.GameMode;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientInteractEntity;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerDigging;
-
-import java.util.ArrayDeque;
-
-@CheckData(name = "PacketOrderI", experimental = true)
-public class PacketOrderI extends AbstractPostPredictionCheck {
-    public PacketOrderI(final GrimPlayer player) {
-        super(player);
-    }
-
-    private boolean exemptPlacingWhileDigging;
-
-    private boolean setback;
-    private boolean digging; // for placing
-    private final ArrayDeque<String> flags = new ArrayDeque<>();
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (event.getPacketType() == PacketType.Play.Client.INTERACT_ENTITY) {
-            if (new WrapperPlayClientInteractEntity(event).getAction() == WrapperPlayClientInteractEntity.InteractAction.ATTACK) {
-                if (player.packetOrderProcessor.isRightClicking() || player.packetOrderProcessor.isPicking() || player.packetOrderProcessor.isReleasing() || player.packetOrderProcessor.isDigging()) {
-                    if (!player.canSkipTicks()) {
-                        if (flagAndAlert("attack") && shouldModifyPackets()) {
-                            event.setCancelled(true);
-                            player.onPacketCancel();
-                        }
-                    } else {
-                        flags.add("attack");
-                    }
-                }
-            } else if (player.packetOrderProcessor.isReleasing() || player.packetOrderProcessor.isDigging()) {
-                if (!player.canSkipTicks()) {
-                    if (flagAndAlert("interact") && shouldModifyPackets()) {
-                        event.setCancelled(true);
-                        player.onPacketCancel();
-                    }
-                } else {
-                    flags.add("interact");
-                }
-            }
-        }
-
-        if (event.getPacketType() == PacketType.Play.Client.PLAYER_BLOCK_PLACEMENT || event.getPacketType() == PacketType.Play.Client.USE_ITEM) {
-            if (player.packetOrderProcessor.isReleasing() || digging) {
-                if (!player.canSkipTicks()) {
-                    if (flagAndAlert("place/use") && shouldModifyPackets()) {
-                        event.setCancelled(true);
-                        player.onPacketCancel();
-                    }
-                } else {
-                    flags.add("place");
-                }
-            }
-        }
-
-        if (event.getPacketType() == PacketType.Play.Client.PLAYER_DIGGING) {
-            WrapperPlayClientPlayerDigging packet = new WrapperPlayClientPlayerDigging(event);
-
-            switch (packet.getAction()) {
-                case RELEASE_USE_ITEM:
-                    if (player.packetOrderProcessor.isAttacking() || player.packetOrderProcessor.isRightClicking() || player.packetOrderProcessor.isPicking() || player.packetOrderProcessor.isDigging()) {
-                        if (!player.canSkipTicks()) {
-                            if (flagAndAlert("release")) {
-                                setback = true;
-                            }
-                        } else {
-                            flags.add("release");
-                            setback = true;
-                        }
-                    }
-                    break;
-                case START_DIGGING:
-                    double damage = BlockBreakSpeed.getBlockDamage(player, packet.getBlockPosition());
-                    if (damage >= 1 || damage <= 0 && player.gamemode == GameMode.CREATIVE) {
-                        return;
-                    }
-                case CANCELLED_DIGGING:
-                case FINISHED_DIGGING:
-                    if (exemptPlacingWhileDigging || player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_7_10)) {
-                        return;
-                    }
-                    digging = true;
-            }
-        }
-
-        if (isTickPacket(event.getPacketType())) {
-            digging = false;
-        }
-    }
-
-    @Override
-    public void onPredictionComplete(PredictionComplete predictionComplete) {
-        if (!player.canSkipTicks()) {
-            if (setback) {
-                setbackIfAboveSetbackVL();
-                setback = false;
-            }
-            return;
-        }
-
-        if (player.isTickingReliablyFor(3) && !player.uncertaintyHandler.lastVehicleSwitch.hasOccurredSince(0)) {
-            for (String verbose : flags) {
-                if (flagAndAlert(verbose) && setback) {
-                    setbackIfAboveSetbackVL();
-                    setback = false;
-                }
-            }
-        }
-
-        flags.clear();
-        setback = false;
-    }
-
-    @Override
-    public void onReload(ConfigManager config) {
-        exemptPlacingWhileDigging = config.getBooleanElse(getConfigName() + ".exempt-placing-while-digging", false);
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/packetorder/PacketOrderJ.java

@@ -1,46 +0,0 @@
-package ac.grim.grimac.checks.impl.packetorder;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPostPredictionCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
-import com.github.retrooper.packetevents.event.PacketReceiveEvent;
-import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-
-@CheckData(name = "PacketOrderJ", experimental = true)
-public class PacketOrderJ extends AbstractPostPredictionCheck {
-    public PacketOrderJ(final GrimPlayer player) {
-        super(player);
-    }
-
-    private int invalid;
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (event.getPacketType() == PacketType.Play.Client.PLAYER_BLOCK_PLACEMENT || event.getPacketType() == PacketType.Play.Client.USE_ITEM) {
-            if (player.packetOrderProcessor.isAttacking() && !player.packetOrderProcessor.isInteracting()) {
-                if (!player.canSkipTicks()) {
-                    if (flagAndAlert() && shouldModifyPackets()) {
-                        event.setCancelled(true);
-                        player.onPacketCancel();
-                    }
-                } else {
-                    invalid++;
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onPredictionComplete(PredictionComplete predictionComplete) {
-        if (!player.canSkipTicks()) return;
-
-        if (player.isTickingReliablyFor(3) && !player.uncertaintyHandler.lastVehicleSwitch.hasOccurredSince(0)) {
-            for (; invalid >= 1; invalid--) {
-                flagAndAlert();
-            }
-        }
-
-        invalid = 0;
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/packetorder/PacketOrderK.java

@@ -1,61 +0,0 @@
-package ac.grim.grimac.checks.impl.packetorder;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPostPredictionCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
-import com.github.retrooper.packetevents.event.PacketReceiveEvent;
-import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientClientStatus;
-
-import java.util.ArrayDeque;
-
-@CheckData(name = "PacketOrderK", experimental = true)
-public class PacketOrderK extends AbstractPostPredictionCheck {
-    public PacketOrderK(final GrimPlayer player) {
-        super(player);
-    }
-
-    private final ArrayDeque<String> flags = new ArrayDeque<>();
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (event.getPacketType() == PacketType.Play.Client.CLIENT_STATUS) {
-            if (new WrapperPlayClientClientStatus(event).getAction() == WrapperPlayClientClientStatus.Action.OPEN_INVENTORY_ACHIEVEMENT) {
-                if (player.packetOrderProcessor.isClickingInInventory() || player.packetOrderProcessor.isClosingInventory()) {
-                    if (!player.canSkipTicks()) {
-                        flagAndAlert("open");
-                    } else {
-                        flags.add("open");
-                    }
-                }
-            }
-        }
-
-        if (event.getPacketType() == PacketType.Play.Client.CLICK_WINDOW || event.getPacketType() == PacketType.Play.Client.CLOSE_WINDOW) {
-            if (player.packetOrderProcessor.isOpeningInventory()) {
-                if (!player.canSkipTicks()) {
-                    if (flagAndAlert(event.getPacketType() == PacketType.Play.Client.CLICK_WINDOW ? "click" : "close") && shouldModifyPackets()) {
-                        event.setCancelled(true);
-                        player.onPacketCancel();
-                    }
-                } else {
-                    flags.add(event.getPacketType() == PacketType.Play.Client.CLICK_WINDOW ? "click" : "close");
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onPredictionComplete(PredictionComplete predictionComplete) {
-        if (!player.canSkipTicks()) return;
-
-        if (player.isTickingReliablyFor(3) && !player.uncertaintyHandler.lastVehicleSwitch.hasOccurredSince(0)) {
-            for (String verbose : flags) {
-                flagAndAlert(verbose);
-            }
-        }
-
-        flags.clear();
-    }
-}

src/main/java/ac/grim/grimac/checks/impl/packetorder/PacketOrderL.java

@@ -1,68 +0,0 @@
-package ac.grim.grimac.checks.impl.packetorder;
-
-import ac.grim.grimac.checks.CheckData;
-import ac.grim.grimac.checks.type.abstracts.AbstractPostPredictionCheck;
-import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
-import com.github.retrooper.packetevents.event.PacketReceiveEvent;
-import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-import com.github.retrooper.packetevents.protocol.player.DiggingAction;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientClientStatus;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerDigging;
-
-import java.util.ArrayDeque;
-
-@CheckData(name = "PacketOrderL", experimental = true)
-public class PacketOrderL extends AbstractPostPredictionCheck {
-    public PacketOrderL(final GrimPlayer player) {
-        super(player);
-    }
-
-    private final ArrayDeque<String> flags = new ArrayDeque<>();
-
-    @Override
-    public void onPacketReceive(PacketReceiveEvent event) {
-        if (event.getPacketType() == PacketType.Play.Client.CLIENT_STATUS) {
-            if (new WrapperPlayClientClientStatus(event).getAction() == WrapperPlayClientClientStatus.Action.OPEN_INVENTORY_ACHIEVEMENT) {
-                if (player.packetOrderProcessor.isDropping()) {
-                    if (!player.canSkipTicks()) {
-                        if (flagAndAlert("inventory") && shouldModifyPackets()) {
-                            event.setCancelled(true);
-                            player.onPacketCancel();
-                        }
-                    } else {
-                        flags.add("inventory");
-                    }
-                }
-            }
-        }
-
-        if (event.getPacketType() == PacketType.Play.Client.PLAYER_DIGGING) {
-            if (new WrapperPlayClientPlayerDigging(event).getAction() == DiggingAction.SWAP_ITEM_WITH_OFFHAND) {
-                if (player.packetOrderProcessor.isDropping()) {
-                    if (!player.canSkipTicks()) {
-                        if (flagAndAlert("swap") && shouldModifyPackets()) {
-                            event.setCancelled(true);
-                            player.onPacketCancel();
-                        }
-                    } else {
-                        flags.add("swap");
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onPredictionComplete(PredictionComplete predictionComplete) {
-        if (!player.canSkipTicks()) return;
-
-        if (player.isTickingReliablyFor(3) && !player.uncertaintyHandler.lastVehicleSwitch.hasOccurredSince(0)) {
-            for (String verbose : flags) {
-                flagAndAlert(verbose);
-            }
-        }
-
-        flags.clear();
-    }
-}