From f7f88f17c11fe24840f9688e22134b72f5f7a7b9 Mon Sep 17 00:00:00 2001 From: Tecnio <50290580+Tecnio@users.noreply.github.com> Date: Tue, 7 Jan 2025 23:49:17 +0300 Subject: [PATCH] One last time --- .github/README.MD | 35 ++------ .gitignore | 1 - build.gradle.kts | 12 ++- gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 6 +- gradlew.bat | 2 + .../ahm/{AHM.java => AntiHaxerman.java} | 11 +-- ...AHMPlugin.java => AntiHaxermanPlugin.java} | 6 +- .../me/tecnio/ahm/alert/AlertManager.java | 8 +- .../punish/PunishmentHandlerFactory.java | 4 +- .../impl/ProductionPunishmentHandler.java | 4 +- src/main/java/me/tecnio/ahm/check/Check.java | 23 ++--- .../me/tecnio/ahm/check/api/CheckManager.java | 83 ++++++++++++++---- .../me/tecnio/ahm/check/impl/aim/AimA.java | 9 -- .../me/tecnio/ahm/check/impl/aim/AimB.java | 8 -- .../me/tecnio/ahm/check/impl/aura/AuraB.java | 20 ++--- .../me/tecnio/ahm/check/impl/aura/AuraC.java | 4 +- .../check/impl/autoclicker/AutoClickerA.java | 19 ++-- .../tecnio/ahm/check/impl/flight/FlightA.java | 22 +++-- .../tecnio/ahm/check/impl/flight/FlightB.java | 32 ++++--- .../tecnio/ahm/check/impl/flight/FlightC.java | 21 +++-- .../tecnio/ahm/check/impl/flight/FlightD.java | 33 ++++--- .../check/impl/groundspoof/GroundSpoofA.java | 3 +- .../tecnio/ahm/check/impl/hitbox/HitboxA.java | 31 ++----- .../ahm/check/impl/interact/InteractC.java | 1 + .../ahm/check/impl/protocol/ProtocolA.java | 4 +- .../ahm/check/impl/protocol/ProtocolC.java | 8 +- .../tecnio/ahm/check/impl/speed/SpeedA.java | 23 +++-- .../tecnio/ahm/check/impl/speed/SpeedB.java | 28 +++--- .../tecnio/ahm/check/impl/timer/TimerA.java | 1 - .../ahm/check/impl/velocity/VelocityA.java | 31 ++++--- .../ahm/check/impl/velocity/VelocityB.java | 33 +++---- .../ahm/check/impl/velocity/VelocityC.java | 33 +++---- ...MCommand.java => AntiHaxermanCommand.java} | 5 +- .../ahm/command/impl/AlertsCommand.java | 10 +-- .../ahm/command/impl/ChecksCommand.java | 13 +-- .../ahm/command/impl/DefaultCommand.java | 8 +- .../tecnio/ahm/command/impl/InfoCommand.java | 14 +-- .../me/tecnio/ahm/config/ConfigManager.java | 20 ++--- .../java/me/tecnio/ahm/data/PlayerData.java | 10 +-- .../me/tecnio/ahm/data/PlayerDataManager.java | 14 +-- .../data/tracker/impl/ConnectionTracker.java | 33 ++++--- .../data/tracker/impl/GhostBlockTracker.java | 2 +- .../data/tracker/impl/PositionTracker.java | 9 +- .../java/me/tecnio/ahm/exempt/ExemptType.java | 37 +++++--- .../listener/bukkit/RegistrationListener.java | 10 +-- .../ahm/listener/network/NetworkFilter.java | 50 +++++++++++ .../ahm/listener/network/NetworkListener.java | 39 +++----- .../me/tecnio/ahm/util/player/PlayerUtil.java | 65 +------------- src/main/resources/plugin.yml | 4 +- 51 files changed, 459 insertions(+), 445 deletions(-) create mode 100644 gradle/wrapper/gradle-wrapper.jar rename src/main/java/me/tecnio/ahm/{AHM.java => AntiHaxerman.java} (95%) rename src/main/java/me/tecnio/ahm/{AHMPlugin.java => AntiHaxermanPlugin.java} (55%) rename src/main/java/me/tecnio/ahm/command/{AHMCommand.java => AntiHaxermanCommand.java} (84%) create mode 100644 src/main/java/me/tecnio/ahm/listener/network/NetworkFilter.java diff --git a/.github/README.MD b/.github/README.MD index b39eb8f..17aa190 100644 --- a/.github/README.MD +++ b/.github/README.MD @@ -1,21 +1,13 @@ -# AntiHaxerman -> An open-sourced anti-cheat solution for servers and for people to learn from. - -## Join MAC (Minecraft Anti-Cheat Community) -https://discord.gg/SAuj458nzM +# antihaxerman +> An open-sourced anti-cheat solution for people to learn from. +## Join the [Minecraft AntiCheat Community](https://discord.gg/SAuj458nzM) ## About Keep in mind I coded this all whilst drunk as hell so you never know what you might find. - Tecnio -This is a project mostly designed for people to be able to learn and take code from to use on their projects. - -## Warning - -This project is intentionally nerfed in order to teach people not to mess up on whilst providing them the ground works of -a nice and robust anti-cheat base that they can work off of. - -This by itself will work stably for the most part, but do not expect it to detect everything and by no means is it flawless. +This is a project mostly designed for people to be able to learn and take code from to use on their projects and is +nerfed by design. It is not representative of what are the best practices. ## Getting Started @@ -24,10 +16,10 @@ This by itself will work stably for the most part, but do not expect it to detec ### Installation 1. Clone the repository\ -`git clone https://github.com/Tecnio/AntiHaxerman.git` +`git clone https://github.com/Tecnio/antihaxerman.git` 2. CD into the folder\ -`cd AntiHaxerman` +`cd antihaxerman` 3. Compile with Gradle - Windows: `./gradlew.bat build` @@ -44,15 +36,4 @@ Supported server/Spigot forks are listed below, the rest are not guaranteed to w - Paper - TacoSpigot -Make sure to be running a 1.8.8 server. - -## Contributing - -If you find any issues or want to contribute to this open-source project, please feel free to do so. Any bug fixes or additions are more than welcome. Your help and ideas are greatly appreciated! - -## Developers -- https://github.com/Tecnio (Tecnio) -- https://github.com/TheRealShitDev (aSwitch) -- https://github.com/gbomexify (Mexify) -- https://github.com/incognitolol (RNOIncognito) -- https://github.com/Cyanade (Cyanade) +Make sure to be running a 1.8.8 server. \ No newline at end of file diff --git a/.gitignore b/.gitignore index 6fc491a..d2f1612 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -# Created by .ignore support plugin (hsz.mobi) ### Java template # Compiled class file *.class diff --git a/build.gradle.kts b/build.gradle.kts index 6e267e9..101d111 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,11 @@ plugins { java - id("com.github.johnrengelman.shadow") version "8.1.1" + id("com.gradleup.shadow") version "8.3.5" + id("io.freefair.lombok") version "8.11" } group = "me.tecnio" -version = "4.0.2" +version = "4.0.3" java { toolchain { @@ -26,19 +27,16 @@ repositories { dependencies { compileOnly("org.github.spigot:1.8.8:1.8.8") - compileOnly("org.projectlombok:lombok:1.18.32") - - annotationProcessor("org.projectlombok:lombok:1.18.32") implementation("com.github.artemisac.artemis-packet-api:api:2.0.0-beta-3") implementation("com.github.artemisac.artemis-packet-api:spigot:2.0.0-beta-3") - implementation("org.atteo.classindex:classindex:3.13") implementation("co.aikar:acf-paper:0.5.1-SNAPSHOT") - implementation("org.bstats:bstats-bukkit:3.0.2") + implementation("org.bstats:bstats-bukkit:3.1.0") } tasks.shadowJar { archiveFileName = "AntiHaxerman.jar" + minimize() relocate("org.atteo.classindex", "me.tecnio.ahm.libs.classindex") diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..cea7a79 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..f3b75f3 100644 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30d..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/src/main/java/me/tecnio/ahm/AHM.java b/src/main/java/me/tecnio/ahm/AntiHaxerman.java similarity index 95% rename from src/main/java/me/tecnio/ahm/AHM.java rename to src/main/java/me/tecnio/ahm/AntiHaxerman.java index 9b96698..faf78f5 100644 --- a/src/main/java/me/tecnio/ahm/AHM.java +++ b/src/main/java/me/tecnio/ahm/AntiHaxerman.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; @Getter -public enum AHM { +public enum AntiHaxerman { INSTANCE; @@ -67,7 +67,6 @@ public void end() { terminateManagers(); } - private void registerMetrics() { System.setProperty("bstats.relocatecheck", "false"); new Metrics(this.plugin, 11350); @@ -82,8 +81,10 @@ private void registerManagers() { } private void registerConfiguration() { - get(ConfigManager.class).generate(); - get(ConfigManager.class).load(); + final ConfigManager config = get(ConfigManager.class); + + config.generate(); + config.load(); } private void registerListeners() { @@ -115,7 +116,7 @@ private void terminateManagers() { this.configManager = null; } - public static AHM get() { + public static AntiHaxerman get() { return INSTANCE; } diff --git a/src/main/java/me/tecnio/ahm/AHMPlugin.java b/src/main/java/me/tecnio/ahm/AntiHaxermanPlugin.java similarity index 55% rename from src/main/java/me/tecnio/ahm/AHMPlugin.java rename to src/main/java/me/tecnio/ahm/AntiHaxermanPlugin.java index 4b8e4f6..7b51682 100644 --- a/src/main/java/me/tecnio/ahm/AHMPlugin.java +++ b/src/main/java/me/tecnio/ahm/AntiHaxermanPlugin.java @@ -2,15 +2,15 @@ import org.bukkit.plugin.java.JavaPlugin; -public final class AHMPlugin extends JavaPlugin { +public final class AntiHaxermanPlugin extends JavaPlugin { @Override public void onEnable() { - AHM.INSTANCE.start(this); + AntiHaxerman.INSTANCE.start(this); } @Override public void onDisable() { - AHM.INSTANCE.end(); + AntiHaxerman.INSTANCE.end(); } } diff --git a/src/main/java/me/tecnio/ahm/alert/AlertManager.java b/src/main/java/me/tecnio/ahm/alert/AlertManager.java index 1b42078..b726942 100644 --- a/src/main/java/me/tecnio/ahm/alert/AlertManager.java +++ b/src/main/java/me/tecnio/ahm/alert/AlertManager.java @@ -1,7 +1,7 @@ package me.tecnio.ahm.alert; import lombok.Getter; -import me.tecnio.ahm.AHM; +import me.tecnio.ahm.AntiHaxerman; import me.tecnio.ahm.alert.alert.AlertHandler; import me.tecnio.ahm.alert.alert.AlertHandlerFactory; import me.tecnio.ahm.alert.punish.PunishmentHandler; @@ -24,7 +24,7 @@ public class AlertManager { private final AlertHandler alertHandler = new AlertHandlerFactory().build(); private final PunishmentHandler punishmentHandler = new PunishmentHandlerFactory() - .setTesting(AHM.TEST_MODE) + .setTesting(AntiHaxerman.TEST_MODE) .build(); public boolean toggleAlerts(final PlayerData data) { @@ -40,8 +40,4 @@ public void handleAlert(final Check check, final String debug) { public void handlePunishment(final Check check) { this.punishmentHandler.punish(check); } - - public enum ToggleAlertType { - ADD, REMOVE - } } diff --git a/src/main/java/me/tecnio/ahm/alert/punish/PunishmentHandlerFactory.java b/src/main/java/me/tecnio/ahm/alert/punish/PunishmentHandlerFactory.java index 5a49d46..ef0cf46 100644 --- a/src/main/java/me/tecnio/ahm/alert/punish/PunishmentHandlerFactory.java +++ b/src/main/java/me/tecnio/ahm/alert/punish/PunishmentHandlerFactory.java @@ -16,6 +16,8 @@ public PunishmentHandlerFactory setTesting(final boolean testing) { @Override public PunishmentHandler build() { - return this.testing ? new TestingPunishmentHandler() : new ProductionPunishmentHandler(); + return this.testing + ? new TestingPunishmentHandler() + : new ProductionPunishmentHandler(); } } diff --git a/src/main/java/me/tecnio/ahm/alert/punish/impl/ProductionPunishmentHandler.java b/src/main/java/me/tecnio/ahm/alert/punish/impl/ProductionPunishmentHandler.java index 1bd8f8e..23d10e9 100644 --- a/src/main/java/me/tecnio/ahm/alert/punish/impl/ProductionPunishmentHandler.java +++ b/src/main/java/me/tecnio/ahm/alert/punish/impl/ProductionPunishmentHandler.java @@ -1,6 +1,6 @@ package me.tecnio.ahm.alert.punish.impl; -import me.tecnio.ahm.AHM; +import me.tecnio.ahm.AntiHaxerman; import me.tecnio.ahm.alert.punish.PunishmentHandler; import me.tecnio.ahm.check.Check; import org.bukkit.Bukkit; @@ -17,7 +17,7 @@ public void punish(final Check check) { } private void execute(final String command) { - Bukkit.getScheduler().runTask(AHM.get().getPlugin(), + Bukkit.getScheduler().runTask(AntiHaxerman.get().getPlugin(), () -> Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command)); } } diff --git a/src/main/java/me/tecnio/ahm/check/Check.java b/src/main/java/me/tecnio/ahm/check/Check.java index 97246f2..c11809f 100644 --- a/src/main/java/me/tecnio/ahm/check/Check.java +++ b/src/main/java/me/tecnio/ahm/check/Check.java @@ -2,7 +2,7 @@ import lombok.Getter; import lombok.Setter; -import me.tecnio.ahm.AHM; +import me.tecnio.ahm.AntiHaxerman; import me.tecnio.ahm.alert.AlertManager; import me.tecnio.ahm.check.api.Buffer; import me.tecnio.ahm.check.api.annotations.CheckManifest; @@ -11,14 +11,12 @@ import me.tecnio.ahm.data.PlayerData; import me.tecnio.ahm.exempt.ExemptType; import me.tecnio.ahm.util.string.ChatUtil; -import org.atteo.classindex.IndexSubclasses; import org.bukkit.ChatColor; import org.bukkit.entity.Player; import java.util.List; @Getter -@IndexSubclasses public abstract class Check { protected final PlayerData data; @@ -57,11 +55,11 @@ public Check(final PlayerData data) { this.buffer = new Buffer(this.info.maxBuffer()); } else { this.info = null; - throw new IllegalStateException("The CheckManifest annotation has not been added on " + this.getClass().getName()); + throw new IllegalStateException("CheckManifest has not been added to " + this.getClass().getName()); } final String name = this.name + "." + this.type; - final ConfigManager config = AHM.get(ConfigManager.class); + final ConfigManager config = AntiHaxerman.get(ConfigManager.class); this.enabled = config.getEnabledMap().get(name); this.punishing = config.getPunishMap().get(name); @@ -74,12 +72,12 @@ protected final void fail() { } protected final void fail(final String debug) { - ++this.violations; + final AlertManager alertManager = AntiHaxerman.get(AlertManager.class); - AHM.get(AlertManager.class).handleAlert(this, debug); + alertManager.handleAlert(this, debug); - if (this.violations >= this.maxVl) { - AHM.get(AlertManager.class).handlePunishment(this); + if (++this.violations >= this.maxVl) { + alertManager.handlePunishment(this); } } @@ -92,10 +90,7 @@ protected final boolean isExempt(final ExemptType... exemptTypes) { } protected final void debug(final Object object, final Object... objects) { - data.getPlayer().sendMessage(ChatUtil.translate(String.format("&6AntiHaxerman Debug &8> " + ChatColor.WHITE + object.toString(), objects))); - } - - protected boolean canClick() { - return !data.getActionTracker().isPlacing(); + data.getPlayer().sendMessage(ChatUtil.translate( + String.format("&6AntiHaxerman Debug &8> " + ChatColor.WHITE + object.toString(), objects))); } } diff --git a/src/main/java/me/tecnio/ahm/check/api/CheckManager.java b/src/main/java/me/tecnio/ahm/check/api/CheckManager.java index 0b71014..5ee8bff 100644 --- a/src/main/java/me/tecnio/ahm/check/api/CheckManager.java +++ b/src/main/java/me/tecnio/ahm/check/api/CheckManager.java @@ -3,12 +3,31 @@ import lombok.Getter; import lombok.SneakyThrows; import me.tecnio.ahm.check.Check; -import me.tecnio.ahm.check.api.annotations.Disabled; +import me.tecnio.ahm.check.impl.aim.AimA; +import me.tecnio.ahm.check.impl.aim.AimB; +import me.tecnio.ahm.check.impl.aura.AuraA; +import me.tecnio.ahm.check.impl.aura.AuraB; +import me.tecnio.ahm.check.impl.aura.AuraC; +import me.tecnio.ahm.check.impl.autoclicker.AutoClickerA; +import me.tecnio.ahm.check.impl.flight.FlightA; +import me.tecnio.ahm.check.impl.flight.FlightB; +import me.tecnio.ahm.check.impl.flight.FlightC; +import me.tecnio.ahm.check.impl.flight.FlightD; +import me.tecnio.ahm.check.impl.groundspoof.GroundSpoofA; +import me.tecnio.ahm.check.impl.hitbox.HitboxA; +import me.tecnio.ahm.check.impl.interact.InteractA; +import me.tecnio.ahm.check.impl.interact.InteractB; +import me.tecnio.ahm.check.impl.interact.InteractC; +import me.tecnio.ahm.check.impl.protocol.*; +import me.tecnio.ahm.check.impl.scaffold.ScaffoldA; +import me.tecnio.ahm.check.impl.speed.SpeedA; +import me.tecnio.ahm.check.impl.speed.SpeedB; +import me.tecnio.ahm.check.impl.timer.TimerA; +import me.tecnio.ahm.check.impl.velocity.VelocityA; +import me.tecnio.ahm.check.impl.velocity.VelocityB; +import me.tecnio.ahm.check.impl.velocity.VelocityC; import me.tecnio.ahm.data.PlayerData; -import org.atteo.classindex.ClassIndex; -import java.lang.reflect.Constructor; -import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.List; @@ -16,27 +35,57 @@ public final class CheckManager { private final List> checks = new ArrayList<>(); - private final List> constructors = new ArrayList<>(); public CheckManager() { - ClassIndex.getSubclasses(Check.class, Check.class.getClassLoader()).forEach(clazz -> { - try { - if (!Modifier.isAbstract(clazz.getModifiers()) && !clazz.isAnnotationPresent(Disabled.class)) { - this.checks.add(clazz); - this.constructors.add(clazz.getConstructor(PlayerData.class)); - } - } catch (final Exception ex) { - ex.printStackTrace(); - } - }); + this.checks.add(AimA.class); + this.checks.add(AimB.class); + + this.checks.add(AuraA.class); + this.checks.add(AuraB.class); + this.checks.add(AuraC.class); + + this.checks.add(AutoClickerA.class); + + this.checks.add(FlightA.class); + this.checks.add(FlightB.class); + this.checks.add(FlightC.class); + this.checks.add(FlightD.class); + + this.checks.add(GroundSpoofA.class); + + this.checks.add(HitboxA.class); + + this.checks.add(InteractA.class); + this.checks.add(InteractB.class); + this.checks.add(InteractC.class); + + this.checks.add(ProtocolA.class); + this.checks.add(ProtocolB.class); + this.checks.add(ProtocolC.class); + this.checks.add(ProtocolD.class); + this.checks.add(ProtocolE.class); + this.checks.add(ProtocolF.class); + this.checks.add(ProtocolG.class); + this.checks.add(ProtocolH.class); + + this.checks.add(ScaffoldA.class); + + this.checks.add(SpeedA.class); + this.checks.add(SpeedB.class); + + this.checks.add(TimerA.class); + + this.checks.add(VelocityA.class); + this.checks.add(VelocityB.class); + this.checks.add(VelocityC.class); } @SneakyThrows public List loadChecks(final PlayerData data) { final List checkList = new ArrayList<>(); - for (final Constructor constructor : this.constructors) { - checkList.add((Check) constructor.newInstance(data)); + for (final Class check : this.checks) { + checkList.add((Check) check.getConstructor(PlayerData.class).newInstance(data)); } return checkList; diff --git a/src/main/java/me/tecnio/ahm/check/impl/aim/AimA.java b/src/main/java/me/tecnio/ahm/check/impl/aim/AimA.java index 4fc5a6c..1b14263 100644 --- a/src/main/java/me/tecnio/ahm/check/impl/aim/AimA.java +++ b/src/main/java/me/tecnio/ahm/check/impl/aim/AimA.java @@ -7,9 +7,6 @@ import me.tecnio.ahm.exempt.ExemptType; import me.tecnio.ahm.update.RotationUpdate; -/** - * Check to detect rotations with rounding flaws. - */ @CheckManifest(name = "Aim", type = "A", description = "Detects rotations with rounding flaws.") public final class AimA extends Check implements RotationCheck { @@ -19,27 +16,21 @@ public AimA(final PlayerData data) { @Override public void handle(final RotationUpdate update) { - // If the player is exempt from aim-related or teleportation-related checks, exit the method. if (this.isExempt(ExemptType.AIM, ExemptType.TELEPORT)) return; - // Calculate the constant based on sensitivity to be used for calculations. final float constant = data.getRotationTracker().getSensitivity() / 142.0F; - // Get the pitch and yaw values from the update. final float pitch = update.getPitch(); final float yaw = update.getYaw(); - // Calculate the modulo of pitch and yaw with respect to the constant. final float moduloPitch = Math.abs(pitch % constant); final float moduloYaw = Math.abs(yaw % constant); - // If both moduloPitch and moduloYaw are zero, increase the buffer count. if (moduloPitch == 0.0D && moduloYaw == 0.0D) { if (this.buffer.increase() > 30) { this.fail("mP: " + moduloPitch); } } else { - // If at least one of the modulos is not zero, decrease the buffer by 0.05. this.buffer.decreaseBy(0.05D); } } diff --git a/src/main/java/me/tecnio/ahm/check/impl/aim/AimB.java b/src/main/java/me/tecnio/ahm/check/impl/aim/AimB.java index 718cb81..3bf0152 100644 --- a/src/main/java/me/tecnio/ahm/check/impl/aim/AimB.java +++ b/src/main/java/me/tecnio/ahm/check/impl/aim/AimB.java @@ -19,31 +19,23 @@ public AimB(final PlayerData data) { @Override public void handle(final RotationUpdate update) { - // If the player is exempt from aim-related checks, exit the method. if (this.isExempt(ExemptType.AIM)) return; - // Get the changes in yaw and pitch from the update. final float deltaYaw = update.getDeltaYaw(); final float deltaPitch = update.getDeltaPitch(); - // If either the change in yaw or pitch is too small, exit the method as we can't do the math - // as we require both yaw and the pitch to be moving in order to get the highest GCD between them. if (deltaYaw < 1.0F || deltaPitch < 1.0F) return; - // Get the divisor values for the x and y axes from the rotation tracker. final float divisorX = data.getRotationTracker().getDivisorX(); final float divisorY = data.getRotationTracker().getDivisorY(); - // Find the maximum divisor value between the x and y axes. final float divisorMax = Math.max(divisorX, divisorY); - // If the maximum divisor is below a certain threshold, increase the buffer count. if (divisorMax < 0.0078125F) { if (this.buffer.increaseBy(0.3D) > 8) { this.fail("dM: " + divisorMax); } } else { - // If the maximum divisor is not too small, decrease the buffer by 0.1. this.buffer.decreaseBy(0.1D); } } diff --git a/src/main/java/me/tecnio/ahm/check/impl/aura/AuraB.java b/src/main/java/me/tecnio/ahm/check/impl/aura/AuraB.java index 65ba16b..1a4777e 100644 --- a/src/main/java/me/tecnio/ahm/check/impl/aura/AuraB.java +++ b/src/main/java/me/tecnio/ahm/check/impl/aura/AuraB.java @@ -8,9 +8,6 @@ import me.tecnio.ahm.update.PositionUpdate; import org.bukkit.entity.Player; -/** - * Check to detect keep-sprint behavior, commonly used in aura-like cheats. - */ @CheckManifest(name = "Aura", type = "B", description = "Detects keep-sprint.") public final class AuraB extends Check implements PositionCheck { @@ -20,26 +17,29 @@ public AuraB(final PlayerData data) { @Override public void handle(final PositionUpdate update) { - // Skip processing if the attack timer hasn't passed or the target is not a player. if (data.getActionTracker().getAttackTimer().hasPassed(1) || !(data.getActionTracker().getTarget() instanceof Player)) return; - // Check for exemption conditions. - final boolean exempt = this.isExempt(ExemptType.VEHICLE, ExemptType.CHUNK, ExemptType.FLIGHT, ExemptType.RETARD, - ExemptType.PISTON, ExemptType.SLIME, ExemptType.LIQUID, ExemptType.TELEPORTED_RECENTLY); + final boolean exempt = this.isExempt( + ExemptType.VEHICLE, + ExemptType.CHUNK, + ExemptType.FLIGHT, + ExemptType.SLOW, + ExemptType.PISTON, + ExemptType.SLIME, + ExemptType.LIQUID, + ExemptType.TELEPORTED_RECENTLY + ); - // Check for invalid conditions: sprinting without hit slowdown, sprinting, and being on the ground. final boolean invalid = !data.getEmulationTracker().isHitSlowdown() && data.getEmulationTracker().isSprint() && data.getPositionTracker().isOnGround(); if (invalid && !exempt) { - // Trigger a violation if the conditions are met and the buffer threshold is exceeded. if (this.buffer.increase() > 3) { this.fail(); } } else { - // Decrease the buffer if the conditions are not met. this.buffer.decreaseBy(0.1D); } } diff --git a/src/main/java/me/tecnio/ahm/check/impl/aura/AuraC.java b/src/main/java/me/tecnio/ahm/check/impl/aura/AuraC.java index 30edeae..5df8021 100644 --- a/src/main/java/me/tecnio/ahm/check/impl/aura/AuraC.java +++ b/src/main/java/me/tecnio/ahm/check/impl/aura/AuraC.java @@ -25,7 +25,9 @@ public void handle(final GPacket packet) { if (packet instanceof PacketPlayClientUseEntity) { final GPacketPlayClientUseEntity wrapper = ((GPacketPlayClientUseEntity) packet); - if (wrapper.getType() == PlayerEnums.UseType.ATTACK && !this.swung) this.fail(); + if (wrapper.getType() == PlayerEnums.UseType.ATTACK && !this.swung) { + this.fail(); + } } else if (packet instanceof PacketPlayClientArmAnimation) { diff --git a/src/main/java/me/tecnio/ahm/check/impl/autoclicker/AutoClickerA.java b/src/main/java/me/tecnio/ahm/check/impl/autoclicker/AutoClickerA.java index c52fcd7..87dbf4f 100644 --- a/src/main/java/me/tecnio/ahm/check/impl/autoclicker/AutoClickerA.java +++ b/src/main/java/me/tecnio/ahm/check/impl/autoclicker/AutoClickerA.java @@ -19,19 +19,20 @@ public AutoClickerA(final PlayerData data) { @Override public void handle(final GPacket packet) { - if (packet instanceof GPacketPlayClientArmAnimation) { - if (this.canClick()) { - ++this.cps; - } - } - - else if (packet instanceof PacketPlayClientFlying) { + if (packet instanceof PacketPlayClientFlying) { if (++this.movements >= 20) { - if (this.cps > 20 && this.canClick()) { + if (this.cps > 20 && !data.getActionTracker().isPlacing()) { this.fail("C: %s", this.cps); } - this.cps = this.movements = 0; + this.cps = 0; + this.movements = 0; + } + } + + else if (packet instanceof GPacketPlayClientArmAnimation) { + if (!data.getActionTracker().isPlacing()) { + ++this.cps; } } } diff --git a/src/main/java/me/tecnio/ahm/check/impl/flight/FlightA.java b/src/main/java/me/tecnio/ahm/check/impl/flight/FlightA.java index 47a1ef9..3cd4c38 100644 --- a/src/main/java/me/tecnio/ahm/check/impl/flight/FlightA.java +++ b/src/main/java/me/tecnio/ahm/check/impl/flight/FlightA.java @@ -19,7 +19,6 @@ public FlightA(final PlayerData data) { @Override public void handle(final PositionUpdate update) { - // Retrieve relevant data for analysis final boolean velocity = data.getVelocityTracker().getTicksSinceVelocity() == 1; final boolean lastVelocity = data.getVelocityTracker().isLastTickVelocity(); @@ -65,22 +64,27 @@ public void handle(final PositionUpdate update) { } } - // 0.03 can happen for multiple ticks but I rather doubt it's gonna be anything over 0.03 tbh. - final double threshold = this.isExempt(ExemptType.RETARD) ? 0.03D : 1e-06D; + final double threshold = this.isExempt(ExemptType.SLOW) ? 0.03D : 1e-06D; - // Check for invalid conditions: significant difference between observed and predicted Y, not on ground, and previous tick not on ground. final boolean invalid = distance > threshold && !ground && !lastGround; - final boolean exempt = this.isExempt(ExemptType.CLIMBABLE, ExemptType.PISTON, ExemptType.SLIME, - ExemptType.VEHICLE, ExemptType.FLIGHT, ExemptType.TELEPORT, ExemptType.UNDER_BLOCK, ExemptType.WEB, ExemptType.LIQUID, - ExemptType.TELEPORTED_RECENTLY); + final boolean exempt = this.isExempt( + ExemptType.CLIMBABLE, + ExemptType.PISTON, + ExemptType.SLIME, + ExemptType.VEHICLE, + ExemptType.FLIGHT, + ExemptType.TELEPORT, + ExemptType.UNDER_BLOCK, + ExemptType.WEB, + ExemptType.LIQUID, + ExemptType.TELEPORTED_RECENTLY + ); if (invalid && !exempt) { - // Trigger a violation if the conditions are met and the buffer threshold is exceeded. if (this.buffer.increase() > 2) { this.fail("oY: %s", Math.abs(deltaY - predicted)); } } else { - // Decrease the buffer if the conditions are not met. this.buffer.decreaseBy(0.01D); } } diff --git a/src/main/java/me/tecnio/ahm/check/impl/flight/FlightB.java b/src/main/java/me/tecnio/ahm/check/impl/flight/FlightB.java index a06691a..b5f8199 100644 --- a/src/main/java/me/tecnio/ahm/check/impl/flight/FlightB.java +++ b/src/main/java/me/tecnio/ahm/check/impl/flight/FlightB.java @@ -20,29 +20,33 @@ public FlightB(final PlayerData data) { @Override public void handle(final PositionUpdate update) { - // The ground states of the current and last tick in order to detect if the player has jumped or gained velocity. final boolean onGround = update.isOnGround(); final boolean lastOnGround = update.isLastOnGround(); - // The current motion upwards in order to be compared to the expected later on. final double deltaY = update.getDeltaY(); - // Calculate expected jump motion based on block placement ticks and potion effects final double modifierJump = data.getAttributeTracker().getPotionLevel(PotionEffectType.JUMP) * 0.1F; final double expectedJumpMotion = 0.42F + modifierJump; - // This is the 0.03 compensated threshold that should prevent falses related to 0.03. - final double threshold = (this.isExempt(ExemptType.RETARD) ? 0.03D : 0.0) + 1.0E-6; - - // Check exemption conditions - final boolean exempt = this.isExempt(ExemptType.VEHICLE, ExemptType.CLIMBABLE, ExemptType.VELOCITY, ExemptType.PISTON, - ExemptType.LIQUID, ExemptType.TELEPORT, ExemptType.WEB, ExemptType.BOAT, ExemptType.FLIGHT, ExemptType.SLIME, - ExemptType.WALL, ExemptType.UNDER_BLOCK, ExemptType.CHUNK); - - // Check for invalid jump motion + final double threshold = (this.isExempt(ExemptType.SLOW) ? 0.03D : 0.0) + 1.0E-6; + final boolean invalid = Math.abs(deltaY - expectedJumpMotion) > threshold && deltaY >= 0; - - // Checking for first "air tick" could be spoofed but they better jump this high if they spoof so idc + final boolean exempt = this.isExempt( + ExemptType.VEHICLE, + ExemptType.CLIMBABLE, + ExemptType.VELOCITY, + ExemptType.PISTON, + ExemptType.LIQUID, + ExemptType.TELEPORT, + ExemptType.WEB, + ExemptType.BOAT, + ExemptType.FLIGHT, + ExemptType.SLIME, + ExemptType.WALL, + ExemptType.UNDER_BLOCK, + ExemptType.CHUNK + ); + if (!onGround && lastOnGround && invalid && !exempt) { this.fail("dY: %s", deltaY); } diff --git a/src/main/java/me/tecnio/ahm/check/impl/flight/FlightC.java b/src/main/java/me/tecnio/ahm/check/impl/flight/FlightC.java index 39c0c20..f32bfcd 100644 --- a/src/main/java/me/tecnio/ahm/check/impl/flight/FlightC.java +++ b/src/main/java/me/tecnio/ahm/check/impl/flight/FlightC.java @@ -8,9 +8,6 @@ import me.tecnio.ahm.update.PositionUpdate; import org.bukkit.potion.PotionEffectType; -/** - * Check to detect invalid step motion that may indicate flight cheats. - */ @CheckManifest(name = "Flight", type = "C", description = "Checks for invalid step motion.") public class FlightC extends Check implements PositionCheck { @@ -22,18 +19,20 @@ public FlightC(final PlayerData data) { public void handle(final PositionUpdate update) { final boolean ground = update.isOnGround(); - // Calculate modified jump motion with potion effects final double modifierJump = data.getAttributeTracker().getPotionLevel(PotionEffectType.JUMP) * 0.1F; final double deltaY = update.getDeltaY() - modifierJump; - // Check exemption conditions - final boolean exempt = this.isExempt(ExemptType.VEHICLE, ExemptType.VELOCITY, ExemptType.PISTON, - ExemptType.TELEPORT, ExemptType.BOAT, ExemptType.FLIGHT, ExemptType.SLIME, ExemptType.CHUNK); + final boolean exempt = this.isExempt( + ExemptType.VEHICLE, + ExemptType.VELOCITY, + ExemptType.PISTON, + ExemptType.TELEPORT, + ExemptType.BOAT, + ExemptType.FLIGHT, + ExemptType.SLIME, + ExemptType.CHUNK + ); - /* - * Check if their instant motion is more than possible while still on ground. - * We use 0.6f to avoid false positives from fences/walls with carpets on top. - */ if (deltaY > 0.6f && ground && !exempt) { this.fail("dY: %s", deltaY); } diff --git a/src/main/java/me/tecnio/ahm/check/impl/flight/FlightD.java b/src/main/java/me/tecnio/ahm/check/impl/flight/FlightD.java index 189de4d..ac85bb4 100644 --- a/src/main/java/me/tecnio/ahm/check/impl/flight/FlightD.java +++ b/src/main/java/me/tecnio/ahm/check/impl/flight/FlightD.java @@ -8,9 +8,6 @@ import me.tecnio.ahm.exempt.ExemptType; import me.tecnio.ahm.update.PositionUpdate; -/** - * Check to detect invalid fall motion that may indicate flight cheats. - */ @CheckManifest(name = "Flight", type = "D", description = "Checks for invalid fall motion.", state = CheckState.EXPERIMENTAL) public class FlightD extends Check implements PositionCheck { @@ -20,25 +17,33 @@ public FlightD(final PlayerData data) { @Override public void handle(final PositionUpdate update) { - /* - * The main idea here is that when players start to fall, their motion cannot be higher than their previous motion - * unless they are cheating. We check for this by comparing the current motion with the previous motion while the - * player is in the air. - */ final double deltaY = update.getDeltaY(); final double lastDeltaY = update.getLastDeltaY(); final boolean ground = update.isOnGround(); final boolean lastOnGround = update.isLastOnGround(); - final boolean exempt = this.isExempt(ExemptType.VEHICLE, ExemptType.VELOCITY, ExemptType.PISTON, - ExemptType.CLIMBABLE, ExemptType.TELEPORT, ExemptType.BOAT, ExemptType.TELEPORTED_RECENTLY, - ExemptType.UNDER_BLOCK, ExemptType.WEB, ExemptType.FLIGHT, ExemptType.SLIME, ExemptType.CHUNK, - ExemptType.LIQUID, ExemptType.JOIN); - final boolean startedFalling = deltaY <= 0.2 && !ground; - if (!ground && !lastOnGround && !exempt && deltaY >= lastDeltaY && startedFalling) { + final boolean invalid = !ground && !lastOnGround && deltaY >= lastDeltaY && startedFalling; + final boolean exempt = this.isExempt( + ExemptType.VEHICLE, + ExemptType.VELOCITY, + ExemptType.PISTON, + ExemptType.CLIMBABLE, + ExemptType.TELEPORT, + ExemptType.BOAT, + ExemptType.TELEPORTED_RECENTLY, + ExemptType.UNDER_BLOCK, + ExemptType.WEB, + ExemptType.FLIGHT, + ExemptType.SLIME, + ExemptType.CHUNK, + ExemptType.LIQUID, + ExemptType.JOIN + ); + + if (invalid && !exempt) { if (this.buffer.increase() > 2) { this.fail("invalid fall motion"); } diff --git a/src/main/java/me/tecnio/ahm/check/impl/groundspoof/GroundSpoofA.java b/src/main/java/me/tecnio/ahm/check/impl/groundspoof/GroundSpoofA.java index e8c7a0d..8085d5e 100644 --- a/src/main/java/me/tecnio/ahm/check/impl/groundspoof/GroundSpoofA.java +++ b/src/main/java/me/tecnio/ahm/check/impl/groundspoof/GroundSpoofA.java @@ -16,7 +16,8 @@ public GroundSpoofA(final PlayerData data) { @Override public void handle(final PositionUpdate update) { - if (this.isExempt(ExemptType.CHUNK, ExemptType.CLIMBABLE, ExemptType.SLIME, ExemptType.BOAT, ExemptType.RETARD)) return; + if (this.isExempt(ExemptType.CHUNK, ExemptType.CLIMBABLE, + ExemptType.SLIME, ExemptType.BOAT, ExemptType.SLOW)) return; final boolean ground = data.getPositionTracker().isOnGround(); final boolean mathGround = data.getPositionTracker().getY() % 0.015625D == 0.0D; diff --git a/src/main/java/me/tecnio/ahm/check/impl/hitbox/HitboxA.java b/src/main/java/me/tecnio/ahm/check/impl/hitbox/HitboxA.java index dde6b1a..e348906 100644 --- a/src/main/java/me/tecnio/ahm/check/impl/hitbox/HitboxA.java +++ b/src/main/java/me/tecnio/ahm/check/impl/hitbox/HitboxA.java @@ -32,52 +32,39 @@ public HitboxA(final PlayerData data) { @Override public void handle(final GPacket packet) { if (packet instanceof PacketPlayClientFlying && this.target != null) { - // As we are brute forcing some possibilities, we just need to see if any of them intersected; boolean intersection = false; - // These are the tracked positions of the target that was attacked; final double targetX = this.target.getPosX(); final double targetY = this.target.getPosY(); final double targetZ = this.target.getPosZ(); - // As we are going to ray-cast we need to create an appropriately sized bounding box for the target. AxisAlignedBB boundingBox = new AxisAlignedBB( targetX - 0.4F, targetY - 0.1F, targetZ - 0.4F, targetX + 0.4F, targetY + 1.9F, targetZ + 0.4F ); - // Because of something called 0.03 we sometimes get uncertainty in the position of the attacker. - // To handle this we can just add a 0.03 block leniency on the targets bounding box. - // Not a perfect solution but a valid one for sure. - if (this.isExempt(ExemptType.RETARD)) boundingBox = boundingBox.expand(0.03, 0.03, 0.03); + if (this.isExempt(ExemptType.SLOW)) boundingBox = boundingBox.expand(0.03, 0.03, 0.03); - // On 1.8.9, the rotations of the player is a tick behind but very popular mods like OptiFine fix this problem, - // and therefore we have to handle them as well. for (final boolean rotation : BOOLEANS) { - // This is for the sneaking status of the player, because the latest sneaking position doesn't work - // and I can't be asked to find the proper sneaking state of the player, we are brute forcing it. for (final boolean sneak : BOOLEANS) { - // These are the yaw and pitch of the player. For the explanation of this read the rotation iterations comment. - final float yaw = rotation ? data.getRotationTracker().getYaw() : data.getRotationTracker().getLastYaw(); - final float pitch = rotation ? data.getRotationTracker().getPitch() : data.getRotationTracker().getLastPitch(); + final float yaw = rotation + ? data.getRotationTracker().getYaw() + : data.getRotationTracker().getLastYaw(); + final float pitch = data.getRotationTracker().getPitch(); - // This is where we do the actual ray-casting. final MovingObjectPosition result = this.rayCast(yaw, pitch, sneak, boundingBox); - // Here, if we have an intersection we set the intersection variable to true, if else it stays false. intersection |= result != null && result.hitVec != null; } } final Player target = (Player) data.getActionTracker().getTarget(); - // These are some scenarios the check wouldn't work and instead of properly handling it, we are returning - // because who actually gives a fuck about these scenarios. final boolean exempt = data.getPlayer().getGameMode() == GameMode.CREATIVE - || target.isInsideVehicle() || target.isSleeping(); + || target.isInsideVehicle() + || target.isSleeping(); if (!intersection && !exempt) { - // This check does need some buffer as it's not flawless but the concept is there, ready to be expanded on. if (this.buffer.increase() > 2) { this.fail(); } @@ -92,7 +79,8 @@ else if (packet instanceof PacketPlayClientUseEntity) { final GPacketPlayClientUseEntity wrapper = ((GPacketPlayClientUseEntity) packet); if (wrapper.getType() == PlayerEnums.UseType.ATTACK) { - this.target = data.getEntityTracker().getTrackerMap().getOrDefault(wrapper.getEntityId(), null); + this.target = data.getEntityTracker().getTrackerMap() + .get(wrapper.getEntityId()); } } } @@ -111,7 +99,6 @@ private MovingObjectPosition rayCast(final float yaw, final float pitch, final b return bb.calculateIntercept(vec3, vec32); } - // better not be using fastmath my guy private Vec3 getVectorForRotation(final float pitch, final float yaw) { final float f = MathHelper.cos(-yaw * 0.017453292F - (float) Math.PI); final float f1 = MathHelper.sin(-yaw * 0.017453292F - (float) Math.PI); diff --git a/src/main/java/me/tecnio/ahm/check/impl/interact/InteractC.java b/src/main/java/me/tecnio/ahm/check/impl/interact/InteractC.java index 70aeb45..c8c40b8 100644 --- a/src/main/java/me/tecnio/ahm/check/impl/interact/InteractC.java +++ b/src/main/java/me/tecnio/ahm/check/impl/interact/InteractC.java @@ -11,6 +11,7 @@ @CheckManifest(name = "Interact", type = "C", description = "Checks for baritone rotations") public class InteractC extends Check implements PacketCheck { + public InteractC(PlayerData data) { super(data); } diff --git a/src/main/java/me/tecnio/ahm/check/impl/protocol/ProtocolA.java b/src/main/java/me/tecnio/ahm/check/impl/protocol/ProtocolA.java index 66189ff..787c15d 100644 --- a/src/main/java/me/tecnio/ahm/check/impl/protocol/ProtocolA.java +++ b/src/main/java/me/tecnio/ahm/check/impl/protocol/ProtocolA.java @@ -16,9 +16,11 @@ public ProtocolA(final PlayerData data) { @Override public void handle(final RotationUpdate update) { + if (this.isExempt(ExemptType.TELEPORT)) return; + final float pitch = Math.abs(update.getPitch()); - if (pitch > 90.0F && !this.isExempt(ExemptType.TELEPORT)) { + if (pitch > 90.0F) { this.fail("p: " + pitch); } } diff --git a/src/main/java/me/tecnio/ahm/check/impl/protocol/ProtocolC.java b/src/main/java/me/tecnio/ahm/check/impl/protocol/ProtocolC.java index a861124..4df38f3 100644 --- a/src/main/java/me/tecnio/ahm/check/impl/protocol/ProtocolC.java +++ b/src/main/java/me/tecnio/ahm/check/impl/protocol/ProtocolC.java @@ -23,10 +23,10 @@ public void handle(final GPacket packet) { if (packet instanceof GPacketPlayClientUseEntity) { final GPacketPlayClientUseEntity wrapper = ((GPacketPlayClientUseEntity) packet); - if (wrapper.getType() == PlayerEnums.UseType.ATTACK) { - if (++this.streak > 2) { - this.fail(); - } + if (wrapper.getType() != PlayerEnums.UseType.ATTACK) return; + + if (++this.streak > 2) { + this.fail(); } } else if (packet instanceof GPacketPlayClientArmAnimation) { this.streak = 0; diff --git a/src/main/java/me/tecnio/ahm/check/impl/speed/SpeedA.java b/src/main/java/me/tecnio/ahm/check/impl/speed/SpeedA.java index 5173ebb..61fd023 100644 --- a/src/main/java/me/tecnio/ahm/check/impl/speed/SpeedA.java +++ b/src/main/java/me/tecnio/ahm/check/impl/speed/SpeedA.java @@ -35,37 +35,36 @@ public void handle(final PositionUpdate update) { float friction = 0.91F; if (lastOnGround) friction *= data.getPositionTracker().getSlipperiness(); - // Create a limit for the maximum offset. We assume they are sprinting why not. double movementSpeed = PlayerUtil.getAttributeSpeed(data, true); - // Apply air and ground math depending on the current scenario. if (lastOnGround) { - // Apply ground movement math. movementSpeed *= 0.16277136F / (friction * friction * friction); - // If the player might have jumped compensate for it. This may or may not be abusable (It is - Mexify YW BTW). if (!onGround && deltaY >= 0.0D) { movementSpeed += 0.2D; } } else { - // If the player is in air get the max sprint speed. movementSpeed = (float) ((double) 0.02F + (double) 0.02F * 0.3D); } - // Compensate for velocity. if (data.getVelocityTracker().getTicksSinceVelocity() == 1) { this.motionX = data.getVelocityTracker().getVelocity().getX(); this.motionZ = data.getVelocityTracker().getVelocity().getZ(); } - // Create a ratio for acceleration final double acceleration = (deltaXZ - (MathUtil.hypot(this.motionX, this.motionZ))) / movementSpeed; - final boolean exempt = this.isExempt(ExemptType.TELEPORTED_RECENTLY, ExemptType.PISTON, ExemptType.EXPLOSION, - ExemptType.FLIGHT, ExemptType.CHUNK, ExemptType.RETARD, ExemptType.VEHICLE, ExemptType.LIQUID); - - // Checks if acceleration is impossible and also checks if the player is not moving slow final boolean invalid = acceleration > 1.0D + 1.0E-6 && deltaXZ > 0.2D; + final boolean exempt = this.isExempt( + ExemptType.TELEPORTED_RECENTLY, + ExemptType.PISTON, + ExemptType.EXPLOSION, + ExemptType.FLIGHT, + ExemptType.CHUNK, + ExemptType.SLOW, + ExemptType.VEHICLE, + ExemptType.LIQUID + ); if (invalid && !exempt) { final boolean certain = data.getVelocityTracker().getTicksSinceVelocity() > 2; @@ -78,11 +77,9 @@ public void handle(final PositionUpdate update) { this.buffer.decreaseBy(0.02D); } - // Update motion values this.motionX = deltaX * friction; this.motionZ = deltaZ * friction; - // Low motion if (Math.abs(this.motionX) < 0.005D) this.motionX = 0.0D; if (Math.abs(this.motionZ) < 0.005D) this.motionZ = 0.0D; } diff --git a/src/main/java/me/tecnio/ahm/check/impl/speed/SpeedB.java b/src/main/java/me/tecnio/ahm/check/impl/speed/SpeedB.java index 735a090..e08c9e4 100644 --- a/src/main/java/me/tecnio/ahm/check/impl/speed/SpeedB.java +++ b/src/main/java/me/tecnio/ahm/check/impl/speed/SpeedB.java @@ -21,22 +21,28 @@ public SpeedB(final PlayerData data) { public void handle(final PositionUpdate update) { if (!update.isPosition()) return; - // Get the smallest outcome final double smallest = data.getEmulationTracker().getDistance(); - // This value will determine a compensated value for 0.03 occurring final double compensation = 0.03D * data.getPositionTracker().getDelayedFlyingTicks(); - /* - * We use this in order to set our max offset value this checks if a player is retarded(AKA 0.03 MOST LIKELY OCCURRED) - * if so we compensate for it to prevent false positives, if not we don't have to worry about aids affecting. - */ - final double max = data.getExemptTracker().isExempt(ExemptType.RETARD) ? compensation : 1.0E-14D; + final double max = data.getExemptTracker().isExempt(ExemptType.SLOW) ? compensation : 1.0E-14D; final boolean invalid = smallest > max; - final boolean exempt = this.isExempt(ExemptType.JOIN, ExemptType.TELEPORTED_RECENTLY, ExemptType.PISTON, - ExemptType.FLIGHT, ExemptType.LIQUID, ExemptType.SLIME, ExemptType.VEHICLE, ExemptType.CHUNK, - ExemptType.CLIMBABLE, ExemptType.SOUL_SAND, ExemptType.WEB, ExemptType.ICE, ExemptType.WALL, - ExemptType.STEP, ExemptType.SNEAK_EDGE + final boolean exempt = this.isExempt( + ExemptType.JOIN, + ExemptType.TELEPORTED_RECENTLY, + ExemptType.PISTON, + ExemptType.FLIGHT, + ExemptType.LIQUID, + ExemptType.SLIME, + ExemptType.VEHICLE, + ExemptType.CHUNK, + ExemptType.CLIMBABLE, + ExemptType.SOUL_SAND, + ExemptType.WEB, + ExemptType.ICE, + ExemptType.WALL, + ExemptType.STEP, + ExemptType.SNEAK_EDGE ); if (invalid && !exempt) { diff --git a/src/main/java/me/tecnio/ahm/check/impl/timer/TimerA.java b/src/main/java/me/tecnio/ahm/check/impl/timer/TimerA.java index 7a9d4b2..5b452d9 100644 --- a/src/main/java/me/tecnio/ahm/check/impl/timer/TimerA.java +++ b/src/main/java/me/tecnio/ahm/check/impl/timer/TimerA.java @@ -28,7 +28,6 @@ public void handle(final GPacket packet) { final long delay = packet.getTimestamp() - this.lastFlying; - // Update allowance using balance system this.allowance += 50L; this.allowance -= delay; diff --git a/src/main/java/me/tecnio/ahm/check/impl/velocity/VelocityA.java b/src/main/java/me/tecnio/ahm/check/impl/velocity/VelocityA.java index 9d5c4e3..680aa51 100644 --- a/src/main/java/me/tecnio/ahm/check/impl/velocity/VelocityA.java +++ b/src/main/java/me/tecnio/ahm/check/impl/velocity/VelocityA.java @@ -7,9 +7,6 @@ import me.tecnio.ahm.exempt.ExemptType; import me.tecnio.ahm.update.PositionUpdate; -/** - * Check to detect any horizontal velocity modification. - */ @CheckManifest(name = "Velocity", type = "A", description = "Detects for any horizontal velocity modification.") public final class VelocityA extends Check implements PositionCheck { @@ -19,21 +16,31 @@ public VelocityA(final PlayerData data) { @Override public void handle(final PositionUpdate update) { - // Check if recent velocity update if (data.getVelocityTracker().getTicksSinceVelocity() > 8) return; - // Calculate the distance and compensation for delayed flying ticks final double distance = data.getEmulationTracker().getDistance(); final double compensation = 0.03D * data.getPositionTracker().getDelayedFlyingTicks(); - // Check if the distance is invalid and handle exemptions - final boolean invalid = distance > (this.isExempt(ExemptType.RETARD) ? compensation : 1.0E-07); - final boolean exempt = this.isExempt(ExemptType.JOIN, ExemptType.TELEPORTED_RECENTLY, ExemptType.PISTON, - ExemptType.FLIGHT, ExemptType.LIQUID, ExemptType.SLIME, ExemptType.VEHICLE, ExemptType.CHUNK, - ExemptType.CLIMBABLE, ExemptType.SOUL_SAND, ExemptType.WEB, ExemptType.ICE, ExemptType.RETARD, - ExemptType.WALL, ExemptType.STEP, ExemptType.GHOST_WALL); + final boolean invalid = distance > (this.isExempt(ExemptType.SLOW) ? compensation : 1.0E-07); + final boolean exempt = this.isExempt( + ExemptType.JOIN, + ExemptType.TELEPORTED_RECENTLY, + ExemptType.PISTON, + ExemptType.FLIGHT, + ExemptType.LIQUID, + ExemptType.SLIME, + ExemptType.VEHICLE, + ExemptType.CHUNK, + ExemptType.CLIMBABLE, + ExemptType.SOUL_SAND, + ExemptType.WEB, + ExemptType.ICE, + ExemptType.SLOW, + ExemptType.WALL, + ExemptType.STEP, + ExemptType.GHOST_WALL + ); - // Check if invalid and increase buffer, or decrease buffer if valid if (invalid && !exempt) { if (this.buffer.increase() > 3) { this.fail("o: " + distance); diff --git a/src/main/java/me/tecnio/ahm/check/impl/velocity/VelocityB.java b/src/main/java/me/tecnio/ahm/check/impl/velocity/VelocityB.java index 86b72da..780cf05 100644 --- a/src/main/java/me/tecnio/ahm/check/impl/velocity/VelocityB.java +++ b/src/main/java/me/tecnio/ahm/check/impl/velocity/VelocityB.java @@ -8,9 +8,6 @@ import me.tecnio.ahm.update.PositionUpdate; import org.bukkit.potion.PotionEffectType; -/** - * Check to detect vertical velocity modifications. - */ @CheckManifest(name = "Velocity", type = "B", description = "Checks for vertical velocity modifications.") public final class VelocityB extends Check implements PositionCheck { @@ -20,36 +17,40 @@ public VelocityB(final PlayerData data) { @Override public void handle(final PositionUpdate update) { - // Check if recent velocity update if (data.getVelocityTracker().getTicksSinceVelocity() != 1) return; - // Calculate expected jump motion final float expectedJumpMotion = 0.42F + (data.getAttributeTracker().getPotionLevel(PotionEffectType.JUMP) * 0.1F); - // Get delta Y and velocity Y final double deltaY = data.getPositionTracker().getDeltaY(); final double velocityY = data.getVelocityTracker().getVelocity().getY(); - // Calculate offsets final double offset = Math.abs(deltaY - velocityY); final double jumpOffset = Math.abs(deltaY - expectedJumpMotion); - // Calculate compensation and maximum threshold final double compensation = 0.03D * data.getPositionTracker().getDelayedFlyingTicks(); - final double max = (this.isExempt(ExemptType.RETARD) ? compensation : 1.0E-08); + final double max = (this.isExempt(ExemptType.SLOW) ? compensation : 1.0E-08); - // Check primary and secondary conditions for invalidity final boolean primary = offset > max && jumpOffset > 1.0E-08; final boolean secondary = offset > max && jumpOffset > max && data.getEmulationTracker().isJump(); - // Check for invalid vertical velocity modification final boolean invalid = (primary || secondary) && velocityY > 0.05; - final boolean exempt = this.isExempt(ExemptType.JOIN, ExemptType.TELEPORTED_RECENTLY, ExemptType.PISTON, - ExemptType.FLIGHT, ExemptType.LIQUID, ExemptType.SLIME, ExemptType.VEHICLE, ExemptType.CHUNK, - ExemptType.CLIMBABLE, ExemptType.SOUL_SAND, ExemptType.WEB, ExemptType.ICE, ExemptType.UNDER_BLOCK, - ExemptType.STEP); + final boolean exempt = this.isExempt( + ExemptType.JOIN, + ExemptType.TELEPORTED_RECENTLY, + ExemptType.PISTON, + ExemptType.FLIGHT, + ExemptType.LIQUID, + ExemptType.SLIME, + ExemptType.VEHICLE, + ExemptType.CHUNK, + ExemptType.CLIMBABLE, + ExemptType.SOUL_SAND, + ExemptType.WEB, + ExemptType.ICE, + ExemptType.UNDER_BLOCK, + ExemptType.STEP + ); - // Check if invalid and increase buffer, or decrease buffer if valid if (invalid && !exempt) { if (this.buffer.increase() > 2) { this.fail(); diff --git a/src/main/java/me/tecnio/ahm/check/impl/velocity/VelocityC.java b/src/main/java/me/tecnio/ahm/check/impl/velocity/VelocityC.java index 11ca44c..fb9eabb 100644 --- a/src/main/java/me/tecnio/ahm/check/impl/velocity/VelocityC.java +++ b/src/main/java/me/tecnio/ahm/check/impl/velocity/VelocityC.java @@ -7,9 +7,6 @@ import me.tecnio.ahm.exempt.ExemptType; import me.tecnio.ahm.update.PositionUpdate; -/** - * Check to detect vertical velocity modifications. - */ @CheckManifest(name = "Velocity", type = "C", description = "Checks for vertical velocity modifications.") public final class VelocityC extends Check implements PositionCheck { @@ -21,25 +18,32 @@ public VelocityC(final PlayerData data) { @Override public void handle(final PositionUpdate update) { - // Check if recent velocity update if (data.getVelocityTracker().getTicksSinceVelocity() > 3) return; - // If first tick after velocity update, store the initial velocity if (data.getVelocityTracker().getTicksSinceVelocity() == 1) { this.velocity = data.getVelocityTracker().getVelocity().getY(); } - // Get delta Y and calculate percentage change in Y velocity final double deltaY = data.getPositionTracker().getDeltaY(); - final float percentage = (float) (deltaY / this.velocity); + final double percentage = deltaY / this.velocity; + + final boolean exempt = this.isExempt( + ExemptType.JOIN, + ExemptType.TELEPORTED_RECENTLY, + ExemptType.PISTON, + ExemptType.FLIGHT, + ExemptType.LIQUID, + ExemptType.SLIME, + ExemptType.VEHICLE, + ExemptType.CHUNK, + ExemptType.CLIMBABLE, + ExemptType.SOUL_SAND, + ExemptType.WEB, + ExemptType.ICE, + ExemptType.UNDER_BLOCK, + ExemptType.STEP + ) || update.isOnGround(); - // Check exemptions - final boolean exempt = this.isExempt(ExemptType.JOIN, ExemptType.TELEPORTED_RECENTLY, ExemptType.PISTON, - ExemptType.FLIGHT, ExemptType.LIQUID, ExemptType.SLIME, ExemptType.VEHICLE, ExemptType.CHUNK, - ExemptType.CLIMBABLE, ExemptType.SOUL_SAND, ExemptType.WEB, ExemptType.ICE, ExemptType.UNDER_BLOCK, - ExemptType.STEP) || update.isOnGround(); - - // Check if percentage change is less than 1 and velocity is positive, and increase buffer if invalid if (percentage < 1 && this.velocity > 0 && !exempt) { if (this.buffer.increase() > 7) { this.fail("p: %s", (percentage * 100)); @@ -48,7 +52,6 @@ public void handle(final PositionUpdate update) { this.buffer.decreaseBy(0.125); } - // Update and decay the velocity this.velocity -= 0.08D; this.velocity *= 0.9800000190734863D; diff --git a/src/main/java/me/tecnio/ahm/command/AHMCommand.java b/src/main/java/me/tecnio/ahm/command/AntiHaxermanCommand.java similarity index 84% rename from src/main/java/me/tecnio/ahm/command/AHMCommand.java rename to src/main/java/me/tecnio/ahm/command/AntiHaxermanCommand.java index a0bfa99..044ac06 100644 --- a/src/main/java/me/tecnio/ahm/command/AHMCommand.java +++ b/src/main/java/me/tecnio/ahm/command/AntiHaxermanCommand.java @@ -10,7 +10,7 @@ import java.util.List; @Getter -public class AHMCommand extends BaseCommand { +public class AntiHaxermanCommand extends BaseCommand { public void sendLineBreak(final CommandSender sender) { sender.sendMessage(ChatUtil.translate("&7&m-------------------------------------------------")); @@ -29,7 +29,8 @@ public void sendMessage(final Player sender, final String message) { } @Override - public List tabComplete(final CommandIssuer issuer, final String commandLabel, final String[] args, final boolean isAsync) throws IllegalArgumentException { + public List tabComplete(final CommandIssuer issuer, final String commandLabel, + final String[] args, final boolean isAsync) throws IllegalArgumentException { return super.tabComplete(issuer, commandLabel, args, isAsync); } } diff --git a/src/main/java/me/tecnio/ahm/command/impl/AlertsCommand.java b/src/main/java/me/tecnio/ahm/command/impl/AlertsCommand.java index 263a5f8..e2fb578 100644 --- a/src/main/java/me/tecnio/ahm/command/impl/AlertsCommand.java +++ b/src/main/java/me/tecnio/ahm/command/impl/AlertsCommand.java @@ -4,9 +4,9 @@ import co.aikar.commands.annotation.CommandPermission; import co.aikar.commands.annotation.Description; import co.aikar.commands.annotation.Subcommand; -import me.tecnio.ahm.AHM; +import me.tecnio.ahm.AntiHaxerman; import me.tecnio.ahm.alert.AlertManager; -import me.tecnio.ahm.command.AHMCommand; +import me.tecnio.ahm.command.AntiHaxermanCommand; import me.tecnio.ahm.data.PlayerData; import me.tecnio.ahm.data.PlayerDataManager; import me.tecnio.ahm.util.string.ChatUtil; @@ -14,7 +14,7 @@ import org.bukkit.entity.Player; @CommandAlias("ahm") -public class AlertsCommand extends AHMCommand { +public class AlertsCommand extends AntiHaxermanCommand { @Subcommand("alerts") @Description("Toggles your anti-cheat alerts") @@ -26,9 +26,9 @@ public void onCommand(final CommandSender sender) { } final Player player = ((Player) sender).getPlayer(); - final PlayerData data = AHM.get(PlayerDataManager.class).getPlayerData(player.getUniqueId()); + final PlayerData data = AntiHaxerman.get(PlayerDataManager.class).get(player.getUniqueId()); - if (AHM.get(AlertManager.class).toggleAlerts(data)) { + if (AntiHaxerman.get(AlertManager.class).toggleAlerts(data)) { player.sendMessage(ChatUtil.translate("&aYou are now viewing alerts!")); } else { player.sendMessage(ChatUtil.translate("&cYou are no longer viewing alerts!")); diff --git a/src/main/java/me/tecnio/ahm/command/impl/ChecksCommand.java b/src/main/java/me/tecnio/ahm/command/impl/ChecksCommand.java index bb799b3..231d932 100644 --- a/src/main/java/me/tecnio/ahm/command/impl/ChecksCommand.java +++ b/src/main/java/me/tecnio/ahm/command/impl/ChecksCommand.java @@ -2,13 +2,16 @@ import co.aikar.commands.annotation.*; import co.aikar.commands.bukkit.contexts.OnlinePlayer; -import me.tecnio.ahm.AHM; +import me.tecnio.ahm.AntiHaxerman; import me.tecnio.ahm.check.Check; -import me.tecnio.ahm.command.AHMCommand; +import me.tecnio.ahm.command.AntiHaxermanCommand; import me.tecnio.ahm.data.PlayerData; import me.tecnio.ahm.data.PlayerDataManager; import me.tecnio.ahm.util.string.ChatUtil; -import net.md_5.bungee.api.chat.*; +import net.md_5.bungee.api.chat.BaseComponent; +import net.md_5.bungee.api.chat.ComponentBuilder; +import net.md_5.bungee.api.chat.HoverEvent; +import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -16,14 +19,14 @@ import java.util.List; @CommandAlias("ahm") -public class ChecksCommand extends AHMCommand { +public class ChecksCommand extends AntiHaxermanCommand { @Subcommand("checks") @Description("View enabled checks for player") @CommandPermission("ahm.checks") public void onCommand(final CommandSender sender, @Name("target") final OnlinePlayer onlinePlayer) { final Player player = onlinePlayer.getPlayer(); - final PlayerData data = AHM.get(PlayerDataManager.class).getPlayerData(player.getUniqueId()); + final PlayerData data = AntiHaxerman.get(PlayerDataManager.class).get(player.getUniqueId()); sendLineBreak(sender); sendMessage(sender, "&cChecks for &f" + player.getName() + "&c:"); diff --git a/src/main/java/me/tecnio/ahm/command/impl/DefaultCommand.java b/src/main/java/me/tecnio/ahm/command/impl/DefaultCommand.java index 5485d85..ae5f33d 100644 --- a/src/main/java/me/tecnio/ahm/command/impl/DefaultCommand.java +++ b/src/main/java/me/tecnio/ahm/command/impl/DefaultCommand.java @@ -2,11 +2,11 @@ import co.aikar.commands.CommandHelp; import co.aikar.commands.annotation.*; -import me.tecnio.ahm.command.AHMCommand; +import me.tecnio.ahm.command.AntiHaxermanCommand; import org.bukkit.command.CommandSender; @CommandAlias("ahm") -public class DefaultCommand extends AHMCommand { +public class DefaultCommand extends AntiHaxermanCommand { @HelpCommand @Description("AntiHaxerman help command") @@ -17,8 +17,8 @@ public void onHelp(final CommandSender sender, final CommandHelp commandHelp) { sendMessage(sender, "&cAntiHaxerman commands:"); - // whoever coded this fix this monstrosity. or ur fired - commandHelp.getHelpEntries().forEach(command -> sendMessage(sender, " &f- &c" + command.getCommandPrefix() + command.getCommand() + " &7" + command.getParameterSyntax() + " &8- &c" + command.getDescription())); + commandHelp.getHelpEntries().forEach(command -> sendMessage(sender, " &f- &c" + command.getCommandPrefix() + + command.getCommand() + " &7" + command.getParameterSyntax() + " &8- &c" + command.getDescription())); sendMessage(sender, String.format("&7Total of &c%s &7commands.", commandHelp.getHelpEntries().size())); sendLineBreak(sender); diff --git a/src/main/java/me/tecnio/ahm/command/impl/InfoCommand.java b/src/main/java/me/tecnio/ahm/command/impl/InfoCommand.java index 9f571f7..4b6f91e 100644 --- a/src/main/java/me/tecnio/ahm/command/impl/InfoCommand.java +++ b/src/main/java/me/tecnio/ahm/command/impl/InfoCommand.java @@ -2,8 +2,8 @@ import co.aikar.commands.annotation.*; import co.aikar.commands.bukkit.contexts.OnlinePlayer; -import me.tecnio.ahm.AHM; -import me.tecnio.ahm.command.AHMCommand; +import me.tecnio.ahm.AntiHaxerman; +import me.tecnio.ahm.command.AntiHaxermanCommand; import me.tecnio.ahm.data.PlayerData; import me.tecnio.ahm.data.PlayerDataManager; import org.bukkit.command.CommandSender; @@ -14,17 +14,19 @@ import java.util.List; @CommandAlias("ahm") -public class InfoCommand extends AHMCommand { +public class InfoCommand extends AntiHaxermanCommand { @Subcommand("info") @Description("View information about a player") @CommandPermission("ahm.info") public void onCommand(final CommandSender sender, @Name("target") final OnlinePlayer onlinePlayer) { final Player player = onlinePlayer.getPlayer(); - final PlayerData data = AHM.get(PlayerDataManager.class).getPlayerData(player.getUniqueId()); + final PlayerData data = AntiHaxerman.get(PlayerDataManager.class).get(player.getUniqueId()); - final String lastTransaction = new SimpleDateFormat("hh:mm:ss:ms aaa").format(data.getConnectionTracker().getLastTransaction()); - final String lastEntity = data.getActionTracker().getTarget() == null ? "None" : data.getActionTracker().getTarget().getName(); + final String lastTransaction = new SimpleDateFormat("hh:mm:ss:ms aaa") + .format(data.getConnectionTracker().getLastTransaction()); + final String lastEntity = data.getActionTracker().getTarget() == null + ? "None" : data.getActionTracker().getTarget().getName(); final List message = Arrays.asList( "&cInformation for &f" + player.getName() + "&c:", diff --git a/src/main/java/me/tecnio/ahm/config/ConfigManager.java b/src/main/java/me/tecnio/ahm/config/ConfigManager.java index cca93bb..cb0a1e7 100644 --- a/src/main/java/me/tecnio/ahm/config/ConfigManager.java +++ b/src/main/java/me/tecnio/ahm/config/ConfigManager.java @@ -3,7 +3,7 @@ import com.google.common.collect.Maps; import lombok.Getter; import lombok.SneakyThrows; -import me.tecnio.ahm.AHM; +import me.tecnio.ahm.AntiHaxerman; import me.tecnio.ahm.check.api.CheckManager; import me.tecnio.ahm.check.api.annotations.CheckManifest; import org.bukkit.configuration.file.FileConfiguration; @@ -24,16 +24,12 @@ public final class ConfigManager { @SneakyThrows public void generate() { - final JavaPlugin plugin = AHM.get().getPlugin(); + final JavaPlugin plugin = AntiHaxerman.get().getPlugin(); final FileConfiguration config = plugin.getConfig(); - final List> checks = AHM.get(CheckManager.class).getChecks(); + final List> checks = AntiHaxerman.get(CheckManager.class).getChecks(); plugin.saveDefaultConfig(); - /* - * Simple config generation, no need to make it more complicated and it is quite - * easy to navigate, this also allows us to have the default values saved on temp - */ for (final Class check : checks) { final CheckManifest info = check.getAnnotation(CheckManifest.class); @@ -61,20 +57,16 @@ public void generate() { write(commands, Collections.singletonList("ban %player% Cheating")); } - /* - * Make sure to make the config changes before this point, otherwise - * they will only be saved on temp and it wont function properly - */ plugin.saveConfig(); plugin.reloadConfig(); } @SneakyThrows public void load() { - final JavaPlugin plugin = AHM.get().getPlugin(); + final JavaPlugin plugin = AntiHaxerman.get().getPlugin(); final FileConfiguration config = plugin.getConfig(); - final List> checks = AHM.get(CheckManager.class).getChecks(); + final List> checks = AntiHaxerman.get(CheckManager.class).getChecks(); plugin.saveDefaultConfig(); @@ -102,7 +94,7 @@ public void load() { } private void write(final String header, final Object value) { - final JavaPlugin plugin = AHM.get().getPlugin(); + final JavaPlugin plugin = AntiHaxerman.get().getPlugin(); if (plugin.getConfig().contains(header)) return; diff --git a/src/main/java/me/tecnio/ahm/data/PlayerData.java b/src/main/java/me/tecnio/ahm/data/PlayerData.java index fa3012b..bbd83b8 100644 --- a/src/main/java/me/tecnio/ahm/data/PlayerData.java +++ b/src/main/java/me/tecnio/ahm/data/PlayerData.java @@ -4,7 +4,7 @@ import cc.ghast.packet.PacketAPI; import lombok.Getter; import lombok.Setter; -import me.tecnio.ahm.AHM; +import me.tecnio.ahm.AntiHaxerman; import me.tecnio.ahm.alert.AlertManager; import me.tecnio.ahm.check.Check; import me.tecnio.ahm.check.api.CheckManager; @@ -80,7 +80,7 @@ public PlayerData(final Player player) { }; this.exemptTracker = new ExemptTracker(this); - this.checks = AHM.get(CheckManager.class).loadChecks(this); + this.checks = AntiHaxerman.get(CheckManager.class).loadChecks(this); this.packetChecks = this.checks.stream().filter(check -> check instanceof PacketCheck) .map(check -> ((PacketCheck) check)).collect(Collectors.toList()); @@ -89,11 +89,11 @@ public PlayerData(final Player player) { this.rotationChecks = this.checks.stream().filter(check -> check instanceof RotationCheck) .map(check -> ((RotationCheck) check)).collect(Collectors.toList()); - if (this.player.hasPermission("ahm.alerts")) AHM.get(AlertManager.class).toggleAlerts(this); + if (this.player.hasPermission("ahm.alerts")) AntiHaxerman.get(AlertManager.class).toggleAlerts(this); } public void terminate() { - AHM.get(AlertManager.class).getPlayers().remove(this); + AntiHaxerman.get(AlertManager.class).getPlayers().remove(this); } public void updateTicks() { @@ -105,7 +105,7 @@ public void haram() { } public void haram(final String reason) { - Bukkit.getScheduler().runTask(AHM.get().getPlugin(), () -> this.player.kickPlayer(reason)); + Bukkit.getScheduler().runTask(AntiHaxerman.get().getPlugin(), () -> this.player.kickPlayer(reason)); } public void send(final GPacket packet) { diff --git a/src/main/java/me/tecnio/ahm/data/PlayerDataManager.java b/src/main/java/me/tecnio/ahm/data/PlayerDataManager.java index a983ea9..51e061d 100644 --- a/src/main/java/me/tecnio/ahm/data/PlayerDataManager.java +++ b/src/main/java/me/tecnio/ahm/data/PlayerDataManager.java @@ -2,22 +2,20 @@ import org.bukkit.entity.Player; -import java.util.Collection; import java.util.Map; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; public final class PlayerDataManager { - // skidded from OG AHM... W private final Map playerDataMap = new ConcurrentHashMap<>(); - public PlayerData getPlayerData(final UUID uuid) { - return playerDataMap.getOrDefault(uuid, null); + public PlayerData get(final UUID uuid) { + return this.playerDataMap.get(uuid); } public void add(final Player player) { - playerDataMap.put(player.getUniqueId(), new PlayerData(player)); + this.playerDataMap.put(player.getUniqueId(), new PlayerData(player)); } public boolean has(final Player player) { @@ -25,10 +23,6 @@ public boolean has(final Player player) { } public void remove(final Player player) { - playerDataMap.remove(player.getUniqueId()); - } - - public Collection getAllData() { - return playerDataMap.values(); + this.playerDataMap.remove(player.getUniqueId()); } } \ No newline at end of file diff --git a/src/main/java/me/tecnio/ahm/data/tracker/impl/ConnectionTracker.java b/src/main/java/me/tecnio/ahm/data/tracker/impl/ConnectionTracker.java index 7f37570..263d377 100644 --- a/src/main/java/me/tecnio/ahm/data/tracker/impl/ConnectionTracker.java +++ b/src/main/java/me/tecnio/ahm/data/tracker/impl/ConnectionTracker.java @@ -10,24 +10,25 @@ import lombok.Getter; import me.tecnio.ahm.data.PlayerData; import me.tecnio.ahm.data.tracker.Tracker; -import me.tecnio.ahm.util.type.EvictingMap; +import java.util.HashMap; +import java.util.Map; import java.util.Optional; @Getter public final class ConnectionTracker extends Tracker { - private final EvictingMap keepAliveMap = new EvictingMap<>(800); - private final EvictingMap transactionMap = new EvictingMap<>(800); + private final Map keepAliveMap = new HashMap<>(); + private final Map transactionMap = new HashMap<>(); - private final EvictingMap confirmationMap = new EvictingMap<>(800); + private final Map confirmationMap = new HashMap<>(); private int transactionPing, keepAlivePing; private short transactionId = Short.MIN_VALUE; - private int keepAliveId = Short.MIN_VALUE; private long lastFlying, flyingDelay; - private long lastKeepAlive = System.currentTimeMillis(), lastTransaction = System.currentTimeMillis(); + private long lastKeepAlive = System.currentTimeMillis(), + lastTransaction = System.currentTimeMillis(); private int ticksSinceLag; @@ -45,17 +46,19 @@ public void handle(final GPacket packet) { final GPacketPlayServerTransaction wrapper = ((GPacketPlayServerTransaction) packet); this.transactionMap.put(wrapper.getActionNumber(), packet.getTimestamp()); - } else if (packet instanceof PacketPlayClientKeepAlive) { + } + + else if (packet instanceof PacketPlayClientKeepAlive) { final PacketPlayClientKeepAlive wrapper = ((PacketPlayClientKeepAlive) packet); this.keepAliveMap.computeIfPresent(wrapper.getId(), (id, time) -> { this.keepAlivePing = (int) (packet.getTimestamp() - time); this.lastKeepAlive = packet.getTimestamp(); - this.keepAliveMap.remove(wrapper.getId()); - return time; }); + + this.keepAliveMap.remove(wrapper.getId()); } else if (packet instanceof PacketPlayClientTransaction) { final PacketPlayClientTransaction wrapper = ((PacketPlayClientTransaction) packet); @@ -63,20 +66,24 @@ public void handle(final GPacket packet) { this.transactionPing = (int) (packet.getTimestamp() - time); this.lastTransaction = packet.getTimestamp(); - this.transactionMap.remove(wrapper.getActionNumber()); - return time; }); + this.transactionMap.remove(wrapper.getActionNumber()); + Optional.ofNullable(this.confirmationMap.remove(wrapper.getActionNumber())) .ifPresent(Runnable::run); - } else if (packet instanceof PacketPlayClientFlying) { + } + + else if (packet instanceof PacketPlayClientFlying) { final long now = packet.getTimestamp(); this.flyingDelay = now - this.lastFlying; this.lastFlying = now; - if (this.flyingDelay < 30 || this.flyingDelay > 70) this.ticksSinceLag = 0; + if (this.flyingDelay < 30 || this.flyingDelay > 70) { + this.ticksSinceLag = 0; + } } } diff --git a/src/main/java/me/tecnio/ahm/data/tracker/impl/GhostBlockTracker.java b/src/main/java/me/tecnio/ahm/data/tracker/impl/GhostBlockTracker.java index 72d40ae..5140589 100644 --- a/src/main/java/me/tecnio/ahm/data/tracker/impl/GhostBlockTracker.java +++ b/src/main/java/me/tecnio/ahm/data/tracker/impl/GhostBlockTracker.java @@ -41,7 +41,7 @@ public void handle(final GPacket packet) { for (final BlockPosition position : this.blockMap.keySet()) { final boolean x = Math.floor(data.getPositionTracker().getX()) == position.getX(); // TODO: 9/7/23 fix artemis packet api insaneness - final boolean y = /*Math.floor(data.getPositionTracker().getY() - 0.03D) == position.getY()*/ true; + final boolean y = true; final boolean z = Math.floor(data.getPositionTracker().getZ()) == position.getZ(); legit |= x && y && z; diff --git a/src/main/java/me/tecnio/ahm/data/tracker/impl/PositionTracker.java b/src/main/java/me/tecnio/ahm/data/tracker/impl/PositionTracker.java index f523ca1..d56a660 100644 --- a/src/main/java/me/tecnio/ahm/data/tracker/impl/PositionTracker.java +++ b/src/main/java/me/tecnio/ahm/data/tracker/impl/PositionTracker.java @@ -14,13 +14,14 @@ import me.tecnio.ahm.util.mcp.MathHelper; import me.tecnio.ahm.util.player.Teleport; import me.tecnio.ahm.util.player.TickTimer; -import me.tecnio.ahm.util.type.EvictingList; import me.tecnio.ahm.util.world.BlockUtil; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.EntityType; +import java.util.ArrayDeque; +import java.util.Deque; import java.util.Set; import java.util.function.Predicate; @@ -65,7 +66,7 @@ public final class PositionTracker extends Tracker { private boolean boat; - private final EvictingList teleportQueue = new EvictingList<>(800); + private final Deque teleportQueue = new ArrayDeque<>(); private boolean teleported; private final TickTimer ticksSinceTeleport = new TickTimer(this.data); @@ -133,7 +134,7 @@ public void handle(final GPacket packet) { if (!(wrapper.isPos() && wrapper.isLook() && !wrapper.isOnGround())) break teleport; - if (this.teleportQueue.size() != 0) { + if (!this.teleportQueue.isEmpty()) { final Teleport teleport = this.teleportQueue.peek(); final Set flags = teleport.getFlags(); @@ -156,7 +157,7 @@ public void handle(final GPacket packet) { data.setTicks(data.getTicks() - 1); - this.teleportQueue.poll(); + this.teleportQueue.removeFirst(); } } } diff --git a/src/main/java/me/tecnio/ahm/exempt/ExemptType.java b/src/main/java/me/tecnio/ahm/exempt/ExemptType.java index b8ee2bc..b3ce32a 100644 --- a/src/main/java/me/tecnio/ahm/exempt/ExemptType.java +++ b/src/main/java/me/tecnio/ahm/exempt/ExemptType.java @@ -24,41 +24,54 @@ public enum ExemptType { VELOCITY(data -> data.getVelocityTracker().getTicksSinceVelocity() == 1), - RETARD(data -> !data.getPositionTracker().isLastPosition() || !data.getPositionTracker().isLastLastPosition()), + SLOW(data -> !data.getPositionTracker().isLastPosition() + || !data.getPositionTracker().isLastLastPosition()), LIQUID(data -> data.getPositionTracker().isWater() || data.getPositionTracker().isLastWater() || data.getPositionTracker().isLava() || data.getPositionTracker().isLastLava()), - WEB(data -> data.getPositionTracker().isWeb() || data.getPositionTracker().isLastWeb()), + WEB(data -> data.getPositionTracker().isWeb() + || data.getPositionTracker().isLastWeb()), - CLIMBABLE(data -> data.getPositionTracker().isClimbable() || data.getPositionTracker().isLastClimbable()), + CLIMBABLE(data -> data.getPositionTracker().isClimbable() + || data.getPositionTracker().isLastClimbable()), - UNDER_BLOCK(data -> data.getPositionTracker().isUnderBlock() || data.getPositionTracker().isLastUnderBlock()), + UNDER_BLOCK(data -> data.getPositionTracker().isUnderBlock() + || data.getPositionTracker().isLastUnderBlock()), - PISTON(data -> data.getPositionTracker().isPiston() || data.getPositionTracker().isLastPiston()), + PISTON(data -> data.getPositionTracker().isPiston() + || data.getPositionTracker().isLastPiston()), BOAT(data -> data.getPositionTracker().isBoat()), - SLIME(data -> data.getPositionTracker().isSlime() || data.getPositionTracker().isLastSlime()), + SLIME(data -> data.getPositionTracker().isSlime() + || data.getPositionTracker().isLastSlime()), - SOUL_SAND(data -> data.getPositionTracker().isSoulSand() || data.getPositionTracker().isLastSoulSand()), + SOUL_SAND(data -> data.getPositionTracker().isSoulSand() + || data.getPositionTracker().isLastSoulSand()), - ICE(data -> data.getPositionTracker().isIce() || data.getPositionTracker().isLastIce()), + ICE(data -> data.getPositionTracker().isIce() + || data.getPositionTracker().isLastIce()), - WALL(data -> data.getPositionTracker().isWall() || data.getPositionTracker().isLastWall()), + WALL(data -> data.getPositionTracker().isWall() + || data.getPositionTracker().isLastWall()), - STEP(data -> data.getPositionTracker().isFucked() || data.getPositionTracker().isLastFucked()), + STEP(data -> data.getPositionTracker().isFucked() + || data.getPositionTracker().isLastFucked()), AIM(data -> data.getActionTracker().getAttackTimer().hasPassed(3) || data.getPositionTracker().getTicksSinceTeleport().hasNotPassed(2)), EXPLOSION(data -> data.getVelocityTracker().getTicksSinceExplosion() < 2), - FLIGHT(data -> data.getPlayer().getAllowFlight() || data.getPlayer().isFlying()), + FLIGHT(data -> data.getPlayer().getAllowFlight() + || data.getPlayer().isFlying()), - SNEAK_EDGE(data -> data.getActionTracker().isSneaking() && data.getPositionTracker().isLastOnGround() && data.getPositionTracker().isAirBelow()), + SNEAK_EDGE(data -> data.getActionTracker().isSneaking() + && data.getPositionTracker().isLastOnGround() + && data.getPositionTracker().isAirBelow()), GHOST_WALL(data -> data.getPositionTracker().isMathCollision()); diff --git a/src/main/java/me/tecnio/ahm/listener/bukkit/RegistrationListener.java b/src/main/java/me/tecnio/ahm/listener/bukkit/RegistrationListener.java index e998ad6..b1de360 100644 --- a/src/main/java/me/tecnio/ahm/listener/bukkit/RegistrationListener.java +++ b/src/main/java/me/tecnio/ahm/listener/bukkit/RegistrationListener.java @@ -1,6 +1,6 @@ package me.tecnio.ahm.listener.bukkit; -import me.tecnio.ahm.AHM; +import me.tecnio.ahm.AntiHaxerman; import me.tecnio.ahm.data.PlayerData; import me.tecnio.ahm.data.PlayerDataManager; import org.bukkit.event.EventHandler; @@ -13,17 +13,17 @@ public final class RegistrationListener implements Listener { @EventHandler(priority = EventPriority.MONITOR) public void onPlayerJoin(final PlayerJoinEvent event) { - AHM.get(PlayerDataManager.class).add(event.getPlayer()); + AntiHaxerman.get(PlayerDataManager.class).add(event.getPlayer()); } @EventHandler(priority = EventPriority.LOWEST) public void onPlayerLeave(final PlayerQuitEvent event) { - final PlayerData data = AHM.get(PlayerDataManager.class).getPlayerData(event.getPlayer().getUniqueId()); + final PlayerDataManager dataManager = AntiHaxerman.get(PlayerDataManager.class); + final PlayerData data = dataManager.get(event.getPlayer().getUniqueId()); if (data == null) return; data.terminate(); - - AHM.get(PlayerDataManager.class).remove(event.getPlayer()); + dataManager.remove(event.getPlayer()); } } diff --git a/src/main/java/me/tecnio/ahm/listener/network/NetworkFilter.java b/src/main/java/me/tecnio/ahm/listener/network/NetworkFilter.java new file mode 100644 index 0000000..0b7591a --- /dev/null +++ b/src/main/java/me/tecnio/ahm/listener/network/NetworkFilter.java @@ -0,0 +1,50 @@ +package me.tecnio.ahm.listener.network; + +import cc.ghast.packet.wrapper.packet.play.client.*; +import cc.ghast.packet.wrapper.packet.play.server.*; + +import java.util.Arrays; +import java.util.HashSet; + +public final class NetworkFilter { + + private final HashSet> filters = new HashSet<>(); + + public NetworkFilter() { + this.filters.addAll(Arrays.asList( + GPacketPlayClientFlying.class, + GPacketPlayClientPosition.class, + GPacketPlayClientPositionLook.class, + GPacketPlayClientLook.class, + GPacketPlayClientUseEntity.class, + GPacketPlayClientKeepAlive.class, + GPacketPlayServerKeepAlive.class, + GPacketPlayClientTransaction.class, + GPacketPlayServerTransaction.class, + GPacketPlayServerEntity.class, + GPacketPlayServerEntity.GPacketPlayServerEntityLook.class, + GPacketPlayServerEntity.GPacketPlayServerRelEntityMove.class, + GPacketPlayServerEntity.GPacketPlayServerRelEntityMoveLook.class, + GPacketPlayServerEntityTeleport.class, + GPacketPlayServerSpawnNamedEntity.class, + GPacketPlayServerEntityDestroy.class, + GPacketPlayClientBlockPlace.class, + GPacketPlayClientArmAnimation.class, + GPacketPlayClientBlockDig.class, + GPacketPlayClientHeldItemSlot.class, + GPacketPlayServerPosition.class, + GPacketPlayServerBlockChange.class, + GPacketPlayServerBlockChangeMulti.class, + GPacketPlayClientEntityAction.class, + GPacketPlayServerEntityEffect.class, + GPacketPlayServerEntityEffectRemove.class, + GPacketPlayServerUpdateAttributes.class, + GPacketPlayServerEntityVelocity.class, + GPacketPlayClientBlockDig.class + )); + } + + public boolean isAllowed(final Class clazz) { + return this.filters.contains(clazz); + } +} diff --git a/src/main/java/me/tecnio/ahm/listener/network/NetworkListener.java b/src/main/java/me/tecnio/ahm/listener/network/NetworkListener.java index 87c38ce..2691d45 100644 --- a/src/main/java/me/tecnio/ahm/listener/network/NetworkListener.java +++ b/src/main/java/me/tecnio/ahm/listener/network/NetworkListener.java @@ -5,45 +5,26 @@ import ac.artemis.packet.spigot.wrappers.GPacket; import ac.artemis.packet.wrapper.Packet; import ac.artemis.packet.wrapper.PacketClient; -import cc.ghast.packet.wrapper.packet.play.client.*; -import cc.ghast.packet.wrapper.packet.play.server.*; -import me.tecnio.ahm.AHM; +import me.tecnio.ahm.AntiHaxerman; import me.tecnio.ahm.data.PlayerData; import me.tecnio.ahm.data.PlayerDataManager; -import java.util.Arrays; -import java.util.HashSet; - public final class NetworkListener implements PacketListener { - private final HashSet> allowedPackets = new HashSet<>(); - - public NetworkListener() { - // I know this shit's ugly, but I really don't give a shit. - this.allowedPackets.addAll(Arrays.asList(GPacketPlayClientFlying.class, GPacketPlayClientPosition.class, - GPacketPlayClientPositionLook.class, GPacketPlayClientLook.class, GPacketPlayClientUseEntity.class, - GPacketPlayClientKeepAlive.class, GPacketPlayServerKeepAlive.class, GPacketPlayClientTransaction.class, - GPacketPlayServerTransaction.class, GPacketPlayServerEntity.class, GPacketPlayServerEntity.GPacketPlayServerEntityLook.class, - GPacketPlayServerEntity.GPacketPlayServerRelEntityMove.class, GPacketPlayServerEntity.GPacketPlayServerRelEntityMoveLook.class, - GPacketPlayServerEntityTeleport.class, GPacketPlayServerSpawnNamedEntity.class, GPacketPlayServerEntityDestroy.class, - GPacketPlayClientBlockPlace.class, GPacketPlayClientArmAnimation.class, GPacketPlayClientBlockDig.class, - GPacketPlayClientHeldItemSlot.class, GPacketPlayServerPosition.class, GPacketPlayServerBlockChange.class, - GPacketPlayServerBlockChangeMulti.class, GPacketPlayClientEntityAction.class, GPacketPlayServerEntityEffect.class, - GPacketPlayServerEntityEffectRemove.class, GPacketPlayServerUpdateAttributes.class, GPacketPlayServerEntityVelocity.class, - GPacketPlayClientBlockDig.class - )); - } + private final NetworkFilter filter = new NetworkFilter(); @Override public void onPacket(final Profile profile, final Packet packet) { - if (profile == null || !this.allowedPackets.contains(packet.getClass())) return; + if (profile == null || !this.filter.isAllowed(packet.getClass())) return; + + final PlayerData data = AntiHaxerman.get(PlayerDataManager.class).get(profile.getUuid()); - final PlayerData data = AHM.get(PlayerDataManager.class).getPlayerData(profile.getUuid()); + if (data == null) return; - if (data != null) { - // TODO: 4/9/2023 switch to ahm executor - if (packet instanceof PacketClient) data.getIncomingPacketProcessor().handle((GPacket) packet); - else data.getOutgoingPacketProcessor().handle((GPacket) packet); + if (packet instanceof PacketClient) { + data.getIncomingPacketProcessor().handle((GPacket) packet); + } else { + data.getOutgoingPacketProcessor().handle((GPacket) packet); } } } diff --git a/src/main/java/me/tecnio/ahm/util/player/PlayerUtil.java b/src/main/java/me/tecnio/ahm/util/player/PlayerUtil.java index 1f9c154..363d2a5 100644 --- a/src/main/java/me/tecnio/ahm/util/player/PlayerUtil.java +++ b/src/main/java/me/tecnio/ahm/util/player/PlayerUtil.java @@ -3,15 +3,8 @@ import cc.ghast.packet.wrapper.packet.play.server.GPacketPlayServerUpdateAttributes; import lombok.experimental.UtilityClass; import me.tecnio.ahm.data.PlayerData; -import org.bukkit.Location; -import org.bukkit.World; -import org.bukkit.entity.Entity; import org.bukkit.potion.PotionEffectType; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - @UtilityClass public final class PlayerUtil { @@ -29,65 +22,15 @@ public float getAttributeSpeed(PlayerData data, boolean sprinting) { } if (data.getAttributeTracker().getPotionLevel(PotionEffectType.SPEED) > 0) { - attributeSpeed += data.getAttributeTracker().getPotionLevel(PotionEffectType.SPEED) * 0.20000000298023224D * attributeSpeed; + attributeSpeed += data.getAttributeTracker() + .getPotionLevel(PotionEffectType.SPEED) * 0.20000000298023224D * attributeSpeed; } if (data.getAttributeTracker().getPotionLevel(PotionEffectType.SLOW) > 0) { - attributeSpeed += data.getAttributeTracker().getPotionLevel(PotionEffectType.SLOW) * -0.15000000596046448D * attributeSpeed; + attributeSpeed += data.getAttributeTracker() + .getPotionLevel(PotionEffectType.SLOW) * -0.15000000596046448D * attributeSpeed; } return (float) attributeSpeed; } - - /** - * Bukkit's getNearbyEntities method looks for all entities in all chunks - * This is a lighter method and can also be used Asynchronously since we won't load any chunks - * - * @param location The location to scan for nearby entities - * @param radius The radius to expand - * @return The entities within that radius - * @author Nik - */ - public List getEntitiesWithinRadius(final Location location, final double radius) { - try { - final double expander = 16.0D; - - final double x = location.getX(); - final double z = location.getZ(); - - final int minX = (int) Math.floor((x - radius) / expander); - final int maxX = (int) Math.floor((x + radius) / expander); - - final int minZ = (int) Math.floor((z - radius) / expander); - final int maxZ = (int) Math.floor((z + radius) / expander); - - final World world = location.getWorld(); - - final List entities = new LinkedList<>(); - - for (int xVal = minX; xVal <= maxX; xVal++) { - - for (int zVal = minZ; zVal <= maxZ; zVal++) { - - if (!world.isChunkLoaded(xVal, zVal)) continue; - - for (final Entity entity : world.getChunkAt(xVal, zVal).getEntities()) { - //We have to do this due to stupidness - if (entity == null) break; - - //Make sure the entity is within the radius specified - if (entity.getLocation().distanceSquared(location) > radius * radius) continue; - - entities.add(entity); - } - } - } - - return entities; - } catch (final Throwable t) { - // I know stfu - } - - return new ArrayList<>(); - } } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 2160230..620fff8 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: AntiHaxerman -version: 4.0.2 -main: me.tecnio.ahm.AHMPlugin +version: 4.0.3 +main: me.tecnio.ahm.AntiHaxermanPlugin authors: [Tecnio, Incognito, aSwitch, Mexify, Cyanade] description: An open-sourced anti-cheat solution. load: STARTUP \ No newline at end of file