Fix ProtocolLib version and paper URL (#1269)

### Summary of your change

- Use new URL for papermc. The old one will breaked at the end of
december
- The used version of ProtocolLib is no longer available. I changed it
to new one.

README.md

@@ -64,7 +64,7 @@ Possible values: `Premium`, `Cracked`, `Unknown`
 * Server software in offlinemode:
   * Spigot (or a fork e.g. Paper) 1.8.8+
     * Protocol plugin:
-      * [ProtocolLib 5.2+](https://www.spigotmc.org/resources/protocollib.1997/) or
+      * [ProtocolLib 5.3+ with development build above 720](https://www.spigotmc.org/resources/protocollib.1997/) or
       * [ProtocolSupport](https://www.spigotmc.org/resources/protocolsupport.7201/)
   * Latest BungeeCord (or a fork e.g. Waterfall) or Velocity proxy
 * An auth plugin.

bukkit/pom.xml

@@ -50,7 +50,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.3</version>
+                <version>3.6.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <shadedArtifactAttached>false</shadedArtifactAttached>
@@ -119,16 +119,13 @@
         <!-- PaperSpigot API, PaperLib, datafixupper and bungeecord-chat -->
         <repository>
             <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
         </repository>
 
         <!-- ProtocolLib -->
         <repository>
             <id>dmulloy2-repo</id>
             <url>https://repo.dmulloy2.net/repository/public/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
         </repository>
 
         <!-- AuthMe Reloaded, xAuth and LoginSecurity -->
@@ -211,7 +208,7 @@
         <dependency>
             <groupId>com.comphenix.protocol</groupId>
             <artifactId>ProtocolLib</artifactId>
-            <version>5.1.0</version>
+            <version>5.3.0</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -282,7 +279,7 @@
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.11.5</version>
+            <version>2.11.6</version>
             <scope>provided</scope>
             <optional>true</optional>
             <exclusions>
@@ -297,7 +294,7 @@
         <dependency>
             <groupId>fr.xephi</groupId>
             <artifactId>authme</artifactId>
-            <version>5.6.0-beta2</version>
+            <version>5.6.0</version>
             <scope>provided</scope>
             <optional>true</optional>
             <exclusions>

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

@@ -90,6 +90,7 @@ public class ConnectionListener implements Listener {
                 if (floodgatePlayer != null) {
                     Runnable floodgateAuthTask = new FloodgateAuthTask(plugin.getCore(), player, floodgatePlayer);
                     Bukkit.getScheduler().runTaskAsynchronously(plugin, floodgateAuthTask);
+                    plugin.getBungeeManager().markJoinEventFired(player);
                     return;
                 }
             }

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java

@@ -30,12 +30,11 @@ import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
-import com.comphenix.protocol.injector.PacketFilterManager;
-import com.comphenix.protocol.injector.player.PlayerInjectionHandler;
+import com.comphenix.protocol.injector.netty.channel.NettyChannelInjector;
+import com.comphenix.protocol.injector.temporary.TemporaryPlayerFactory;
 import com.comphenix.protocol.reflect.FieldAccessException;
 import com.comphenix.protocol.reflect.FuzzyReflection;
 import com.comphenix.protocol.reflect.accessors.Accessors;
-import com.comphenix.protocol.reflect.accessors.FieldAccessor;
 import com.comphenix.protocol.utility.MinecraftVersion;
 import com.comphenix.protocol.wrappers.BukkitConverters;
 import com.comphenix.protocol.wrappers.Converters;
@@ -75,7 +74,6 @@ import static com.comphenix.protocol.PacketType.Login.Client.START;
 public class ProtocolLibListener extends PacketAdapter {
 
     private final FastLoginBukkit plugin;
-    private final PlayerInjectionHandler handler;
 
     //just create a new once on plugin enable. This used for verify token generation
     private final SecureRandom random = new SecureRandom();
@@ -94,7 +92,6 @@ public class ProtocolLibListener extends PacketAdapter {
         this.plugin = plugin;
         this.antiBotService = antiBotService;
         this.verifyClientKeys = verifyClientKeys;
-        this.handler = getHandler();
     }
 
     public static void register(FastLoginBukkit plugin, AntiBotService antiBotService, boolean verifyClientKeys) {
@@ -117,13 +114,13 @@ public class ProtocolLibListener extends PacketAdapter {
         Player sender = packetEvent.getPlayer();
         PacketType packetType = getOverriddenType(packetEvent.getPacketType());
 
-        plugin.getLog().info("New packet {} from {}", packetType, sender);
+        plugin.getLog().info("New incoming packet {} from {}", packetType, sender.getName());
         try {
             if (packetType == START) {
                 if (plugin.getFloodgateService() != null) {
                     boolean success = processFloodgateTasks(packetEvent);
-                    // don't continue execution if the player was kicked by Floodgate
                     if (!success) {
+                        // don't continue execution if the player was kicked by Floodgate
                         return;
                     }
                 }
@@ -297,18 +294,19 @@ public class ProtocolLibListener extends PacketAdapter {
         return profile.getName();
     }
 
-    private static PlayerInjectionHandler getHandler() {
-        PacketFilterManager manager = (PacketFilterManager) ProtocolLibrary.getProtocolManager();
-        FieldAccessor accessor = Accessors.getFieldAccessor(manager.getClass(), PlayerInjectionHandler.class, true);
-        return (PlayerInjectionHandler) accessor.get(manager);
-    }
-
     private FloodgatePlayer getFloodgatePlayer(Player player) {
-        Channel channel = handler.getChannel(player);
+        Channel channel = getChannel(player);
         AttributeKey<FloodgatePlayer> floodgateAttribute = AttributeKey.valueOf("floodgate-player");
         return channel.attr(floodgateAttribute).get();
     }
 
+    private static Channel getChannel(Player player) {
+        NettyChannelInjector injector = (NettyChannelInjector) Accessors.getMethodAccessorOrNull(
+                        TemporaryPlayerFactory.class, "getInjectorFromPlayer", Player.class
+                ).invoke(null, player);
+        return FuzzyReflection.getFieldValue(injector, Channel.class, true);
+    }
+
     /**
      * Reimplementation of the tasks injected Floodgate in ProtocolLib that are not run due to a bug
      * @see <a href="https://github.com/GeyserMC/Floodgate/issues/143">Issue Floodgate#143</a>
@@ -325,7 +323,7 @@ public class ProtocolLibListener extends PacketAdapter {
         }
 
         // kick the player, if necessary
-        Channel channel = handler.getChannel(packetEvent.getPlayer());
+        Channel channel = getChannel(packetEvent.getPlayer());
         AttributeKey<String> kickMessageAttribute = AttributeKey.valueOf("floodgate-kick-message");
         String kickMessage = channel.attr(kickMessageAttribute).get();
         if (kickMessage != null) {

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/VerifyResponseTask.java

@@ -28,6 +28,7 @@ package com.github.games647.fastlogin.bukkit.listener.protocollib;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
+import com.comphenix.protocol.injector.netty.channel.NettyChannelInjector;
 import com.comphenix.protocol.injector.packet.PacketRegistry;
 import com.comphenix.protocol.injector.temporary.TemporaryPlayerFactory;
 import com.comphenix.protocol.reflect.EquivalentConverter;
@@ -218,15 +219,14 @@ public class VerifyResponseTask implements Runnable {
 
     //try to get the networkManager from ProtocolLib
     private Object getNetworkManager() throws ClassNotFoundException {
-        Object injectorContainer = TemporaryPlayerFactory.getInjectorFromPlayer(player);
+        NettyChannelInjector injectorContainer = (NettyChannelInjector) Accessors.getMethodAccessorOrNull(
+                TemporaryPlayerFactory.class, "getInjectorFromPlayer", Player.class
+        ).invoke(null, player);
 
-        // ChannelInjector
-        Class<?> injectorClass = Class.forName("com.comphenix.protocol.injector.netty.Injector");
-        Object rawInjector = FuzzyReflection.getFieldValue(injectorContainer, injectorClass, true);
-
-        Class<?> rawInjectorClass = rawInjector.getClass();
-        FieldAccessor accessor = Accessors.getFieldAccessorOrNull(rawInjectorClass, "networkManager", Object.class);
-        return accessor.get(rawInjector);
+        FieldAccessor accessor = Accessors.getFieldAccessorOrNull(
+                NettyChannelInjector.class, "networkManager", Object.class
+        );
+        return accessor.get(injectorContainer);
     }
 
     private boolean enableEncryption(SecretKey loginKey) throws IllegalArgumentException {

bungee/pom.xml

@@ -51,7 +51,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.3</version>
+                <version>3.6.0</version>
                 <configuration>
                     <minimizeJar>true</minimizeJar>
 

core/pom.xml

@@ -73,7 +73,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.4.2</version>
                 <configuration>
                     <archive>
                         <manifestEntries>

core/src/main/java/com/github/games647/fastlogin/core/shared/FloodgateManagement.java

@@ -62,9 +62,9 @@ public abstract class FloodgateManagement<P extends C, C, L extends LoginSession
         this.username = getName(player);
 
         //load values from config.yml
-        autoLoginFloodgate = core.getConfig().getString("autoLoginFloodgate").toLowerCase(Locale.ROOT);
-        autoRegisterFloodgate = core.getConfig().getString("autoRegisterFloodgate").toLowerCase(Locale.ROOT);
-        allowNameConflict = core.getConfig().getString("allowFloodgateNameConflict").toLowerCase(Locale.ROOT);
+        autoLoginFloodgate = core.getConfig().get("autoLoginFloodgate").toString().toLowerCase(Locale.ROOT);
+        autoRegisterFloodgate = core.getConfig().get("autoRegisterFloodgate").toString().toLowerCase(Locale.ROOT);
+        allowNameConflict = core.getConfig().get("allowFloodgateNameConflict").toString().toLowerCase(Locale.ROOT);
     }
 
     @Override

core/src/main/resources/config.yml

@@ -171,7 +171,7 @@ premium-warning: true
 # This option is considered highly experimental. While it is highly unlikely this will break your server,
 # more tests need to be conducted in order to verify its effectiveness. Brief tests seemed promising, but
 # every environment is different, and so it might not work for you as it did for me.
-useProxyAgnosticResolver: false
+useProxyAgnosticResolver: true
 
 # If you have autoRegister or nameChangeCheck enabled, you could be rate-limited by Mojang.
 # The requests of the both options will be only made by FastLogin if the username is unknown to the server

pom.xml

@@ -50,7 +50,7 @@
 
         <maven.compiler.release>8</maven.compiler.release>
 
-        <lombook.version>1.18.32</lombook.version>
+        <lombook.version>1.18.34</lombook.version>
 
         <floodgate.version>2.2.3-SNAPSHOT</floodgate.version>
         <geyser.version>2.2.1-SNAPSHOT</geyser.version>
@@ -106,7 +106,7 @@
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
-                <version>4.3</version>
+                <version>4.5</version>
                 <configuration>
                     <licenseSets>
                         <licenseSet>
@@ -134,7 +134,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.4.0</version>
                 <configuration>
                     <configLocation>checkstyle.xml</configLocation>
                     <consoleOutput>true</consoleOutput>
@@ -145,7 +145,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>10.16.0</version>
+                        <version>10.17.0</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -162,7 +162,7 @@
             <!-- Require newer versions for Junit5 support -->
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.2.5</version>
+                <version>3.3.0</version>
                 <configuration>
                     <!-- Work-around to make multi-release classes discoverable
                     https://issues.apache.org/jira/browse/SUREFIRE-1731 -->
@@ -179,7 +179,7 @@
 
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.4.2</version>
                 <!-- Explicitly enable multi-release for the scheduler,
                 because detection from class shading doesn't work -->
                 <executions>
@@ -229,7 +229,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.10.2</version>
+            <version>5.10.3</version>
             <scope>test</scope>
         </dependency>
 
@@ -237,7 +237,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>5.11.0</version>
+            <version>5.12.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

velocity/pom.xml

@@ -64,7 +64,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.3</version>
+                <version>3.6.0</version>
                 <configuration>
                     <minimizeJar>true</minimizeJar>
 
@@ -179,7 +179,7 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>3.3.3</version>
+            <version>3.4.0</version>
             <exclusions>
                 <!-- Exclude JNA implementation for WAFFLE - Windows Authentication Framework (mariadb)-->
                 <exclusion>

velocity/src/main/java/com/github/games647/fastlogin/velocity/FastLoginVelocity.java

@@ -230,4 +230,8 @@ public class FastLoginVelocity implements PlatformPlugin<CommandSource> {
     public UUID getProxyId() {
         return proxyId;
     }
+
+    public ProxyServer getServer() {
+        return server;
+    }
 }

velocity/src/main/java/com/github/games647/fastlogin/velocity/listener/ConnectListener.java

@@ -36,6 +36,9 @@ import com.github.games647.fastlogin.velocity.VelocityLoginSession;
 import com.github.games647.fastlogin.velocity.task.AsyncPremiumCheck;
 import com.github.games647.fastlogin.velocity.task.FloodgateAuthTask;
 import com.github.games647.fastlogin.velocity.task.ForceLoginTask;
+import com.google.common.cache.Cache;
+import com.google.common.collect.ListMultimap;
+import com.velocitypowered.api.event.EventManager;
 import com.velocitypowered.api.event.EventTask;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.DisconnectEvent;
@@ -43,6 +46,7 @@ import com.velocitypowered.api.event.connection.PreLoginEvent;
 import com.velocitypowered.api.event.connection.PreLoginEvent.PreLoginComponentResult;
 import com.velocitypowered.api.event.player.GameProfileRequestEvent;
 import com.velocitypowered.api.event.player.ServerConnectedEvent;
+import com.velocitypowered.api.plugin.PluginContainer;
 import com.velocitypowered.api.proxy.InboundConnection;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
@@ -52,6 +56,7 @@ import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.geysermc.floodgate.api.player.FloodgatePlayer;
 
+import java.lang.reflect.Field;
 import java.net.InetSocketAddress;
 import java.time.Duration;
 import java.util.ArrayList;
@@ -61,6 +66,8 @@ import java.util.UUID;
 
 public class ConnectListener {
 
+    private static final String FLOODGATE_PLUGIN_NAME = "org.geysermc.floodgate.VelocityPlugin";
+
     private final FastLoginVelocity plugin;
     private final AntiBotService antiBotService;
 
@@ -80,6 +87,15 @@ public class ConnectListener {
         InetSocketAddress address = connection.getRemoteAddress();
         plugin.getLog().info("Incoming login request for {} from {}", username, address);
 
+        // FloodgateVelocity only sets the correct username in GetProfileRequestEvent, but we need it here too.
+        if (plugin.getFloodgateService() != null) {
+            String floodgateUsername = getFloodgateUsername(connection);
+            if (floodgateUsername != null) {
+                plugin.getLog().info("Found player's Floodgate: {}", floodgateUsername);
+                username = floodgateUsername;
+            }
+        }
+
         Action action = antiBotService.onIncomingConnection(address, username);
         switch (action) {
             case Ignore:
@@ -117,7 +133,7 @@ public class ConnectListener {
             StoredProfile playerProfile = session.getProfile();
             playerProfile.setId(verifiedUUID);
             if (!plugin.getCore().getConfig().get("premiumUuid", true)) {
-                UUID offlineUUID = UUIDAdapter.generateOfflineId(playerProfile.getName());
+                UUID offlineUUID = UUIDAdapter.generateOfflineId(event.getUsername());
                 event.setGameProfile(event.getGameProfile().withId(offlineUUID));
                 plugin.getLog().info("Overridden UUID from {} to {} (based of {}) on {}",
                         verifiedUUID, offlineUUID, verifiedUsername, event.getConnection());
@@ -177,4 +193,74 @@ public class ConnectListener {
         Player player = disconnectEvent.getPlayer();
         plugin.getCore().getPendingConfirms().remove(player.getUniqueId());
     }
+
+    /**
+     * Get the Floodgate username from the Floodgate plugin's playerCache using lots of reflections
+     *
+     * @param connection
+     * @return the Floodgate username or null if not found
+     */
+    private String getFloodgateUsername(InboundConnection connection) {
+        try {
+            // get floodgate's event handler
+            Object floodgateEventHandler = getFloodgateHandler();
+            if (floodgateEventHandler == null) {
+                return null;
+            }
+
+            // Get the Floodgate playerCache field
+            Field playerCacheField = floodgateEventHandler.getClass().getDeclaredField("playerCache");
+            playerCacheField.setAccessible(true);
+            @SuppressWarnings("unchecked")
+            Cache<InboundConnection, FloodgatePlayer> playerCache =
+                    (Cache<InboundConnection, FloodgatePlayer>) playerCacheField.get(floodgateEventHandler);
+
+            // Find the FloodgatePlayer instance in playerCache
+            FloodgatePlayer floodgatePlayer = playerCache.getIfPresent(connection);
+            if (floodgatePlayer == null) {
+                return null;
+            }
+
+            return floodgatePlayer.getCorrectUsername();
+        } catch (Exception ex) {
+            plugin.getLog().error("Failed to fetch current floodgate username", ex);
+        }
+
+        return null;
+    }
+
+    private Object getFloodgateHandler()
+            throws NoSuchFieldException, IllegalAccessException {
+        // Get Velocity's event manager
+        EventManager eventManager = plugin.getServer().getEventManager();
+        Field handlerField = eventManager.getClass().getDeclaredField("handlersByType");
+        handlerField.setAccessible(true);
+        @SuppressWarnings("unchecked")
+        ListMultimap<Class<?>, ?> handlersByType = (ListMultimap<Class<?>, ?>) handlerField.get(eventManager);
+
+        // Get all registered PreLoginEvent handlers
+        List<?> loginEventRegistrations = handlersByType.get(PreLoginEvent.class);
+        Field pluginField = loginEventRegistrations.get(0).getClass().getDeclaredField("plugin");
+        pluginField.setAccessible(true);
+
+        // Find the Floodgate plugin's PreLoginEvent handler registration (Velocity implementation)
+        Object floodgateRegistration = null;
+        for (Object handler : loginEventRegistrations) {
+            PluginContainer eventHandlerPlugin = (PluginContainer) pluginField.get(handler);
+            String eventHandlerPluginName = eventHandlerPlugin.getInstance().get().getClass().getName();
+            if (eventHandlerPluginName.equals(FLOODGATE_PLUGIN_NAME)) {
+                floodgateRegistration = handler;
+                break;
+            }
+        }
+
+        if (floodgateRegistration == null) {
+            return null;
+        }
+
+        // Extract the EventHandler instance (floodgate impl) from Velocity's internal registration handler storage
+        Field eventHandlerField = floodgateRegistration.getClass().getDeclaredField("instance");
+        eventHandlerField.setAccessible(true);
+        return eventHandlerField.get(floodgateRegistration);
+    }
 }