diff --git a/API/pom.xml b/API/pom.xml index 2d1a4d7..3c3b4f2 100644 --- a/API/pom.xml +++ b/API/pom.xml @@ -5,9 +5,14 @@ 4.0.0 - dev.brighten.ac API 1.0 + + + dev.brighten.ac + EnterpriseAnticheat + 1.0-SNAPSHOT + UTF-8 @@ -45,12 +50,6 @@ - - org.projectlombok - lombok - 1.18.24 - provided - org.github.spigot 1.8.8 diff --git a/Anticheat/pom.xml b/Anticheat/pom.xml new file mode 100644 index 0000000..465cfa6 --- /dev/null +++ b/Anticheat/pom.xml @@ -0,0 +1,179 @@ + + + 4.0.0 + + AntiCheat + 1.0-SNAPSHOT + + + dev.brighten.ac + EnterpriseAnticheat + 1.0-SNAPSHOT + + + + 8 + 8 + 1.7.10 + + + + + funkemunky-releases + https://nexus.funkemunky.cc/content/repositories/releases/ + + + aikar-snapshots + https://repo.aikar.co/content/repositories/aikar-snapshots/ + + + jitpack.io + https://jitpack.io + + + lucko + https://repo.lucko.me/ + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + 8 + 8 + true + -XDignore.symbol.file + + + org.projectlombok + lombok + 1.18.24 + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.4.1 + + + package + + shade + + + true + + + it.unimi.dsi + + dev.brighten.ac.utils.it.unimi.dsi + + + + + + + + + + src/main/resources + true + + + + + + + dev.brighten.ac + API + 1.0 + compile + + + me.hydro + emulator + 1.2-neo + compile + + + org.github.spigot + 1.13 + 1.13 + provided + + + me.mat1337.loader + loader + 4.1 + provided + + + org.github.spigot + 1.8.8 + 1.8.8 + provided + + + org.github.spigot + 1.7.10 + 1.7.10 + provided + + + it.unimi.dsi + fastutil + 8.5.11 + compile + + + com.shevchik.protocolsupport + protocolsupport + 1.8 + provided + + + us.myles.viaversion + ViaVersion + 2.2.3 + provided + + + com.google.guava + guava + 31.1-jre + provided + + + org.ow2.asm + asm + 9.4 + provided + + + org.ow2.asm + asm-tree + 9.4 + provided + + + com.neovisionaries + nv-websocket-client + 2.14 + + + co.aikar + acf-bukkit + 0.5.1 + compile + + + + \ No newline at end of file diff --git a/src/main/java/dev/brighten/ac/Anticheat.java b/Anticheat/src/main/java/dev/brighten/ac/Anticheat.java similarity index 100% rename from src/main/java/dev/brighten/ac/Anticheat.java rename to Anticheat/src/main/java/dev/brighten/ac/Anticheat.java diff --git a/src/main/java/dev/brighten/ac/check/Check.java b/Anticheat/src/main/java/dev/brighten/ac/check/Check.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/Check.java rename to Anticheat/src/main/java/dev/brighten/ac/check/Check.java diff --git a/src/main/java/dev/brighten/ac/check/CheckConfig.java b/Anticheat/src/main/java/dev/brighten/ac/check/CheckConfig.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/CheckConfig.java rename to Anticheat/src/main/java/dev/brighten/ac/check/CheckConfig.java diff --git a/src/main/java/dev/brighten/ac/check/CheckData.java b/Anticheat/src/main/java/dev/brighten/ac/check/CheckData.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/CheckData.java rename to Anticheat/src/main/java/dev/brighten/ac/check/CheckData.java diff --git a/src/main/java/dev/brighten/ac/check/CheckManager.java b/Anticheat/src/main/java/dev/brighten/ac/check/CheckManager.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/CheckManager.java rename to Anticheat/src/main/java/dev/brighten/ac/check/CheckManager.java diff --git a/src/main/java/dev/brighten/ac/check/CheckSettings.java b/Anticheat/src/main/java/dev/brighten/ac/check/CheckSettings.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/CheckSettings.java rename to Anticheat/src/main/java/dev/brighten/ac/check/CheckSettings.java diff --git a/src/main/java/dev/brighten/ac/check/CheckStatic.java b/Anticheat/src/main/java/dev/brighten/ac/check/CheckStatic.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/CheckStatic.java rename to Anticheat/src/main/java/dev/brighten/ac/check/CheckStatic.java diff --git a/src/main/java/dev/brighten/ac/check/Pre.java b/Anticheat/src/main/java/dev/brighten/ac/check/Pre.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/Pre.java rename to Anticheat/src/main/java/dev/brighten/ac/check/Pre.java diff --git a/src/main/java/dev/brighten/ac/check/WAction.java b/Anticheat/src/main/java/dev/brighten/ac/check/WAction.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/WAction.java rename to Anticheat/src/main/java/dev/brighten/ac/check/WAction.java diff --git a/src/main/java/dev/brighten/ac/check/WCancellable.java b/Anticheat/src/main/java/dev/brighten/ac/check/WCancellable.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/WCancellable.java rename to Anticheat/src/main/java/dev/brighten/ac/check/WCancellable.java diff --git a/src/main/java/dev/brighten/ac/check/WTimedAction.java b/Anticheat/src/main/java/dev/brighten/ac/check/WTimedAction.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/WTimedAction.java rename to Anticheat/src/main/java/dev/brighten/ac/check/WTimedAction.java diff --git a/src/main/java/dev/brighten/ac/check/impl/chat/Log4J.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/chat/Log4J.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/chat/Log4J.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/chat/Log4J.java diff --git a/src/main/java/dev/brighten/ac/check/impl/combat/Hitbox.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/combat/Hitbox.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/combat/Hitbox.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/combat/Hitbox.java diff --git a/src/main/java/dev/brighten/ac/check/impl/combat/aim/Aim.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/combat/aim/Aim.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/combat/aim/Aim.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/combat/aim/Aim.java diff --git a/src/main/java/dev/brighten/ac/check/impl/combat/autoclicker/AutoclickerA.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/combat/autoclicker/AutoclickerA.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/combat/autoclicker/AutoclickerA.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/combat/autoclicker/AutoclickerA.java diff --git a/src/main/java/dev/brighten/ac/check/impl/combat/autoclicker/AutoclickerB.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/combat/autoclicker/AutoclickerB.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/combat/autoclicker/AutoclickerB.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/combat/autoclicker/AutoclickerB.java diff --git a/src/main/java/dev/brighten/ac/check/impl/combat/autoclicker/AutoclickerC.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/combat/autoclicker/AutoclickerC.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/combat/autoclicker/AutoclickerC.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/combat/autoclicker/AutoclickerC.java diff --git a/src/main/java/dev/brighten/ac/check/impl/combat/autoclicker/AutoclickerD.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/combat/autoclicker/AutoclickerD.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/combat/autoclicker/AutoclickerD.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/combat/autoclicker/AutoclickerD.java diff --git a/src/main/java/dev/brighten/ac/check/impl/combat/killaura/KABot.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/combat/killaura/KABot.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/combat/killaura/KABot.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/combat/killaura/KABot.java diff --git a/src/main/java/dev/brighten/ac/check/impl/combat/killaura/KATrace.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/combat/killaura/KATrace.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/combat/killaura/KATrace.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/combat/killaura/KATrace.java diff --git a/src/main/java/dev/brighten/ac/check/impl/misc/BookOp.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/misc/BookOp.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/misc/BookOp.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/misc/BookOp.java diff --git a/src/main/java/dev/brighten/ac/check/impl/misc/HealthSpoof.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/misc/HealthSpoof.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/misc/HealthSpoof.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/misc/HealthSpoof.java diff --git a/src/main/java/dev/brighten/ac/check/impl/misc/inventory/InventoryA.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/misc/inventory/InventoryA.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/misc/inventory/InventoryA.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/misc/inventory/InventoryA.java diff --git a/src/main/java/dev/brighten/ac/check/impl/misc/inventory/InventoryB.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/misc/inventory/InventoryB.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/misc/inventory/InventoryB.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/misc/inventory/InventoryB.java diff --git a/src/main/java/dev/brighten/ac/check/impl/misc/inventory/InventoryC.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/misc/inventory/InventoryC.java similarity index 96% rename from src/main/java/dev/brighten/ac/check/impl/misc/inventory/InventoryC.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/misc/inventory/InventoryC.java index 0933f3c..540cf90 100644 --- a/src/main/java/dev/brighten/ac/check/impl/misc/inventory/InventoryC.java +++ b/Anticheat/src/main/java/dev/brighten/ac/check/impl/misc/inventory/InventoryC.java @@ -22,6 +22,7 @@ public class InventoryC extends Check { WAction flying = packet -> { // If the player isn't sending any rotational or positional updates, then we don't need to check them. if((!packet.isMoved() + || player.getPlayerTick() < 10 // Can false flag on join || (player.getMovement().getDeltaX() == 0 && player.getMovement().getDeltaZ() == 0)) && !packet.isLooked()) return; diff --git a/src/main/java/dev/brighten/ac/check/impl/movement/Phase.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/Phase.java similarity index 93% rename from src/main/java/dev/brighten/ac/check/impl/movement/Phase.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/Phase.java index c5cfda6..21c2930 100644 --- a/src/main/java/dev/brighten/ac/check/impl/movement/Phase.java +++ b/Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/Phase.java @@ -25,7 +25,7 @@ public class Phase extends Check { } private int ticks; - private Set positions = new HashSet<>(); + private final Set POSITIONS = new HashSet<>(); private Location teleportLoc = null; WAction positionOut = packet -> { @@ -47,7 +47,7 @@ public class Phase extends Check { loc.yaw += player.getMovement().getTo().getLoc().yaw; } - positions.add(loc.toVector()); + POSITIONS.add(loc.toVector()); }; WCancellable packet = (packet) -> { @@ -62,14 +62,14 @@ public class Phase extends Check { return false; } - if(positions.size() > 0 && !packet.isOnGround() && positions.stream() + if(POSITIONS.size() > 0 && !packet.isOnGround() && POSITIONS.stream() .anyMatch(v -> v.distanceSquared(player.getMovement().getTo().getLoc().toVector()) < 0.0001)) { debug("Returned: [%s, %s, %s]", player.getMovement().getTo().getX(), player.getMovement().getTo().getY(), player.getMovement().getTo().getZ()); teleportLoc = null; return false; } else if(player.getMovement().getMoveTicks() > 0 && player.getMovement().getTeleportsToConfirm() == 0) { - positions.clear(); + POSITIONS.clear(); } else if(teleportLoc != null) { RunUtils.task(() -> player.getBukkitPlayer().teleport(teleportLoc)); return true; @@ -125,8 +125,8 @@ public class Phase extends Check { flag("x=%.4f, y=%.4f, z=%.4f", dx, dy, dz); } - debug("(%s) [%.5f]: new=[%.3f, %.3f, %.3f] old=[%.3f, %.3f, %.3f]", collisions.size(), totalDelta, deltaX, deltaY, deltaZ, - player.getMovement().getDeltaX(), player.getMovement().getDeltaY(), + debug("(%s) [%.5f]: new=[%.3f, %.3f, %.3f] old=[%.3f, %.3f, %.3f]", collisions.size(), totalDelta, + deltaX, deltaY, deltaZ, player.getMovement().getDeltaX(), player.getMovement().getDeltaY(), player.getMovement().getDeltaZ()); return false; }; diff --git a/src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyA.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyA.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyA.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyA.java diff --git a/src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyB.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyB.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyB.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyB.java diff --git a/src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyC.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyC.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyC.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyC.java diff --git a/src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyD.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyD.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyD.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyD.java diff --git a/src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyE.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyE.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyE.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyE.java diff --git a/src/main/java/dev/brighten/ac/check/impl/movement/nofall/NoFallA.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/nofall/NoFallA.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/movement/nofall/NoFallA.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/nofall/NoFallA.java diff --git a/src/main/java/dev/brighten/ac/check/impl/movement/nofall/NoFallB.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/nofall/NoFallB.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/movement/nofall/NoFallB.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/nofall/NoFallB.java diff --git a/src/main/java/dev/brighten/ac/check/impl/movement/nofall/NoFallC.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/nofall/NoFallC.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/movement/nofall/NoFallC.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/nofall/NoFallC.java diff --git a/src/main/java/dev/brighten/ac/check/impl/movement/speed/Prediction.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/speed/Prediction.java similarity index 96% rename from src/main/java/dev/brighten/ac/check/impl/movement/speed/Prediction.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/speed/Prediction.java index 37fd839..45473ab 100644 --- a/src/main/java/dev/brighten/ac/check/impl/movement/speed/Prediction.java +++ b/Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/speed/Prediction.java @@ -85,8 +85,4 @@ public class Prediction extends Check { lastSkipPos.reset(); } }; - - private static float roundToFloat(double d) { - return (float) ((double) Math.round(d * 1.0E8D) / 1.0E8D); - } } \ No newline at end of file diff --git a/src/main/java/dev/brighten/ac/check/impl/movement/speed/Speed.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/speed/Speed.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/movement/speed/Speed.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/speed/Speed.java diff --git a/src/main/java/dev/brighten/ac/check/impl/movement/velocity/VelocityA.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/velocity/VelocityA.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/movement/velocity/VelocityA.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/velocity/VelocityA.java diff --git a/src/main/java/dev/brighten/ac/check/impl/movement/velocity/VelocityB.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/velocity/VelocityB.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/movement/velocity/VelocityB.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/movement/velocity/VelocityB.java diff --git a/src/main/java/dev/brighten/ac/check/impl/packet/badpackets/Pitch.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/packet/badpackets/Pitch.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/packet/badpackets/Pitch.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/packet/badpackets/Pitch.java diff --git a/src/main/java/dev/brighten/ac/check/impl/packet/order/Place.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/packet/order/Place.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/packet/order/Place.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/packet/order/Place.java diff --git a/src/main/java/dev/brighten/ac/check/impl/packet/order/Timer.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/packet/order/Timer.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/packet/order/Timer.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/packet/order/Timer.java diff --git a/src/main/java/dev/brighten/ac/check/impl/packet/order/UseEntity.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/packet/order/UseEntity.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/packet/order/UseEntity.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/packet/order/UseEntity.java diff --git a/src/main/java/dev/brighten/ac/check/impl/world/BlockA.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/world/BlockA.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/world/BlockA.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/world/BlockA.java diff --git a/src/main/java/dev/brighten/ac/check/impl/world/BlockB.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/world/BlockB.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/world/BlockB.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/world/BlockB.java diff --git a/src/main/java/dev/brighten/ac/check/impl/world/BlockC.java b/Anticheat/src/main/java/dev/brighten/ac/check/impl/world/BlockC.java similarity index 100% rename from src/main/java/dev/brighten/ac/check/impl/world/BlockC.java rename to Anticheat/src/main/java/dev/brighten/ac/check/impl/world/BlockC.java diff --git a/src/main/java/dev/brighten/ac/command/AnticheatCommand.java b/Anticheat/src/main/java/dev/brighten/ac/command/AnticheatCommand.java similarity index 100% rename from src/main/java/dev/brighten/ac/command/AnticheatCommand.java rename to Anticheat/src/main/java/dev/brighten/ac/command/AnticheatCommand.java diff --git a/src/main/java/dev/brighten/ac/command/LogsCommand.java b/Anticheat/src/main/java/dev/brighten/ac/command/LogsCommand.java similarity index 100% rename from src/main/java/dev/brighten/ac/command/LogsCommand.java rename to Anticheat/src/main/java/dev/brighten/ac/command/LogsCommand.java diff --git a/src/main/java/dev/brighten/ac/data/APlayer.java b/Anticheat/src/main/java/dev/brighten/ac/data/APlayer.java similarity index 100% rename from src/main/java/dev/brighten/ac/data/APlayer.java rename to Anticheat/src/main/java/dev/brighten/ac/data/APlayer.java diff --git a/src/main/java/dev/brighten/ac/data/PlayerRegistry.java b/Anticheat/src/main/java/dev/brighten/ac/data/PlayerRegistry.java similarity index 100% rename from src/main/java/dev/brighten/ac/data/PlayerRegistry.java rename to Anticheat/src/main/java/dev/brighten/ac/data/PlayerRegistry.java diff --git a/src/main/java/dev/brighten/ac/data/info/BlockInformation.java b/Anticheat/src/main/java/dev/brighten/ac/data/info/BlockInformation.java similarity index 98% rename from src/main/java/dev/brighten/ac/data/info/BlockInformation.java rename to Anticheat/src/main/java/dev/brighten/ac/data/info/BlockInformation.java index ecc2922..689c7a0 100644 --- a/src/main/java/dev/brighten/ac/data/info/BlockInformation.java +++ b/Anticheat/src/main/java/dev/brighten/ac/data/info/BlockInformation.java @@ -110,7 +110,9 @@ public class BlockInformation { int xstart = Math.min(startX, endX), xend = Math.max(startX, endX); int zstart = Math.min(startZ, endZ), zend = Math.max(startZ, endZ); - SimpleCollisionBox boundsForCollision = player.getMovement().getFrom().getBox() != null ? player.getMovement().getFrom().getBox().copy().shrink(0.001D, 0.001D, 0.001D) : null; + SimpleCollisionBox boundsForCollision = player.getMovement().getFrom().getBox() != null + ? player.getMovement().getFrom().getBox().copy().shrink(0.001D, 0.001D, 0.001D) + : null; IntVector min; IntVector max; @@ -131,7 +133,6 @@ public class BlockInformation { break loop; } - final Material type = player.getBlockUpdateHandler().getBlock(new IntVector(x, y, z)).getType(); @@ -144,7 +145,9 @@ public class BlockInformation { .getBox(player, vec, player.getPlayerVersion()); // Checking of within boundsForCollision - if(x >= min.getX() && x <= max.getX() && y >= min.getY() && y <= max.getY() && z >= min.getZ() && z <= max.getZ()) { + if(x >= min.getX() && x <= max.getX() + && y >= min.getY() && y <= max.getY() + && z >= min.getZ() && z <= max.getZ()) { collisionMaterialCount.compute(type, (key, count) -> { if(count == null) return 1; diff --git a/src/main/java/dev/brighten/ac/data/info/CheckHandler.java b/Anticheat/src/main/java/dev/brighten/ac/data/info/CheckHandler.java similarity index 100% rename from src/main/java/dev/brighten/ac/data/info/CheckHandler.java rename to Anticheat/src/main/java/dev/brighten/ac/data/info/CheckHandler.java diff --git a/src/main/java/dev/brighten/ac/data/info/GeneralInformation.java b/Anticheat/src/main/java/dev/brighten/ac/data/info/GeneralInformation.java similarity index 100% rename from src/main/java/dev/brighten/ac/data/info/GeneralInformation.java rename to Anticheat/src/main/java/dev/brighten/ac/data/info/GeneralInformation.java diff --git a/src/main/java/dev/brighten/ac/data/info/LagInformation.java b/Anticheat/src/main/java/dev/brighten/ac/data/info/LagInformation.java similarity index 100% rename from src/main/java/dev/brighten/ac/data/info/LagInformation.java rename to Anticheat/src/main/java/dev/brighten/ac/data/info/LagInformation.java diff --git a/src/main/java/dev/brighten/ac/data/obj/ActionStore.java b/Anticheat/src/main/java/dev/brighten/ac/data/obj/ActionStore.java similarity index 100% rename from src/main/java/dev/brighten/ac/data/obj/ActionStore.java rename to Anticheat/src/main/java/dev/brighten/ac/data/obj/ActionStore.java diff --git a/src/main/java/dev/brighten/ac/data/obj/CMove.java b/Anticheat/src/main/java/dev/brighten/ac/data/obj/CMove.java similarity index 100% rename from src/main/java/dev/brighten/ac/data/obj/CMove.java rename to Anticheat/src/main/java/dev/brighten/ac/data/obj/CMove.java diff --git a/src/main/java/dev/brighten/ac/data/obj/CancellableActionStore.java b/Anticheat/src/main/java/dev/brighten/ac/data/obj/CancellableActionStore.java similarity index 100% rename from src/main/java/dev/brighten/ac/data/obj/CancellableActionStore.java rename to Anticheat/src/main/java/dev/brighten/ac/data/obj/CancellableActionStore.java diff --git a/src/main/java/dev/brighten/ac/data/obj/InstantAction.java b/Anticheat/src/main/java/dev/brighten/ac/data/obj/InstantAction.java similarity index 100% rename from src/main/java/dev/brighten/ac/data/obj/InstantAction.java rename to Anticheat/src/main/java/dev/brighten/ac/data/obj/InstantAction.java diff --git a/src/main/java/dev/brighten/ac/data/obj/NormalAction.java b/Anticheat/src/main/java/dev/brighten/ac/data/obj/NormalAction.java similarity index 100% rename from src/main/java/dev/brighten/ac/data/obj/NormalAction.java rename to Anticheat/src/main/java/dev/brighten/ac/data/obj/NormalAction.java diff --git a/src/main/java/dev/brighten/ac/data/obj/TimedActionStore.java b/Anticheat/src/main/java/dev/brighten/ac/data/obj/TimedActionStore.java similarity index 100% rename from src/main/java/dev/brighten/ac/data/obj/TimedActionStore.java rename to Anticheat/src/main/java/dev/brighten/ac/data/obj/TimedActionStore.java diff --git a/src/main/java/dev/brighten/ac/depends/LibraryLoader.java b/Anticheat/src/main/java/dev/brighten/ac/depends/LibraryLoader.java similarity index 100% rename from src/main/java/dev/brighten/ac/depends/LibraryLoader.java rename to Anticheat/src/main/java/dev/brighten/ac/depends/LibraryLoader.java diff --git a/src/main/java/dev/brighten/ac/depends/MavenLibraries.java b/Anticheat/src/main/java/dev/brighten/ac/depends/MavenLibraries.java similarity index 100% rename from src/main/java/dev/brighten/ac/depends/MavenLibraries.java rename to Anticheat/src/main/java/dev/brighten/ac/depends/MavenLibraries.java diff --git a/src/main/java/dev/brighten/ac/depends/MavenLibrary.java b/Anticheat/src/main/java/dev/brighten/ac/depends/MavenLibrary.java similarity index 100% rename from src/main/java/dev/brighten/ac/depends/MavenLibrary.java rename to Anticheat/src/main/java/dev/brighten/ac/depends/MavenLibrary.java diff --git a/src/main/java/dev/brighten/ac/depends/Repository.java b/Anticheat/src/main/java/dev/brighten/ac/depends/Repository.java similarity index 100% rename from src/main/java/dev/brighten/ac/depends/Repository.java rename to Anticheat/src/main/java/dev/brighten/ac/depends/Repository.java diff --git a/src/main/java/dev/brighten/ac/depends/URLClassLoaderAccess.java b/Anticheat/src/main/java/dev/brighten/ac/depends/URLClassLoaderAccess.java similarity index 100% rename from src/main/java/dev/brighten/ac/depends/URLClassLoaderAccess.java rename to Anticheat/src/main/java/dev/brighten/ac/depends/URLClassLoaderAccess.java diff --git a/src/main/java/dev/brighten/ac/gui/Logs.java b/Anticheat/src/main/java/dev/brighten/ac/gui/Logs.java similarity index 100% rename from src/main/java/dev/brighten/ac/gui/Logs.java rename to Anticheat/src/main/java/dev/brighten/ac/gui/Logs.java diff --git a/src/main/java/dev/brighten/ac/handler/BBRevealHandler.java b/Anticheat/src/main/java/dev/brighten/ac/handler/BBRevealHandler.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/BBRevealHandler.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/BBRevealHandler.java diff --git a/src/main/java/dev/brighten/ac/handler/EntityLocationHandler.java b/Anticheat/src/main/java/dev/brighten/ac/handler/EntityLocationHandler.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/EntityLocationHandler.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/EntityLocationHandler.java diff --git a/src/main/java/dev/brighten/ac/handler/MovementHandler.java b/Anticheat/src/main/java/dev/brighten/ac/handler/MovementHandler.java similarity index 98% rename from src/main/java/dev/brighten/ac/handler/MovementHandler.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/MovementHandler.java index 1f8fbcb..15a7ead 100644 --- a/src/main/java/dev/brighten/ac/handler/MovementHandler.java +++ b/Anticheat/src/main/java/dev/brighten/ac/handler/MovementHandler.java @@ -134,6 +134,19 @@ public class MovementHandler { IterationResult minimum = null; iteration: { + for (KLocation posLoc : posLocs) { + IterationResult result = player.EMULATOR.runTeleportIteration(new Vector(posLoc.x, posLoc.y, posLoc.z)); + + if (minimum == null || minimum.getOffset() > result.getOffset()) { + minimum = result; + + if(minimum.getOffset() < 1E-26) { + // The player teleported, therefore we don't need to continue with predictions. + break iteration; + } + } + } + for (int forward : FULL_RANGE) { for (int strafe : FULL_RANGE) { for (boolean jumping : getJumpingIterations()) { diff --git a/src/main/java/dev/brighten/ac/handler/PacketHandler.java b/Anticheat/src/main/java/dev/brighten/ac/handler/PacketHandler.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/PacketHandler.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/PacketHandler.java diff --git a/src/main/java/dev/brighten/ac/handler/PotionHandler.java b/Anticheat/src/main/java/dev/brighten/ac/handler/PotionHandler.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/PotionHandler.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/PotionHandler.java diff --git a/src/main/java/dev/brighten/ac/handler/VelocityHandler.java b/Anticheat/src/main/java/dev/brighten/ac/handler/VelocityHandler.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/VelocityHandler.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/VelocityHandler.java diff --git a/src/main/java/dev/brighten/ac/handler/block/BlockUpdateHandler.java b/Anticheat/src/main/java/dev/brighten/ac/handler/block/BlockUpdateHandler.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/block/BlockUpdateHandler.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/block/BlockUpdateHandler.java diff --git a/src/main/java/dev/brighten/ac/handler/block/WrappedBlock.java b/Anticheat/src/main/java/dev/brighten/ac/handler/block/WrappedBlock.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/block/WrappedBlock.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/block/WrappedBlock.java diff --git a/src/main/java/dev/brighten/ac/handler/compat/CompatHandler.java b/Anticheat/src/main/java/dev/brighten/ac/handler/compat/CompatHandler.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/compat/CompatHandler.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/compat/CompatHandler.java diff --git a/src/main/java/dev/brighten/ac/handler/compat/impl/CompatHandler1_13.java b/Anticheat/src/main/java/dev/brighten/ac/handler/compat/impl/CompatHandler1_13.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/compat/impl/CompatHandler1_13.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/compat/impl/CompatHandler1_13.java diff --git a/src/main/java/dev/brighten/ac/handler/compat/impl/CompatHandler1_8.java b/Anticheat/src/main/java/dev/brighten/ac/handler/compat/impl/CompatHandler1_8.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/compat/impl/CompatHandler1_8.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/compat/impl/CompatHandler1_8.java diff --git a/src/main/java/dev/brighten/ac/handler/compat/impl/CompatHandler1_9.java b/Anticheat/src/main/java/dev/brighten/ac/handler/compat/impl/CompatHandler1_9.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/compat/impl/CompatHandler1_9.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/compat/impl/CompatHandler1_9.java diff --git a/src/main/java/dev/brighten/ac/handler/entity/FakeEntityTracker.java b/Anticheat/src/main/java/dev/brighten/ac/handler/entity/FakeEntityTracker.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/entity/FakeEntityTracker.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/entity/FakeEntityTracker.java diff --git a/src/main/java/dev/brighten/ac/handler/entity/FakeMob.java b/Anticheat/src/main/java/dev/brighten/ac/handler/entity/FakeMob.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/entity/FakeMob.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/entity/FakeMob.java diff --git a/src/main/java/dev/brighten/ac/handler/keepalive/KeepAlive.java b/Anticheat/src/main/java/dev/brighten/ac/handler/keepalive/KeepAlive.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/keepalive/KeepAlive.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/keepalive/KeepAlive.java diff --git a/src/main/java/dev/brighten/ac/handler/keepalive/KeepaliveProcessor.java b/Anticheat/src/main/java/dev/brighten/ac/handler/keepalive/KeepaliveProcessor.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/keepalive/KeepaliveProcessor.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/keepalive/KeepaliveProcessor.java diff --git a/src/main/java/dev/brighten/ac/handler/keepalive/actions/Action.java b/Anticheat/src/main/java/dev/brighten/ac/handler/keepalive/actions/Action.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/keepalive/actions/Action.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/keepalive/actions/Action.java diff --git a/src/main/java/dev/brighten/ac/handler/keepalive/actions/ActionManager.java b/Anticheat/src/main/java/dev/brighten/ac/handler/keepalive/actions/ActionManager.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/keepalive/actions/ActionManager.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/keepalive/actions/ActionManager.java diff --git a/src/main/java/dev/brighten/ac/handler/keepalive/actions/ActionType.java b/Anticheat/src/main/java/dev/brighten/ac/handler/keepalive/actions/ActionType.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/keepalive/actions/ActionType.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/keepalive/actions/ActionType.java diff --git a/src/main/java/dev/brighten/ac/handler/keepalive/actions/types/TransactionAction.java b/Anticheat/src/main/java/dev/brighten/ac/handler/keepalive/actions/types/TransactionAction.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/keepalive/actions/types/TransactionAction.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/keepalive/actions/types/TransactionAction.java diff --git a/src/main/java/dev/brighten/ac/handler/protocolsupport/Protocol.java b/Anticheat/src/main/java/dev/brighten/ac/handler/protocolsupport/Protocol.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/protocolsupport/Protocol.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/protocolsupport/Protocol.java diff --git a/src/main/java/dev/brighten/ac/handler/protocolsupport/ProtocolAPI.java b/Anticheat/src/main/java/dev/brighten/ac/handler/protocolsupport/ProtocolAPI.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/protocolsupport/ProtocolAPI.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/protocolsupport/ProtocolAPI.java diff --git a/src/main/java/dev/brighten/ac/handler/protocolsupport/impl/NoAPI.java b/Anticheat/src/main/java/dev/brighten/ac/handler/protocolsupport/impl/NoAPI.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/protocolsupport/impl/NoAPI.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/protocolsupport/impl/NoAPI.java diff --git a/src/main/java/dev/brighten/ac/handler/protocolsupport/impl/ProtocolSupport.java b/Anticheat/src/main/java/dev/brighten/ac/handler/protocolsupport/impl/ProtocolSupport.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/protocolsupport/impl/ProtocolSupport.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/protocolsupport/impl/ProtocolSupport.java diff --git a/src/main/java/dev/brighten/ac/handler/protocolsupport/impl/ViaVersionAPI.java b/Anticheat/src/main/java/dev/brighten/ac/handler/protocolsupport/impl/ViaVersionAPI.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/protocolsupport/impl/ViaVersionAPI.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/protocolsupport/impl/ViaVersionAPI.java diff --git a/src/main/java/dev/brighten/ac/handler/thread/PlayerThread.java b/Anticheat/src/main/java/dev/brighten/ac/handler/thread/PlayerThread.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/thread/PlayerThread.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/thread/PlayerThread.java diff --git a/src/main/java/dev/brighten/ac/handler/thread/ThreadHandler.java b/Anticheat/src/main/java/dev/brighten/ac/handler/thread/ThreadHandler.java similarity index 100% rename from src/main/java/dev/brighten/ac/handler/thread/ThreadHandler.java rename to Anticheat/src/main/java/dev/brighten/ac/handler/thread/ThreadHandler.java diff --git a/src/main/java/dev/brighten/ac/listener/GeneralListener.java b/Anticheat/src/main/java/dev/brighten/ac/listener/GeneralListener.java similarity index 100% rename from src/main/java/dev/brighten/ac/listener/GeneralListener.java rename to Anticheat/src/main/java/dev/brighten/ac/listener/GeneralListener.java diff --git a/src/main/java/dev/brighten/ac/listener/JoinListener.java b/Anticheat/src/main/java/dev/brighten/ac/listener/JoinListener.java similarity index 100% rename from src/main/java/dev/brighten/ac/listener/JoinListener.java rename to Anticheat/src/main/java/dev/brighten/ac/listener/JoinListener.java diff --git a/src/main/java/dev/brighten/ac/logging/Log.java b/Anticheat/src/main/java/dev/brighten/ac/logging/Log.java similarity index 100% rename from src/main/java/dev/brighten/ac/logging/Log.java rename to Anticheat/src/main/java/dev/brighten/ac/logging/Log.java diff --git a/src/main/java/dev/brighten/ac/logging/LoggerManager.java b/Anticheat/src/main/java/dev/brighten/ac/logging/LoggerManager.java similarity index 100% rename from src/main/java/dev/brighten/ac/logging/LoggerManager.java rename to Anticheat/src/main/java/dev/brighten/ac/logging/LoggerManager.java diff --git a/src/main/java/dev/brighten/ac/messages/Messages.java b/Anticheat/src/main/java/dev/brighten/ac/messages/Messages.java similarity index 100% rename from src/main/java/dev/brighten/ac/messages/Messages.java rename to Anticheat/src/main/java/dev/brighten/ac/messages/Messages.java diff --git a/src/main/java/dev/brighten/ac/packet/ProtocolVersion.java b/Anticheat/src/main/java/dev/brighten/ac/packet/ProtocolVersion.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/ProtocolVersion.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/ProtocolVersion.java diff --git a/src/main/java/dev/brighten/ac/packet/handler/HandlerAbstract.java b/Anticheat/src/main/java/dev/brighten/ac/packet/handler/HandlerAbstract.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/handler/HandlerAbstract.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/handler/HandlerAbstract.java diff --git a/src/main/java/dev/brighten/ac/packet/handler/LegacyHandler.java b/Anticheat/src/main/java/dev/brighten/ac/packet/handler/LegacyHandler.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/handler/LegacyHandler.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/handler/LegacyHandler.java diff --git a/src/main/java/dev/brighten/ac/packet/handler/ModernHandler.java b/Anticheat/src/main/java/dev/brighten/ac/packet/handler/ModernHandler.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/handler/ModernHandler.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/handler/ModernHandler.java diff --git a/src/main/java/dev/brighten/ac/packet/handler/SilentObject.java b/Anticheat/src/main/java/dev/brighten/ac/packet/handler/SilentObject.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/handler/SilentObject.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/handler/SilentObject.java diff --git a/src/main/java/dev/brighten/ac/packet/listener/ListenerEntry.java b/Anticheat/src/main/java/dev/brighten/ac/packet/listener/ListenerEntry.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/listener/ListenerEntry.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/listener/ListenerEntry.java diff --git a/src/main/java/dev/brighten/ac/packet/listener/PacketInfo.java b/Anticheat/src/main/java/dev/brighten/ac/packet/listener/PacketInfo.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/listener/PacketInfo.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/listener/PacketInfo.java diff --git a/src/main/java/dev/brighten/ac/packet/listener/PacketProcessor.java b/Anticheat/src/main/java/dev/brighten/ac/packet/listener/PacketProcessor.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/listener/PacketProcessor.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/listener/PacketProcessor.java diff --git a/src/main/java/dev/brighten/ac/packet/listener/functions/PacketListener.java b/Anticheat/src/main/java/dev/brighten/ac/packet/listener/functions/PacketListener.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/listener/functions/PacketListener.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/listener/functions/PacketListener.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/PacketConverter.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/PacketConverter.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/PacketConverter.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/PacketConverter.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/PacketType.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/PacketType.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/PacketType.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/PacketType.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/WObject.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/WObject.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/WObject.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/WObject.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/WPacket.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/WPacket.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/WPacket.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/WPacket.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/impl/Processor_18.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/impl/Processor_18.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/impl/Processor_18.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/impl/Processor_18.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInAbilities.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInAbilities.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInAbilities.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInAbilities.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInArmAnimation.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInArmAnimation.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInArmAnimation.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInArmAnimation.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInBlockDig.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInBlockDig.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInBlockDig.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInBlockDig.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInBlockPlace.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInBlockPlace.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInBlockPlace.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInBlockPlace.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInChat.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInChat.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInChat.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInChat.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInCloseWindow.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInCloseWindow.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInCloseWindow.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInCloseWindow.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInEntityAction.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInEntityAction.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInEntityAction.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInEntityAction.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInFlying.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInFlying.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInFlying.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInFlying.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInTransaction.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInTransaction.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInTransaction.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInTransaction.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInUseEntity.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInUseEntity.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInUseEntity.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInUseEntity.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInWindowClick.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInWindowClick.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInWindowClick.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/in/WPacketPlayInWindowClick.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/login/WPacketHandshakingInSetProtocol.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/login/WPacketHandshakingInSetProtocol.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/login/WPacketHandshakingInSetProtocol.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/login/WPacketHandshakingInSetProtocol.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/objects/EnumParticle.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/objects/EnumParticle.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/objects/EnumParticle.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/objects/EnumParticle.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/objects/PlayerCapabilities.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/objects/PlayerCapabilities.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/objects/PlayerCapabilities.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/objects/PlayerCapabilities.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/objects/WrappedEnumDirection.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/objects/WrappedEnumDirection.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/objects/WrappedEnumDirection.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/objects/WrappedEnumDirection.java diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/objects/WrappedWatchableObject.java b/Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/objects/WrappedWatchableObject.java similarity index 100% rename from src/main/java/dev/brighten/ac/packet/wrapper/objects/WrappedWatchableObject.java rename to Anticheat/src/main/java/dev/brighten/ac/packet/wrapper/objects/WrappedWatchableObject.java diff --git a/src/main/java/dev/brighten/ac/utils/AimbotUtil.java b/Anticheat/src/main/java/dev/brighten/ac/utils/AimbotUtil.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/AimbotUtil.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/AimbotUtil.java diff --git a/src/main/java/dev/brighten/ac/utils/AxisAlignedBB.java b/Anticheat/src/main/java/dev/brighten/ac/utils/AxisAlignedBB.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/AxisAlignedBB.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/AxisAlignedBB.java diff --git a/src/main/java/dev/brighten/ac/utils/BlockBounds.java b/Anticheat/src/main/java/dev/brighten/ac/utils/BlockBounds.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/BlockBounds.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/BlockBounds.java diff --git a/src/main/java/dev/brighten/ac/utils/BlockUtils.java b/Anticheat/src/main/java/dev/brighten/ac/utils/BlockUtils.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/BlockUtils.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/BlockUtils.java diff --git a/src/main/java/dev/brighten/ac/utils/BoundingBox.java b/Anticheat/src/main/java/dev/brighten/ac/utils/BoundingBox.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/BoundingBox.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/BoundingBox.java diff --git a/src/main/java/dev/brighten/ac/utils/BukkitRunnable.java b/Anticheat/src/main/java/dev/brighten/ac/utils/BukkitRunnable.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/BukkitRunnable.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/BukkitRunnable.java diff --git a/src/main/java/dev/brighten/ac/utils/ClassScanner.java b/Anticheat/src/main/java/dev/brighten/ac/utils/ClassScanner.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/ClassScanner.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/ClassScanner.java diff --git a/src/main/java/dev/brighten/ac/utils/Color.java b/Anticheat/src/main/java/dev/brighten/ac/utils/Color.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/Color.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/Color.java diff --git a/src/main/java/dev/brighten/ac/utils/CommandPropertiesManager.java b/Anticheat/src/main/java/dev/brighten/ac/utils/CommandPropertiesManager.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/CommandPropertiesManager.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/CommandPropertiesManager.java diff --git a/src/main/java/dev/brighten/ac/utils/ConfigDefault.java b/Anticheat/src/main/java/dev/brighten/ac/utils/ConfigDefault.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/ConfigDefault.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/ConfigDefault.java diff --git a/src/main/java/dev/brighten/ac/utils/EntityLocation.java b/Anticheat/src/main/java/dev/brighten/ac/utils/EntityLocation.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/EntityLocation.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/EntityLocation.java diff --git a/src/main/java/dev/brighten/ac/utils/FastTrig.java b/Anticheat/src/main/java/dev/brighten/ac/utils/FastTrig.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/FastTrig.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/FastTrig.java diff --git a/src/main/java/dev/brighten/ac/utils/Helper.java b/Anticheat/src/main/java/dev/brighten/ac/utils/Helper.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/Helper.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/Helper.java diff --git a/src/main/java/dev/brighten/ac/utils/HookedListWrapper.java b/Anticheat/src/main/java/dev/brighten/ac/utils/HookedListWrapper.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/HookedListWrapper.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/HookedListWrapper.java diff --git a/src/main/java/dev/brighten/ac/utils/IntegrityCheck.java b/Anticheat/src/main/java/dev/brighten/ac/utils/IntegrityCheck.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/IntegrityCheck.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/IntegrityCheck.java diff --git a/src/main/java/dev/brighten/ac/utils/ItemBuilder.java b/Anticheat/src/main/java/dev/brighten/ac/utils/ItemBuilder.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/ItemBuilder.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/ItemBuilder.java diff --git a/src/main/java/dev/brighten/ac/utils/KLocation.java b/Anticheat/src/main/java/dev/brighten/ac/utils/KLocation.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/KLocation.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/KLocation.java diff --git a/src/main/java/dev/brighten/ac/utils/ListWrapper.java b/Anticheat/src/main/java/dev/brighten/ac/utils/ListWrapper.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/ListWrapper.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/ListWrapper.java diff --git a/src/main/java/dev/brighten/ac/utils/Log.java b/Anticheat/src/main/java/dev/brighten/ac/utils/Log.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/Log.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/Log.java diff --git a/src/main/java/dev/brighten/ac/utils/Materials.java b/Anticheat/src/main/java/dev/brighten/ac/utils/Materials.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/Materials.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/Materials.java diff --git a/src/main/java/dev/brighten/ac/utils/MathHelper.java b/Anticheat/src/main/java/dev/brighten/ac/utils/MathHelper.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/MathHelper.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/MathHelper.java diff --git a/src/main/java/dev/brighten/ac/utils/MathUtils.java b/Anticheat/src/main/java/dev/brighten/ac/utils/MathUtils.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/MathUtils.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/MathUtils.java diff --git a/src/main/java/dev/brighten/ac/utils/MiscUtils.java b/Anticheat/src/main/java/dev/brighten/ac/utils/MiscUtils.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/MiscUtils.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/MiscUtils.java diff --git a/src/main/java/dev/brighten/ac/utils/MojangAPI.java b/Anticheat/src/main/java/dev/brighten/ac/utils/MojangAPI.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/MojangAPI.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/MojangAPI.java diff --git a/src/main/java/dev/brighten/ac/utils/MouseFilter.java b/Anticheat/src/main/java/dev/brighten/ac/utils/MouseFilter.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/MouseFilter.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/MouseFilter.java diff --git a/src/main/java/dev/brighten/ac/utils/MovementUtils.java b/Anticheat/src/main/java/dev/brighten/ac/utils/MovementUtils.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/MovementUtils.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/MovementUtils.java diff --git a/src/main/java/dev/brighten/ac/utils/PastLocation.java b/Anticheat/src/main/java/dev/brighten/ac/utils/PastLocation.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/PastLocation.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/PastLocation.java diff --git a/src/main/java/dev/brighten/ac/utils/Pastebin.java b/Anticheat/src/main/java/dev/brighten/ac/utils/Pastebin.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/Pastebin.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/Pastebin.java diff --git a/src/main/java/dev/brighten/ac/utils/PlayerUtils.java b/Anticheat/src/main/java/dev/brighten/ac/utils/PlayerUtils.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/PlayerUtils.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/PlayerUtils.java diff --git a/src/main/java/dev/brighten/ac/utils/Priority.java b/Anticheat/src/main/java/dev/brighten/ac/utils/Priority.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/Priority.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/Priority.java diff --git a/src/main/java/dev/brighten/ac/utils/ReflectionUtil.java b/Anticheat/src/main/java/dev/brighten/ac/utils/ReflectionUtil.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/ReflectionUtil.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/ReflectionUtil.java diff --git a/src/main/java/dev/brighten/ac/utils/ReflectionsUtil.java b/Anticheat/src/main/java/dev/brighten/ac/utils/ReflectionsUtil.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/ReflectionsUtil.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/ReflectionsUtil.java diff --git a/src/main/java/dev/brighten/ac/utils/RunUtils.java b/Anticheat/src/main/java/dev/brighten/ac/utils/RunUtils.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/RunUtils.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/RunUtils.java diff --git a/src/main/java/dev/brighten/ac/utils/ServerInjector.java b/Anticheat/src/main/java/dev/brighten/ac/utils/ServerInjector.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/ServerInjector.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/ServerInjector.java diff --git a/src/main/java/dev/brighten/ac/utils/Setting.java b/Anticheat/src/main/java/dev/brighten/ac/utils/Setting.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/Setting.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/Setting.java diff --git a/src/main/java/dev/brighten/ac/utils/Step.java b/Anticheat/src/main/java/dev/brighten/ac/utils/Step.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/Step.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/Step.java diff --git a/src/main/java/dev/brighten/ac/utils/TagsBuilder.java b/Anticheat/src/main/java/dev/brighten/ac/utils/TagsBuilder.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/TagsBuilder.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/TagsBuilder.java diff --git a/src/main/java/dev/brighten/ac/utils/Triad.java b/Anticheat/src/main/java/dev/brighten/ac/utils/Triad.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/Triad.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/Triad.java diff --git a/src/main/java/dev/brighten/ac/utils/Tuple.java b/Anticheat/src/main/java/dev/brighten/ac/utils/Tuple.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/Tuple.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/Tuple.java diff --git a/src/main/java/dev/brighten/ac/utils/Vec3D.java b/Anticheat/src/main/java/dev/brighten/ac/utils/Vec3D.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/Vec3D.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/Vec3D.java diff --git a/src/main/java/dev/brighten/ac/utils/XMaterial.java b/Anticheat/src/main/java/dev/brighten/ac/utils/XMaterial.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/XMaterial.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/XMaterial.java diff --git a/src/main/java/dev/brighten/ac/utils/XPotion.java b/Anticheat/src/main/java/dev/brighten/ac/utils/XPotion.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/XPotion.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/XPotion.java diff --git a/src/main/java/dev/brighten/ac/utils/annotation/Async.java b/Anticheat/src/main/java/dev/brighten/ac/utils/annotation/Async.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/annotation/Async.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/annotation/Async.java diff --git a/src/main/java/dev/brighten/ac/utils/annotation/AutoLoad.java b/Anticheat/src/main/java/dev/brighten/ac/utils/annotation/AutoLoad.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/annotation/AutoLoad.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/annotation/AutoLoad.java diff --git a/src/main/java/dev/brighten/ac/utils/annotation/Commands.java b/Anticheat/src/main/java/dev/brighten/ac/utils/annotation/Commands.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/annotation/Commands.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/annotation/Commands.java diff --git a/src/main/java/dev/brighten/ac/utils/annotation/ConfigSetting.java b/Anticheat/src/main/java/dev/brighten/ac/utils/annotation/ConfigSetting.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/annotation/ConfigSetting.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/annotation/ConfigSetting.java diff --git a/src/main/java/dev/brighten/ac/utils/annotation/Init.java b/Anticheat/src/main/java/dev/brighten/ac/utils/annotation/Init.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/annotation/Init.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/annotation/Init.java diff --git a/src/main/java/dev/brighten/ac/utils/annotation/Instance.java b/Anticheat/src/main/java/dev/brighten/ac/utils/annotation/Instance.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/annotation/Instance.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/annotation/Instance.java diff --git a/src/main/java/dev/brighten/ac/utils/annotation/Invoke.java b/Anticheat/src/main/java/dev/brighten/ac/utils/annotation/Invoke.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/annotation/Invoke.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/annotation/Invoke.java diff --git a/src/main/java/dev/brighten/ac/utils/annotation/NonnullByDefault.java b/Anticheat/src/main/java/dev/brighten/ac/utils/annotation/NonnullByDefault.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/annotation/NonnullByDefault.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/annotation/NonnullByDefault.java diff --git a/src/main/java/dev/brighten/ac/utils/config/Configuration.java b/Anticheat/src/main/java/dev/brighten/ac/utils/config/Configuration.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/config/Configuration.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/config/Configuration.java diff --git a/src/main/java/dev/brighten/ac/utils/config/ConfigurationProvider.java b/Anticheat/src/main/java/dev/brighten/ac/utils/config/ConfigurationProvider.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/config/ConfigurationProvider.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/config/ConfigurationProvider.java diff --git a/src/main/java/dev/brighten/ac/utils/config/JsonConfiguration.java b/Anticheat/src/main/java/dev/brighten/ac/utils/config/JsonConfiguration.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/config/JsonConfiguration.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/config/JsonConfiguration.java diff --git a/src/main/java/dev/brighten/ac/utils/config/YamlConfiguration.java b/Anticheat/src/main/java/dev/brighten/ac/utils/config/YamlConfiguration.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/config/YamlConfiguration.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/config/YamlConfiguration.java diff --git a/src/main/java/dev/brighten/ac/utils/json/CDL.java b/Anticheat/src/main/java/dev/brighten/ac/utils/json/CDL.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/json/CDL.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/json/CDL.java diff --git a/src/main/java/dev/brighten/ac/utils/json/Cookie.java b/Anticheat/src/main/java/dev/brighten/ac/utils/json/Cookie.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/json/Cookie.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/json/Cookie.java diff --git a/src/main/java/dev/brighten/ac/utils/json/CookieList.java b/Anticheat/src/main/java/dev/brighten/ac/utils/json/CookieList.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/json/CookieList.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/json/CookieList.java diff --git a/src/main/java/dev/brighten/ac/utils/json/HTTP.java b/Anticheat/src/main/java/dev/brighten/ac/utils/json/HTTP.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/json/HTTP.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/json/HTTP.java diff --git a/src/main/java/dev/brighten/ac/utils/json/HTTPTokener.java b/Anticheat/src/main/java/dev/brighten/ac/utils/json/HTTPTokener.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/json/HTTPTokener.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/json/HTTPTokener.java diff --git a/src/main/java/dev/brighten/ac/utils/json/JSONArray.java b/Anticheat/src/main/java/dev/brighten/ac/utils/json/JSONArray.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/json/JSONArray.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/json/JSONArray.java diff --git a/src/main/java/dev/brighten/ac/utils/json/JSONException.java b/Anticheat/src/main/java/dev/brighten/ac/utils/json/JSONException.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/json/JSONException.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/json/JSONException.java diff --git a/src/main/java/dev/brighten/ac/utils/json/JSONML.java b/Anticheat/src/main/java/dev/brighten/ac/utils/json/JSONML.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/json/JSONML.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/json/JSONML.java diff --git a/src/main/java/dev/brighten/ac/utils/json/JSONObject.java b/Anticheat/src/main/java/dev/brighten/ac/utils/json/JSONObject.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/json/JSONObject.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/json/JSONObject.java diff --git a/src/main/java/dev/brighten/ac/utils/json/JSONString.java b/Anticheat/src/main/java/dev/brighten/ac/utils/json/JSONString.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/json/JSONString.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/json/JSONString.java diff --git a/src/main/java/dev/brighten/ac/utils/json/JSONStringer.java b/Anticheat/src/main/java/dev/brighten/ac/utils/json/JSONStringer.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/json/JSONStringer.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/json/JSONStringer.java diff --git a/src/main/java/dev/brighten/ac/utils/json/JSONTokener.java b/Anticheat/src/main/java/dev/brighten/ac/utils/json/JSONTokener.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/json/JSONTokener.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/json/JSONTokener.java diff --git a/src/main/java/dev/brighten/ac/utils/json/JSONWriter.java b/Anticheat/src/main/java/dev/brighten/ac/utils/json/JSONWriter.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/json/JSONWriter.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/json/JSONWriter.java diff --git a/src/main/java/dev/brighten/ac/utils/json/JsonReader.java b/Anticheat/src/main/java/dev/brighten/ac/utils/json/JsonReader.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/json/JsonReader.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/json/JsonReader.java diff --git a/src/main/java/dev/brighten/ac/utils/json/XML.java b/Anticheat/src/main/java/dev/brighten/ac/utils/json/XML.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/json/XML.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/json/XML.java diff --git a/src/main/java/dev/brighten/ac/utils/json/XMLTokener.java b/Anticheat/src/main/java/dev/brighten/ac/utils/json/XMLTokener.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/json/XMLTokener.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/json/XMLTokener.java diff --git a/src/main/java/dev/brighten/ac/utils/math/Average.java b/Anticheat/src/main/java/dev/brighten/ac/utils/math/Average.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/math/Average.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/math/Average.java diff --git a/src/main/java/dev/brighten/ac/utils/math/FloatVector.java b/Anticheat/src/main/java/dev/brighten/ac/utils/math/FloatVector.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/math/FloatVector.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/math/FloatVector.java diff --git a/src/main/java/dev/brighten/ac/utils/math/IntVector.java b/Anticheat/src/main/java/dev/brighten/ac/utils/math/IntVector.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/math/IntVector.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/math/IntVector.java diff --git a/src/main/java/dev/brighten/ac/utils/math/MCSmooth.java b/Anticheat/src/main/java/dev/brighten/ac/utils/math/MCSmooth.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/math/MCSmooth.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/math/MCSmooth.java diff --git a/src/main/java/dev/brighten/ac/utils/math/RayTrace.java b/Anticheat/src/main/java/dev/brighten/ac/utils/math/RayTrace.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/math/RayTrace.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/math/RayTrace.java diff --git a/src/main/java/dev/brighten/ac/utils/math/RollingAverage.java b/Anticheat/src/main/java/dev/brighten/ac/utils/math/RollingAverage.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/math/RollingAverage.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/math/RollingAverage.java diff --git a/src/main/java/dev/brighten/ac/utils/math/RollingAverageDouble.java b/Anticheat/src/main/java/dev/brighten/ac/utils/math/RollingAverageDouble.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/math/RollingAverageDouble.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/math/RollingAverageDouble.java diff --git a/src/main/java/dev/brighten/ac/utils/math/RollingAverageLong.java b/Anticheat/src/main/java/dev/brighten/ac/utils/math/RollingAverageLong.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/math/RollingAverageLong.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/math/RollingAverageLong.java diff --git a/src/main/java/dev/brighten/ac/utils/math/SimpleAverage.java b/Anticheat/src/main/java/dev/brighten/ac/utils/math/SimpleAverage.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/math/SimpleAverage.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/math/SimpleAverage.java diff --git a/src/main/java/dev/brighten/ac/utils/math/cond/MaxDouble.java b/Anticheat/src/main/java/dev/brighten/ac/utils/math/cond/MaxDouble.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/math/cond/MaxDouble.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/math/cond/MaxDouble.java diff --git a/src/main/java/dev/brighten/ac/utils/math/cond/MaxFloat.java b/Anticheat/src/main/java/dev/brighten/ac/utils/math/cond/MaxFloat.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/math/cond/MaxFloat.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/math/cond/MaxFloat.java diff --git a/src/main/java/dev/brighten/ac/utils/math/cond/MaxInteger.java b/Anticheat/src/main/java/dev/brighten/ac/utils/math/cond/MaxInteger.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/math/cond/MaxInteger.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/math/cond/MaxInteger.java diff --git a/src/main/java/dev/brighten/ac/utils/math/cond/MaxLong.java b/Anticheat/src/main/java/dev/brighten/ac/utils/math/cond/MaxLong.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/math/cond/MaxLong.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/math/cond/MaxLong.java diff --git a/src/main/java/dev/brighten/ac/utils/menu/Menu.java b/Anticheat/src/main/java/dev/brighten/ac/utils/menu/Menu.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/menu/Menu.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/menu/Menu.java diff --git a/src/main/java/dev/brighten/ac/utils/menu/MenuListener.java b/Anticheat/src/main/java/dev/brighten/ac/utils/menu/MenuListener.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/menu/MenuListener.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/menu/MenuListener.java diff --git a/src/main/java/dev/brighten/ac/utils/menu/button/Button.java b/Anticheat/src/main/java/dev/brighten/ac/utils/menu/button/Button.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/menu/button/Button.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/menu/button/Button.java diff --git a/src/main/java/dev/brighten/ac/utils/menu/button/ClickAction.java b/Anticheat/src/main/java/dev/brighten/ac/utils/menu/button/ClickAction.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/menu/button/ClickAction.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/menu/button/ClickAction.java diff --git a/src/main/java/dev/brighten/ac/utils/menu/button/UpdatingButton.java b/Anticheat/src/main/java/dev/brighten/ac/utils/menu/button/UpdatingButton.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/menu/button/UpdatingButton.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/menu/button/UpdatingButton.java diff --git a/src/main/java/dev/brighten/ac/utils/menu/mask/Mask.java b/Anticheat/src/main/java/dev/brighten/ac/utils/menu/mask/Mask.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/menu/mask/Mask.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/menu/mask/Mask.java diff --git a/src/main/java/dev/brighten/ac/utils/menu/mask/Mask2D.java b/Anticheat/src/main/java/dev/brighten/ac/utils/menu/mask/Mask2D.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/menu/mask/Mask2D.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/menu/mask/Mask2D.java diff --git a/src/main/java/dev/brighten/ac/utils/menu/preset/ConfirmationMenu.java b/Anticheat/src/main/java/dev/brighten/ac/utils/menu/preset/ConfirmationMenu.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/menu/preset/ConfirmationMenu.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/menu/preset/ConfirmationMenu.java diff --git a/src/main/java/dev/brighten/ac/utils/menu/preset/SettingsMenu.java b/Anticheat/src/main/java/dev/brighten/ac/utils/menu/preset/SettingsMenu.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/menu/preset/SettingsMenu.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/menu/preset/SettingsMenu.java diff --git a/src/main/java/dev/brighten/ac/utils/menu/preset/button/FillerButton.java b/Anticheat/src/main/java/dev/brighten/ac/utils/menu/preset/button/FillerButton.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/menu/preset/button/FillerButton.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/menu/preset/button/FillerButton.java diff --git a/src/main/java/dev/brighten/ac/utils/menu/preset/button/SettingButton.java b/Anticheat/src/main/java/dev/brighten/ac/utils/menu/preset/button/SettingButton.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/menu/preset/button/SettingButton.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/menu/preset/button/SettingButton.java diff --git a/src/main/java/dev/brighten/ac/utils/menu/type/BukkitInventoryHolder.java b/Anticheat/src/main/java/dev/brighten/ac/utils/menu/type/BukkitInventoryHolder.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/menu/type/BukkitInventoryHolder.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/menu/type/BukkitInventoryHolder.java diff --git a/src/main/java/dev/brighten/ac/utils/menu/type/impl/BookMenu.java b/Anticheat/src/main/java/dev/brighten/ac/utils/menu/type/impl/BookMenu.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/menu/type/impl/BookMenu.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/menu/type/impl/BookMenu.java diff --git a/src/main/java/dev/brighten/ac/utils/menu/type/impl/ChestMenu.java b/Anticheat/src/main/java/dev/brighten/ac/utils/menu/type/impl/ChestMenu.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/menu/type/impl/ChestMenu.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/menu/type/impl/ChestMenu.java diff --git a/src/main/java/dev/brighten/ac/utils/menu/type/impl/PagedMenu.java b/Anticheat/src/main/java/dev/brighten/ac/utils/menu/type/impl/PagedMenu.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/menu/type/impl/PagedMenu.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/menu/type/impl/PagedMenu.java diff --git a/src/main/java/dev/brighten/ac/utils/menu/type/impl/ValueMenu.java b/Anticheat/src/main/java/dev/brighten/ac/utils/menu/type/impl/ValueMenu.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/menu/type/impl/ValueMenu.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/menu/type/impl/ValueMenu.java diff --git a/src/main/java/dev/brighten/ac/utils/menu/util/ArrayIterator.java b/Anticheat/src/main/java/dev/brighten/ac/utils/menu/util/ArrayIterator.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/menu/util/ArrayIterator.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/menu/util/ArrayIterator.java diff --git a/src/main/java/dev/brighten/ac/utils/msg/ChatBuilder.java b/Anticheat/src/main/java/dev/brighten/ac/utils/msg/ChatBuilder.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/msg/ChatBuilder.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/msg/ChatBuilder.java diff --git a/src/main/java/dev/brighten/ac/utils/objects/BiSupplier.java b/Anticheat/src/main/java/dev/brighten/ac/utils/objects/BiSupplier.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/objects/BiSupplier.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/objects/BiSupplier.java diff --git a/src/main/java/dev/brighten/ac/utils/objects/Interval.java b/Anticheat/src/main/java/dev/brighten/ac/utils/objects/Interval.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/objects/Interval.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/objects/Interval.java diff --git a/src/main/java/dev/brighten/ac/utils/objects/MethodFunction.java b/Anticheat/src/main/java/dev/brighten/ac/utils/objects/MethodFunction.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/objects/MethodFunction.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/objects/MethodFunction.java diff --git a/src/main/java/dev/brighten/ac/utils/objects/MultiFunction.java b/Anticheat/src/main/java/dev/brighten/ac/utils/objects/MultiFunction.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/objects/MultiFunction.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/objects/MultiFunction.java diff --git a/src/main/java/dev/brighten/ac/utils/objects/QuadFunction.java b/Anticheat/src/main/java/dev/brighten/ac/utils/objects/QuadFunction.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/objects/QuadFunction.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/objects/QuadFunction.java diff --git a/src/main/java/dev/brighten/ac/utils/objects/RemoteClassLoader.java b/Anticheat/src/main/java/dev/brighten/ac/utils/objects/RemoteClassLoader.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/objects/RemoteClassLoader.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/objects/RemoteClassLoader.java diff --git a/src/main/java/dev/brighten/ac/utils/objects/TriFunction.java b/Anticheat/src/main/java/dev/brighten/ac/utils/objects/TriFunction.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/objects/TriFunction.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/objects/TriFunction.java diff --git a/src/main/java/dev/brighten/ac/utils/objects/VariableValue.java b/Anticheat/src/main/java/dev/brighten/ac/utils/objects/VariableValue.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/objects/VariableValue.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/objects/VariableValue.java diff --git a/src/main/java/dev/brighten/ac/utils/objects/evicting/ConcurrentEvictingList.java b/Anticheat/src/main/java/dev/brighten/ac/utils/objects/evicting/ConcurrentEvictingList.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/objects/evicting/ConcurrentEvictingList.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/objects/evicting/ConcurrentEvictingList.java diff --git a/src/main/java/dev/brighten/ac/utils/objects/evicting/ConcurrentEvictingMap.java b/Anticheat/src/main/java/dev/brighten/ac/utils/objects/evicting/ConcurrentEvictingMap.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/objects/evicting/ConcurrentEvictingMap.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/objects/evicting/ConcurrentEvictingMap.java diff --git a/src/main/java/dev/brighten/ac/utils/objects/evicting/EvictingList.java b/Anticheat/src/main/java/dev/brighten/ac/utils/objects/evicting/EvictingList.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/objects/evicting/EvictingList.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/objects/evicting/EvictingList.java diff --git a/src/main/java/dev/brighten/ac/utils/objects/evicting/EvictingMap.java b/Anticheat/src/main/java/dev/brighten/ac/utils/objects/evicting/EvictingMap.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/objects/evicting/EvictingMap.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/objects/evicting/EvictingMap.java diff --git a/src/main/java/dev/brighten/ac/utils/objects/filtered/ConcurrentFilteredList.java b/Anticheat/src/main/java/dev/brighten/ac/utils/objects/filtered/ConcurrentFilteredList.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/objects/filtered/ConcurrentFilteredList.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/objects/filtered/ConcurrentFilteredList.java diff --git a/src/main/java/dev/brighten/ac/utils/objects/filtered/ConcurrentFilteredSet.java b/Anticheat/src/main/java/dev/brighten/ac/utils/objects/filtered/ConcurrentFilteredSet.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/objects/filtered/ConcurrentFilteredSet.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/objects/filtered/ConcurrentFilteredSet.java diff --git a/src/main/java/dev/brighten/ac/utils/objects/filtered/FilteredList.java b/Anticheat/src/main/java/dev/brighten/ac/utils/objects/filtered/FilteredList.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/objects/filtered/FilteredList.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/objects/filtered/FilteredList.java diff --git a/src/main/java/dev/brighten/ac/utils/objects/filtered/FilteredSet.java b/Anticheat/src/main/java/dev/brighten/ac/utils/objects/filtered/FilteredSet.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/objects/filtered/FilteredSet.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/objects/filtered/FilteredSet.java diff --git a/src/main/java/dev/brighten/ac/utils/objects/listmap/ConcurrentListMap.java b/Anticheat/src/main/java/dev/brighten/ac/utils/objects/listmap/ConcurrentListMap.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/objects/listmap/ConcurrentListMap.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/objects/listmap/ConcurrentListMap.java diff --git a/src/main/java/dev/brighten/ac/utils/objects/listmap/HashListMap.java b/Anticheat/src/main/java/dev/brighten/ac/utils/objects/listmap/HashListMap.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/objects/listmap/HashListMap.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/objects/listmap/HashListMap.java diff --git a/src/main/java/dev/brighten/ac/utils/objects/listmap/ListMap.java b/Anticheat/src/main/java/dev/brighten/ac/utils/objects/listmap/ListMap.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/objects/listmap/ListMap.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/objects/listmap/ListMap.java diff --git a/src/main/java/dev/brighten/ac/utils/reflections/Reflections.java b/Anticheat/src/main/java/dev/brighten/ac/utils/reflections/Reflections.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/reflections/Reflections.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/reflections/Reflections.java diff --git a/src/main/java/dev/brighten/ac/utils/reflections/impl/CraftReflection.java b/Anticheat/src/main/java/dev/brighten/ac/utils/reflections/impl/CraftReflection.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/reflections/impl/CraftReflection.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/reflections/impl/CraftReflection.java diff --git a/src/main/java/dev/brighten/ac/utils/reflections/impl/MinecraftReflection.java b/Anticheat/src/main/java/dev/brighten/ac/utils/reflections/impl/MinecraftReflection.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/reflections/impl/MinecraftReflection.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/reflections/impl/MinecraftReflection.java diff --git a/src/main/java/dev/brighten/ac/utils/reflections/types/WrappedClass.java b/Anticheat/src/main/java/dev/brighten/ac/utils/reflections/types/WrappedClass.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/reflections/types/WrappedClass.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/reflections/types/WrappedClass.java diff --git a/src/main/java/dev/brighten/ac/utils/reflections/types/WrappedConstructor.java b/Anticheat/src/main/java/dev/brighten/ac/utils/reflections/types/WrappedConstructor.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/reflections/types/WrappedConstructor.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/reflections/types/WrappedConstructor.java diff --git a/src/main/java/dev/brighten/ac/utils/reflections/types/WrappedField.java b/Anticheat/src/main/java/dev/brighten/ac/utils/reflections/types/WrappedField.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/reflections/types/WrappedField.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/reflections/types/WrappedField.java diff --git a/src/main/java/dev/brighten/ac/utils/reflections/types/WrappedMethod.java b/Anticheat/src/main/java/dev/brighten/ac/utils/reflections/types/WrappedMethod.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/reflections/types/WrappedMethod.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/reflections/types/WrappedMethod.java diff --git a/src/main/java/dev/brighten/ac/utils/timer/Timer.java b/Anticheat/src/main/java/dev/brighten/ac/utils/timer/Timer.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/timer/Timer.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/timer/Timer.java diff --git a/src/main/java/dev/brighten/ac/utils/timer/impl/MillisTimer.java b/Anticheat/src/main/java/dev/brighten/ac/utils/timer/impl/MillisTimer.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/timer/impl/MillisTimer.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/timer/impl/MillisTimer.java diff --git a/src/main/java/dev/brighten/ac/utils/timer/impl/TickTimer.java b/Anticheat/src/main/java/dev/brighten/ac/utils/timer/impl/TickTimer.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/timer/impl/TickTimer.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/timer/impl/TickTimer.java diff --git a/src/main/java/dev/brighten/ac/utils/world/BlockData.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/BlockData.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/BlockData.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/BlockData.java diff --git a/src/main/java/dev/brighten/ac/utils/world/CollisionBox.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/CollisionBox.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/CollisionBox.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/CollisionBox.java diff --git a/src/main/java/dev/brighten/ac/utils/world/EntityData.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/EntityData.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/EntityData.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/EntityData.java diff --git a/src/main/java/dev/brighten/ac/utils/world/WorldInfo.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/WorldInfo.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/WorldInfo.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/WorldInfo.java diff --git a/src/main/java/dev/brighten/ac/utils/world/blocks/CouldronBounding.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/CouldronBounding.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/blocks/CouldronBounding.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/CouldronBounding.java diff --git a/src/main/java/dev/brighten/ac/utils/world/blocks/DoorHandler.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/DoorHandler.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/blocks/DoorHandler.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/DoorHandler.java diff --git a/src/main/java/dev/brighten/ac/utils/world/blocks/DynamicFence.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/DynamicFence.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/blocks/DynamicFence.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/DynamicFence.java diff --git a/src/main/java/dev/brighten/ac/utils/world/blocks/DynamicPane.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/DynamicPane.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/blocks/DynamicPane.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/DynamicPane.java diff --git a/src/main/java/dev/brighten/ac/utils/world/blocks/DynamicRod.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/DynamicRod.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/blocks/DynamicRod.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/DynamicRod.java diff --git a/src/main/java/dev/brighten/ac/utils/world/blocks/DynamicStair.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/DynamicStair.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/blocks/DynamicStair.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/DynamicStair.java diff --git a/src/main/java/dev/brighten/ac/utils/world/blocks/DynamicWall.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/DynamicWall.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/blocks/DynamicWall.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/DynamicWall.java diff --git a/src/main/java/dev/brighten/ac/utils/world/blocks/HopperBounding.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/HopperBounding.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/blocks/HopperBounding.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/HopperBounding.java diff --git a/src/main/java/dev/brighten/ac/utils/world/blocks/PistonBaseCollision.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/PistonBaseCollision.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/blocks/PistonBaseCollision.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/PistonBaseCollision.java diff --git a/src/main/java/dev/brighten/ac/utils/world/blocks/PistonDickCollision.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/PistonDickCollision.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/blocks/PistonDickCollision.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/PistonDickCollision.java diff --git a/src/main/java/dev/brighten/ac/utils/world/blocks/TrapDoorHandler.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/TrapDoorHandler.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/blocks/TrapDoorHandler.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/blocks/TrapDoorHandler.java diff --git a/src/main/java/dev/brighten/ac/utils/world/types/CollisionFactory.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/types/CollisionFactory.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/types/CollisionFactory.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/types/CollisionFactory.java diff --git a/src/main/java/dev/brighten/ac/utils/world/types/ComplexCollisionBox.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/types/ComplexCollisionBox.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/types/ComplexCollisionBox.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/types/ComplexCollisionBox.java diff --git a/src/main/java/dev/brighten/ac/utils/world/types/DynamicCollisionBox.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/types/DynamicCollisionBox.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/types/DynamicCollisionBox.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/types/DynamicCollisionBox.java diff --git a/src/main/java/dev/brighten/ac/utils/world/types/HexCollisionBox.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/types/HexCollisionBox.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/types/HexCollisionBox.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/types/HexCollisionBox.java diff --git a/src/main/java/dev/brighten/ac/utils/world/types/NoCollisionBox.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/types/NoCollisionBox.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/types/NoCollisionBox.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/types/NoCollisionBox.java diff --git a/src/main/java/dev/brighten/ac/utils/world/types/RayCollision.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/types/RayCollision.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/types/RayCollision.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/types/RayCollision.java diff --git a/src/main/java/dev/brighten/ac/utils/world/types/SimpleCollisionBox.java b/Anticheat/src/main/java/dev/brighten/ac/utils/world/types/SimpleCollisionBox.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/world/types/SimpleCollisionBox.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/world/types/SimpleCollisionBox.java diff --git a/src/main/java/dev/brighten/ac/utils/wrapper/Wrapper.java b/Anticheat/src/main/java/dev/brighten/ac/utils/wrapper/Wrapper.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/wrapper/Wrapper.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/wrapper/Wrapper.java diff --git a/src/main/java/dev/brighten/ac/utils/wrapper/impl/Wrapper_18R3.java b/Anticheat/src/main/java/dev/brighten/ac/utils/wrapper/impl/Wrapper_18R3.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/wrapper/impl/Wrapper_18R3.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/wrapper/impl/Wrapper_18R3.java diff --git a/src/main/java/dev/brighten/ac/utils/wrapper/impl/Wrapper_Reflection.java b/Anticheat/src/main/java/dev/brighten/ac/utils/wrapper/impl/Wrapper_Reflection.java similarity index 100% rename from src/main/java/dev/brighten/ac/utils/wrapper/impl/Wrapper_Reflection.java rename to Anticheat/src/main/java/dev/brighten/ac/utils/wrapper/impl/Wrapper_Reflection.java diff --git a/src/main/resources/anticheat.yml b/Anticheat/src/main/resources/anticheat.yml similarity index 100% rename from src/main/resources/anticheat.yml rename to Anticheat/src/main/resources/anticheat.yml diff --git a/src/main/resources/command-messages.properties b/Anticheat/src/main/resources/command-messages.properties similarity index 100% rename from src/main/resources/command-messages.properties rename to Anticheat/src/main/resources/command-messages.properties diff --git a/src/main/resources/plugin.yml b/Anticheat/src/main/resources/plugin.yml similarity index 100% rename from src/main/resources/plugin.yml rename to Anticheat/src/main/resources/plugin.yml diff --git a/pom.xml b/pom.xml index 982e9d7..fa95a8e 100644 --- a/pom.xml +++ b/pom.xml @@ -7,174 +7,26 @@ dev.brighten.ac EnterpriseAnticheat 1.0-SNAPSHOT + pom + + + AntiCheat + API + 8 8 - 1.7.10 - - - funkemunky-releases - https://nexus.funkemunky.cc/content/repositories/releases/ - - - aikar-snapshots - https://repo.aikar.co/content/repositories/aikar-snapshots/ - - - jitpack.io - https://jitpack.io - - - lucko - https://repo.lucko.me/ - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - 8 - 8 - true - -XDignore.symbol.file - - - org.projectlombok - lombok - 1.18.24 - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.4.1 - - - package - - shade - - - true - - - it.unimi.dsi - - dev.brighten.ac.utils.it.unimi.dsi - - - - - - - - - - src/main/resources - true - - - - - - dev.brighten.ac - API - 1.0 - compile - org.projectlombok lombok 1.18.24 provided - - me.hydro - emulator - 1.2-neo - compile - - - org.github.spigot - 1.13 - 1.13 - provided - - - me.mat1337.loader - loader - 4.1 - provided - - - org.github.spigot - 1.8.8 - 1.8.8 - provided - - - org.github.spigot - 1.7.10 - 1.7.10 - provided - - - it.unimi.dsi - fastutil - 8.5.11 - compile - - - com.shevchik.protocolsupport - protocolsupport - 1.8 - provided - - - us.myles.viaversion - ViaVersion - 2.2.3 - provided - - - com.google.guava - guava - 31.1-jre - provided - - - org.ow2.asm - asm - 9.4 - provided - - - org.ow2.asm - asm-tree - 9.4 - provided - - - com.neovisionaries - nv-websocket-client - 2.14 - - - co.aikar - acf-bukkit - 0.5.1 - compile - + \ No newline at end of file diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayInClientCommand.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayInClientCommand.java deleted file mode 100644 index d638792..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayInClientCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import lombok.AllArgsConstructor; -import lombok.Getter; - -@AllArgsConstructor -@Getter -public class WPacketPlayInClientCommand extends WPacket { - - private WrappedEnumClientCommand command; - - @Override - public PacketType getPacketType() { - return PacketType.CLIENT_COMMAND; - } - - @Override - public Object getPacket() { - return null; - } - - public enum WrappedEnumClientCommand { - PERFORM_RESPAWN, - REQUEST_STATS, - OPEN_INVENTORY_ACHIEVEMENT; - } -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutAbilities.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutAbilities.java deleted file mode 100644 index a0739d0..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutAbilities.java +++ /dev/null @@ -1,32 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.Anticheat; -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import dev.brighten.ac.packet.wrapper.objects.PlayerCapabilities; -import lombok.Builder; -import lombok.Getter; - -@Builder -@Getter -public class WPacketPlayOutAbilities extends WPacket { - - private PlayerCapabilities capabilities; - - @Override - public PacketType getPacketType() { - return PacketType.SERVER_ABILITIES; - } - - @Override - public Object getPacket() { - return Anticheat.INSTANCE.getPacketProcessor().getPacketConverter().processOutAbilities(this); - } - - @Override - public String toString() { - return "WPacketPlayOutAbilities{" + - "capabilities=" + capabilities + - '}'; - } -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutAttachEntity.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutAttachEntity.java deleted file mode 100644 index af8fe8c..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutAttachEntity.java +++ /dev/null @@ -1,33 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import lombok.Builder; -import lombok.Getter; - -@Builder -@Getter -public class WPacketPlayOutAttachEntity extends WPacket { - - private int attachedEntityId, holdingEntityId; - private boolean isLeashModifer = true; - - @Override - public PacketType getPacketType() { - return PacketType.ATTACH; - } - - @Override - public Object getPacket() { - return null; - } - - @Override - public String toString() { - return "WPacketPlayOutAttachEntity{" + - "attachedEntityId=" + attachedEntityId + - ", holdingEntityId=" + holdingEntityId + - ", isLeashModifer=" + isLeashModifer + - '}'; - } -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutBlockChange.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutBlockChange.java deleted file mode 100644 index f4759a4..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutBlockChange.java +++ /dev/null @@ -1,36 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import dev.brighten.ac.utils.math.IntVector; -import lombok.Builder; -import lombok.Getter; -import org.bukkit.Material; - -@Builder -@Getter -public class WPacketPlayOutBlockChange extends WPacket { - - private IntVector blockLocation; - private Material material; - private byte blockData; - - - @Override - public PacketType getPacketType() { - return PacketType.BLOCK_CHANGE; - } - - @Override - public Object getPacket() { - return null; - } - - @Override - public String toString() { - return "WPacketPlayOutBlockChange{" + - "blockLocation=" + blockLocation + - ", material=" + material + - '}'; - } -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutEntity.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutEntity.java deleted file mode 100644 index 71dfe57..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutEntity.java +++ /dev/null @@ -1,42 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.Anticheat; -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import lombok.Builder; -import lombok.Getter; - -@Builder -@Getter -public class WPacketPlayOutEntity extends WPacket { - - private int id; - private boolean looked, moved, onGround; - private double x, y, z; - private float yaw, pitch; - - @Override - public PacketType getPacketType() { - return PacketType.ENTITY; - } - - @Override - public Object getPacket() { - return Anticheat.INSTANCE.getPacketProcessor().getPacketConverter().processOutEntity(this); - } - - @Override - public String toString() { - return "WPacketPlayOutEntity{" + - "id=" + id + - ", looked=" + looked + - ", moved=" + moved + - ", onGround=" + onGround + - ", x=" + x + - ", y=" + y + - ", z=" + z + - ", yaw=" + yaw + - ", pitch=" + pitch + - '}'; - } -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutEntityDestroy.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutEntityDestroy.java deleted file mode 100644 index 5ddb63a..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutEntityDestroy.java +++ /dev/null @@ -1,26 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import lombok.Builder; -import lombok.Getter; - -@Getter -@Builder -public class WPacketPlayOutEntityDestroy extends WPacket { - private int[] entityIds; - - public WPacketPlayOutEntityDestroy(int[] entityIds) { - this.entityIds = entityIds; - } - - @Override - public PacketType getPacketType() { - return PacketType.ENTITY_DESTROY; - } - - @Override - public Object getPacket() { - return null; - } -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutEntityEffect.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutEntityEffect.java deleted file mode 100644 index e2c6108..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutEntityEffect.java +++ /dev/null @@ -1,41 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.Anticheat; -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import lombok.Builder; -import lombok.Getter; - -@Builder -@Getter -public class WPacketPlayOutEntityEffect extends WPacket { - - private int entityId, effectId, duration; - private byte amplifier, flags; - /* Flags (source: https://wiki.vg/Protocol#Entity_Effect): - 0x01: Is ambient - was the effect spawned from a beacon? All beacon-generated effects are ambient. Ambient effects use a different icon in the HUD (blue border rather than gray). If all effects on an entity are ambient, the "Is potion effect ambient" living metadata field should be set to true. Usually should not be enabled. - 0x02: Show particles - should all particles from this effect be hidden? Effects with particles hidden are not included in the calculation of the effect color, and are not rendered on the HUD (but are still rendered within the inventory). Usually should be enabled. - 0x04: Show icon - should the icon be displayed on the client? Usually should be enabled. - */ - - @Override - public PacketType getPacketType() { - return PacketType.ENTITY_EFFECT; - } - - @Override - public Object getPacket() { - return Anticheat.INSTANCE.getPacketProcessor().getPacketConverter().processEntityEffect(this); - } - - @Override - public String toString() { - return "WPacketPlayOutEntityEffect{" + - "entityId=" + entityId + - ", effectId=" + effectId + - ", duration=" + duration + - ", amplifier=" + amplifier + - ", flags=" + flags + - '}'; - } -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutEntityMetadata.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutEntityMetadata.java deleted file mode 100644 index 8f63bb8..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutEntityMetadata.java +++ /dev/null @@ -1,30 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.Anticheat; -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import dev.brighten.ac.packet.wrapper.objects.WrappedWatchableObject; -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; - -import java.util.List; - -@Builder -@Getter -@Setter -public class WPacketPlayOutEntityMetadata extends WPacket { - - private int entityId; - private List watchedObjects; - - @Override - public PacketType getPacketType() { - return PacketType.ENTITY_METADATA; - } - - @Override - public Object getPacket() { - return Anticheat.INSTANCE.getPacketProcessor().getPacketConverter().processEntityMetadata(this); - } -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutEntityTeleport.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutEntityTeleport.java deleted file mode 100644 index 66bac04..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutEntityTeleport.java +++ /dev/null @@ -1,40 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.Anticheat; -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import lombok.Builder; -import lombok.Getter; - -@Builder -@Getter -public class WPacketPlayOutEntityTeleport extends WPacket { - - private int entityId; - private double x, y, z; - private float yaw, pitch; - private boolean onGround; - - @Override - public PacketType getPacketType() { - return PacketType.ENTITY_TELEPORT; - } - - @Override - public Object getPacket() { - return Anticheat.INSTANCE.getPacketProcessor().getPacketConverter().processEntityTeleport(this); - } - - @Override - public String toString() { - return "WPacketPlayOutEntityTeleport{" + - "entityId=" + entityId + - ", x=" + x + - ", y=" + y + - ", z=" + z + - ", yaw=" + yaw + - ", pitch=" + pitch + - ", onGround=" + onGround + - '}'; - } -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutEntityVelocity.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutEntityVelocity.java deleted file mode 100644 index a83532f..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutEntityVelocity.java +++ /dev/null @@ -1,34 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.Anticheat; -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import lombok.Builder; -import lombok.Getter; - -@Getter -@Builder -public class WPacketPlayOutEntityVelocity extends WPacket { - private int entityId; - private double deltaX, deltaY, deltaZ; - - @Override - public PacketType getPacketType() { - return PacketType.VELOCITY; - } - - @Override - public Object getPacket() { - return Anticheat.INSTANCE.getPacketProcessor().getPacketConverter().processVelocity(this); - } - - @Override - public String toString() { - return "WPacketPlayOutEntityVelocity{" + - "entityId=" + entityId + - ", deltaX=" + deltaX + - ", deltaY=" + deltaY + - ", deltaZ=" + deltaZ + - '}'; - } -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutExplosion.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutExplosion.java deleted file mode 100644 index 6e9ffa5..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutExplosion.java +++ /dev/null @@ -1,30 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.Anticheat; -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import dev.brighten.ac.utils.math.FloatVector; -import dev.brighten.ac.utils.math.IntVector; -import lombok.Builder; -import lombok.Getter; -import org.bukkit.util.Vector; - -@Getter -@Builder -public class WPacketPlayOutExplosion extends WPacket { - private Vector origin; - private float radius; // Currently unused in 1.8 - private IntVector[] blocksExploded; - private FloatVector entityPush; - - - @Override - public PacketType getPacketType() { - return PacketType.EXPLOSION; - } - - @Override - public Object getPacket() { - return Anticheat.INSTANCE.getPacketProcessor().getPacketConverter().processOutExplosion(this); - } -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutGameStateChange.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutGameStateChange.java deleted file mode 100644 index f27cb60..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutGameStateChange.java +++ /dev/null @@ -1,24 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.Anticheat; -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import lombok.Builder; -import lombok.Getter; - -@Getter -@Builder -public class WPacketPlayOutGameStateChange extends WPacket { - private short reason; - private float value; - - @Override - public PacketType getPacketType() { - return PacketType.GAME_STATE_CHANGE; - } - - @Override - public Object getPacket() { - return Anticheat.INSTANCE.getPacketProcessor().getPacketConverter().processOutGameStateChange(this); - } -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutMapChunk.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutMapChunk.java deleted file mode 100644 index c358e10..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutMapChunk.java +++ /dev/null @@ -1,39 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import dev.brighten.ac.utils.math.IntVector; -import lombok.AllArgsConstructor; -import lombok.Getter; -import org.bukkit.Material; - -import java.util.Map; - -@AllArgsConstructor -@Getter -public class WPacketPlayOutMapChunk extends WPacket { - - private WrappedChunk chunk; - - @Override - public PacketType getPacketType() { - return PacketType.MAP_CHUNK; - } - - @Override - public Object getPacket() { - return null; - } - - @AllArgsConstructor - public static class MinBlock { - public Material material; - public byte data; - } - - @AllArgsConstructor - @Getter - public static class WrappedChunk { - private Map blocks; - } -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutMapChunkBulk.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutMapChunkBulk.java deleted file mode 100644 index e5726bb..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutMapChunkBulk.java +++ /dev/null @@ -1,25 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import lombok.AllArgsConstructor; -import lombok.Getter; - -import java.util.List; - -@AllArgsConstructor -@Getter -public class WPacketPlayOutMapChunkBulk extends WPacket { - - private List chunks; - - @Override - public PacketType getPacketType() { - return PacketType.MAP_CHUNK_BULK; - } - - @Override - public Object getPacket() { - return null; - } -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutMultiBlockChange.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutMultiBlockChange.java deleted file mode 100644 index be27df5..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutMultiBlockChange.java +++ /dev/null @@ -1,52 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import dev.brighten.ac.utils.math.IntVector; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import org.bukkit.Material; - -import java.util.Arrays; - -@Builder -@Getter -public class WPacketPlayOutMultiBlockChange extends WPacket { - private int[] chunk; - private BlockChange[] changes; - - @Override - public PacketType getPacketType() { - return PacketType.MULTI_BLOCK_CHANGE; - } - - @Override - public Object getPacket() { - return null; - } - - @AllArgsConstructor - @Getter - public static class BlockChange { - private IntVector location; - private Material material; - private byte data; - - @Override - public String toString() { - return "BlockChange{" + - "location=" + location + - ", material=" + material + - '}'; - } - } - - @Override - public String toString() { - return "WPacketPlayOutMultiBlockChange{" + - "chunk=" + Arrays.toString(chunk) + - ", changes=" + Arrays.toString(changes) + - '}'; - } -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutNamedEntitySpawn.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutNamedEntitySpawn.java deleted file mode 100644 index e71f352..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutNamedEntitySpawn.java +++ /dev/null @@ -1,35 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.Anticheat; -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; - -import java.util.UUID; - -@Getter -@Setter -@Builder -public class WPacketPlayOutNamedEntitySpawn extends WPacket { - - private int entityId; - private UUID uuid; - private double x, y, z; - private float yaw, pitch; - private Material itemInHand; - - - @Override - public PacketType getPacketType() { - return PacketType.NAMED_ENTITY_SPAWN; - } - - @Override - public Object getPacket() { - return Anticheat.INSTANCE.getPacketProcessor().getPacketConverter().processNamedEntitySpawn(this); - } -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutPlayerInfo.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutPlayerInfo.java deleted file mode 100644 index 4760660..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutPlayerInfo.java +++ /dev/null @@ -1,4 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -public class WPacketPlayOutPlayerInfo { -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutPosition.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutPosition.java deleted file mode 100644 index 7e0b712..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutPosition.java +++ /dev/null @@ -1,95 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.Anticheat; -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import lombok.Builder; -import lombok.Getter; - -import java.util.EnumSet; -import java.util.Iterator; -import java.util.Set; - -@Builder -@Getter -public class WPacketPlayOutPosition extends WPacket { - - private double x, y, z; - private float yaw, pitch; - private int teleportAwait; - private Set flags; - - - @Override - public PacketType getPacketType() { - return PacketType.SERVER_POSITION; - } - - @Override - public Object getPacket() { - return Anticheat.INSTANCE.getPacketProcessor().getPacketConverter().processServerPosition(this); - } - - public enum EnumPlayerTeleportFlags { - X(0), - Y(1), - Z(2), - Y_ROT(3), - X_ROT(4); - - private int f; - - private EnumPlayerTeleportFlags(int var3) { - this.f = var3; - } - - private int a() { - return 1 << this.f; - } - - private boolean b(int var1) { - return (var1 & this.a()) == this.a(); - } - - public static Set a(int var0) { - EnumSet var1 = EnumSet.noneOf(EnumPlayerTeleportFlags.class); - EnumPlayerTeleportFlags[] var2 = values(); - int var3 = var2.length; - - for(int var4 = 0; var4 < var3; ++var4) { - EnumPlayerTeleportFlags var5 = var2[var4]; - if (var5.b(var0)) { - var1.add(var5); - } - } - - return var1; - } - - public static int a(Set var0) { - int var1 = 0; - - EnumPlayerTeleportFlags var3; - for(Iterator var2 = var0.iterator(); var2.hasNext(); var1 |= var3.a()) { - var3 = (EnumPlayerTeleportFlags)var2.next(); - } - - return var1; - } - - - } - - @Override - public String toString() { - return "WPacketPlayOutPosition{" + - "x=" + x + - ", y=" + y + - ", z=" + z + - ", yaw=" + yaw + - ", pitch=" + pitch + - ", teleportAwait=" + teleportAwait + - ", flags=" + flags + - '}'; - } -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutRemoveEntityEffect.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutRemoveEntityEffect.java deleted file mode 100644 index 3f7ca0b..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutRemoveEntityEffect.java +++ /dev/null @@ -1,26 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.Anticheat; -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import lombok.Builder; -import lombok.Getter; -import org.bukkit.potion.PotionEffectType; - -@Builder -@Getter -public class WPacketPlayOutRemoveEntityEffect extends WPacket { - - private int entityId; - private PotionEffectType effect; - - @Override - public PacketType getPacketType() { - return PacketType.REMOVE_EFFECT; - } - - @Override - public Object getPacket() { - return Anticheat.INSTANCE.getPacketProcessor().getPacketConverter().processRemoveEffect(this); - } -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutSpawnEntityLiving.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutSpawnEntityLiving.java deleted file mode 100644 index 58b3569..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutSpawnEntityLiving.java +++ /dev/null @@ -1,33 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.Anticheat; -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import dev.brighten.ac.packet.wrapper.objects.WrappedWatchableObject; -import lombok.Builder; -import lombok.Getter; -import org.bukkit.entity.EntityType; - -import java.util.List; - -@Getter -@Builder -public class WPacketPlayOutSpawnEntityLiving extends WPacket { - - private int entityId; - private EntityType type; - private double x, y, z; - private float yaw, pitch, headYaw; - private double motionX, motionY, motionZ; - private List watchedObjects; - - @Override - public PacketType getPacketType() { - return PacketType.SPAWN_ENTITY_LIVING; - } - - @Override - public Object getPacket() { - return Anticheat.INSTANCE.getPacketProcessor().getPacketConverter().processSpawnLiving(this); - } -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutTransaction.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutTransaction.java deleted file mode 100644 index e82eab4..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutTransaction.java +++ /dev/null @@ -1,28 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.Anticheat; -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@Builder -public class WPacketPlayOutTransaction extends WPacket { - - private int id; - private short action; - private boolean accept; - - @Override - public PacketType getPacketType() { - return PacketType.SERVER_TRANSACTION; - } - - @Override - public Object getPacket() { - return Anticheat.INSTANCE.getPacketProcessor().getPacketConverter().processServerTransaction(this); - } -} diff --git a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutWorldParticles.java b/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutWorldParticles.java deleted file mode 100644 index 6cf5956..0000000 --- a/src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutWorldParticles.java +++ /dev/null @@ -1,47 +0,0 @@ -package dev.brighten.ac.packet.wrapper.out; - -import dev.brighten.ac.Anticheat; -import dev.brighten.ac.packet.wrapper.PacketType; -import dev.brighten.ac.packet.wrapper.WPacket; -import dev.brighten.ac.packet.wrapper.objects.EnumParticle; -import lombok.Builder; -import lombok.Getter; - -import java.util.Arrays; - -@Getter -@Builder -public class WPacketPlayOutWorldParticles extends WPacket { - private EnumParticle particle; - private float x, y, z, offsetX, offsetY, offsetZ, speed; - private int amount; - private int[] data; - private boolean longD; - - @Override - public PacketType getPacketType() { - return PacketType.WORLD_PARTICLE; - } - - @Override - public Object getPacket() { - return Anticheat.INSTANCE.getPacketProcessor().getPacketConverter().processParticles(this); - } - - @Override - public String toString() { - return "WPacketPlayOutWorldParticles{" + - "particle=" + particle + - ", x=" + x + - ", y=" + y + - ", z=" + z + - ", offsetX=" + offsetX + - ", offsetY=" + offsetY + - ", offsetZ=" + offsetZ + - ", speed=" + speed + - ", amount=" + amount + - ", data=" + Arrays.toString(data) + - ", longD=" + longD + - '}'; - } -}