diff --git a/src/main/java/ac/grim/grimac/checks/Check.java b/src/main/java/ac/grim/grimac/checks/Check.java index 882e2eda42..ecfc63171f 100644 --- a/src/main/java/ac/grim/grimac/checks/Check.java +++ b/src/main/java/ac/grim/grimac/checks/Check.java @@ -38,7 +38,7 @@ public class Check extends GrimProcessor implements AbstractCheck { private boolean noSetbackPermission; private boolean noModifyPacketPermission; - 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 920f922550..fa2d623989 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; @@ -12,7 +13,7 @@ import java.util.ArrayList; -@CheckData(name = "MultiInteractA", description = "Interacted with multiple entities in the same tick", experimental = true) +@CheckData(name = "MultiInteractA", description = "Interacted with multiple entities in the same tick", 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 1d90ddca0e..9ad6520b35 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; @@ -14,7 +15,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 825d18aad0..76db4cd7c3 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,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.PacketCheck; import ac.grim.grimac.player.GrimPlayer; import com.github.retrooper.packetevents.PacketEvents; @@ -14,7 +15,7 @@ // this can false from click events, but I doubt this would actually // happen unless they're trying to flag, or if the server is set up badly -@CheckData(name = "ExploitC", description = "Invalid chat message") +@CheckData(name = "ExploitC", description = "Invalid chat message", 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/NoFall.java b/src/main/java/ac/grim/grimac/checks/impl/groundspoof/NoFall.java index 66a5274a28..159a6cd56f 100644 --- a/src/main/java/ac/grim/grimac/checks/impl/groundspoof/NoFall.java +++ b/src/main/java/ac/grim/grimac/checks/impl/groundspoof/NoFall.java @@ -18,7 +18,7 @@ // Catches NoFalls for LOOK and GROUND packets // This check runs AFTER the predictions -@CheckData(name = "NoFall", setback = 10, checkType = CheckType.PACKETS) +@CheckData(name = "NoFall", configName = "nofall", setback = 10, checkType = CheckType.PACKETS) public class NoFall extends Check implements PacketCheck { public boolean flipPlayerGroundStatus = false; 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 cfd133060c..45c9b83881 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) {