From e14d5edf25b3f375c0708c867e4c85da50ce2036 Mon Sep 17 00:00:00 2001 From: overkidding <46853321+overkidding@users.noreply.github.com> Date: Mon, 2 Dec 2024 08:48:06 +0100 Subject: [PATCH] feat: requested changes --- src/main/java/ac/grim/grimac/checks/Check.java | 2 +- src/main/java/ac/grim/grimac/checks/CheckData.java | 2 +- src/main/java/ac/grim/grimac/checks/CheckType.java | 6 ++---- .../ac/grim/grimac/checks/impl/combat/MultiInteractA.java | 3 ++- .../ac/grim/grimac/checks/impl/combat/MultiInteractB.java | 3 ++- .../java/ac/grim/grimac/checks/impl/exploit/ExploitC.java | 3 ++- .../ac/grim/grimac/checks/impl/groundspoof/NoFallA.java | 2 +- .../ac/grim/grimac/checks/impl/prediction/DebugHandler.java | 2 +- .../grimac/checks/impl/scaffolding/DuplicateRotPlace.java | 2 +- .../ac/grim/grimac/checks/impl/scaffolding/MultiPlace.java | 3 ++- 10 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/ac/grim/grimac/checks/Check.java b/src/main/java/ac/grim/grimac/checks/Check.java index 68f94847cc..6ba0971229 100644 --- a/src/main/java/ac/grim/grimac/checks/Check.java +++ b/src/main/java/ac/grim/grimac/checks/Check.java @@ -33,7 +33,7 @@ public class Check implements AbstractCheck, ConfigReloadObserver { private boolean isEnabled; private boolean exempted; - private CheckType type = CheckType.OTHER; + private CheckType type; @Override public boolean isExperimental() { diff --git a/src/main/java/ac/grim/grimac/checks/CheckData.java b/src/main/java/ac/grim/grimac/checks/CheckData.java index 40f0893e52..a3a45b1bbc 100644 --- a/src/main/java/ac/grim/grimac/checks/CheckData.java +++ b/src/main/java/ac/grim/grimac/checks/CheckData.java @@ -22,6 +22,6 @@ boolean experimental() default false; - CheckType checkType(); + CheckType checkType() default CheckType.OTHER; } diff --git a/src/main/java/ac/grim/grimac/checks/CheckType.java b/src/main/java/ac/grim/grimac/checks/CheckType.java index 5f5a548368..49b6cb6a92 100644 --- a/src/main/java/ac/grim/grimac/checks/CheckType.java +++ b/src/main/java/ac/grim/grimac/checks/CheckType.java @@ -3,7 +3,6 @@ import org.apache.commons.lang.StringUtils; public enum CheckType { - MOVEMENT, ROTATION, COMBAT, @@ -11,9 +10,8 @@ public enum CheckType { WORLD, OTHER; - public String displayName(){ - String loweredEnumName = this.name().toLowerCase(); - return StringUtils.capitalize(loweredEnumName); + public String displayName() { + return StringUtils.capitalize(this.name().toLowerCase()); } } diff --git a/src/main/java/ac/grim/grimac/checks/impl/combat/MultiInteractA.java b/src/main/java/ac/grim/grimac/checks/impl/combat/MultiInteractA.java index c494820139..1c57e54d20 100644 --- a/src/main/java/ac/grim/grimac/checks/impl/combat/MultiInteractA.java +++ b/src/main/java/ac/grim/grimac/checks/impl/combat/MultiInteractA.java @@ -2,6 +2,7 @@ import ac.grim.grimac.checks.Check; import ac.grim.grimac.checks.CheckData; +import ac.grim.grimac.checks.CheckType; import ac.grim.grimac.checks.type.PostPredictionCheck; import ac.grim.grimac.player.GrimPlayer; import ac.grim.grimac.utils.anticheat.update.PredictionComplete; @@ -13,7 +14,7 @@ import java.util.ArrayList; -@CheckData(name = "MultiInteractA", experimental = true) +@CheckData(name = "MultiInteractA", experimental = true, checkType = CheckType.COMBAT) public class MultiInteractA extends Check implements PostPredictionCheck { public MultiInteractA(final GrimPlayer player) { super(player); diff --git a/src/main/java/ac/grim/grimac/checks/impl/combat/MultiInteractB.java b/src/main/java/ac/grim/grimac/checks/impl/combat/MultiInteractB.java index dc686bfebc..4c44f97207 100644 --- a/src/main/java/ac/grim/grimac/checks/impl/combat/MultiInteractB.java +++ b/src/main/java/ac/grim/grimac/checks/impl/combat/MultiInteractB.java @@ -2,6 +2,7 @@ import ac.grim.grimac.checks.Check; import ac.grim.grimac.checks.CheckData; +import ac.grim.grimac.checks.CheckType; import ac.grim.grimac.checks.type.PostPredictionCheck; import ac.grim.grimac.player.GrimPlayer; import ac.grim.grimac.utils.anticheat.MessageUtil; @@ -15,7 +16,7 @@ import java.util.ArrayList; -@CheckData(name = "MultiInteractB", experimental = true) +@CheckData(name = "MultiInteractB", experimental = true, checkType = CheckType.COMBAT) public class MultiInteractB extends Check implements PostPredictionCheck { public MultiInteractB(final GrimPlayer player) { super(player); diff --git a/src/main/java/ac/grim/grimac/checks/impl/exploit/ExploitC.java b/src/main/java/ac/grim/grimac/checks/impl/exploit/ExploitC.java index a8d7139b98..628d3dc8ca 100644 --- a/src/main/java/ac/grim/grimac/checks/impl/exploit/ExploitC.java +++ b/src/main/java/ac/grim/grimac/checks/impl/exploit/ExploitC.java @@ -2,13 +2,14 @@ import ac.grim.grimac.checks.Check; import ac.grim.grimac.checks.CheckData; +import ac.grim.grimac.checks.CheckType; 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.WrapperPlayClientEditBook; -@CheckData(name = "ExploitC") +@CheckData(name = "ExploitC", checkType = CheckType.PACKETS) public class ExploitC extends Check implements PacketCheck { public ExploitC(GrimPlayer playerData) { super(playerData); diff --git a/src/main/java/ac/grim/grimac/checks/impl/groundspoof/NoFallA.java b/src/main/java/ac/grim/grimac/checks/impl/groundspoof/NoFallA.java index 45e5673409..e0397d85c5 100644 --- a/src/main/java/ac/grim/grimac/checks/impl/groundspoof/NoFallA.java +++ b/src/main/java/ac/grim/grimac/checks/impl/groundspoof/NoFallA.java @@ -18,7 +18,7 @@ // Catches NoFalls for LOOK and GROUND packets // This check runs AFTER the predictions -@CheckData(name = "NoFall", configName = "nofall", setback = 10, checkType = CheckType.PACKETS) +@CheckData(name = "NoFall", configName = "nofall", setback = 10, checkType = CheckType.MOVEMENT) public class NoFallA extends Check implements PacketCheck { public boolean flipPlayerGroundStatus = false; 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 index fc1785ceff..e9ad3f9f48 100644 --- a/src/main/java/ac/grim/grimac/checks/impl/prediction/DebugHandler.java +++ b/src/main/java/ac/grim/grimac/checks/impl/prediction/DebugHandler.java @@ -16,7 +16,7 @@ import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; -@CheckData(name = "Prediction (Debug)", checkType = CheckType.MOVEMENT) +@CheckData(name = "Prediction (Debug)", checkType = CheckType.OTHER) public class DebugHandler extends Check implements PostPredictionCheck { Set listeners = new CopyOnWriteArraySet<>(new HashSet<>()); diff --git a/src/main/java/ac/grim/grimac/checks/impl/scaffolding/DuplicateRotPlace.java b/src/main/java/ac/grim/grimac/checks/impl/scaffolding/DuplicateRotPlace.java index 489a437cc1..f74bb7cbba 100644 --- a/src/main/java/ac/grim/grimac/checks/impl/scaffolding/DuplicateRotPlace.java +++ b/src/main/java/ac/grim/grimac/checks/impl/scaffolding/DuplicateRotPlace.java @@ -7,7 +7,7 @@ import ac.grim.grimac.utils.anticheat.update.BlockPlace; import ac.grim.grimac.utils.anticheat.update.RotationUpdate; -@CheckData(name = "DuplicateRotPlace", experimental = true, checkType = CheckType.WORLD) +@CheckData(name = "DuplicateRotPlace", experimental = true, checkType = CheckType.ROTATION) public class DuplicateRotPlace extends BlockPlaceCheck { public DuplicateRotPlace(GrimPlayer player) { diff --git a/src/main/java/ac/grim/grimac/checks/impl/scaffolding/MultiPlace.java b/src/main/java/ac/grim/grimac/checks/impl/scaffolding/MultiPlace.java index 7b2a1a5f2b..ae3226ae06 100644 --- a/src/main/java/ac/grim/grimac/checks/impl/scaffolding/MultiPlace.java +++ b/src/main/java/ac/grim/grimac/checks/impl/scaffolding/MultiPlace.java @@ -1,6 +1,7 @@ package ac.grim.grimac.checks.impl.scaffolding; import ac.grim.grimac.checks.CheckData; +import ac.grim.grimac.checks.CheckType; import ac.grim.grimac.checks.type.BlockPlaceCheck; import ac.grim.grimac.player.GrimPlayer; import ac.grim.grimac.utils.anticheat.MessageUtil; @@ -16,7 +17,7 @@ import java.util.ArrayList; import java.util.List; -@CheckData(name = "MultiPlace", experimental = true) +@CheckData(name = "MultiPlace", experimental = true, checkType = CheckType.WORLD) public class MultiPlace extends BlockPlaceCheck { public MultiPlace(GrimPlayer player) { super(player);