geyser detection rewrite

Author: ManInMyVan

build.gradle.kts

@@ -52,6 +52,7 @@ repositories {
     maven("https://nexus.scarsz.me/content/repositories/releases") // Configuralize
     maven("https://repo.opencollab.dev/maven-snapshots/") // Floodgate
     maven("https://repo.opencollab.dev/maven-releases/") // Cumulus (for Floodgate)
+    maven("https://repo.opencollab.dev/main/") // Geyser
     maven("https://repo.codemc.io/repository/maven-releases/") // PacketEvents
     maven("https://repo.codemc.io/repository/maven-snapshots/")
     maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
@@ -78,6 +79,7 @@ dependencies {
 
     implementation("org.jetbrains:annotations:24.1.0")
     compileOnly("org.geysermc.floodgate:api:2.0-SNAPSHOT")
+    compileOnly("org.geysermc.geyser:api:2.4.2-SNAPSHOT")
     compileOnly("com.viaversion:viaversion-api:5.0.4-SNAPSHOT")
     compileOnly("me.clip:placeholderapi:2.11.6")
     compileOnly("io.netty:netty-all:4.1.85.Final")

src/main/java/ac/grim/grimac/utils/anticheat/PlayerDataManager.java

@@ -2,12 +2,11 @@
 
 import ac.grim.grimac.api.events.GrimJoinEvent;
 import ac.grim.grimac.player.GrimPlayer;
-import ac.grim.grimac.utils.floodgate.FloodgateUtil;
+import ac.grim.grimac.utils.geyser.GeyserUtil;
 import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.netty.channel.ChannelHelper;
 import com.github.retrooper.packetevents.protocol.player.User;
-import io.github.retrooper.packetevents.util.GeyserUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
@@ -25,8 +24,7 @@ public GrimPlayer getPlayer(final Player player) {
         if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_18) && MultiLibUtil.isExternalPlayer(player)) return null;
 
         // Is it safe to interact with this, or is this internal PacketEvents code?
-        User user = PacketEvents.getAPI().getPlayerManager().getUser(player);
-        return playerDataMap.get(user);
+        return playerDataMap.get(PacketEvents.getAPI().getPlayerManager().getUser(player));
     }
 
     public boolean shouldCheck(User user) {
@@ -35,8 +33,7 @@ public boolean shouldCheck(User user) {
 
         if (user.getUUID() != null) {
             // Geyser players don't have Java movement
-            // Floodgate is the authentication system for Geyser on servers that use Geyser as a proxy instead of installing it as a plugin directly on the server
-            if (GeyserUtil.isGeyserPlayer(user.getUUID()) || FloodgateUtil.isFloodgatePlayer(user.getUUID())) {
+            if (GeyserUtil.isBedrockPlayer(user.getUUID())) {
                 exemptUsers.add(user);
                 return false;
             }
@@ -47,13 +44,6 @@ public boolean shouldCheck(User user) {
                 exemptUsers.add(user);
                 return false;
             }
-
-            // Geyser formatted player string
-            // This will never happen for Java players, as the first character in the 3rd group is always 4 (xxxxxxxx-xxxx-4xxx-xxxx-xxxxxxxxxxxx)
-            if (user.getUUID().toString().startsWith("00000000-0000-0000-0009")) {
-                exemptUsers.add(user);
-                return false;
-            }
         }
 
         return true;

src/main/java/ac/grim/grimac/utils/floodgate/FloodgateUtil.java

@@ -0,0 +1,36 @@
+package ac.grim.grimac.utils.geyser;
+
+import org.geysermc.api.Geyser;
+import org.geysermc.floodgate.api.FloodgateApi;
+
+import java.util.UUID;
+
+public class GeyserUtil {
+    // Floodgate is the authentication system for Geyser on servers that use Geyser
+    // as a proxy instead of installing it as a plugin directly on the server
+    private static boolean floodgate;
+    private static boolean geyser;
+
+    public static boolean isBedrockPlayer(UUID uuid) {
+        return floodgate && FloodgateApi.getInstance().isFloodgatePlayer(uuid)
+                || geyser && Geyser.api().isBedrockPlayer(uuid);
+    }
+
+    static {
+        try {
+            @SuppressWarnings("unused")
+            Object obj = FloodgateApi.class;
+            floodgate = true;
+        } catch (NoClassDefFoundError e) {
+            floodgate = false;
+        }
+
+        try {
+            @SuppressWarnings("unused")
+            Object obj = Geyser.class;
+            geyser = true;
+        } catch (NoClassDefFoundError e) {
+            geyser = false;
+        }
+    }
+}