Merge branch 'GrimAnticheat:2.0' into 2.0

Author: Anthony01M

build.gradle.kts

@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.github.retrooper.packetevents:spigot:2.3.1-SNAPSHOT")
+    implementation("com.github.retrooper:packetevents-spigot:2.3.1-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.13")
@@ -136,7 +136,7 @@ tasks.shadowJar {
     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.gson", "ac.grim.grimac.shaded.gson")
+    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")

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

@@ -19,15 +19,14 @@ public BadPacketsA(final GrimPlayer player) {
     @Override
     public void onPacketReceive(PacketReceiveEvent event) {
         if (event.getPacketType() == PacketType.Play.Client.HELD_ITEM_CHANGE) {
-            WrapperPlayClientHeldItemChange packet = new WrapperPlayClientHeldItemChange(event);
+            final int slot = new WrapperPlayClientHeldItemChange(event).getSlot();
 
-            int slot = packet.getSlot();
-
-            if (slot == lastSlot) {
-                flagAndAlert("slot=" + slot);
+            if (slot == lastSlot && flagAndAlert("slot=" + slot) && shouldModifyPackets()) {
+                event.setCancelled(true);
+                player.onPacketCancel();
             }
 
-            lastSlot = packet.getSlot();
+            lastSlot = slot;
         }
     }
 }

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

@@ -17,13 +17,13 @@ public BadPacketsB(GrimPlayer player) {
     @Override
     public void onPacketReceive(final PacketReceiveEvent event) {
         if (event.getPacketType() == PacketType.Play.Client.STEER_VEHICLE) {
-            WrapperPlayClientSteerVehicle packet = new WrapperPlayClientSteerVehicle(event);
+            final WrapperPlayClientSteerVehicle packet = new WrapperPlayClientSteerVehicle(event);
 
-            float forwards = Math.abs(packet.getForward());
-            float sideways = Math.abs(packet.getSideways());
-
-            if (forwards > 0.98f || sideways > 0.98f) {
-                flagAndAlert();
+            if (Math.abs(packet.getForward()) > 0.98f || Math.abs(packet.getSideways()) > 0.98f) {
+                if (flagAndAlert("forwards=" + packet.getForward() + ", sideways=" + packet.getSideways()) && shouldModifyPackets()) {
+                    event.setCancelled(true);
+                    player.onPacketCancel();
+                }
             }
         }
     }

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

@@ -17,9 +17,12 @@ public BadPacketsC(GrimPlayer player) {
     @Override
     public void onPacketReceive(PacketReceiveEvent event) {
         if (event.getPacketType() == PacketType.Play.Client.INTERACT_ENTITY) {
-            WrapperPlayClientInteractEntity packet = new WrapperPlayClientInteractEntity(event);
-            if (packet.getEntityId() == player.entityID) {
-                flagAndAlert(); // Instant ban
+            if (new WrapperPlayClientInteractEntity(event).getEntityId() == player.entityID) {
+                // Instant ban
+                if (flagAndAlert() && shouldModifyPackets()) {
+                    event.setCancelled(true);
+                    player.onPacketCancel();
+                }
             }
         }
     }

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

@@ -28,7 +28,7 @@ public void onPacketReceive(PacketReceiveEvent event) {
         }
 
         if (noReminderTicks > 20) {
-            flagAndAlert(); // ban?  I don't know how this would false
+            flagAndAlert("ticks=" + noReminderTicks); // ban?  I don't know how this would false
         }
     }
 

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

@@ -28,7 +28,10 @@ public void onPacketReceive(PacketReceiveEvent event) {
                         exemptNext = false;
                         return;
                     }
-                    flagAndAlert();
+                    if (flagAndAlert("state=true") && shouldModifyPackets()) {
+                        event.setCancelled(true);
+                        player.onPacketCancel();
+                    }
                 }
 
                 lastSprinting = true;
@@ -38,7 +41,10 @@ public void onPacketReceive(PacketReceiveEvent event) {
                         exemptNext = false;
                         return;
                     }
-                    flagAndAlert();
+                    if (flagAndAlert("state=false") && shouldModifyPackets()) {
+                        event.setCancelled(true);
+                        player.onPacketCancel();
+                    }
                 }
 
                 lastSprinting = false;

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

@@ -26,13 +26,19 @@ public void onPacketReceive(PacketReceiveEvent event) {
 
             if (packet.getAction() == WrapperPlayClientEntityAction.Action.START_SNEAKING) {
                 if (lastSneaking && !wasTeleport) {
-                    flagAndAlert();
+                    if (flagAndAlert("state=true") && shouldModifyPackets()) {
+                        event.setCancelled(true);
+                        player.onPacketCancel();
+                    }
                 } else {
                     lastSneaking = true;
                 }
             } else if (packet.getAction() == WrapperPlayClientEntityAction.Action.STOP_SNEAKING) {
                 if (!lastSneaking && !wasTeleport) {
-                    flagAndAlert();
+                    if (flagAndAlert("state=false") && shouldModifyPackets()) {
+                        event.setCancelled(true);
+                        player.onPacketCancel();
+                    }
                 } else {
                     lastSneaking = false;
                 }

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

@@ -26,6 +26,7 @@ public void onPacketReceive(PacketReceiveEvent event) {
             if (packet.getAction() != WrapperPlayClientInteractEntity.InteractAction.ATTACK) return;
             if (!sentAnimation && flagAndAlert()) {
                 event.setCancelled(true);
+                player.onPacketCancel();
             }
 
             sentAnimation = false;

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

@@ -17,10 +17,11 @@ public BadPacketsI(GrimPlayer player) {
     @Override
     public void onPacketReceive(PacketReceiveEvent event) {
         if (event.getPacketType() == PacketType.Play.Client.PLAYER_ABILITIES) {
-            WrapperPlayClientPlayerAbilities packet = new WrapperPlayClientPlayerAbilities(event);
-
-            if (packet.isFlying() && !player.canFly) {
-                flagAndAlert();
+            if (new WrapperPlayClientPlayerAbilities(event).isFlying() && !player.canFly) {
+                if (flagAndAlert() && shouldModifyPackets()) {
+                    event.setCancelled(true);
+                    player.onPacketCancel();
+                }
             }
         }
     }

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

@@ -17,7 +17,10 @@ public BadPacketsJ(GrimPlayer player) {
     public void onPacketReceive(PacketReceiveEvent event) {
         if (event.getPacketType() == PacketType.Play.Client.STEER_VEHICLE) {
             if (!player.compensatedEntities.getSelf().inVehicle()) {
-                flagAndAlert();
+                if (flagAndAlert() && shouldModifyPackets()) {
+                    event.setCancelled(true);
+                    player.onPacketCancel();
+                }
             }
         }
     }