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.

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -12,10 +12,6 @@ body:
       description: What behavior is observed?
     validations:
       required: true
-  - type: textarea
-    attributes:
-      label: What did you expect?
-      description: What behavior is expected?
   - type: textarea
     attributes:
       label: Steps to reproduce

.github/dependabot.yml

@@ -10,10 +10,10 @@ updates:
       interval: "monthly"
 
   # Maven project
-  - package-ecosystem: maven
+  - package-ecosystem: "maven"
     directory: "/"
     schedule:
-      interval: weekly
+      interval: "monthly"
 
     groups:
       production-dependencies:
@@ -30,6 +30,3 @@ updates:
       # HikariCP dropped Java 8 support with 5.0
       - dependency-name: "com.zaxxer:HikariCP"
         update-types: ["version-update:semver-major"]
-      # SnakeYAML has breaking changes with 2.0
-      - dependency-name: "org.yaml:snakeyaml"
-        update-types: ["version-update:semver-major"]

.github/workflows/codeql-analysis.yml

@@ -25,8 +25,7 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
 
     permissions:
-      actions: read
-      contents: read
+      # Only allow write for security, then all others default to read only
       security-events: write
 
     strategy:

.github/workflows/maven.yml

@@ -21,7 +21,8 @@ jobs:
     # Environment image - always use the newest OS
     runs-on: ubuntu-latest
     permissions:
-      contents: write
+      # With at least one permission given, all default to read
+      contents: read
 
     # Run steps
     steps:
@@ -42,6 +43,25 @@ jobs:
         # ignore snapshot updates, because they are likely to have breaking changes, enforce checksums
         run: mvn test --batch-mode --threads 2.0C --no-snapshot-updates --strict-checksums --file pom.xml
 
-      - name: Update dependency graph
+  dependency:
+    runs-on: ubuntu-latest
+    permissions:
+      # Write only necessary for dependency submission all others then default to read
+      contents: write
+
+    # Run steps
+    steps:
+      # Pull changes
+      - uses: actions/checkout@v4
+
+      # Setup Java
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version-file: '.java-version'
+          cache: 'maven'
+
+      - name: Submit Dependency Snapshot
         if: ${{ github.event_name == 'push' }}
-        uses: advanced-security/maven-dependency-submission-action@v4.0.0
+        uses: advanced-security/maven-dependency-submission-action@v4.0.3

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2023 games647 and contributors
+Copyright (c) 2015-2024 games647 and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -8,14 +8,11 @@ So they don't need to enter passwords. This is also called auto login (auto-logi
 * Detect paid accounts from others
 * Automatically login paid accounts (premium)
 * Support various of auth plugins
-* Cauldron support
-* Forge/Sponge message support
 * Premium UUID support
 * Forward skins
 * Detect username changed and will update the existing database record
-* BungeeCord support
+* BungeeCord/Velocity support
 * Auto register new premium players
-* Plugin: ProtocolSupport is supported and can be used as an alternative to ProtocolLib
 * No client modifications needed
 * Good performance by using async operations
 * Locale messages
@@ -46,6 +43,7 @@ You can download them from here: https://ci.codemc.org/job/Games647/job/FastLogi
 
     fastlogin.bukkit.command.premium
     fastlogin.bukkit.command.cracked
+
     fastlogin.command.premium.other
     fastlogin.command.cracked.other
 
@@ -60,13 +58,15 @@ Possible values: `Premium`, `Cracked`, `Unknown`
 
 ## Requirements
 
-* Java 17+ (Recommended)
+* Java: 21+ recommended for improved multi-threading code by FastLogin
+  * Spigot: 8+
+  * BungeeCord and Velocity: 17+
 * Server software in offlinemode:
   * Spigot (or a fork e.g. Paper) 1.8.8+
     * Protocol plugin:
-      * [ProtocolLib 5.1+](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
+  * Latest BungeeCord (or a fork e.g. Waterfall) or Velocity proxy
 * An auth plugin.
 
 ### Supported auth plugins
@@ -85,7 +85,6 @@ Possible values: `Premium`, `Cracked`, `Unknown`
 #### BungeeCord/Waterfall
 
 * [BungeeAuth](https://www.spigotmc.org/resources/bungeeauth.493/)
-* [BungeeAuthenticator](https://www.spigotmc.org/resources/bungeecordauthenticator.87669/)
 
 ## Network requests
 
@@ -101,8 +100,8 @@ This plugin performs network requests to:
 ### Spigot/Paper
 
 1. Download and install ProtocolLib/ProtocolSupport
-2. Download and install FastLogin (or `FastLoginBukkit` for newer versions)
-3. Set your server in offline mode by setting the value `onlinemode` in your server.properties to false
+2. Download and install `FastLoginBukkit`
+3. Set your server in offline mode by setting the value `onlinemode` in your server.properties to `false`
 
 ### BungeeCord/Waterfall or Velocity
 
@@ -117,8 +116,8 @@ Install the plugin on both platforms, that is proxy (BungeeCord or Velocity) and
 4. Activate ip forwarding in your proxy config
 5. Check your database settings in the config of FastLogin on your proxy
     * The proxies only ship with a limited set of drivers where Spigot supports more. Therefore, these are supported:
-    * BungeeCord: `com.mysql.jdbc.Driver` for MySQL/MariaDB
-    * Velocity: `fastlogin.mariadb.jdbc.Driver` for MySQL/MariaDB
+    * BungeeCord: `mysql` for MySQL/MariaDB
+    * Velocity: `mariadb` for MySQL/MariaDB
     * Note the embedded file storage SQLite is not available
     * MySQL/MariaDB requires an external database server running. Check your server provider if there is one available
    or install one.

bukkit/pom.xml

@@ -4,7 +4,7 @@
 
     The MIT License (MIT)
 
-    Copyright (c) 2015-2023 games647 and contributors
+    Copyright (c) 2015-2024 games647 and contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +30,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <nettyVersion>4.1.79.Final</nettyVersion>
+        <maven.compiler.release>8</maven.compiler.release>
     </properties>
 
     <parent>
@@ -50,7 +50,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.6.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <shadedArtifactAttached>false</shadedArtifactAttached>
@@ -98,7 +98,6 @@
                         <filter>
                             <artifact>*:*</artifact>
                             <excludes>
-                                <exclude>META-INF/MANIFEST.MF</exclude>
                                 <exclude>**/module-info.class</exclude>
                             </excludes>
                         </filter>
@@ -117,19 +116,16 @@
     </build>
 
     <repositories>
-        <!-- PaperSpigot API and PaperLib -->
+        <!-- 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 -->
@@ -168,18 +164,11 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>1.33</version>
-            <scope>compile</scope>
-        </dependency>
-
         <!-- PaperSpigot API for correcting user cache usage -->
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.19-R0.1-SNAPSHOT</version>
+            <version>1.20.6-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
             <!-- Use our own newer api version -->
             <exclusions>
@@ -187,13 +176,25 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.maven</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
         <dependency>
             <groupId>com.mojang</groupId>
             <artifactId>datafixerupper</artifactId>
-            <version>5.0.28</version>
+            <version>7.1.15</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -207,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>
@@ -278,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>
@@ -293,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>
@@ -378,29 +379,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk18on</artifactId>
-            <version>1.77</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-transport</artifactId>
-            <version>${nettyVersion}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-codec</artifactId>
-            <version>${nettyVersion}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Provided by the spigot, required for testing ProtocolLib -->
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
+            <version>1.78.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitLoginSession.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -47,7 +47,6 @@ public class BukkitLoginSession extends LoginSession {
     private final ClientPublicKey clientPublicKey;
 
     private boolean verified;
-
     private SkinProperty skinProperty;
 
     public BukkitLoginSession(String username, byte[] verifyToken, ClientPublicKey publicKey, boolean registered,
@@ -109,7 +108,7 @@ public class BukkitLoginSession extends LoginSession {
      *
      * @param verified whether the player has valid session
      */
-    public synchronized void setVerified(boolean verified) {
+    public synchronized void setVerifiedPremium(boolean verified) {
         this.verified = verified;
     }
 
@@ -118,7 +117,7 @@ public class BukkitLoginSession extends LoginSession {
      *
      * @return whether the player has a valid session
      */
-    public synchronized boolean isVerified() {
+    public synchronized boolean isVerifiedPremium() {
         return verified;
     }
 }

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitScheduler.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@
  */
 package com.github.games647.fastlogin.bukkit;
 
-import com.github.games647.fastlogin.core.AsyncScheduler;
+import com.github.games647.fastlogin.core.scheduler.AsyncScheduler;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;
 import org.slf4j.Logger;

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BungeeManager.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -36,6 +36,7 @@ import com.github.games647.fastlogin.bukkit.listener.protocolsupport.ProtocolSup
 import com.github.games647.fastlogin.bukkit.task.DelayedAuthHook;
 import com.github.games647.fastlogin.core.CommonUtil;
 import com.github.games647.fastlogin.core.PremiumStatus;
+import com.github.games647.fastlogin.core.antibot.AntiBotService;
 import com.github.games647.fastlogin.core.hooks.bedrock.BedrockService;
 import com.github.games647.fastlogin.core.hooks.bedrock.FloodgateService;
 import com.github.games647.fastlogin.core.hooks.bedrock.GeyserService;
@@ -53,6 +54,7 @@ import org.slf4j.Logger;
 
 import java.net.InetSocketAddress;
 import java.nio.file.Path;
+import java.time.Duration;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
@@ -65,7 +67,10 @@ import java.util.concurrent.ConcurrentMap;
 public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<CommandSender> {
 
     //1 minutes should be enough as a timeout for bad internet connection (Server, Client and Mojang)
-    private final ConcurrentMap<String, BukkitLoginSession> loginSession = CommonUtil.buildCache(1, -1);
+    private final ConcurrentMap<String, BukkitLoginSession> loginSession = CommonUtil.buildCache(
+            Duration.ofMinutes(1), -1
+    );
+
     private final Map<UUID, PremiumStatus> premiumPlayers = new ConcurrentHashMap<>();
     private final Logger logger;
 
@@ -111,10 +116,11 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
                 return;
             }
 
+            AntiBotService antiBotService = core.getAntiBotService();
             if (pluginManager.isPluginEnabled("ProtocolSupport")) {
-                pluginManager.registerEvents(new ProtocolSupportListener(this, core.getAntiBot()), this);
+                pluginManager.registerEvents(new ProtocolSupportListener(this, antiBotService), this);
             } else if (pluginManager.isPluginEnabled("ProtocolLib")) {
-                ProtocolLibListener.register(this, core.getAntiBot(), core.getConfig().getBoolean("verifyClientKeys"));
+                ProtocolLibListener.register(this, antiBotService, core.getConfig().getBoolean("verifyClientKeys"));
 
                 //if server is using paper - we need to set the skin at pre login anyway, so no need for this listener
                 if (!isPaper() && getConfig().getBoolean("forwardSkin")) {
@@ -137,9 +143,7 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
             pluginManager.registerEvents(new PaperCacheListener(this), this);
         }
 
-        //register commands using a unique name
-        Optional.ofNullable(getCommand("premium")).ifPresent(c -> c.setExecutor(new PremiumCommand(this)));
-        Optional.ofNullable(getCommand("cracked")).ifPresent(c -> c.setExecutor(new CrackedCommand(this)));
+        registerCommands();
 
         if (pluginManager.isPluginEnabled("PlaceholderAPI")) {
             premiumPlaceholder = new PremiumPlaceholder(this);
@@ -147,6 +151,12 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
         }
     }
 
+    private void registerCommands() {
+        //register commands using a unique name
+        Optional.ofNullable(getCommand("premium")).ifPresent(c -> c.setExecutor(new PremiumCommand(this)));
+        Optional.ofNullable(getCommand("cracked")).ifPresent(c -> c.setExecutor(new CrackedCommand(this)));
+    }
+
     private boolean initializeFloodgate() {
         if (getServer().getPluginManager().getPlugin("Geyser-Spigot") != null) {
             geyserService = new GeyserService(GeyserImpl.getInstance(), core);

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/InetUtils.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/PremiumPlaceholder.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -74,11 +74,13 @@ public class PremiumPlaceholder extends PlaceholderExpansion {
 
     @Override
     public @NotNull String getAuthor() {
+        //noinspection deprecation
         return String.join(", ", plugin.getDescription().getAuthors());
     }
 
     @Override
     public @NotNull String getVersion() {
+        //noinspection deprecation
         return plugin.getDescription().getVersion();
     }
 }

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/CrackedCommand.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -63,10 +63,10 @@ public class CrackedCommand extends ToggleCommand {
 
         // todo: load async if
         StoredProfile profile = plugin.getCore().getStorage().loadProfile(sender.getName());
-        if (profile.isPremium()) {
+        if (profile.isOnlinemodePreferred()) {
             plugin.getCore().sendLocaleMessage("remove-premium", sender);
 
-            profile.setPremium(false);
+            profile.setOnlinemodePreferred(false);
             profile.setId(null);
             plugin.getScheduler().runAsync(() -> {
                 plugin.getCore().getStorage().save(profile);
@@ -95,12 +95,12 @@ public class CrackedCommand extends ToggleCommand {
         }
 
         //existing player is already cracked
-        if (profile.isSaved() && !profile.isPremium()) {
+        if (profile.isExistingPlayer() && !profile.isOnlinemodePreferred()) {
             plugin.getCore().sendLocaleMessage("not-premium-other", sender);
         } else {
             plugin.getCore().sendLocaleMessage("remove-premium", sender);
 
-            profile.setPremium(false);
+            profile.setOnlinemodePreferred(false);
             plugin.getScheduler().runAsync(() -> {
                 plugin.getCore().getStorage().save(profile);
                 plugin.getServer().getPluginManager().callEvent(

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/PremiumCommand.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -78,11 +78,11 @@ public class PremiumCommand extends ToggleCommand {
         plugin.getCore().getPendingConfirms().remove(id);
         //todo: load async
         StoredProfile profile = plugin.getCore().getStorage().loadProfile(sender.getName());
-        if (profile.isPremium()) {
+        if (profile.isOnlinemodePreferred()) {
             plugin.getCore().sendLocaleMessage("already-exists", sender);
         } else {
             //todo: resolve uuid
-            profile.setPremium(true);
+            profile.setOnlinemodePreferred(true);
             plugin.getScheduler().runAsync(() -> {
                 plugin.getCore().getStorage().save(profile);
                 plugin.getServer().getPluginManager().callEvent(
@@ -109,11 +109,11 @@ public class PremiumCommand extends ToggleCommand {
             return;
         }
 
-        if (profile.isPremium()) {
+        if (profile.isOnlinemodePreferred()) {
             plugin.getCore().sendLocaleMessage("already-exists-other", sender);
         } else {
             //todo: resolve uuid
-            profile.setPremium(true);
+            profile.setOnlinemodePreferred(true);
             plugin.getScheduler().runAsync(() -> {
                 plugin.getCore().getStorage().save(profile);
                 plugin.getServer().getPluginManager().callEvent(

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/ToggleCommand.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/event/BukkitFastLoginAutoLoginEvent.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/event/BukkitFastLoginPreLoginEvent.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/event/BukkitFastLoginPremiumToggleEvent.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/AuthMeHook.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -45,9 +45,9 @@ import java.lang.reflect.Field;
  * <p>
  * Project page:
  * <p>
- * Bukkit: <a href="https://dev.bukkit.org/bukkit-plugins/authme-reloaded/">...</a>
+ * <a href="https://dev.bukkit.org/bukkit-plugins/authme-reloaded/">Bukkit</a>
  * <p>
- * Spigot: <a href="https://www.spigotmc.org/resources/authme-reloaded.6269/">...</a>
+ * <a href="https://www.spigotmc.org/resources/authme-reloaded.6269/">Spigot</a>
  */
 public class AuthMeHook implements AuthPlugin<Player>, Listener {
 
@@ -76,7 +76,7 @@ public class AuthMeHook implements AuthPlugin<Player>, Listener {
         Player player = restoreSessionEvent.getPlayer();
 
         BukkitLoginSession session = plugin.getSession(player.spigot().getRawAddress());
-        if (session != null && session.isVerified()) {
+        if (session != null && session.isVerifiedPremium()) {
             restoreSessionEvent.setCancelled(true);
         }
     }

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/CrazyLoginHook.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -46,7 +46,7 @@ import java.util.concurrent.Future;
  * <p>
  * Project page:
  * <p>
- * Bukkit: <a href="https://dev.bukkit.org/server-mods/crazylogin/">...</a>
+ * <a href="https://dev.bukkit.org/server-mods/crazylogin/">Bukkit</a>
  */
 public class CrazyLoginHook implements AuthPlugin<Player> {
 

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/LogItHook.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/LoginSecurityHook.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -39,9 +39,9 @@ import org.bukkit.entity.Player;
  * <p>
  * Project page:
  * <p>
- * Bukkit: <a href="https://dev.bukkit.org/bukkit-plugins/loginsecurity/">...</a>
+ * <a href="https://dev.bukkit.org/bukkit-plugins/loginsecurity/">Bukkit</a>
  * <p>
- * Spigot: <a href="https://www.spigotmc.org/resources/loginsecurity.19362/">...</a>
+ * <a href="https://www.spigotmc.org/resources/loginsecurity.19362/">Spigot</a>
  */
 public class LoginSecurityHook implements AuthPlugin<Player> {
 

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/UltraAuthHook.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -38,9 +38,9 @@ import java.util.concurrent.Future;
 /**
  * Project page:
  * <p>
- * Bukkit: <a href="https://dev.bukkit.org/bukkit-plugins/ultraauth-aa/">...</a>
+ * <a href="https://dev.bukkit.org/bukkit-plugins/ultraauth-aa/">Bukkit</a>
  * <p>
- * Spigot: <a href="https://www.spigotmc.org/resources/ultraauth.17044/">...</a>
+ * <a href="https://www.spigotmc.org/resources/ultraauth.17044/">Spigot</a>
  */
 public class UltraAuthHook implements AuthPlugin<Player> {
 

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/XAuthHook.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,7 @@ import java.util.concurrent.Future;
  * <p>
  * Project page:
  * <p>
- * Bukkit: <a href="https://dev.bukkit.org/bukkit-plugins/xauth/">...</a>
+ * <a href="https://dev.bukkit.org/bukkit-plugins/xauth/">Bukkit</a>
  */
 public class XAuthHook implements AuthPlugin<Player> {
 

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

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -123,7 +123,7 @@ public class BungeeListener implements PluginMessageListener {
     }
 
     private void startLoginTaskIfReady(Player player, BukkitLoginSession session) {
-        session.setVerified(true);
+        session.setVerifiedPremium(true);
         plugin.putSession(player.spigot().getRawAddress(), session);
 
         // only start a new login task if the join event fired earlier. This event then didn't

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

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -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/PaperCacheListener.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

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

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

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

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -97,7 +97,7 @@ public class NameCheckTask extends JoinManagement<Player, CommandSender, Protoco
         }
 
         String ip = player.getAddress().getAddress().getHostAddress();
-        core.getPendingLogin().put(ip + username, new Object());
+        core.addLoginAttempt(ip, username);
 
         byte[] verify = source.getVerifyToken();
         ClientPublicKey clientKey = source.getClientKey();

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

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,11 +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;
@@ -51,6 +51,7 @@ import io.netty.util.AttributeKey;
 import lombok.val;
 import org.bukkit.entity.Player;
 import org.geysermc.floodgate.api.player.FloodgatePlayer;
+import org.jetbrains.annotations.NotNull;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.IllegalBlockSizeException;
@@ -73,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();
@@ -92,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) {
@@ -112,45 +111,66 @@ public class ProtocolLibListener extends PacketAdapter {
             return;
         }
 
-        plugin.getLog().info("New packet {} from {}", packetEvent.getPacketType(), packetEvent.getPlayer());
-
         Player sender = packetEvent.getPlayer();
-        PacketType packetType = packetEvent.getPacketType();
-        if (packetType == START) {
+        PacketType packetType = getOverriddenType(packetEvent.getPacketType());
 
-            if (plugin.getFloodgateService() != null) {
-                boolean success = processFloodgateTasks(packetEvent);
-                // don't continue execution if the player was kicked by Floodgate
-                if (!success) {
-                    return;
+        plugin.getLog().info("New incoming packet {} from {}", packetType, sender.getName());
+        try {
+            if (packetType == START) {
+                if (plugin.getFloodgateService() != null) {
+                    boolean success = processFloodgateTasks(packetEvent);
+                    if (!success) {
+                        // don't continue execution if the player was kicked by Floodgate
+                        return;
+                    }
                 }
+
+                PacketContainer packet = packetEvent.getPacket();
+
+                InetSocketAddress address = sender.getAddress();
+                String username = getUsername(packet);
+
+                Action action = antiBotService.onIncomingConnection(address, username);
+                switch (action) {
+                    case Ignore:
+                        // just ignore
+                        return;
+                    case Block:
+                        String message = plugin.getCore().getMessage("kick-antibot");
+                        sender.kickPlayer(message);
+                        break;
+                    case Continue:
+                    default:
+                        //player.getName() won't work at this state
+                        onLoginStart(packetEvent, sender, username);
+                        break;
+                }
+            } else if (packetType == ENCRYPTION_BEGIN) {
+                onEncryptionBegin(packetEvent, sender);
+            } else {
+                plugin.getLog().warn("Unknown packet type received {}", packetType);
             }
-
-            PacketContainer packet = packetEvent.getPacket();
-
-            InetSocketAddress address = sender.getAddress();
-            String username = getUsername(packet);
-
-            Action action = antiBotService.onIncomingConnection(address, username);
-            switch (action) {
-                case Ignore:
-                    // just ignore
-                    return;
-                case Block:
-                    String message = plugin.getCore().getMessage("kick-antibot");
-                    sender.kickPlayer(message);
-                    break;
-                case Continue:
-                default:
-                    //player.getName() won't work at this state
-                    onLoginStart(packetEvent, sender, username);
-                    break;
-            }
-        } else {
-            onEncryptionBegin(packetEvent, sender);
+        } catch (FieldAccessException fieldAccessEx) {
+            plugin.getLog().error("Failed to parse packet {}", packetEvent.getPacketType(), fieldAccessEx);
         }
     }
 
+    private @NotNull PacketType getOverriddenType(PacketType packetType) {
+        if (packetType.isDynamic()) {
+            String vanillaName = packetType.getPacketClass().getName();
+            plugin.getLog().info("Overriding packet type for unregistered packet type to fix ProtocolLib bug");
+            if (vanillaName.endsWith("ServerboundHelloPacket")) {
+                return START;
+            }
+
+            if (vanillaName.endsWith("ServerboundKeyPacket")) {
+                return ENCRYPTION_BEGIN;
+            }
+        }
+
+        return packetType;
+    }
+
     private void onEncryptionBegin(PacketEvent packetEvent, Player sender) {
         byte[] sharedSecret = packetEvent.getPacket().getByteArrays().read(0);
 
@@ -222,7 +242,7 @@ public class ProtocolLibListener extends PacketAdapter {
         PacketContainer packet = packetEvent.getPacket();
         Optional<ClientPublicKey> clientKey;
         if (new MinecraftVersion(1, 19, 3).atOrAbove()) {
-            // public key sent separate
+            // public key is sent separate
             clientKey = Optional.empty();
         } else {
             val profileKey = packet.getOptionals(BukkitConverters.getWrappedPublicKeyDataConverter())
@@ -247,7 +267,6 @@ public class ProtocolLibListener extends PacketAdapter {
             }
         }
 
-
         plugin.getLog().trace("GameProfile {} with {} connecting", sessionKey, username);
 
         packetEvent.getAsyncMarker().incrementProcessingDelay();
@@ -275,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>
@@ -303,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/ProtocolLibLoginSource.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -51,7 +51,6 @@ class ProtocolLibLoginSource implements LoginSource {
     private final ClientPublicKey clientKey;
     private final PublicKey publicKey;
 
-    private final String serverId = "";
     private byte[] verifyToken;
 
     ProtocolLibLoginSource(Player player, Random random, PublicKey serverPublicKey, ClientPublicKey clientKey) {
@@ -72,7 +71,7 @@ class ProtocolLibLoginSource implements LoginSource {
          */
         PacketContainer newPacket = new PacketContainer(ENCRYPTION_BEGIN);
 
-        newPacket.getStrings().write(0, serverId);
+        newPacket.getStrings().write(0, "");
         StructureModifier<PublicKey> keyModifier = newPacket.getSpecificModifier(PublicKey.class);
         int verifyField = 0;
         if (keyModifier.getFields().isEmpty()) {
@@ -84,6 +83,8 @@ class ProtocolLibLoginSource implements LoginSource {
         }
 
         newPacket.getByteArrays().write(verifyField, verifyToken);
+        // shouldAuthenticate, but why does this field even exist?
+        newPacket.getBooleans().writeSafely(0, true);
 
         //serverId is an empty string
         ProtocolLibrary.getProtocolManager().sendServerPacket(player, newPacket);
@@ -115,10 +116,6 @@ class ProtocolLibLoginSource implements LoginSource {
         return clientKey;
     }
 
-    public String getServerId() {
-        return serverId;
-    }
-
     public byte[] getVerifyToken() {
         return verifyToken.clone();
     }
@@ -128,7 +125,6 @@ class ProtocolLibLoginSource implements LoginSource {
         return this.getClass().getSimpleName() + '{'
             + "player=" + player
             + ", random=" + random
-            + ", serverId='" + serverId + '\''
             + ", verifyToken=" + Arrays.toString(verifyToken)
             + '}';
     }

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

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

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

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -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;
@@ -72,7 +73,6 @@ import static com.comphenix.protocol.PacketType.Login.Server.DISCONNECT;
 public class VerifyResponseTask implements Runnable {
 
     private static final String ENCRYPTION_CLASS_NAME = "MinecraftEncryption";
-    private static final Class<?> ENCRYPTION_CLASS;
     private static final String ADDRESS_VERIFY_WARNING = "This indicates the use of reverse-proxy like HAProxy, "
             + "TCPShield, BungeeCord, Velocity, etc. "
             + "By default (configurable in the config) this plugin requests Mojang to verify the connecting IP "
@@ -81,12 +81,6 @@ public class VerifyResponseTask implements Runnable {
             + "(keyword IP forwarding). This process will also be useful for other server "
             + "features like IP banning, so that it doesn't ban the proxy IP.";
 
-    static {
-        ENCRYPTION_CLASS = MinecraftReflection.getMinecraftClass(
-                "util." + ENCRYPTION_CLASS_NAME, ENCRYPTION_CLASS_NAME
-        );
-    }
-
     private final FastLoginBukkit plugin;
     private final PacketEvent packetEvent;
     private final KeyPair serverKey;
@@ -98,6 +92,8 @@ public class VerifyResponseTask implements Runnable {
     private final byte[] sharedSecret;
 
     private static Method encryptMethod;
+    private static Method encryptKeyMethod;
+
     private static Method cipherMethod;
 
     public VerifyResponseTask(FastLoginBukkit plugin, PacketEvent packetEvent,
@@ -159,11 +155,11 @@ public class VerifyResponseTask implements Runnable {
                 //user tried to fake an authentication
                 disconnect(
                         "invalid-session",
-                        "Session server rejected incoming connection for GameProfile {} ({}). Possible reasons are"
+                        "Session server rejected incoming connection for GameProfile {} ({}). Possible reasons are "
                                 + "1) Client IP address contacting Mojang and server during server join were different "
                                 + "(Do you use a reverse proxy? -> Enable IP forwarding, "
                                 + "or disable the feature in the config). "
-                                + "2) Player is offline, but tried to bypass the authentication"
+                                + "2) Player is offline, but tried to bypass the authentication "
                                 + "3) Client uses an outdated username for connecting (Fix: Restart client)",
                         requestedUsername, address
                 );
@@ -173,12 +169,12 @@ public class VerifyResponseTask implements Runnable {
                             "The incoming request for player {} uses a local IP address",
                             requestedUsername
                     );
-                    plugin.getLog().warn(ADDRESS_VERIFY_WARNING);
                 } else {
                     plugin.getLog().warn("If you think this is an error, please verify that the incoming "
                             + "IP address {} is not associated with a server hosting company.", address);
-                    plugin.getLog().warn(ADDRESS_VERIFY_WARNING);
                 }
+
+                plugin.getLog().warn(ADDRESS_VERIFY_WARNING);
             }
         } catch (IOException ioEx) {
             disconnect("error-kick", "Failed to connect to session server", ioEx);
@@ -200,7 +196,7 @@ public class VerifyResponseTask implements Runnable {
 
         session.setVerifiedUsername(realUsername);
         session.setUuid(verification.getId());
-        session.setVerified(true);
+        session.setVerifiedPremium(true);
 
         setPremiumUUID(session.getUuid());
         receiveFakeStartPacket(realUsername, session.getClientPublicKey(), session.getUuid());
@@ -223,34 +219,36 @@ 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 {
         plugin.getLog().info("Enabling onlinemode encryption for {}", player.getAddress());
         // Initialize method reflections
-        if (encryptMethod == null) {
+        if (encryptKeyMethod == null || encryptMethod == null) {
             Class<?> networkManagerClass = MinecraftReflection.getNetworkManagerClass();
-
             try {
                 // Try to get the old (pre MC 1.16.4) encryption method
-                encryptMethod = FuzzyReflection.fromClass(networkManagerClass)
+                encryptKeyMethod = FuzzyReflection.fromClass(networkManagerClass)
                         .getMethodByParameters("a", SecretKey.class);
             } catch (IllegalArgumentException exception) {
                 // Get the new encryption method
                 encryptMethod = FuzzyReflection.fromClass(networkManagerClass)
                         .getMethodByParameters("a", Cipher.class, Cipher.class);
 
+                Class<?> encryptionClass = MinecraftReflection.getMinecraftClass(
+                        "util." + ENCRYPTION_CLASS_NAME, ENCRYPTION_CLASS_NAME
+                );
+
                 // Get the needed Cipher helper method (used to generate ciphers from login key)
-                cipherMethod = FuzzyReflection.fromClass(ENCRYPTION_CLASS)
+                cipherMethod = FuzzyReflection.fromClass(encryptionClass)
                         .getMethodByParameters("a", int.class, Key.class);
             }
         }
@@ -259,9 +257,9 @@ public class VerifyResponseTask implements Runnable {
             Object networkManager = this.getNetworkManager();
 
             // If cipherMethod is null - use old encryption (pre MC 1.16.4), otherwise use the new cipher one
-            if (cipherMethod == null) {
+            if (encryptKeyMethod != null) {
                 // Encrypt/decrypt packet flow, this behaviour is expected by the client
-                encryptMethod.invoke(networkManager, loginKey);
+                encryptKeyMethod.invoke(networkManager, loginKey);
             } else {
                 // Create ciphers from login key
                 Object decryptionCipher = cipherMethod.invoke(null, Cipher.DECRYPT_MODE, loginKey);

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

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolLoginSource.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolSupportListener.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -101,7 +101,7 @@ public class ProtocolSupportListener extends JoinManagement<Player, CommandSende
         BukkitLoginSession session = plugin.getSession(address);
 
         if (session != null && profileCompleteEvent.getConnection().getProfile().isOnlineMode()) {
-            session.setVerified(true);
+            session.setVerifiedPremium(true);
 
             if (!plugin.getConfig().getBoolean("premiumUuid")) {
                 String username = Optional.ofNullable(profileCompleteEvent.getForcedName())
@@ -125,7 +125,7 @@ public class ProtocolSupportListener extends JoinManagement<Player, CommandSende
         source.enableOnlinemode();
 
         String ip = source.getAddress().getAddress().getHostAddress();
-        plugin.getCore().getPendingLogin().put(ip + username, new Object());
+        plugin.getCore().addLoginAttempt(ip, username);
 
         BukkitLoginSession playerSession = new BukkitLoginSession(username, registered, profile);
         plugin.putSession(source.getAddress(), playerSession);

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/DelayedAuthHook.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

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

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -49,7 +49,7 @@ public class FloodgateAuthTask extends FloodgateManagement<Player, CommandSender
         BukkitLoginSession session = new BukkitLoginSession(player.getName(), isRegistered, profile);
 
         // enable auto login based on the value of 'autoLoginFloodgate' in config.yml
-        session.setVerified(isAutoAuthAllowed(autoLoginFloodgate));
+        session.setVerifiedPremium(isAutoAuthAllowed(autoLoginFloodgate));
 
         // run login task
         Runnable forceLoginTask = new ForceLoginTask(core.getPlugin().getCore(), player, session);

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/ForceLoginTask.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -103,6 +103,6 @@ public class ForceLoginTask extends ForceLoginManagement<Player, CommandSender,
 
     @Override
     public boolean isOnlineMode() {
-        return session.isVerified();
+        return session.isVerifiedPremium();
     }
 }

bukkit/src/main/resources/plugin.yml

@@ -25,12 +25,11 @@ softdepend:
     - floodgate
     # Auth plugins
     - AuthMe
+    - CrazyLogin
     - LoginSecurity
-    - SodionAuth
-    - xAuth
     - LogIt
     - UltraAuth
-    - CrazyLogin
+    - xAuth
 
 commands:
     ${project.parent.name}:

bukkit/src/test/java/com/github/games647/fastlogin/bukkit/FastLoginBukkitTest.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -41,8 +41,10 @@ class FastLoginBukkitTest {
         val msg = CommonUtil.translateColorCodes(message);
         assertEquals(msg, "§x00002a00002b§lText");
 
+        @SuppressWarnings("deprecation")
         val components = TextComponent.fromLegacyText(msg);
         val expected = "{\"bold\":true,\"color\":\"#00a00b\",\"text\":\"Text\"}";
+        //noinspection deprecation
         assertEquals(ComponentSerializer.toString(components), expected);
     }
 }

bukkit/src/test/java/com/github/games647/fastlogin/bukkit/ReflectionTest.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bukkit/src/test/java/com/github/games647/fastlogin/bukkit/hook/CrazyLoginHookTest.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bukkit/src/test/java/com/github/games647/fastlogin/bukkit/listener/protocollib/Base64Adapter.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bukkit/src/test/java/com/github/games647/fastlogin/bukkit/listener/protocollib/EncryptionUtilTest.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bukkit/src/test/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ResourceLoader.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bukkit/src/test/java/com/github/games647/fastlogin/bukkit/listener/protocollib/SignatureTestData.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bukkit/src/test/java/com/github/games647/fastlogin/bukkit/listener/protocollib/VerifyResponseTaskTest.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bukkit/src/test/java/com/github/games647/fastlogin/bukkit/task/DelayedAuthHookTest.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bungee/pom.xml

@@ -4,7 +4,7 @@
 
     The MIT License (MIT)
 
-    Copyright (c) 2015-2023 games647 and contributors
+    Copyright (c) 2015-2024 games647 and contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -40,6 +40,10 @@
     <artifactId>fastlogin.bungee</artifactId>
     <packaging>jar</packaging>
 
+    <properties>
+        <maven.compiler.release>17</maven.compiler.release>
+    </properties>
+
     <!--Represents the main plugin-->
     <name>FastLoginBungee</name>
 
@@ -47,20 +51,12 @@
         <plugins>
             <plugin>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.6.0</version>
                 <configuration>
                     <minimizeJar>true</minimizeJar>
 
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <shadedArtifactAttached>false</shadedArtifactAttached>
-                    <artifactSet>
-                        <excludes>
-                            <!--Those classes are already present in BungeeCord version-->
-                            <exclude>net.md-5:bungeecord-config</exclude>
-                            <exclude>com.google.code.gson:gson</exclude>
-                            <exclude>com.google.guava:guava</exclude>
-                        </excludes>
-                    </artifactSet>
                     <relocations>
                         <relocation>
                             <pattern>com.zaxxer.hikari</pattern>
@@ -82,6 +78,7 @@
                             <artifact>*:*</artifact>
                             <excludes>
                                 <exclude>META-INF/MANIFEST.MF</exclude>
+                                <exclude>**/module-info</exclude>
                                 <exclude>**/module-info.class</exclude>
                             </excludes>
                         </filter>
@@ -120,13 +117,33 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>fastlogin.core</artifactId>
             <version>${project.version}</version>
+            <!--Those classes are already present in BungeeCord version-->
+            <exclusions>
+                <exclusion>
+                    <groupId>net.md-5</groupId>
+                    <artifactId>bungeecord-config</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.code.gson</groupId>
+                    <artifactId>gson</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+                <!-- Exclude snakeyaml, because it is included in BungeeCord with the correct version -->
+                <exclusion>
+                    <groupId>org.yaml</groupId>
+                    <artifactId>snakeyaml</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!--BungeeCord with also the part outside the API-->
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-proxy</artifactId>
-            <version>1.19-R0.1-SNAPSHOT</version>
+            <version>1.20-R0.2-SNAPSHOT</version>
             <scope>provided</scope>
             <!-- Use our own newer api version -->
             <exclusions>
@@ -135,13 +152,14 @@
                     <artifactId>slf4j-api</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>mysql</groupId>
+                    <groupId>com.mysql</groupId>
                     <artifactId>*</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>net.md-5</groupId>
                     <artifactId>bungeecord-native</artifactId>
                 </exclusion>
+
                 <exclusion>
                     <groupId>net.md-5</groupId>
                     <artifactId>bungeecord-query</artifactId>
@@ -150,6 +168,11 @@
                     <groupId>net.md-5</groupId>
                     <artifactId>bungeecord-slf4j</artifactId>
                 </exclusion>
+
+                <exclusion>
+                    <groupId>net.sf.jopt-simple</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.apache.maven</groupId>
                     <artifactId>*</artifactId>
@@ -158,6 +181,10 @@
                     <groupId>org.apache.maven.resolver</groupId>
                     <artifactId>*</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 

bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeLoginSession.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeLoginSource.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -54,9 +54,15 @@ public class BungeeLoginSource implements LoginSource {
         preLoginEvent.setCancelled(true);
 
         if (message == null) {
-            preLoginEvent.setCancelReason(new ComponentBuilder("Kicked").color(ChatColor.WHITE).create());
+            preLoginEvent.setReason(
+                    TextComponent.fromArray(
+                            new ComponentBuilder("Kicked").color(ChatColor.WHITE).create()
+                    ));
         } else {
-            preLoginEvent.setCancelReason(TextComponent.fromLegacyText(message));
+            preLoginEvent.setReason(
+                    TextComponent.fromArray(
+                            TextComponent.fromLegacyText(message)
+                    ));
         }
     }
 
@@ -72,7 +78,7 @@ public class BungeeLoginSource implements LoginSource {
     @Override
     public String toString() {
         return this.getClass().getSimpleName() + '{'
-            + "connection=" + connection
-            + '}';
+                + "connection=" + connection
+                + '}';
     }
 }

bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +28,6 @@ package com.github.games647.fastlogin.bungee;
 import com.github.games647.fastlogin.bungee.hook.BungeeAuthHook;
 import com.github.games647.fastlogin.bungee.listener.ConnectListener;
 import com.github.games647.fastlogin.bungee.listener.PluginMessageListener;
-import com.github.games647.fastlogin.core.AsyncScheduler;
 import com.github.games647.fastlogin.core.CommonUtil;
 import com.github.games647.fastlogin.core.hooks.AuthPlugin;
 import com.github.games647.fastlogin.core.hooks.bedrock.BedrockService;
@@ -38,6 +37,7 @@ import com.github.games647.fastlogin.core.message.ChangePremiumMessage;
 import com.github.games647.fastlogin.core.message.ChannelMessage;
 import com.github.games647.fastlogin.core.message.NamespaceKey;
 import com.github.games647.fastlogin.core.message.SuccessMessage;
+import com.github.games647.fastlogin.core.scheduler.AsyncScheduler;
 import com.github.games647.fastlogin.core.shared.FastLoginCore;
 import com.github.games647.fastlogin.core.shared.PlatformPlugin;
 import com.google.common.collect.MapMaker;
@@ -98,7 +98,7 @@ public class FastLoginBungee extends Plugin implements PlatformPlugin<CommandSen
         //events
         PluginManager pluginManager = getProxy().getPluginManager();
 
-        Listener connectListener = new ConnectListener(this, core.getAntiBot());
+        Listener connectListener = new ConnectListener(this, core.getAntiBotService());
         pluginManager.registerListener(this, connectListener);
         pluginManager.registerListener(this, new PluginMessageListener(this));
 

bungee/src/main/java/com/github/games647/fastlogin/bungee/event/BungeeFastLoginAutoLoginEvent.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bungee/src/main/java/com/github/games647/fastlogin/bungee/event/BungeeFastLoginPreLoginEvent.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bungee/src/main/java/com/github/games647/fastlogin/bungee/event/BungeeFastLoginPremiumToggleEvent.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/BungeeAuthHook.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

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

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -71,25 +71,43 @@ public class ConnectListener implements Listener {
     private static final String UUID_FIELD_NAME = "uniqueId";
     protected static final MethodHandle UNIQUE_ID_SETTER;
 
+    private static final String REWRITE_ID_NAME = "rewriteId";
+    protected static final MethodHandle REWRITE_ID_SETTER;
+
     static {
-        MethodHandle setHandle = null;
+        MethodHandle uniqueIdHandle = null;
+        MethodHandle rewriterHandle = null;
         try {
             Lookup lookup = MethodHandles.lookup();
 
+            // test for implementation class availability
             Class.forName("net.md_5.bungee.connection.InitialHandler");
-
-            Field uuidField = InitialHandler.class.getDeclaredField(UUID_FIELD_NAME);
-            uuidField.setAccessible(true);
-            setHandle = lookup.unreflectSetter(uuidField);
+            uniqueIdHandle = getHandlerSetter(lookup, UUID_FIELD_NAME);
+            try {
+                rewriterHandle = getHandlerSetter(lookup, REWRITE_ID_NAME);
+            } catch (NoSuchFieldException noSuchFieldEx) {
+                Logger logger = LoggerFactory.getLogger(ConnectListener.class);
+                logger.error(
+                        "Rewrite field not found. Setting only legacy BungeeCord field"
+                );
+            }
         } catch (ReflectiveOperationException reflectiveOperationException) {
             Logger logger = LoggerFactory.getLogger(ConnectListener.class);
             logger.error(
-                    "Cannot find Bungee initial handler; Disabling premium UUID and skin won't work.",
+                    "Cannot find Bungee UUID field implementation; Disabling premium UUID and skin won't work.",
                     reflectiveOperationException
             );
         }
 
-        UNIQUE_ID_SETTER = setHandle;
+        UNIQUE_ID_SETTER = uniqueIdHandle;
+        REWRITE_ID_SETTER = rewriterHandle;
+    }
+
+    private static MethodHandle getHandlerSetter(Lookup lookup, String fieldName)
+            throws NoSuchFieldException, IllegalAccessException {
+        Field uuidField = InitialHandler.class.getDeclaredField(fieldName);
+        uuidField.setAccessible(true);
+        return lookup.unreflectSetter(uuidField);
     }
 
     private final FastLoginBungee plugin;
@@ -179,6 +197,12 @@ public class ConnectListener implements Listener {
             // So we have to do it with reflection
             UNIQUE_ID_SETTER.invokeExact(connection, offlineUUID);
 
+            // if available set rewrite id to forward the UUID for newer BungeeCord versions since
+            // https://github.com/SpigotMC/BungeeCord/commit/1be25b6c74ec2be4b15adf8ca53a0497f01e2afe
+            if (REWRITE_ID_SETTER != null) {
+                REWRITE_ID_SETTER.invokeExact(connection, offlineUUID);
+            }
+
             String format = "Overridden UUID from {} to {} (based of {}) on {}";
             plugin.getLog().info(format, oldPremiumId, offlineUUID, username, connection);
         } catch (Exception ex) {

bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PluginMessageListener.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -131,7 +131,7 @@ public class PluginMessageListener implements Listener {
             loginSession.setRegistered(true);
 
             if (!loginSession.isAlreadySaved()) {
-                playerProfile.setPremium(true);
+                playerProfile.setOnlinemodePreferred(true);
                 plugin.getCore().getStorage().save(playerProfile);
                 loginSession.setAlreadySaved(true);
             }

bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncPremiumCheck.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -81,7 +81,7 @@ public class AsyncPremiumCheck extends JoinManagement<ProxiedPlayer, CommandSend
         plugin.getSession().put(source.getConnection(), new BungeeLoginSession(username, registered, profile));
 
         String ip = source.getAddress().getAddress().getHostAddress();
-        plugin.getCore().getPendingLogin().put(ip + username, new Object());
+        plugin.getCore().addLoginAttempt(ip, username);
     }
 
     @Override

bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncToggleMessage.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -64,12 +64,12 @@ public class AsyncToggleMessage implements Runnable {
     private void turnOffPremium() {
         StoredProfile playerProfile = core.getStorage().loadProfile(targetPlayer);
         //existing player is already cracked
-        if (playerProfile.isSaved() && !playerProfile.isPremium()) {
+        if (playerProfile.isExistingPlayer() && !playerProfile.isOnlinemodePreferred()) {
             sendMessage("not-premium");
             return;
         }
 
-        playerProfile.setPremium(false);
+        playerProfile.setOnlinemodePreferred(false);
         playerProfile.setId(null);
         core.getStorage().save(playerProfile);
         PremiumToggleReason reason = (!isPlayerSender || !sender.getName().equalsIgnoreCase(playerProfile.getName()))
@@ -81,12 +81,12 @@ public class AsyncToggleMessage implements Runnable {
 
     private void activatePremium() {
         StoredProfile playerProfile = core.getStorage().loadProfile(targetPlayer);
-        if (playerProfile.isPremium()) {
+        if (playerProfile.isOnlinemodePreferred()) {
             sendMessage("already-exists");
             return;
         }
 
-        playerProfile.setPremium(true);
+        playerProfile.setOnlinemodePreferred(true);
         core.getStorage().save(playerProfile);
         PremiumToggleReason reason = (!isPlayerSender || !sender.getName().equalsIgnoreCase(playerProfile.getName()))
             ? PremiumToggleReason.COMMAND_OTHER : PremiumToggleReason.COMMAND_SELF;

bungee/src/main/java/com/github/games647/fastlogin/bungee/task/FloodgateAuthTask.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bungee/src/main/java/com/github/games647/fastlogin/bungee/task/ForceLoginTask.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bungee/src/main/resources/bungee.yml

@@ -11,8 +11,6 @@ author: games647, https://github.com/games647/FastLogin/graphs/contributors
 softDepends:
     # BungeeCord auth plugins
     - BungeeAuth
-    - BungeeCordAuthenticatorBungee
-    - SodionAuth
     # Bedrock Player Bridge
     - Geyser-BungeeCord
     - floodgate

bungee/src/test/java/com/github/games647/fastlogin/bungee/listener/ConnectListenerTest.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

checkstyle.xml

@@ -5,7 +5,7 @@
 
     The MIT License (MIT)
 
-    Copyright (c) 2015-2023 games647 and contributors
+    Copyright (c) 2015-2024 games647 and contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -29,35 +29,6 @@
 <!DOCTYPE module PUBLIC
           "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
           "https://checkstyle.org/dtds/configuration_1_3.dtd">
-
-<!--
-
-  Checkstyle configuration that checks the sun coding conventions from:
-
-    - the Java Language Specification at
-      https://docs.oracle.com/javase/specs/jls/se11/html/index.html
-
-    - the Sun Code Conventions at https://www.oracle.com/java/technologies/javase/codeconventions-contents.html
-
-    - the Javadoc guidelines at
-      https://www.oracle.com/technical-resources/articles/java/javadoc-tool.html
-
-    - the JDK Api documentation https://docs.oracle.com/en/java/javase/11/
-
-    - some best practices
-
-  Checkstyle is very configurable. Be sure to read the documentation at
-  https://checkstyle.org (or in your downloaded distribution).
-
-  Most Checks are configurable, be sure to consult the documentation.
-
-  To completely disable a check, just comment it out or delete it from the file.
-  To suppress certain violations please review suppression filters.
-
-  Finally, it is worth reading the documentation.
-
--->
-
 <module name="Checker">
   <!--
       If you set the basedir property below, then all reported file
@@ -227,7 +198,5 @@
       <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
       <property name="checkFormat" value="$1"/>
     </module>
-
   </module>
-
 </module>

core/pom.xml

@@ -4,7 +4,7 @@
 
     The MIT License (MIT)
 
-    Copyright (c) 2015-2023 games647 and contributors
+    Copyright (c) 2015-2024 games647 and contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -39,6 +39,11 @@
     <artifactId>fastlogin.core</artifactId>
     <packaging>jar</packaging>
 
+    <properties>
+        <!-- Still force Java 8 for the remaining project -->
+        <maven.compiler.release>8</maven.compiler.release>
+    </properties>
+
     <name>FastLoginCore</name>
 
     <repositories>
@@ -55,7 +60,7 @@
         </repository>
         <!-- Floodgate -->
         <repository>
-            <id>opencollab-snapshot</id>
+            <id>opencollab</id>
             <url>https://repo.opencollab.dev/maven-snapshots/</url>
             <releases>
                 <enabled>false</enabled>
@@ -68,7 +73,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.2</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -80,6 +85,39 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>jdk21</id>
+            <activation>
+                <jdk>[21,)</jdk>
+            </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <artifactId>maven-compiler-plugin</artifactId>
+                            <executions>
+                                <execution>
+                                    <id>jdk21</id>
+                                    <goals>
+                                        <goal>compile</goal>
+                                    </goals>
+                                    <configuration>
+                                        <release>21</release>
+                                        <compileSourceRoots>
+                                            <compileSourceRoot>${project.basedir}/src/main/java21</compileSourceRoot>
+                                        </compileSourceRoots>
+                                        <multiReleaseOutput>true</multiReleaseOutput>
+                                    </configuration>
+                                </execution>
+                            </executions>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+    </profiles>
+
     <dependencies>
         <!-- Libraries that we shade into the project -->
 
@@ -102,14 +140,21 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
-            <version>2.0.11</version>
+            <version>2.0.13</version>
         </dependency>
 
-        <!-- snakeyaml is present in Bungee, Spigot, Cauldron, so we could use this independent implementation -->
+        <!-- snakeyaml is present in Bungee, Spigot, so we could use this independent implementation -->
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-config</artifactId>
-            <version>1.19-R0.1-SNAPSHOT</version>
+            <version>1.20-R0.2-SNAPSHOT</version>
+        </dependency>
+
+        <!-- This is optional in BungeeCord-config, so we include it here manually -->
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>2.2</version>
         </dependency>
 
         <!--Floodgate for Xbox Live Authentication-->
@@ -158,46 +203,10 @@
         <dependency>
             <groupId>com.github.games647</groupId>
             <artifactId>craftapi</artifactId>
-            <version>0.6.2</version>
-        </dependency>
-
-        <!-- APIs we can use because they are available in all platforms (Spigot, Bungee, Velocity) -->
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <!-- Old version for velocity -->
-            <version>25.1-jre</version>
-            <!-- Exclude compile time dependencies not marked as such on upstream  -->
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.code.findbugs</groupId>
-                    <artifactId>jsr305</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.checkerframework</groupId>
-                    <artifactId>checker-qual</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.google.errorprone</groupId>
-                    <artifactId>error_prone_annotations</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.google.j2objc</groupId>
-                    <artifactId>j2objc-annotations</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>animal-sniffer-annotations</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <version>0.8.1</version>
         </dependency>
 
+        <!-- Database driver included in Spigot -->
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>

core/src/main/java/com/github/games647/fastlogin/core/CommonUtil.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -32,8 +32,8 @@ import org.slf4j.jul.JDK14LoggerAdapter;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
+import java.time.Duration;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 
 public final class CommonUtil {
@@ -41,11 +41,11 @@ public final class CommonUtil {
     private static final char COLOR_CHAR = '&';
     private static final char TRANSLATED_CHAR = '§';
 
-    public static <K, V> ConcurrentMap<K, V> buildCache(int expireAfterWrite, int maxSize) {
+    public static <K, V> ConcurrentMap<K, V> buildCache(Duration expireAfterWrite, int maxSize) {
         CacheBuilder<Object, Object> builder = CacheBuilder.newBuilder();
 
-        if (expireAfterWrite > 0) {
-            builder.expireAfterWrite(expireAfterWrite, TimeUnit.MINUTES);
+        if (expireAfterWrite != null) {
+            builder.expireAfterWrite(expireAfterWrite);
         }
 
         if (maxSize > 0) {

core/src/main/java/com/github/games647/fastlogin/core/PremiumStatus.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/com/github/games647/fastlogin/core/ProxyAgnosticMojangResolver.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/com/github/games647/fastlogin/core/antibot/AntiBotService.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/com/github/games647/fastlogin/core/antibot/RateLimiter.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/com/github/games647/fastlogin/core/antibot/TickingRateLimiter.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/com/github/games647/fastlogin/core/hooks/AuthPlugin.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/com/github/games647/fastlogin/core/hooks/DefaultPasswordGenerator.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/com/github/games647/fastlogin/core/hooks/PasswordGenerator.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -34,8 +34,8 @@ public interface PasswordGenerator<P> {
 
     /**
      * Generate a password for a non-registered player
-     * @param player
-     * @return daw
+     * @param player player representation
+     * @return generated password
      */
     String getRandomPassword(P player);
 }

core/src/main/java/com/github/games647/fastlogin/core/hooks/bedrock/BedrockService.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/com/github/games647/fastlogin/core/hooks/bedrock/FloodgateService.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

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

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/com/github/games647/fastlogin/core/message/ChangePremiumMessage.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/com/github/games647/fastlogin/core/message/ChannelMessage.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/com/github/games647/fastlogin/core/message/LoginActionMessage.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/com/github/games647/fastlogin/core/message/NamespaceKey.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/com/github/games647/fastlogin/core/message/SuccessMessage.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/com/github/games647/fastlogin/core/scheduler/AbstractAsyncScheduler.java

@@ -0,0 +1,58 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015-2024 games647 and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.github.games647.fastlogin.core.scheduler;
+
+import org.slf4j.Logger;
+
+import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public abstract class AbstractAsyncScheduler {
+
+    protected final Logger logger;
+    protected final Executor processingPool;
+    protected final AtomicInteger currentlyRunning = new AtomicInteger();
+
+    public AbstractAsyncScheduler(Logger logger, Executor processingPool) {
+        this.logger = logger;
+        this.processingPool = processingPool;
+    }
+
+    public abstract CompletableFuture<Void> runAsync(Runnable task);
+
+    public abstract CompletableFuture<Void> runAsyncDelayed(Runnable task, Duration delay);
+
+    protected void process(Runnable task) {
+        currentlyRunning.incrementAndGet();
+        try {
+            task.run();
+        } finally {
+            currentlyRunning.getAndDecrement();
+        }
+    }
+}

core/src/main/java/com/github/games647/fastlogin/core/scheduler/AsyncScheduler.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,13 +23,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.github.games647.fastlogin.core;
+package com.github.games647.fastlogin.core.scheduler;
 
 import org.slf4j.Logger;
 
+import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * This limits the number of threads that are used at maximum. Thread creation can be very heavy for the CPU and
@@ -38,25 +38,14 @@ import java.util.concurrent.atomic.AtomicInteger;
  * is limited by the size of our database pool. The goal is to separate concerns into processing and blocking only
  * threads.
  */
-public class AsyncScheduler {
-
-    private static final int MAX_CAPACITY = 1024;
-
-    //todo: single thread for delaying and scheduling tasks
-    private final Logger logger;
-
-    // 30 threads are still too many - the optimal solution is to separate into processing and blocking threads
-    // where processing threads could only be max number of cores while blocking threads could be minimized using
-    // non-blocking I/O and a single event executor
-    private final Executor processingPool;
-
-    private final AtomicInteger currentlyRunning = new AtomicInteger();
+public class AsyncScheduler extends AbstractAsyncScheduler {
 
     public AsyncScheduler(Logger logger, Executor processingPool) {
-        this.logger = logger;
-        this.processingPool = processingPool;
+        super(logger, processingPool);
+        logger.info("Using legacy scheduler");
     }
 
+    @Override
     public CompletableFuture<Void> runAsync(Runnable task) {
         return CompletableFuture.runAsync(() -> process(task), processingPool).exceptionally(error -> {
             logger.warn("Error occurred on thread pool", error);
@@ -64,12 +53,22 @@ public class AsyncScheduler {
         });
     }
 
-    private void process(Runnable task) {
-        currentlyRunning.incrementAndGet();
-        try {
-            task.run();
-        } finally {
-            currentlyRunning.getAndDecrement();
-        }
+    @Override
+    public CompletableFuture<Void> runAsyncDelayed(Runnable task, Duration delay) {
+        return CompletableFuture.runAsync(() -> {
+            currentlyRunning.incrementAndGet();
+            try {
+                Thread.sleep(delay.toMillis());
+                process(task);
+            } catch (InterruptedException interruptedException) {
+                // restore interrupt flag
+                Thread.currentThread().interrupt();
+            } finally {
+                currentlyRunning.getAndDecrement();
+            }
+        }, processingPool).exceptionally(error -> {
+            logger.warn("Error occurred on thread pool", error);
+            return null;
+        });
     }
 }

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

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -55,6 +55,7 @@ import java.net.Proxy.Type;
 import java.net.UnknownHostException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.time.Duration;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
@@ -78,7 +79,10 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
     private static final long MAX_EXPIRE_RATE = 1_000_000;
 
     private final Map<String, String> localeMessages = new ConcurrentHashMap<>();
-    private final ConcurrentMap<String, Object> pendingLogin = CommonUtil.buildCache(5, -1);
+    private final ConcurrentMap<String, Object> pendingLogin = CommonUtil.buildCache(
+            Duration.ofMinutes(5), -1
+    );
+
     private final Collection<UUID> pendingConfirms = new HashSet<>();
     private final T plugin;
 
@@ -272,8 +276,16 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
         this.passwordGenerator = passwordGenerator;
     }
 
-    public ConcurrentMap<String, Object> getPendingLogin() {
-        return pendingLogin;
+    public void addLoginAttempt(String ip, String username) {
+        pendingLogin.put(ip + username, new Object());
+    }
+
+    public boolean hasFailedLogin(String ip, String username) {
+        if (!config.get("secondAttemptCracked", false)) {
+            return false;
+        }
+
+        return pendingLogin.remove(ip + username) != null;
     }
 
     public Collection<UUID> getPendingConfirms() {
@@ -284,7 +296,7 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
         return authPlugin;
     }
 
-    public AntiBotService getAntiBot() {
+    public AntiBotService getAntiBotService() {
         return antiBot;
     }
 

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

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -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
@@ -82,7 +82,7 @@ public abstract class FloodgateManagement<P extends C, C, L extends LoginSession
 
         profile = core.getStorage().loadProfile(username);
 
-        if (profile.isSaved()) {
+        if (profile.isExistingPlayer()) {
             if (profile.isFloodgateMigrated()) {
                 if (profile.getFloodgate() == FloodgateState.TRUE && isLinked) {
                     core.getPlugin().getLog()
@@ -121,7 +121,7 @@ public abstract class FloodgateManagement<P extends C, C, L extends LoginSession
             //maybe Bungee without auth plugin
             if (authPlugin == null) {
                 if (profile != null) {
-                    isRegistered = profile.isPremium();
+                    isRegistered = profile.isOnlinemodePreferred();
                 } else {
                     isRegistered = false;
                 }

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

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -47,7 +47,7 @@ public enum FloodgateState {
      */
     NOT_MIGRATED(3);
 
-    private int value;
+    private final int value;
 
     FloodgateState(int value) {
         this.value = value;

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

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -81,7 +81,7 @@ public abstract class ForceLoginManagement<P extends C, C, L extends LoginSessio
                         //update only on success to prevent corrupt data
                         if (playerProfile != null) {
                             playerProfile.setId(session.getUuid());
-                            playerProfile.setPremium(true);
+                            playerProfile.setOnlinemodePreferred(true);
                             storage.save(playerProfile);
                         }
 
@@ -91,7 +91,7 @@ public abstract class ForceLoginManagement<P extends C, C, L extends LoginSessio
             } else if (playerProfile != null) {
                 //cracked player
                 playerProfile.setId(null);
-                playerProfile.setPremium(false);
+                playerProfile.setOnlinemodePreferred(false);
                 storage.save(playerProfile);
             }
         } catch (Exception ex) {

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

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -48,8 +48,6 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
     }
 
     public void onLogin(String username, S source) {
-        core.getPlugin().getLog().info("Handling player {}", username);
-
         //check if the player is connecting through Bedrock Edition
         if (bedrockService != null && bedrockService.isBedrockConnection(username)) {
             //perform Bedrock specific checks and skip Java checks if no longer needed
@@ -59,7 +57,6 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
         }
 
         StoredProfile profile = core.getStorage().loadProfile(username);
-
         //can't be a premium Java player, if it's not saved in the database
         if (profile == null) {
             return;
@@ -74,62 +71,65 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
         } else {
             profile.setFloodgate(FloodgateState.FALSE);
             core.getPlugin().getLog().info(
-                    "Player {} will be migrated to the v2 database schema as a JAVA user", username);
+                    "Player {} will be migrated to the v2 database schema as a JAVA user", username
+            );
         }
 
         callFastLoginPreLoginEvent(username, source, profile);
 
-        Configuration config = core.getConfig();
-
         String ip = source.getAddress().getAddress().getHostAddress();
         profile.setLastIp(ip);
-        try {
-            if (profile.isSaved()) {
-                if (profile.isPremium()) {
-                    core.getPlugin().getLog().info("Requesting premium login for registered player: {}", username);
-                    requestPremiumLogin(source, profile, username, true);
-                } else {
-                    if (isValidUsername(source, profile)) {
-                        startCrackedSession(source, profile, username);
-                    }
-                }
+        if (profile.isExistingPlayer()) {
+            if (profile.isOnlinemodePreferred()) {
+                core.getPlugin().getLog().info("Requesting premium login for registered player: {}", username);
+                requestPremiumLogin(source, profile, username, true);
             } else {
-                if (core.getPendingLogin().remove(ip + username) != null && config.get("secondAttemptCracked", false)) {
-                    core.getPlugin().getLog().info("Second attempt login -> cracked {}", username);
-
-                    //first login request failed so make a cracked session
-                    startCrackedSession(source, profile, username);
-                    return;
-                }
-
-                Optional<Profile> premiumUUID = Optional.empty();
-                if (config.get("nameChangeCheck", false) || config.get("autoRegister", false)) {
-                    premiumUUID = core.getResolver().findProfile(username);
-                }
-
-                if (!premiumUUID.isPresent()
-                        || (!checkNameChange(source, username, premiumUUID.get())
-                        && !checkPremiumName(source, username, profile))) {
-                    //nothing detected the player as premium -> start a cracked session
-                    if (core.getConfig().get("switchMode", false)) {
-                        source.kick(core.getMessage("switch-kick-message"));
-                        return;
-                    }
-
+                if (isValidUsername(source, profile)) {
                     startCrackedSession(source, profile, username);
                 }
             }
+        } else {
+            performNewPlayerLogin(username, source, ip, profile);
+        }
+    }
+
+    private void performNewPlayerLogin(String username, S source, String ip, StoredProfile profile) {
+        try {
+            if (core.hasFailedLogin(ip, username)) {
+                core.getPlugin().getLog().info("Second attempt login -> cracked {}", username);
+
+                //first login request failed so make a cracked session
+                startCrackedSession(source, profile, username);
+                return;
+            }
+
+            Configuration config = core.getConfig();
+            Optional<Profile> premiumUUID = Optional.empty();
+            if (config.get("nameChangeCheck", false) || config.get("autoRegister", false)) {
+                premiumUUID = core.getResolver().findProfile(username);
+            }
+
+            if (!premiumUUID.isPresent()
+                    || (!isNameChanged(source, username, premiumUUID.get())
+                    && !isUsernameAvailable(source, username, profile))) {
+                //nothing detected the player as premium -> start a cracked session
+                if (core.getConfig().get("switchMode", false)) {
+                    source.kick(core.getMessage("switch-kick-message"));
+                    return;
+                }
+
+                startCrackedSession(source, profile, username);
+            }
         } catch (RateLimitException rateLimitEx) {
             core.getPlugin().getLog().error("Mojang's rate limit reached for {}. The public IPv4 address of this"
-                + " server issued more than 600 Name -> UUID requests within 10 minutes. After those 10"
-                + " minutes we can make requests again.", username);
+                    + " server issued more than 600 Name -> UUID requests within 10 minutes. After those 10"
+                    + " minutes we can make requests again.", username);
         } catch (Exception ex) {
-            core.getPlugin().getLog().error("Failed to check premium state for {}", username, ex);
             core.getPlugin().getLog().error("Failed to check premium state of {}", username, ex);
         }
     }
 
-    protected boolean isValidUsername(LoginSource source, StoredProfile profile) throws Exception {
+    protected boolean isValidUsername(LoginSource source, StoredProfile profile) {
         if (bedrockService != null && bedrockService.isUsernameForbidden(profile)) {
             core.getPlugin().getLog().info("Floodgate Prefix detected on cracked player");
             source.kick("Your username contains illegal characters");
@@ -139,7 +139,7 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
         return true;
     }
 
-    private boolean checkPremiumName(S source, String username, StoredProfile profile) throws Exception {
+    private boolean isUsernameAvailable(S source, String username, StoredProfile profile) throws Exception {
         core.getPlugin().getLog().info("GameProfile {} uses a premium username", username);
         if (core.getConfig().get("autoRegister", false) && (authHook == null || !authHook.isRegistered(username))) {
             requestPremiumLogin(source, profile, username, false);
@@ -149,7 +149,7 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
         return false;
     }
 
-    private boolean checkNameChange(S source, String username, Profile profile) {
+    private boolean isNameChanged(S source, String username, Profile profile) {
         //user not exists in the db
         if (core.getConfig().get("nameChangeCheck", false)) {
             StoredProfile storedProfile = core.getStorage().loadProfile(profile.getId());

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

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

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

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -31,7 +31,7 @@ public interface LoginSource {
 
     void enableOnlinemode() throws Exception;
 
-    void kick(String message) throws Exception;
+    void kick(String message);
 
     InetSocketAddress getAddress();
 }

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

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,8 +25,8 @@
  */
 package com.github.games647.fastlogin.core.shared;
 
-import com.github.games647.fastlogin.core.AsyncScheduler;
 import com.github.games647.fastlogin.core.hooks.bedrock.BedrockService;
+import com.github.games647.fastlogin.core.scheduler.AsyncScheduler;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.slf4j.Logger;
 

core/src/main/java/com/github/games647/fastlogin/core/shared/event/FastLoginAutoLoginEvent.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +30,7 @@ import com.github.games647.fastlogin.core.storage.StoredProfile;
 
 /**
  * This event fires if the plugin performs an auto login on the platform where the login plugin is
- *
+ * <p>
  * {@snippet :
  * @EventHandler()
  * public void onPlayerLogin(FastLoginAutoLoginEvent loginEvent) {

core/src/main/java/com/github/games647/fastlogin/core/shared/event/FastLoginCancellableEvent.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/com/github/games647/fastlogin/core/shared/event/FastLoginPreLoginEvent.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/com/github/games647/fastlogin/core/shared/event/FastLoginPremiumToggleEvent.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/com/github/games647/fastlogin/core/storage/AuthStorage.java

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 games647 and contributors
+ * Copyright (c) 2015-2024 games647 and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal