TuxCoding/FastLogin
1
0
Fork 1
mirror of https://github.com/TuxCoding/FastLogin.git synced 2025-07-31 11:17:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Geyser 2.0 API

Browse Source
This commit is contained in:
Smart123s
2021-12-06 18:23:11 +01:00
parent 95251b611a
commit 8c33813e45
7 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bukkit/pom.xml
View File

@ -216,7 +216,7 @@
<!-- Bedrock player bridge --> <!-- Bedrock player bridge -->
<dependency> <dependency>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>connector</artifactId> <artifactId>core</artifactId>
<version>${geyser.version}</version> <version>${geyser.version}</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
@ -227,6 +227,14 @@
</exclusions> </exclusions>
</dependency> </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--> <!--Provide premium placeholders-->
<dependency> <dependency>
<groupId>me.clip</groupId> <groupId>me.clip</groupId>

4
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
View File

@ -55,8 +55,8 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import org.geysermc.connector.GeyserConnector;
import org.geysermc.floodgate.api.FloodgateApi; import org.geysermc.floodgate.api.FloodgateApi;
import org.geysermc.geyser.GeyserImpl;
import org.slf4j.Logger; import org.slf4j.Logger;
/** /**
@ -151,7 +151,7 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
private boolean initializeFloodgate() { private boolean initializeFloodgate() {
if (getServer().getPluginManager().getPlugin("Geyser-Spigot") != null) { 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) { if (getServer().getPluginManager().getPlugin("floodgate") != null) {

10
bungee/pom.xml
View File

@ -152,7 +152,7 @@
<!-- Bedrock player bridge --> <!-- Bedrock player bridge -->
<dependency> <dependency>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>connector</artifactId> <artifactId>core</artifactId>
<version>${geyser.version}</version> <version>${geyser.version}</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
@ -163,6 +163,14 @@
</exclusions> </exclusions>
</dependency> </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--> <!--Login plugin-->
<dependency> <dependency>
<groupId>me.vik1395</groupId> <groupId>me.vik1395</groupId>

4
bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java
View File

@ -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.plugin.PluginManager;
import net.md_5.bungee.api.scheduler.GroupedThreadFactory; import net.md_5.bungee.api.scheduler.GroupedThreadFactory;
import org.geysermc.connector.GeyserConnector;
import org.geysermc.floodgate.api.FloodgateApi; import org.geysermc.floodgate.api.FloodgateApi;
import org.geysermc.geyser.GeyserImpl;
import org.slf4j.Logger; import org.slf4j.Logger;
/** /**
@ -95,7 +95,7 @@ public class FastLoginBungee extends Plugin implements PlatformPlugin<CommandSen
} }
if (isPluginInstalled("Geyser-BungeeCord")) { if (isPluginInstalled("Geyser-BungeeCord")) {
geyserService = new GeyserService(GeyserConnector.getInstance(), core); geyserService = new GeyserService(GeyserImpl.getInstance(), core);
} }
//events //events

10
core/pom.xml
View File

@ -119,7 +119,7 @@
<!-- Bedrock player bridge --> <!-- Bedrock player bridge -->
<dependency> <dependency>
<groupId>org.geysermc</groupId> <groupId>org.geysermc</groupId>
<artifactId>connector</artifactId> <artifactId>core</artifactId>
<version>${geyser.version}</version> <version>${geyser.version}</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
@ -130,6 +130,14 @@
</exclusions> </exclusions>
</dependency> </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--> <!--Common component for contacting the Mojang API-->
<dependency> <dependency>
<groupId>com.github.games647</groupId> <groupId>com.github.games647</groupId>

22
core/src/main/java/com/github/games647/fastlogin/core/hooks/bedrock/GeyserService.java
View File

@ -30,21 +30,21 @@ import java.util.UUID;
import com.github.games647.fastlogin.core.shared.FastLoginCore; import com.github.games647.fastlogin.core.shared.FastLoginCore;
import com.github.games647.fastlogin.core.shared.LoginSource; import com.github.games647.fastlogin.core.shared.LoginSource;
import org.geysermc.connector.GeyserConnector; import org.geysermc.geyser.GeyserImpl;
import org.geysermc.connector.common.AuthType; import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.geyser.session.auth.AuthType;
public class GeyserService extends BedrockService<GeyserSession> { public class GeyserService extends BedrockService<GeyserSession> {
private final GeyserConnector geyser; private final GeyserImpl geyser;
private final FastLoginCore<?, ?, ?> core; private final FastLoginCore<?, ?, ?> core;
private final AuthType authType; private final AuthType authType;
public GeyserService(GeyserConnector geyser, FastLoginCore<?, ?, ?> core) { public GeyserService(GeyserImpl geyser, FastLoginCore<?, ?, ?> core) {
super(core); super(core);
this.geyser = geyser; this.geyser = geyser;
this.core = core; this.core = core;
this.authType = geyser.getConfig().getRemote().getAuthType(); this.authType = GeyserImpl.getInstance().getConfig().getRemote().getAuthType();
} }
@Override @Override
@ -65,17 +65,11 @@ public class GeyserService extends BedrockService<GeyserSession> {
@Override @Override
public GeyserSession getBedrockPlayer(String username) { public GeyserSession getBedrockPlayer(String username) {
for (GeyserSession gSess : geyser.getSessionManager().getSessions().values()) { return geyser.connectionByName(username);
if (gSess.getName().equals(username)) {
return gSess;
}
}
return null;
} }
@Override @Override
public GeyserSession getBedrockPlayer(UUID uuid) { public GeyserSession getBedrockPlayer(UUID uuid) {
return geyser.getPlayerByUuid(uuid); return geyser.connectionByUuid(uuid);
} }
} }

2
pom.xml
View File

@ -53,7 +53,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<floodgate.version>2.0-SNAPSHOT</floodgate.version> <floodgate.version>2.0-SNAPSHOT</floodgate.version>
<geyser.version>1.4.3-SNAPSHOT</geyser.version> <geyser.version>2.0.0-SNAPSHOT</geyser.version>
</properties> </properties>
<modules> <modules>