Merge branch 'merge-dev' into merge

# Conflicts: # src/main/java/ac/grim/grimac/checks/Check.java # src/main/java/ac/grim/grimac/checks/impl/elytra/ElytraA.java # src/main/java/ac/grim/grimac/checks/impl/elytra/ElytraC.java # src/main/java/ac/grim/grimac/checks/impl/elytra/ElytraD.java # src/main/java/ac/grim/grimac/checks/impl/elytra/ElytraE.java # src/main/java/ac/grim/grimac/checks/impl/elytra/ElytraF.java # src/main/java/ac/grim/grimac/checks/impl/elytra/ElytraH.java # src/main/java/ac/grim/grimac/checks/impl/prediction/GroundSpoof.java # src/main/java/ac/grim/grimac/checks/impl/sprint/SprintB.java # src/main/java/ac/grim/grimac/checks/impl/sprint/SprintF.java # src/main/java/ac/grim/grimac/checks/impl/timer/TickTimer.java # src/main/java/ac/grim/grimac/manager/player/features/FeatureManagerImpl.java # src/main/java/ac/grim/grimac/manager/player/features/types/ExemptElytraFeature.java # src/main/java/ac/grim/grimac/manager/player/features/types/ExperimentalChecksFeature.java # src/main/java/ac/grim/grimac/manager/player/features/types/GrimFeature.java # src/main/java/ac/grim/grimac/player/GrimPlayer.java
Axionize · Jan 22, 2025 · ff28ad2 · ff28ad2
2 parents 1bbaad3 + 9e296cb
commit ff28ad2
Show file tree

Hide file tree

Showing 83 changed files with 391 additions and 257 deletions.
diff --git a/src/main/java/ac/grim/grimac/checks/Check.java b/src/main/java/ac/grim/grimac/checks/Check.java
@@ -32,15 +32,16 @@ public class Check extends GrimProcessor implements AbstractCheck {
     private boolean experimental;
     @Setter
     private boolean isEnabled;
-    private boolean exempted;
+
+    private boolean exemptPermission;
+    private boolean noSetbackPermission;
+    private boolean noModifyPacketPermission;
 
     public Check(final GrimPlayer player) {
         this.player = player;
 
-        final Class<?> checkClass = this.getClass();
-
-        if (checkClass.isAnnotationPresent(CheckData.class)) {
-            final CheckData checkData = checkClass.getAnnotation(CheckData.class);
+        final CheckData checkData = this.getClass().getAnnotation(CheckData.class);
+        if (checkData != null) {
             this.checkName = checkData.name();
             this.configName = checkData.configName();
             // Fall back to check name
@@ -57,14 +58,22 @@ public Check(final GrimPlayer player) {
     }
 
     public boolean shouldModifyPackets() {
-        return isEnabled && !player.disableGrim && !player.noModifyPacketPermission && !exempted;
+        return isEnabled && !player.disableGrim && !player.noModifyPacketPermission && !exemptPermission;
     }
 
-    public void updateExempted() {
+    public void updatePermissions() {
         if (player.bukkitPlayer == null || checkName == null) return;
-        FoliaScheduler.getEntityScheduler().run(player.bukkitPlayer, GrimAPI.INSTANCE.getPlugin(),
-                t -> exempted = player.bukkitPlayer.hasPermission("grim.exempt." + checkName.toLowerCase()),
-                () -> {});
+        FoliaScheduler.getEntityScheduler().run(
+                player.bukkitPlayer,
+                GrimAPI.INSTANCE.getPlugin(),
+                t -> {
+                    final String id = checkName.toLowerCase();
+                    exemptPermission = player.bukkitPlayer.hasPermission("grim.exempt." + id);
+                    noSetbackPermission = player.bukkitPlayer.hasPermission("grim.nosetback." + id);
+                    noModifyPacketPermission = player.bukkitPlayer.hasPermission("grim.nomodifypacket." + id);
+                },
+                () -> {}
+        );
     }
 
     public final boolean flagAndAlert(String verbose) {
@@ -86,7 +95,7 @@ public final boolean flag() {
     private long lastViolationTime;
 
     public final boolean flag(String verbose) {
-        if (player.disableGrim || (experimental && !player.isExperimentalChecks()) || exempted)
+        if (player.disableGrim || (experimental && !player.isExperimentalChecks()) || exemptPermission)
             return false; // Avoid calling event if disabled
 
         FlagEvent event = new FlagEvent(player, this, verbose);
@@ -107,6 +116,18 @@ public final boolean flagWithSetback() {
         return false;
     }
 
+    public final boolean flagAndAlertWithSetback() {
+        return flagAndAlertWithSetback("");
+    }
+
+    public final boolean flagAndAlertWithSetback(String verbose) {
+        if (flagAndAlert(verbose)) {
+            setbackIfAboveSetbackVL();
+            return true;
+        }
+        return false;
+    }
+
     public final void reward() {
         violations = Math.max(0, violations - decay);
     }
@@ -119,7 +140,7 @@ public void reload(ConfigManager configuration) {
         description = configuration.getStringElse(configName + ".description", description);
 
         if (setbackVL == -1) setbackVL = Double.MAX_VALUE;
-        updateExempted();
+        updatePermissions();
         onReload(configuration);
     }
 
@@ -133,14 +154,14 @@ public boolean alert(String verbose) {
     }
 
     public boolean setbackIfAboveSetbackVL() {
-        if (getViolations() > setbackVL) {
+        if (shouldSetback()) {
             return player.getSetbackTeleportUtil().executeViolationSetback();
         }
         return false;
     }
 
-    public boolean isAboveSetbackVl() {
-        return getViolations() > setbackVL;
+    public boolean shouldSetback() {
+        return !noSetbackPermission && violations > setbackVL;
     }
 
     public String formatOffset(double offset) {

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

diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsQ.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsQ.java
@@ -5,7 +5,6 @@
 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.entity.type.EntityTypes;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType.Play.Client;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientEntityAction;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientEntityAction.Action;
@@ -20,10 +19,10 @@ public BadPacketsQ(final GrimPlayer player) {
     public void onPacketReceive(PacketReceiveEvent event) {
         if (event.getPacketType() == Client.ENTITY_ACTION) {
             WrapperPlayClientEntityAction wrapper = new WrapperPlayClientEntityAction(event);
-            // Camels are able to send negative jump boost, how and why!?
-            if (wrapper.getJumpBoost() < 0 && player.compensatedEntities.getSelf().getRiding().getType() == EntityTypes.CAMEL) return;
-
-            if (wrapper.getJumpBoost() < 0 || wrapper.getJumpBoost() > 100 || wrapper.getEntityId() != player.entityID || (wrapper.getAction() != Action.START_JUMPING_WITH_HORSE && wrapper.getJumpBoost() != 0)) {
+            // you are able to send negative jump boost, how and why!?
+            if (Math.abs(wrapper.getJumpBoost()) > 100
+                    || wrapper.getEntityId() != player.entityID
+                    || wrapper.getAction() != Action.START_JUMPING_WITH_HORSE && wrapper.getJumpBoost() != 0) {
                 if (flagAndAlert("boost=" + wrapper.getJumpBoost() + ", action=" + wrapper.getAction() + ", entity=" + wrapper.getEntityId()) && shouldModifyPackets()) {
                     event.setCancelled(true);
                     player.onPacketCancel();

diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsX.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsX.java
@@ -33,9 +33,7 @@ public void onPredictionComplete(final PredictionComplete predictionComplete) {
 
         if (player.isTickingReliablyFor(3)) {
             for (; flags > 0; flags--) {
-                if (flagAndAlert()) {
-                    setbackIfAboveSetbackVL();
-                }
+                flagAndAlertWithSetback();
             }
         }
 
@@ -64,6 +62,10 @@ public void onPacketReceive(PacketReceiveEvent event) {
 
                 case START_SPRINTING:
                 case STOP_SPRINTING:
+                    if (player.inVehicle()) {
+                        return;
+                    }
+
                     if (sprint) {
                         if (player.canSkipTicks() || flagAndAlert()) {
                             flags++;

diff --git a/src/main/java/ac/grim/grimac/checks/impl/breaking/FastBreak.java b/src/main/java/ac/grim/grimac/checks/impl/breaking/FastBreak.java
@@ -63,8 +63,7 @@ public void onBlockBreak(BlockBreak blockBreak) {
             }
 
             if (blockDelayBalance > 1000) { // If more than a second of advantage
-                flagAndAlert("Delay=" + breakDelay);
-                if (shouldModifyPackets()) {
+                if (flagAndAlert("Delay=" + breakDelay) && shouldModifyPackets()) {
                     blockBreak.cancel();
                 }
             }

diff --git a/src/main/java/ac/grim/grimac/checks/impl/elytra/ElytraA.java b/src/main/java/ac/grim/grimac/checks/impl/elytra/ElytraA.java
@@ -19,6 +19,10 @@ public ElytraA(GrimPlayer player) {
     }
 
     public void onStartGliding(PacketReceiveEvent event) {
+        if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8)) {
+            return;
+        }
+
         if (player.isGliding && flagAndAlert()) {
             setback = true;
             if (shouldModifyPackets()) {

diff --git a/src/main/java/ac/grim/grimac/checks/impl/elytra/ElytraC.java b/src/main/java/ac/grim/grimac/checks/impl/elytra/ElytraC.java
@@ -7,6 +7,7 @@
 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.GameMode;
 import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientEntityAction;
 
@@ -21,6 +22,10 @@ public ElytraC(GrimPlayer player) {
 
     @Override
     public void onPacketReceive(PacketReceiveEvent event) {
+        if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8)) {
+            return;
+        }
+
         if (player.gamemode == GameMode.SPECTATOR) {
             glideThisTick = glideLastTick = false;
         }

diff --git a/src/main/java/ac/grim/grimac/checks/impl/elytra/ElytraD.java b/src/main/java/ac/grim/grimac/checks/impl/elytra/ElytraD.java
@@ -7,6 +7,7 @@
 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 = "ElytraD", description = "Started gliding without an elytra", experimental = true)
@@ -19,6 +20,10 @@ public ElytraD(GrimPlayer player) {
 
     @Override
     public void onPacketReceive(PacketReceiveEvent event) {
+        if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8)) {
+            return;
+        }
+
         if (event.getPacketType() == PacketType.Play.Client.ENTITY_ACTION
                 && new WrapperPlayClientEntityAction(event).getAction() == WrapperPlayClientEntityAction.Action.START_FLYING_WITH_ELYTRA
                 && !player.canGlide()

diff --git a/src/main/java/ac/grim/grimac/checks/impl/elytra/ElytraE.java b/src/main/java/ac/grim/grimac/checks/impl/elytra/ElytraE.java
@@ -7,6 +7,7 @@
 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 = "ElytraE", description = "Started gliding while flying", experimental = true)
@@ -19,6 +20,10 @@ public ElytraE(GrimPlayer player) {
 
     @Override
     public void onPacketReceive(PacketReceiveEvent event) {
+        if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8)) {
+            return;
+        }
+
         if (event.getPacketType() == PacketType.Play.Client.ENTITY_ACTION
                 && new WrapperPlayClientEntityAction(event).getAction() == WrapperPlayClientEntityAction.Action.START_FLYING_WITH_ELYTRA
                 && player.isFlying

diff --git a/src/main/java/ac/grim/grimac/checks/impl/elytra/ElytraF.java b/src/main/java/ac/grim/grimac/checks/impl/elytra/ElytraF.java
@@ -7,6 +7,7 @@
 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 = "ElytraF", description = "Started gliding while on ground", experimental = true)
@@ -19,6 +20,10 @@ public ElytraF(GrimPlayer player) {
 
     @Override
     public void onPacketReceive(PacketReceiveEvent event) {
+        if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8)) {
+            return;
+        }
+
         if (event.getPacketType() == PacketType.Play.Client.ENTITY_ACTION
                 && new WrapperPlayClientEntityAction(event).getAction() == WrapperPlayClientEntityAction.Action.START_FLYING_WITH_ELYTRA
                 && player.clientClaimsLastOnGround

diff --git a/src/main/java/ac/grim/grimac/checks/impl/elytra/ElytraH.java b/src/main/java/ac/grim/grimac/checks/impl/elytra/ElytraH.java
@@ -7,9 +7,10 @@
 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 = "ElytraF", description = "Started gliding in vehicle", experimental = true)
+@CheckData(name = "ElytraH", description = "Started gliding in vehicle", experimental = true)
 public class ElytraH extends Check implements PostPredictionCheck {
     private boolean setback;
 
@@ -19,6 +20,10 @@ public ElytraH(GrimPlayer player) {
 
     @Override
     public void onPacketReceive(PacketReceiveEvent event) {
+        if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8)) {
+            return;
+        }
+
         if (event.getPacketType() == PacketType.Play.Client.ENTITY_ACTION
                 && new WrapperPlayClientEntityAction(event).getAction() == WrapperPlayClientEntityAction.Action.START_FLYING_WITH_ELYTRA
                 && player.inVehicle()

diff --git a/src/main/java/ac/grim/grimac/checks/impl/groundspoof/NoFall.java b/src/main/java/ac/grim/grimac/checks/impl/groundspoof/NoFall.java
@@ -42,7 +42,7 @@ public void onPacketReceive(PacketReceiveEvent event) {
             if (wrapper.isOnGround() && !hasPosition) {
                 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 (!GhostBlockDetector.isGhostBlock(player)) flagAndAlertWithSetback();
                     if (shouldModifyPackets()) {
                         wrapper.setOnGround(false);
                         event.markForReEncode(true);

diff --git a/src/main/java/ac/grim/grimac/checks/impl/movement/EntityControl.java b/src/main/java/ac/grim/grimac/checks/impl/movement/EntityControl.java
diff --git a/src/main/java/ac/grim/grimac/checks/impl/movement/NoSlow.java b/src/main/java/ac/grim/grimac/checks/impl/movement/NoSlow.java
@@ -8,7 +8,7 @@
 import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 
-@CheckData(name = "NoSlow (Prediction)", configName = "NoSlow", description = "Was not slowed while using an item", setback = 5)
+@CheckData(name = "NoSlow", description = "Was not slowed while using an item", setback = 5)
 public class NoSlow extends Check implements PostPredictionCheck {
     double offsetToFlag;
     double bestOffset = 1;
@@ -34,8 +34,8 @@ public void onPredictionComplete(final PredictionComplete predictionComplete) {
             }
 
             if (bestOffset > offsetToFlag) {
-                if (flaggedLastTick && flagWithSetback()) {
-                    alert("");
+                if (flaggedLastTick) {
+                    flagAndAlertWithSetback();
                 }
                 flaggedLastTick = true;
             } else {
@@ -52,6 +52,6 @@ public void handlePredictionAnalysis(double offset) {
 
     @Override
     public void onReload(ConfigManager config) {
-        offsetToFlag = config.getDoubleElse("NoSlow.threshold", 0.001);
+        offsetToFlag = config.getDoubleElse(getConfigName() + ".threshold", 0.001);
     }
 }
diff --git a/src/main/java/ac/grim/grimac/checks/impl/multiactions/MultiActionsC.java b/src/main/java/ac/grim/grimac/checks/impl/multiactions/MultiActionsC.java
@@ -8,7 +8,7 @@
 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)
+@CheckData(name = "MultiActionsC", description = "Clicked in inventory while sprinting", experimental = true)
 public class MultiActionsC extends Check implements PacketCheck {
     public MultiActionsC(GrimPlayer player) {
         super(player);
@@ -19,13 +19,8 @@ public MultiActionsC(GrimPlayer player) {
     @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()) {
+            if (player.isSprinting && !player.isSwimming && !serverOpenedInventoryThisTick && flagAndAlert() && shouldModifyPackets()) {
                 event.setCancelled(true);
                 player.onPacketCancel();
             }

diff --git a/src/main/java/ac/grim/grimac/checks/impl/multiactions/MultiActionsD.java b/src/main/java/ac/grim/grimac/checks/impl/multiactions/MultiActionsD.java
@@ -7,7 +7,7 @@
 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)
+@CheckData(name = "MultiActionsD", description = "Closed inventory while sprinting", experimental = true)
 public class MultiActionsD extends Check implements PacketCheck {
     public MultiActionsD(GrimPlayer player) {
         super(player);
@@ -16,13 +16,7 @@ public MultiActionsD(GrimPlayer 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()) {
+            if (player.isSprinting && !player.isSwimming && flagAndAlert() && shouldModifyPackets()) {
                 event.setCancelled(true);
                 player.onPacketCancel();
             }

diff --git a/src/main/java/ac/grim/grimac/checks/impl/prediction/DebugHandler.java b/src/main/java/ac/grim/grimac/checks/impl/prediction/DebugHandler.java
@@ -15,7 +15,6 @@
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-@CheckData(name = "Prediction (Debug)")
 public class DebugHandler extends Check implements PostPredictionCheck {
 
     Set<Player> listeners = new CopyOnWriteArraySet<>(new HashSet<>());

diff --git a/src/main/java/ac/grim/grimac/checks/impl/prediction/GroundSpoof.java b/src/main/java/ac/grim/grimac/checks/impl/prediction/GroundSpoof.java
@@ -30,9 +30,7 @@ public void onPredictionComplete(final PredictionComplete predictionComplete) {
         if (player.packetStateData.lastPacketWasTeleport) return;
 
         if (player.clientClaimsLastOnGround != player.onGround) {
-            if (flagAndAlert("claimed " + player.clientClaimsLastOnGround)) {
-                setbackIfAboveSetbackVL();
-            }
+            flagAndAlertWithSetback("claimed " + player.clientClaimsLastOnGround);
             player.checkManager.getNoFall().flipPlayerGroundStatus = true;
         }
     }