From 5a29eede69365e84936990027ae7123e7e1132d7 Mon Sep 17 00:00:00 2001
From: Smart123s <28480228+Smart123s@users.noreply.github.com>
Date: Tue, 20 Sep 2022 06:48:15 +0200
Subject: [PATCH 1/2] Bump Geyser version to 2.1.0-SNAPSHOT

---
 bukkit/pom.xml | 6 +++---
 bungee/pom.xml | 6 +++---
 core/pom.xml   | 8 ++++----
 pom.xml        | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index e5a7e0b2..824a0af2 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -245,7 +245,7 @@
 
         <!-- Bedrock player bridge -->
         <dependency>
-            <groupId>org.geysermc</groupId>
+            <groupId>org.geysermc.geyser</groupId>
             <artifactId>core</artifactId>
             <version>${geyser.version}</version>
             <scope>provided</scope>
@@ -259,8 +259,8 @@
 
         <!-- We need the API, but it was excluded above -->
         <dependency>
-            <groupId>org.geysermc</groupId>
-            <artifactId>geyser-api</artifactId>
+            <groupId>org.geysermc.geyser</groupId>
+            <artifactId>api</artifactId>
             <version>${geyser.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/bungee/pom.xml b/bungee/pom.xml
index a8fe32e1..40f605c9 100644
--- a/bungee/pom.xml
+++ b/bungee/pom.xml
@@ -186,7 +186,7 @@
 
         <!-- Bedrock player bridge -->
         <dependency>
-            <groupId>org.geysermc</groupId>
+            <groupId>org.geysermc.geyser</groupId>
             <artifactId>core</artifactId>
             <version>${geyser.version}</version>
             <scope>provided</scope>
@@ -200,8 +200,8 @@
 
         <!-- We need the API, but it was excluded above -->
         <dependency>
-            <groupId>org.geysermc</groupId>
-            <artifactId>geyser-api</artifactId>
+            <groupId>org.geysermc.geyser</groupId>
+            <artifactId>api</artifactId>
             <version>${geyser.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 53c6b494..5b45b25c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -56,7 +56,7 @@
         <!-- Floodgate -->
         <repository>
             <id>opencollab-snapshot</id>
-            <url>https://repo.opencollab.dev/maven-snapshots/</url>
+            <url>https://repo.opencollab.dev/artifactory/maven-snapshots/</url>
             <releases>
                 <enabled>false</enabled>
             </releases>
@@ -121,7 +121,7 @@
 
         <!-- Bedrock player bridge -->
         <dependency>
-            <groupId>org.geysermc</groupId>
+            <groupId>org.geysermc.geyser</groupId>
             <artifactId>core</artifactId>
             <version>${geyser.version}</version>
             <scope>provided</scope>
@@ -135,8 +135,8 @@
 
         <!-- We need the API, but it was excluded above -->
         <dependency>
-            <groupId>org.geysermc</groupId>
-            <artifactId>geyser-api</artifactId>
+            <groupId>org.geysermc.geyser</groupId>
+            <artifactId>api</artifactId>
             <version>${geyser.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/pom.xml b/pom.xml
index 716809c9..5c3dfce9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
         <maven.compiler.release>${java.version}</maven.compiler.release>
 
         <floodgate.version>2.2.0-SNAPSHOT</floodgate.version>
-        <geyser.version>2.0.6-SNAPSHOT</geyser.version>
+        <geyser.version>2.1.0-SNAPSHOT</geyser.version>
     </properties>
 
     <modules>

From 2fae5060dc3784a3e6bb382154482c7c13243fa3 Mon Sep 17 00:00:00 2001
From: Smart123s <28480228+Smart123s@users.noreply.github.com>
Date: Wed, 21 Sep 2022 10:39:37 +0200
Subject: [PATCH 2/2] Change Geyser AuthType classpath

---
 .../fastlogin/core/hooks/bedrock/GeyserService.java   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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 f3a5d995..dc60804a 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
@@ -31,8 +31,8 @@ import com.github.games647.fastlogin.core.shared.LoginSource;
 import java.util.UUID;
 
 import org.geysermc.geyser.GeyserImpl;
+import org.geysermc.geyser.api.network.AuthType;
 import org.geysermc.geyser.session.GeyserSession;
-import org.geysermc.geyser.session.auth.AuthType;
 
 public class GeyserService extends BedrockService<GeyserSession> {
 
@@ -44,7 +44,7 @@ public class GeyserService extends BedrockService<GeyserSession> {
         super(core);
         this.geyser = geyser;
         this.core = core;
-        this.authType = GeyserImpl.getInstance().getConfig().getRemote().getAuthType();
+        this.authType = GeyserImpl.getInstance().getConfig().getRemote().authType();
     }
 
     @Override
@@ -65,7 +65,12 @@ public class GeyserService extends BedrockService<GeyserSession> {
 
     @Override
     public GeyserSession getBedrockPlayer(String username) {
-        return geyser.connectionByName(username);
+        for (GeyserSession gSess : geyser.getSessionManager().getAllSessions()) {
+            if (username.equals(gSess.getClientData().getUsername())) {
+                return gSess;
+            }
+        }
+        return null;
     }
 
     @Override