TuxCoding/FastLogin
1
0
Fork 1
mirror of https://github.com/TuxCoding/FastLogin.git synced 2025-07-29 18:27:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Migrate to Floodgate v2.0

Browse Source 
This removes support for Floodgate 1.x
This commit is contained in:
Smart123s
2021-03-29 14:49:33 +02:00
parent f7fd94e983
commit 870d1ee281
4 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bukkit/pom.xml
View File

@ -162,19 +162,11 @@
</exclusions>
</dependency>
<!--Geyser for Bedrock Edition support-->
<dependency>
<groupId>org.geysermc</groupId>
<artifactId>connector</artifactId>
<version>1.2.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!--Floodgate for Xbox Live Authentication-->
<dependency>
<groupId>org.geysermc</groupId>
<artifactId>floodgate-bukkit</artifactId>
<version>1.0-SNAPSHOT</version>
<groupId>org.geysermc.floodgate</groupId>
<artifactId>api</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

5
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java
View File

@ -13,7 +13,7 @@ import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerLoginEvent;
import org.bukkit.event.player.PlayerLoginEvent.Result;
import org.geysermc.connector.GeyserConnector;
import org.geysermc.floodgate.api.FloodgateApi;
import org.bukkit.event.player.PlayerQuitEvent;
/**
@ -48,7 +48,8 @@ public class ConnectionListener implements Listener {
// having the login session from the login process
BukkitLoginSession session = plugin.getSession(player.getAddress());
if (GeyserConnector.getInstance().getPlayerByUuid(player.getUniqueId()) != null) {
if (Bukkit.getServer().getPluginManager().isPluginEnabled("floodgate") &&
FloodgateApi.getInstance().getPlayer(player.getUniqueId()) != null) {
Runnable floodgateAuthTask = new FloodgateAuthTask(plugin, player);
Bukkit.getScheduler().runTaskAsynchronously(plugin, floodgateAuthTask);
} else if (session == null) {

22
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java
View File

@ -15,9 +15,8 @@ import java.util.Random;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.geysermc.connector.GeyserConnector;
import org.geysermc.connector.common.AuthType;
import org.geysermc.connector.network.session.GeyserSession;
import org.geysermc.floodgate.api.FloodgateApi;
import org.geysermc.floodgate.api.player.FloodgatePlayer;
public class NameCheckTask extends JoinManagement<Player, CommandSender, ProtocolLibLoginSource>
implements Runnable {
@ -48,7 +47,7 @@ public class NameCheckTask extends JoinManagement<Player, CommandSender, Protoco
try {
// check if the player is connecting through Geyser
if (!plugin.getCore().getConfig().getString("allowFloodgateNameConflict").equalsIgnoreCase("false")
&& getGeyserPlayer(username) != null) {
&& getFloodgatePlayer(username) != null) {
plugin.getLog().info("Skipping name conflict checking for player {}", username);
return;
}
@ -97,17 +96,12 @@ public class NameCheckTask extends JoinManagement<Player, CommandSender, Protoco
plugin.putSession(player.getAddress(), loginSession);
}
private static GeyserSession getGeyserPlayer(String username) {
if (Bukkit.getServer().getPluginManager().isPluginEnabled("floodgate-bukkit") &&
Bukkit.getServer().getPluginManager().isPluginEnabled("Geyser-Spigot") &&
GeyserConnector.getInstance().getDefaultAuthType() == AuthType.FLOODGATE) {
private static FloodgatePlayer getFloodgatePlayer(String username) {
if (Bukkit.getServer().getPluginManager().isPluginEnabled("floodgate")) {
// the Floodgate API requires UUID, which is inaccessible at NameCheckTask.java
// the Floodgate API has a return value for Java (non-bedrock) players, if they
// are linked to a Bedrock account
// workaround: iterate over Geyser's player's usernames
for (GeyserSession geyserPlayer : GeyserConnector.getInstance().getPlayers()) {
if (geyserPlayer.getName().equals(username)) {
return geyserPlayer;
for (FloodgatePlayer floodgatePlayer : FloodgateApi.getInstance().getPlayers()) {
if (floodgatePlayer.getUsername().equals(username)) {
return floodgatePlayer;
}
}
}

8
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/FloodgateAuthTask.java
View File

@ -2,8 +2,8 @@ package com.github.games647.fastlogin.bukkit.task;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.geysermc.floodgate.FloodgateAPI;
import org.geysermc.floodgate.FloodgatePlayer;
import org.geysermc.floodgate.api.FloodgateApi;
import org.geysermc.floodgate.api.player.FloodgatePlayer;
import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
@ -22,13 +22,13 @@ public class FloodgateAuthTask implements Runnable {
@Override
public void run() {
FloodgatePlayer floodgatePlayer = FloodgateAPI.getPlayer(player.getUniqueId());
FloodgatePlayer floodgatePlayer = FloodgateApi.getInstance().getPlayer(player.getUniqueId());
plugin.getLog().info(
"Player {} is connecting through Geyser Floodgate.",
player.getName());
String allowNameConflict = plugin.getCore().getConfig().getString("allowFloodgateNameConflict");
// check if the Bedrock player is linked to a Java account
boolean isLinked = floodgatePlayer.fetchLinkedPlayer() != null;
boolean isLinked = floodgatePlayer.getLinkedPlayer() != null;
if (allowNameConflict.equalsIgnoreCase("linked") && !isLinked) {
plugin.getLog().info(
"Bedrock Player {}'s name conflits an existing Java Premium Player's name",