Merge pull request #552 from ItzKatze/master

fix anticheat errors

Author: ItzKatze

anticheat/build.gradle.kts

@@ -17,6 +17,14 @@ repositories {
             password = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN")
         }
     }
+
+    maven {
+        url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
+    }
+
+    maven {
+        url = uri("https://repo.dmulloy2.net/repository/public/")
+    }
 }
 
 dependencies {
@@ -25,13 +33,16 @@ dependencies {
     }
     implementation("org.tinylog:tinylog-api:2.7.0")
     implementation("org.tinylog:tinylog-impl:2.7.0")
+
+    compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT")
+
+    compileOnly("com.comphenix.protocol:ProtocolLib:5.1.0")
 }
 
 tasks.test {
     useJUnitPlatform()
 }
 
-
 java {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17

anticheat/src/main/java/net/swofty/anticheat/api/AnticheatAPI.java

@@ -1,9 +1,10 @@
 package net.swofty.anticheat.api;
 
+import lombok.Getter;
 import net.swofty.anticheat.api.modifier.CustomModifierRegistry;
 import net.swofty.anticheat.api.player.BypassManager;
 import net.swofty.anticheat.api.player.PlayerDataRegistry;
-import net.swofty.anticheat.detection.FlagType;
+import net.swofty.anticheat.flag.FlagType;
 import net.swofty.anticheat.prediction.modifier.FrictionModifier;
 import net.swofty.anticheat.prediction.modifier.VelocityModifier;
 
@@ -19,8 +20,14 @@
  * - Hook into detection events
  */
 public class AnticheatAPI {
+
+    @Getter
     private static final CustomModifierRegistry modifierRegistry = new CustomModifierRegistry();
+
+    @Getter
     private static final PlayerDataRegistry playerDataRegistry = new PlayerDataRegistry();
+
+    @Getter
     private static final BypassManager bypassManager = new BypassManager();
 
     /**
@@ -152,31 +159,4 @@ public static boolean hasBypass(UUID uuid, FlagType flagType) {
     public static void clearBypasses(UUID uuid) {
         bypassManager.clearBypasses(uuid);
     }
-
-    /**
-     * Get the custom modifier registry.
-     *
-     * @return The modifier registry
-     */
-    public static CustomModifierRegistry getModifierRegistry() {
-        return modifierRegistry;
-    }
-
-    /**
-     * Get the player data registry.
-     *
-     * @return The player data registry
-     */
-    public static PlayerDataRegistry getPlayerDataRegistry() {
-        return playerDataRegistry;
-    }
-
-    /**
-     * Get the bypass manager.
-     *
-     * @return The bypass manager
-     */
-    public static BypassManager getBypassManager() {
-        return bypassManager;
-    }
 }

anticheat/src/main/java/net/swofty/anticheat/api/player/BypassManager.java

@@ -1,8 +1,7 @@
 package net.swofty.anticheat.api.player;
 
-import net.swofty.anticheat.detection.FlagType;
+import net.swofty.anticheat.flag.FlagType;
 
-import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;

anticheat/src/main/java/net/swofty/anticheat/api/player/PlayerDataRegistry.java

@@ -19,7 +19,7 @@ public Object getData(UUID uuid, String key) {
 
     public <T> T getData(UUID uuid, String key, Class<T> type) {
         Object data = getData(uuid, key);
-        if (data != null && type.isInstance(data)) {
+        if (type.isInstance(data)) {
             return type.cast(data);
         }
         return null;

anticheat/src/main/java/net/swofty/anticheat/event/events/AnticheatPacketEvent.java

@@ -1,15 +1,14 @@
 package net.swofty.anticheat.event.events;
 
+import lombok.Getter;
 import net.swofty.anticheat.event.packet.SwoftyPacket;
 
+@Getter
 public class AnticheatPacketEvent {
     private final SwoftyPacket packet;
 
     public AnticheatPacketEvent(SwoftyPacket packet) {
         this.packet = packet;
     }
 
-    public SwoftyPacket getPacket() {
-        return packet;
-    }
 }

anticheat/src/main/java/net/swofty/anticheat/event/packet/IsOnGroundPacket.java

@@ -1,16 +1,15 @@
 package net.swofty.anticheat.event.packet;
 
+import lombok.Getter;
 import net.swofty.anticheat.engine.SwoftyPlayer;
 
+@Getter
 public class IsOnGroundPacket extends SwoftyPacket {
-    private boolean onGround;
+    private final boolean onGround;
 
     public IsOnGroundPacket(SwoftyPlayer player, boolean onGround) {
         super(player);
         this.onGround = onGround;
     }
 
-    public boolean isOnGround() {
-        return onGround;
-    }
 }

anticheat/src/main/java/net/swofty/anticheat/event/packet/PingResponsePacket.java

@@ -5,7 +5,7 @@
 
 @Getter
 public class PingResponsePacket extends SwoftyPacket {
-    private long requestId;
+    private final long requestId;
 
     public PingResponsePacket(SwoftyPlayer player, long requestId) {
         super(player);

anticheat/src/main/java/net/swofty/anticheat/event/packet/PositionAndRotationPacket.java

@@ -1,23 +1,18 @@
 package net.swofty.anticheat.event.packet;
 
+import lombok.Getter;
 import net.swofty.anticheat.engine.SwoftyPlayer;
 import net.swofty.anticheat.math.Pos;
 
+@Getter
 public class PositionAndRotationPacket extends SwoftyPacket {
-    private Pos pos;
-    private boolean onGround;
+    private final Pos pos;
+    private final boolean onGround;
 
     public PositionAndRotationPacket(SwoftyPlayer player, Pos pos, boolean onGround) {
         super(player);
         this.pos = pos;
         this.onGround = onGround;
     }
 
-    public Pos getPos() {
-        return pos;
-    }
-
-    public boolean isOnGround() {
-        return onGround;
-    }
 }

anticheat/src/main/java/net/swofty/anticheat/event/packet/PositionPacket.java

@@ -1,13 +1,15 @@
 package net.swofty.anticheat.event.packet;
 
+import lombok.Getter;
 import net.swofty.anticheat.engine.SwoftyPlayer;
 import org.jetbrains.annotations.NotNull;
 
+@Getter
 public class PositionPacket extends SwoftyPacket {
-    private double x;
-    private double y;
-    private double z;
-    private boolean onGround;
+    private final double x;
+    private final double y;
+    private final double z;
+    private final boolean onGround;
 
     public PositionPacket(@NotNull SwoftyPlayer player, double x, double y, double z, boolean onGround) {
         super(player);
@@ -16,20 +18,4 @@ public PositionPacket(@NotNull SwoftyPlayer player, double x, double y, double z
         this.z = z;
         this.onGround = onGround;
     }
-
-    public double getX() {
-        return x;
-    }
-
-    public double getY() {
-        return y;
-    }
-
-    public double getZ() {
-        return z;
-    }
-
-    public boolean isOnGround() {
-        return onGround;
-    }
 }

anticheat/src/main/java/net/swofty/anticheat/event/packet/RotationPacket.java

@@ -1,11 +1,13 @@
 package net.swofty.anticheat.event.packet;
 
+import lombok.Getter;
 import net.swofty.anticheat.engine.SwoftyPlayer;
 
+@Getter
 public class RotationPacket extends SwoftyPacket {
-    private float yaw;
-    private float pitch;
-    private boolean onGround;
+    private final float yaw;
+    private final float pitch;
+    private final boolean onGround;
 
     public RotationPacket(SwoftyPlayer player, float yaw, float pitch, boolean onGround) {
         super(player);
@@ -14,15 +16,4 @@ public RotationPacket(SwoftyPlayer player, float yaw, float pitch, boolean onGro
         this.onGround = onGround;
     }
 
-    public float getYaw() {
-        return yaw;
-    }
-
-    public float getPitch() {
-        return pitch;
-    }
-
-    public boolean isOnGround() {
-        return onGround;
-    }
 }