From 8c33813e458a395c6162d5c0590f428a6e5e3178 Mon Sep 17 00:00:00 2001
From: Smart123s <28480228+Smart123s@users.noreply.github.com>
Date: Mon, 6 Dec 2021 18:23:11 +0100
Subject: [PATCH] Update to Geyser 2.0 API

---
 bukkit/pom.xml                                | 10 ++++++++-
 .../fastlogin/bukkit/FastLoginBukkit.java     |  4 ++--
 bungee/pom.xml                                | 10 ++++++++-
 .../fastlogin/bungee/FastLoginBungee.java     |  4 ++--
 core/pom.xml                                  | 10 ++++++++-
 .../core/hooks/bedrock/GeyserService.java     | 22 +++++++------------
 pom.xml                                       |  2 +-
 7 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index 9bd510a6..fbafedae 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -216,7 +216,7 @@
         <!-- Bedrock player bridge -->
         <dependency>
             <groupId>org.geysermc</groupId>
-            <artifactId>connector</artifactId>
+            <artifactId>core</artifactId>
             <version>${geyser.version}</version>
             <scope>provided</scope>
             <exclusions>
@@ -227,6 +227,14 @@
             </exclusions>
         </dependency>
 
+        <!-- We need the API, but it was excluded above -->
+        <dependency>
+            <groupId>org.geysermc</groupId>
+            <artifactId>geyser-api</artifactId>
+            <version>${geyser.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <!--Provide premium placeholders-->
         <dependency>
             <groupId>me.clip</groupId>
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
index 1450fc17..28a4f3d6 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
@@ -55,8 +55,8 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.geysermc.connector.GeyserConnector;
 import org.geysermc.floodgate.api.FloodgateApi;
+import org.geysermc.geyser.GeyserImpl;
 import org.slf4j.Logger;
 
 /**
@@ -151,7 +151,7 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
 
     private boolean initializeFloodgate() {
         if (getServer().getPluginManager().getPlugin("Geyser-Spigot") != null) {
-            geyserService = new GeyserService(GeyserConnector.getInstance(), core);
+            geyserService = new GeyserService(GeyserImpl.getInstance(), core);
         }
 
         if (getServer().getPluginManager().getPlugin("floodgate") != null) {
diff --git a/bungee/pom.xml b/bungee/pom.xml
index f0aa6cc6..52a26622 100644
--- a/bungee/pom.xml
+++ b/bungee/pom.xml
@@ -152,7 +152,7 @@
         <!-- Bedrock player bridge -->
         <dependency>
             <groupId>org.geysermc</groupId>
-            <artifactId>connector</artifactId>
+            <artifactId>core</artifactId>
             <version>${geyser.version}</version>
             <scope>provided</scope>
             <exclusions>
@@ -163,6 +163,14 @@
             </exclusions>
         </dependency>
 
+        <!-- We need the API, but it was excluded above -->
+        <dependency>
+            <groupId>org.geysermc</groupId>
+            <artifactId>geyser-api</artifactId>
+            <version>${geyser.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <!--Login plugin-->
         <dependency>
             <groupId>me.vik1395</groupId>
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java
index 5346bf8b..e32c7622 100644
--- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java
+++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java
@@ -62,8 +62,8 @@ import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.api.plugin.PluginManager;
 import net.md_5.bungee.api.scheduler.GroupedThreadFactory;
 
-import org.geysermc.connector.GeyserConnector;
 import org.geysermc.floodgate.api.FloodgateApi;
+import org.geysermc.geyser.GeyserImpl;
 import org.slf4j.Logger;
 
 /**
@@ -95,7 +95,7 @@ public class FastLoginBungee extends Plugin implements PlatformPlugin<CommandSen
         }
 
         if (isPluginInstalled("Geyser-BungeeCord")) {
-            geyserService = new GeyserService(GeyserConnector.getInstance(), core);
+            geyserService = new GeyserService(GeyserImpl.getInstance(), core);
         }
 
         //events
diff --git a/core/pom.xml b/core/pom.xml
index 857212a1..b6a1b680 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -119,7 +119,7 @@
         <!-- Bedrock player bridge -->
         <dependency>
             <groupId>org.geysermc</groupId>
-            <artifactId>connector</artifactId>
+            <artifactId>core</artifactId>
             <version>${geyser.version}</version>
             <scope>provided</scope>
             <exclusions>
@@ -130,6 +130,14 @@
             </exclusions>
         </dependency>
 
+        <!-- We need the API, but it was excluded above -->
+        <dependency>
+            <groupId>org.geysermc</groupId>
+            <artifactId>geyser-api</artifactId>
+            <version>${geyser.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <!--Common component for contacting the Mojang API-->
         <dependency>
             <groupId>com.github.games647</groupId>
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/hooks/bedrock/GeyserService.java b/core/src/main/java/com/github/games647/fastlogin/core/hooks/bedrock/GeyserService.java
index 181927e9..5dba9780 100644
--- a/core/src/main/java/com/github/games647/fastlogin/core/hooks/bedrock/GeyserService.java
+++ b/core/src/main/java/com/github/games647/fastlogin/core/hooks/bedrock/GeyserService.java
@@ -30,21 +30,21 @@ import java.util.UUID;
 import com.github.games647.fastlogin.core.shared.FastLoginCore;
 import com.github.games647.fastlogin.core.shared.LoginSource;
 
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.common.AuthType;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.session.auth.AuthType;
 
 public class GeyserService extends BedrockService<GeyserSession> {
 
-    private final GeyserConnector geyser;
+    private final GeyserImpl geyser;
     private final FastLoginCore<?, ?, ?> core;
     private final AuthType authType;
 
-    public GeyserService(GeyserConnector geyser, FastLoginCore<?, ?, ?> core) {
+    public GeyserService(GeyserImpl geyser, FastLoginCore<?, ?, ?> core) {
         super(core);
         this.geyser = geyser;
         this.core = core;
-        this.authType = geyser.getConfig().getRemote().getAuthType();
+        this.authType = GeyserImpl.getInstance().getConfig().getRemote().getAuthType();
     }
 
     @Override
@@ -65,17 +65,11 @@ public class GeyserService extends BedrockService<GeyserSession> {
 
     @Override
     public GeyserSession getBedrockPlayer(String username) {
-        for (GeyserSession gSess : geyser.getSessionManager().getSessions().values()) {
-            if (gSess.getName().equals(username)) {
-                return gSess;
-            }
-        }
-
-        return null;
+        return geyser.connectionByName(username);
     }
 
     @Override
     public GeyserSession getBedrockPlayer(UUID uuid) {
-        return geyser.getPlayerByUuid(uuid);
+        return geyser.connectionByUuid(uuid);
     }
 }
diff --git a/pom.xml b/pom.xml
index 07071190..691b22b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
 
         <floodgate.version>2.0-SNAPSHOT</floodgate.version>
-        <geyser.version>1.4.3-SNAPSHOT</geyser.version>
+        <geyser.version>2.0.0-SNAPSHOT</geyser.version>
     </properties>
 
     <modules>